Merge pull request '2023-tech' (#3601) from 2023 into V20221228.patch