It seems that you have included some kind of bugfixing in this PR (maybe I'm wrong). Should something about it written in CHANGES_NEXT_RELEASE?