GNR-16 removed old code
Merge branch 'release/v1.1.0' into develop