merge from main (lot of prefabs conflicting because of a manifest update on main, auto resolved all of them, went well)