Added unittest to reproduce #2033
Removed double scoping of transaction.
Returning null as value for ttrigger when sending patch from server. Fixes #2033
Merge branch 'issue/2033' into develop