Merge pull request #2735 from xmcclure/early-lookup-addr