Changes to be applied after the rebase.

See merge request !387
10 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds