Merge "Fixed leak and no clock carousel (1/3)" into udc-dev