Improved dataset endpoint.
Merge branch 'test' into dev