Merge branch 'V20221116' into zouap_static