I don't think the BC will break, you should put no

@eagleoneraptor You need to update tests, as all of them looks to be bugged (see Travis moans =))

Also this should go to 2.3 as this issue occurs there too.

Sorry, @stloyd, this is what happen when one make a patch on the run with the GitHub editor :( , working on that right now.

So, this pull request should go in 2.3 and you later merge into master and 2.4or do I need to create multiple PR?

you don't create multiple PRs. We will merge it in 2.3, and then it will propagate to newer versions (this generally requires approximately 1 week).
If there is no conflcit when trying to apply the patch to 2.3 (or if they are easy to resolve), @fabpot will simply change the target of this PR when merging

Thanks for the PR! I added some more commits and completed the PR in #10687.