Merge branch 'aayush_test' into 'master'

Multiple improvements to Apps

See merge request e/apps/apps!60
1 job for master in 4 minutes and 9 seconds (queued for 2 seconds)