merged 6837 (6739_unity_upgrade) branch to 6739 (last live commit) to make this branch up to date with release branch and not the latest on main (which was all the wip stuff)