Merge branch 'nla_in_addr'