GitHub pull request #6915 of commit aed66336f1023ebc51b237c25f3ad522a72f8a78, no merge conflicts.
This run spent: