TS-2555: fix to keep same context for a transaction