Fix/2.2/billing triggers