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