Merge "Swap cog and left hand side of row" into main