Transaction is rolled back only if it is active.
Merge remote-tracking branch 'origin/develop' into develop