Generalized a few methods away.
Merge branch 'aae' into fifo