Merge "Use proper environment to resolve SCL types in ontology module"