Merge Pack 2023mmdd

Things that were planned to do and things that were done actually