Merge branch 'release/v1.2.1' into develop
fixed regression in settings not showing current settings
Merge branch 'hotfix/v1.2.2' into develop
Merge branch 'develop'