Merge branch 'V20220830' into fix-2628