handle special chars in addresses
Merge commit 'f4530eac46dde3a0e53c0eb4579024e67d868693' into dev