Revert "Revert "Manifest v2 changes""

This reverts commit 9a174ec1582400bf73c4cb693f5119d8b83b0e3f.