Merge branch 'V20220718.patch' into issue-zpz-0801