Merge "Remove xtr id mappings on mapping overwrite"