Merge "MAP MCE remove cancelDiscovery"