Merge "Fix removal of expired mappings when merge on"