changes to support new invoice features, #21293