While working on #1158 I noticed that the changes in @bollhals PR #1077 don't appear in the 7.x branch.
Here's another questionable place:
#1144 (review)
@michaelklishin @stebet I'm wondering what your thoughts are? I know we have planned 7.x as an "interim" before the "big release" but it seems like the branch can't be trusted right now.