Merge "BUG-868: Migrate to SchemaContextListener"