Merge remote-tracking branch 'origin/V20221228' into fix-2417