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