with new manifest
updated manifest according to 6811
Merge branch 'new-manifest'