Code review comment for lp://staging/~oif-team/grail/grail2

It was a bit of work for all of us to get this one in, now that it is done, thank you.

I will update 2.x to this point also, and remake the remaining branches.

Cheers!