Merge pull request #1344 from sjpadgett/front-payment-exits