Merge "idmap2: move commands to Result<Unit>"