Merging required changes to handle forked transactions