Merge "BUG-997: Rework URLSchemaContextResolver"