Merge branch 'mdw/addrcheck'