Merge branch 'Support/2.6.X' into 'master'

Support/2.6.x

See merge request !467
2 jobs for 2.6.3
latest