hotfix 1573
Merge branch 'hotfix/1573'
Merge branch 'hotfix/1573' into develop
Merge branch 'release/1.0.2'