Merge "Use String8/16 c_str [backup]" into main