Merge branch 'Issue_2781' into 'master'

Fixes #2781 - Tighten up ZFS and make sure it's all working.

Closes #2781

See merge request !57
1 job for master in 5 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Test
passed #676
gitpull

00:00:05