No. I was writing the same patch not knowing about your earlier patch