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