Created attachment 78081 [details] [review]
one more test

One more thing to try.  Can you try this patch on top of the previous patches
(attachment 77705 [details] [review], attachment 77743 [details] [review], attachment 78000 [details] [review]).