Merge branch 'feature/PLAY-225' into '2.5.x'

Resolve PLAY-225 "Feature/"

See merge request !407
3 jobs for 2.5.23 in 19 minutes and 23 seconds (queued for 1 second)
latest