Merge branch 'qed-fixes'