Merge "Add missing conversation field" into udc-dev