Merge "Added null check after getPossibleType(STR.Component)"