GitHub pull request #6884 of commit c2dbb061510edc21a29a4263dfd1bfdab0790477, no merge conflicts.
This run spent: