GitHub pull request #6921 of commit a82eec3d0d3bdb724134aea7e9adfadf28166c9c, no merge conflicts.
This run spent: