Merge branch 'merge-16.0.7' into 'master'

Merge 16.0.7

See merge request !1418
42 jobs for master in 21 minutes and 50 seconds (queued for 6 seconds)