Adopt localize2
in a few more places
#203919
Merged
localize2
in a few more places
#203919