Merge branch 'tm-merge-v11' into 'master'

Merged upstream Tusky v11

See merge request !8
2 jobs for master
in 13 minutes and 22 seconds, using 0 compute credits, and was queued for 1 minute