Merge "Remove todo comments as no more action items needed" into udc-dev