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