Original Checkout form branch JMS-17