Fixed bad return value in maybe create hashtrees
Merge branch 'aae' into fifo