Merge remote-tracking branch 'origin/master' into query-trace

11 jobs for query-trace
in 6 minutes and 44 seconds and was queued for 15 seconds