Merge branch 'release/1.0.2' into develop
Fixed conditional
Version bump
Merge branch 'release/1.0.3'