Merge some functionality down from old cartographer data-manager API