GitHub pull request #7356 of commit ec76a50ab47b3e78f2735f2aa34264aa60c84270, no merge conflicts.
This run spent: