Make AFIP mandatory
Merge release back onto dev