Issue #2630804 by Berdir, yongt9412: PaymentMethodBase::execute() tries to save a stale payment instance