Merge branch 'master' into queue
gets correct result for at least small job size