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

Merge 2.8.5

See merge request !732
3 jobs for master in 21 seconds (queued for 1 second)