Merge branch 'hotfix/v1.0.1' into develop
Merge branch 'hotfix/v1.0.2' into develop
Check that property exists to avoid property not defined errors
Merge branch 'release/v1.0.3'