Beta payment class modifications
Merge branch 'aj/beta_class' into develop