Merge "BUG-997: Fix URLSchemaContextResolver"