Merge branch '2.6.1-dev' into 'master'

Merge 2.6.1-dev branch

See merge request !11
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 11 seconds