Merge "Fix an issue with C-compatibility due to a missing tag name"