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