Merge branch 'release/v1.2.2-constellation' into develop
Merge branch 'master' into develop
Fix NPM package.json