Fixed issues in schema resolving.

Merge request reports

Loading