Merge branch 'qed-Slowpath-Queue-bug-fixes'