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

27 jobs for dependency-upgrade in 237 minutes and 42 seconds (queued for 2 seconds)