Merge from waterpump_occlusion_fix