Fix for merge issues related to transaction state handled incorrectly.