Created attachment 101204 [details] [review] test patch Are you able to test whether this helps at all?