GitHub pull request #7322 of commit 0fa80a49d5ab9142c7c8a33923f893f776d3592c, no merge conflicts.
This run spent: