Merge branch 'V20221130' into fix-2775-v1