Merge "Fix reindex broken by removing entries from multimap"