Merge "Bug 2101: Do not block processing on transaction submit."