GNR-28 bugfixes
Merge branch 'hotfix/v1.0.3'