Merge branch 'merge-16.0.7' into 'master'

Merge 16.0.7

See merge request !1418
42 jobs for master in 19 minutes and 35 seconds (queued for 5 seconds)