0.93 should fix this, if for no other reason that so much of that code is now totally different.

I'll test for the suspend scenario there.