Add NPE check in Iron Engine

Closes #1420
Fluid level trigger for tanks
Merge branch 'nightly' into marmot
Merge branch 'marmot' into builder