fixes SettingTest fixture change failure
Merge branch 'develop' into feature/mobile