[DO NOT MERGE] Manifest changes