Merge branch 'stable'
new manifest format