Merge "Remove obsolete todo" into udc-qpr-dev