Merge "Updating to go back to repeated" into udc-dev