Merge "Trace transition and changes flags" into udc-dev