Bug fixes
Resolve merge conflicts
Merge branch 'master' of https://github.com/zakhar-herych/ReflectMobile