Merge "Skip merging non-ready transition" into udc-dev