bug fix: iOS
Merge branch 'master' into develop