Improved behaviour of dataset behaviour.
Merge branch 'test' into dev