Merge branch 'qed-qedr-infrastructure'