Merge SCHEMA_WORK into HEAD. Lots of changes, some things are probably broken: