Port from #6619

[Delawen]

Port from #6619

[pure-bot]

Pull request approved by @oscerd - applying pr/approved label

[zregvart]

@Delawen you can just add backport 1.8.x label to the pull request on master (#6619) and let the bot do the rest...

[Delawen]

Magic! 💃

[backporting]

The backport to 1.8.x failed:

Commits ["af5d82be2d7013757d95cfc5710f61f33b7ec844","352c5d1b87febe8a604c2208b49b71a2fe6d1d8d"] could not be cherry-picked on top of 1.8.x

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 1.8.x
# 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 af5d82be2d7013757d95cfc5710f61f33b7ec844 352c5d1b87febe8a604c2208b49b71a2fe6d1d8d
# Create a new branch with these backported commits.
git checkout -b backport-6637-to-1.8.x
# Push it to GitHub.
git push --set-upstream origin backport-6637-to-1.8.x
# 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 1.8.x and the compare/head branch is backport-6637-to-1.8.x.

[Delawen]

Nothing to compare, bot, both branches are the same.

[heiko-braun]

@Delawen The backport label needs to go onto the original PR that addresses master.