Merge branch 'ff/zfs'