Ajay/Melanie | #2889/#2891 | Fetching entity for populating data-record