Fix due to removal of deprecated Address::address().
Merge branch 'merge'