Minor API change: publisher and license now optional for Datasets
Fixed merge conflicts