Possible fix to NPEs from Citizens.
Updated AllPay to v12 for Fe-economy main class refactor.