Merge "BUG-2931: Avoid removing mapping key when deleting mapping"