Backport 531 to v4-6 branch

[robindevitt]

backporting #531

[hm-backport[bot]]

The backport to v4-3-branch failed:

Commits ["a2758b3c5ab3bbd4838ad23bb547b2b0b984116e","c981715633a6fe367a3b6aa678e96a5eb9b35217","5bd2622fa5f5b91a947ec8121adcdf0c1a042678","ee4f421b7f0eac974a80c66e0c019789fded32a4","7ce5bc5106bb9cc8e414e25c4d15f4792cadffba","6e5441add48cd2be86614a3483e9069f8eddcc7d","8e57507b41cb4fe94992f25a95de6fc7c9762ce5"] could not be cherry-picked on top of v4-3-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v4-3-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick a2758b3c5ab3bbd4838ad23bb547b2b0b984116e c981715633a6fe367a3b6aa678e96a5eb9b35217 5bd2622fa5f5b91a947ec8121adcdf0c1a042678 ee4f421b7f0eac974a80c66e0c019789fded32a4 7ce5bc5106bb9cc8e414e25c4d15f4792cadffba 6e5441add48cd2be86614a3483e9069f8eddcc7d 8e57507b41cb4fe94992f25a95de6fc7c9762ce5
# Create a new branch with these backported commits.
git checkout -b backport-535-to-v4-3-branch
# Push it to GitHub.
git push --set-upstream origin backport-535-to-v4-3-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v4-3-branch and the compare/head branch is backport-535-to-v4-3-branch.