Merge branch '2827_tweak_without_charset' into 4.8.1-stable