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