Merge branch 'default-shell-fix' into 'master'

This merge request resolves a few of the bugs and issues. See merge request !50
3 jobs from master in 19 minutes 29 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build Hamara Sugam Amd64
passed #1014
allowed to fail
build-hamara-sugam-amd64

11:13

passed #1005
allowed to fail
build-hamara-sugam-amd64

10:54

 
  Build Hamara Sugam I386
passed #1006
build-hamara-sugam-i386

08:16