Merge "idmap2: clang-format"