[D11] Merge from art optimisation - includes fixes for some issues brought up in the last merge, and reverting sewer_tunnel_tjunction_600x600