This patch address the PR20360. It has the following fixes
LGTM, though I think you should check this in as two separate changes, first 1, then 2&3.
Sure. I will split in to two
I split the earlier patch in to two
The other half of the patch is at
I don't have commit access.
Can some one merge this ?