Synchronize with upstream and fixing conflicts.

6 jobs for master
in 9 minutes and 34 seconds, using 0.0 compute credits, and was queued for 2 seconds