Merge branch 'V20220926' into zouap_dev