Merge from main Lots of code conflicts, all resolved except for one in PlayerModel.cs, looked fine Conflicts on binocular.entity, used changes from source (presumably related to refresh?)