Re #1296 Preparing corelib for dataset API enhancements.