Issue #5888: Type resolution adaptation
Merge pull request #2236 from VisualSJ/5888

Issue #5888: Type resolution adaptation