support manifest 2
Merge branch 'manifest2'