Merge remote-tracking branch 'origin/V20221214' into repo-square