Merge "Use String8/16 c_str" into main