A new invoice template merge field, and more.