Merge branch 'develop' into 'master'

Develop

See merge request !425
2 jobs for Support/2.6.X