Merge branch 'master' into develop
update catalog-bundle version
Merge branch 'develop'