[BUG #7777] Fixed return types for data sets.