Merge "Ensure candidate phase logged in split branch" into udc-dev