Merge branch 'V20220718' into fix-2418