Stabilize std::convert
and related code
#23875
Merged
std::convert
and related code
#23875