GNR-9 bugfixes
Merge branch 'hotfix/v1.0.2'