Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental