Merge branch 'hotfix/0.2.6'
Undo iOS temp fixes
Merge branch 'hotfix/0.2.7' into dev