Merge branch 'V20221214' into zouap_static