Merge "idmap2: fix clang-tidy warnings [misc-*]"