Merge commit '15c1e631' into update_suqc

8 jobs for update_suqc in 125 minutes and 27 seconds (queued for 2 seconds)