Merge Chris's fix for Cash/Payments