Payment.InvoiceId now nullable