Has anybody come up with a workaround that allows for the invoices and the original estimate to maintain their "link".  The only workaround, to get the custom invoice templates to be applied, requires that the invoice IS NOT "linked" to the original estimate...which is not ideal for tracking balance paid and balance owed on the original estimate's total.