Merge remote-tracking branch 'origin/V20221102' into zouap_static