Update manifests
Merge branch 'release-script-2' into develop