And function to stop/start sub apps
Merge branch 'prepare-for-sub-apps'