Thanks.
I'll request that the changes in head be pulled back into 4.6.x.