Merge "fifo: improve blocking and hysteresis"