Another perf tweak
Add some API failsafes
Merge remote-tracking branch 'upstream/master'
Added colorRenderCache to Tank and Refinery