Backport locale compare deprecations

Closes #3037031

Merge request reports

Loading