Resolution for a number of issues that cause UDT resolutions to fail.

mCurrentMap is now used as the base to resolve identities from.