Merge "Improve transition logging" into udc-dev