Merge "Remove the transactionId field" into main