Merge "Add IT for mapping change events"