Merge "Small improvements in code cleanliness" into udc-dev