Fix/2.7/billing triggers