GitHub pull request #6920 of commit 77f2e7b2eb9bf149324742e1a8ebde575e19a448, no merge conflicts.
This run spent: