Fixed dataset state setter.
Merge branch 'test' into dev