(#579) - WIP Merge rev_map into rev_tree