Merge remote-tracking branch 'origin/V20220801' into fix-2454