Merge "Call getEntryData with correct user context." into udc-qpr-dev