Merge branch 'next'
fix manifest