Merge "idmap2: fix static checks"