GitHub pull request #7284 of commit dc4886feaedd659d71377edd2d516044cd959fc6, no merge conflicts.
This run spent: