Merge branch 'backport-no-global-setlocale' into release-3.1