Merge branch 'V20220815' into issue-zpz-0815