Merge branch 'release/1.0.12' into develop
Fix that getContext issue
Merge branch 'release/1.0.13'