Merge "Native crash -> ISE" into udc-dev