Merge "Blacklist Display#getAddress" into rvc-dev