Merge branch 'V20221102' into fix-2902