Merge branch 'V20221228' into zpz-issue-1228