Eng 6452 inline agg join

I'm not going to bother repeating all of my comments for the duplicate changes.