merged legacy-inetnum branch.