GitHub pull request #7376 of commit a2f79c832221fbe015175492a0dd1f1166508da9, no merge conflicts.
This run spent: