I am happy to merge this one if you can amend this patch. I will close mine.