Automatic merge of upstream (1.16.6) into maistra/istio (maistra-2.4 branch) failed. cc @maistra/release-managers-2-4