Merge "core: Remove 'Data Retrieval API'"