Merge branch 'hotfix/v1.0.3'
GNR-3 bugfix
Merge branch 'hotfix/v1.0.4' into develop