MAR-1 - Add in red code position aggregator
Merge remote-tracking branch 'origin/develop' into develop