Merge branch 'V20220110' into fix-1156