update for replays
Merge branch 'replayfix' into dev