Merge "Revert "Add module 'idmap'.""