Changes to address SW coordinators comments.

6 jobs for !2154 with JVET-Y0126 in 36 minutes and 34 seconds (queued for 6 seconds)
merge request