Fix replay mode
Merge branch 'master' into feature/video-recording