Merge "BUG-997: Introduce ASTSchemaSource"