Merge branch '13.0-dev' into '13.0'

13.0 dev

See merge request !2
8 jobs for 13.0 in 2 minutes and 15 seconds (queued for 1 second)