Merge apps and system modules into main

Created by: SunilMohanAdapa

Continuing the work by @500swapnil in #705 , I have finished merge work. Actual set of changes is quite small.