Merge branch 'release/1.0.2' into develop
Changes for 1.8.4
Merge branch 'release/1.8.4'