[COMMIT] Re: Fix the test failures introduced by the non-ISO-2022 coding systems