Merge "Fix issue with exception type resolution during linking."