Changed based on @lenary's comments on the PR.
Merge branch 'aae' into fifo