Add address rewriting for dc demo.
Merge remote-tracking branch 'origin/master'