Yesterday
Merge from corrupt_prefab_handling