Merge branch 'hotfix/remove_npm_min_version'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update from upstream