Merge branch 'qed-mf-updates'