Created attachment 92636 [details] [review] Patch against git commit 6ec210989fa10847091f06fcfcab77dd07618dff