All the changes needed to make the pipelining code work!
Merge branch 'wip/maxelerpipelining'