Remove support for addresses in the name of performance.
Merge remote-tracking branch 'origin/master'