I know it isn't a big issue but this hasn't been fixed. We are still seeing the wrong first match timing during swapping phase.