on-merge: backport to v3.4.x
No open issues remain. View closed issues or see open milestones in this repository.