Merge "Fix for verifying introspected data"