Could you try to apply both Oliver's and my patches? The log indicates the same double-resume deadlock.