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

Support/2.8.x

See merge request !703
2 jobs for 2.8 in 20 seconds (queued for 3 seconds)
latest