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

Support/2.5.x

See merge request !346
1 job for 2.5 in 8 minutes and 45 seconds (queued for 6 minutes and 30 seconds)
latest