Merge remote-tracking branch 'gitlab/merge-requests/83' into maint-1.1

8 jobs for m12 in 42 minutes and 55 seconds (queued for 64 minutes and 43 seconds)