@imp : Do you have further comments on this patch ? Are we good to push it to the tree ?

Need to adjust patch description a bit to keep code changes and description better aligned.

In D44282#1010108, @imp wrote:

Looks good, feel free to take up or not my suggestion.

Next time, please generate diffs with -U99999 so that we get the full context. It's a lot easier to see it here than to jump over to a terminal to look at it in emacs.