Merge "ios-xe - check existence of element before removing it"