Merge branch 'hotfix/2.6.1' into 'master'

hotfix/2.6.1 into master

See merge request !447
3 jobs for master