Merge branch 'hotfix/2.0.1' into develop
Bump android versionCode
Merge branch 'release/2.0.2'