Merge branch 'V20220815' into fix-2633