Merge branch 'V20220519' into fix-1985