diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt
index 59a10159e8..97c112fe19 100644
--- a/pkgs/base/info.rkt
+++ b/pkgs/base/info.rkt
@@ -12,7 +12,7 @@
 
 (define collection 'multi)
 
-(define version "7.0.0.6")
+(define version "7.0.0.7")
 
 (define deps `("racket-lib"
                ["racket" #:version ,version]))
diff --git a/racket/src/cs/compile-file.ss b/racket/src/cs/compile-file.ss
index d6b861e844..8482548936 100644
--- a/racket/src/cs/compile-file.ss
+++ b/racket/src/cs/compile-file.ss
@@ -16,7 +16,7 @@
 (check-defined 'current-generate-id)
 (check-defined 'load-compiled-from-port)
 (check-defined 'collect-rendezvous)
-(check-defined '(define-ftype T (function __thread () void)))
+(check-defined '(define-ftype T (function __collect_safe () void)))
 
 ;; ----------------------------------------
 
diff --git a/racket/src/cs/io.sls b/racket/src/cs/io.sls
index 97ed29ab37..b62ef27858 100644
--- a/racket/src/cs/io.sls
+++ b/racket/src/cs/io.sls
@@ -114,7 +114,7 @@
              (with-syntax ([ret-type (convert-type #'orig-ret-type)]
                            [(arg-type ...) (map convert-type #'(orig-arg-type ...))]
                            [(conv ...) (if (#%memq 'blocking (map syntax->datum #'(flag ...)))
-                                           #'(__thread)
+                                           #'(__collect_safe)
                                            #'())])
                #'(let ([proc (foreign-procedure conv ... (rktio-lookup 'name)
                                                 (arg-type ...)
diff --git a/racket/src/cs/rumble/foreign.ss b/racket/src/cs/rumble/foreign.ss
index 9167ccfbc4..460ef9edd6 100644
--- a/racket/src/cs/rumble/foreign.ss
+++ b/racket/src/cs/rumble/foreign.ss
@@ -1380,7 +1380,7 @@
                           (lambda (to-wrap)
                             (,(if call? 'foreign-procedure 'foreign-callable)
                              ,conv
-                             ,@(if (or blocking? async-apply) '(__thread) '())
+                             ,@(if (or blocking? async-apply) '(__collect_safe) '())
                              to-wrap
                              ,(map (lambda (in-type id)
                                      (if id
diff --git a/racket/src/racket/src/schvers.h b/racket/src/racket/src/schvers.h
index 573d2aeead..d779579241 100644
--- a/racket/src/racket/src/schvers.h
+++ b/racket/src/racket/src/schvers.h
@@ -13,12 +13,12 @@
    consistently.)
 */
 
-#define MZSCHEME_VERSION "7.0.0.6"
+#define MZSCHEME_VERSION "7.0.0.7"
 
 #define MZSCHEME_VERSION_X 7
 #define MZSCHEME_VERSION_Y 0
 #define MZSCHEME_VERSION_Z 0
-#define MZSCHEME_VERSION_W 6
+#define MZSCHEME_VERSION_W 7
 
 #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
 #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)