Merge from main Stomp cake.entity.prefab due to incompatible changes, will need to be redone on this branch