Merge "Fixed the crash" into udc-dev