Merge "Fix normalize(float)"