Merge branch 'dm/configure-iconv-locale-charset'