Chase changes backported to FreeNAS 9