Manifest v2 compatability.
Merge branch 'hotfix/manifest-v2'