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

Support/2.7.x

See merge request !669
2 jobs for 2.7.4 in 42 seconds (queued for 23 minutes and 40 seconds)
latest