The PR branch does seem to work, I'm planning to move almost all of my Qwen using workload over to it tonight.