LILY-483: improve Dataprovider lookup
Merge branch 'feature/483-dataprovider-update' into develop