Merge commit '9d693030' into upgrade_suqc

8 jobs for upgrade_suqc in 152 minutes and 4 seconds (queued for 2 seconds)