Merge from main. Messy, lots of prefab conflicts, took main for them all as I hadn't changed them locally. Resolved protobuf conflicts due to additions from multiple branches, kept 234 as spare so they can all remain sequential. Needs codegen.