GitHub pull request #6910 of commit 198a99aef89163d83ec722888ed7c4fd7ca646af, no merge conflicts.
This run spent: