Charset added to dbconf.xml
Merge origin/master