[D11] water merge to (near) latest code, merge in most of the minor d11 changes though left quality tweaks out for now. As WIP continues on main branches it should now be quite easy to merge over.