Merge "Fixing missing type info in"