Merge pull request 'V20221130' (#3312) from V20221130 into develop