Call OnData-method in typed json in scope of the correct transaction. Closes #2034
Merge branch 'issue/2034' into develop
Merge branch 'develop' into issue/2035