Merge "Minor refactor to mark fields with respective annotations." into udc-qpr-dev