Merge branch 'hotfix/1.1.5'
WW menu quickfix
Bump version
Merge branch 'hotfix/1.1.6' into develop