Merge branch maxence-shuffling-in-writing with refs/merge-requests/250/train...

Merge branch maxence-shuffling-in-writing with refs/merge-requests/250/train into refs/merge-requests/257/train
25 jobs for !257 with maxence-shuffling-in-writing into master in 11 minutes and 48 seconds (queued for 5 seconds)
merge train