Merge branch 'V20221102' into zouap_static