Merge remote-tracking branch 'upstream/master' into kc_update

28 jobs for kc_update in 7 minutes and 30 seconds (queued for 2 seconds)