Merge "Separate diffing functionality into a separate class." into udc-dev