Issue #5888: Type resolution adaptation

Issue #5888: Type resolution adaptation