Merge branch '3.1.0_update' into '3.1'

3.1.0 update

See merge request !741
9 jobs for !741 with 3.1.0_update into 3.1 in 35 minutes and 58 seconds (queued for 2 minutes and 35 seconds)
latest