fixes
Merge pull request #3338 from ilya-lavrenov:ios_fixes