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

Support/2.5.x

See merge request !379
1 job for 2.5.2 in 8 minutes and 38 seconds
latest