Merge branch 'bug_245_record_playback_fixes'