Merge branch 'V20221019' into fix-2915