Merge branch 'master' into trusted-namespace-change

2 jobs for !241 with namespace-change in 28 minutes and 44 seconds (queued for 5 seconds)
latest merge request