Merge "BUG-944: optimize SchemaContextUtil"