Make Builder support fluids via containers/pipes
Merge pull request #1862 from Prototik/builder-fluid

Make Builder support fluids via containers/pipes