Merge branch 'escape_schemas' into merge