Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fix wrong manifest url
Merge branch 'hotfix/manifest-path' into develop