Merge branch 'V20220926' into issue-0926-zpz