Commit 133280120b4bc714bbb7665e383f36ab262c280a, after the fixes for Cayman in
master, still has the issue.

Or did you mean of me to cherry-pick specific fixes?