Merge pull request 'V20221214' (#3424) from V20221214 into develop