Rebasing Cartography entity to the previous version