RULE-10-4: Improve essential type detection
#745
Merged
RULE-10-4: Improve essential type detection
#745