Merge branch 'bug_752_audio_selection_fix' into experimental