Merge branch 'release/v1.0.0'
GNR-18 update module paths
Merge branch 'hotfix/v1.0.1' into develop