Merge branch 'manifest' into 'develop'