Merge remote-tracking branch 'origin/master' into dependency-upgrade

22 jobs for dependency-upgrade in 40 minutes and 47 seconds (queued for 11 seconds)