Fixed address cleansing.
Merge remote-tracking branch 'origin/master'
Fixed address cleansing.