Backport locale batch

Closes #3581303

Merge request reports

Loading