Merge remote-tracking branch 'upstream/master' into setup-hpa

3 jobs for !98 with setup-hpa in 23 minutes and 9 seconds (queued for 3 seconds)
latest merge request