Revert tentative 2.0.7-GA release and fix incorrect save in CheckoutService