GitHub pull request #6958 of commit 35bd9a126ae47d2291f266bf9487ddaf77e7af92, no merge conflicts.
This run spent: