Merge "Fix usage of incorrect function name" into integration