GitHub pull request #7296 of commit a6e711a06f9929a3ea63c685fe0aa4ab8eaac481, no merge conflicts.
This run spent: