Merge branch 'nkwork1' into 'master'

More work on DataObj

See merge request !20
3 jobs for master in 3 minutes (queued for 7 seconds)