Backport locale history to 11.x

Closes #3037156

Merge request reports

Loading