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