Fix #266

2 jobs for !167 with gus-main-patch-44324 in 35 minutes and 43 seconds
latest merge request