1.1: Update schemas
Merge branch 'refs/heads/1.1-schemas' into 1.1