Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"