Merge "More detailed logging to aid debugging." into udc-dev