Merge "Do not change the leash after completion" into udc-dev