Created attachment 113243 [details] [review] patch 2 Can you try these patches? Patch 1 is there only to avoid merge conflicts.