I can confirm that the patch from comment 16 does not fix the issue I'll now try both patches I'm working from revision 182879