This is a non locale issue and can be replaced with a  batch change in a different PR.