Merge pull request #2393 from wpaulino/bump-transaction-event-handler-fixups