Merge branch 'qed-RoCE-fixes'