Changed priority calculation (zfs and shares)
Merge branch 'test' into dev