I'm confused with the changeset.
Can you maybe look at the Branch_2_2_AS7 / master and send us a PR with the changes?
Ok ill send a change file..
Best D.