Merge branch 'qed-driver'