Merge branch 'cue_fixes'