GitHub pull request #6916 of commit bca5c11f5b15110299e63bf1f6816dc7d52843a8, no merge conflicts.
This run spent: