Created attachment 93419 [details] [review] patch3 Note that this patch will not apply on the master branch.