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