Yes, they have. To your point about two and merging it into one, that's why it's important that the measure be simple, comprehensive, and fairly granular so it can't be messed with. There are always going to be some games that can be played, but they did a good job of coming up with a good, simple measure that was granular enough that you couldn't play those two-for-one kinds of games.
On February 5th, 2019. See this statement in context.