Changed subApp to map.
Merge branch 'release' into dev