merge change of Builder.fill() behavior

7 jobs for master in 69 minutes and 50 seconds (queued for 2 seconds)