Fixed bad call to dataset_set.
Merge branch 'test' into dev