Update upstream/3.26.x with 3.26.4

Include 3.26.4 in upstream branch

Merge request reports

Loading