Fixed handling of missing dataset fields.
Merge branch 'test' into dev