Merge branch 'origin' into 'master'

Update 4.2

See merge request !56
6 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 101 minutes and 19 seconds