Merge "Remove std::char_traits for non-standard types" into main