Merge branch 'V20220228' into fix-1477