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