Created attachment 92645 [details] [review] Patch against git d8c7740ddabeb456243e40dc3cf0e86c7fca09d0