Merge "Set transaction effect when the transaction is not a no-op" into main