Merge branch '2827_tweak_without_charset'