Revert "Revert "Merge pull request #14667 from mcav/utf7""

This reverts commit 7852023abb572c522a07af558e7c19f557cc4866.

That was a wrong revert, it didn't fix the failing tests.