Ah. Thanks for the explanation.

FYI, the reason that I was looking at this was because when trying to find the cause of #6682 `git bisect` pointed to this pull request. I don't think this is correct because (I think) this has only been merged in master but not release, but I am seeing problem in both master and release.