Merge "BUG-1281: fix SchemaContext module ordering"