Merge "Fix ambiguous method name"