Protect against inaccurate type_info information
Merge pull request #6897 from wmtan/ProtectAgainstIncorrectTypeInfo

Protect against inaccurate type_info information