Billing Manager Update (#2585)