Merge "Fix for data type mismatch which confuses safemul."