Merge branch 'develop'
Merge branch 'develop'
fix addlocalsource string to ascii conversion
remove unneeded paranthesis
Merge branch 'bugfix-ascii_encoding' into develop