Yesterday
Merge from blowpipe_test_tweaks