Fix issue with garbage data (bug 671969)

8 jobs for !71 with slb/kvamme62/garbage-data-was-returned in 13 minutes and 18 seconds
latest merge request