Don't show fake address - phishing prevention (#1488981)
Merge branch 'release-0.9' into rutgers_release-0.9