More prefabs changes
Merged