Merge "Add `value_` prefix" into udc-dev