diff --git a/CHANGELOG b/CHANGELOG
index 89f246429e..52bff8dcf2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,8 @@ v2.5.0 (XXXX-XX-XX)
 v2.4.1 (XXXX-XX-XX)
 -------------------
 
+* fixed invalid result of HTTP REST API method `/_admin/foxx/rescan`
+
 * fixed possible segmentation fault when passing a Buffer object into a V8 function 
   as a parameter
 
diff --git a/UnitTests/Makefile.unittests b/UnitTests/Makefile.unittests
index a36f50fe09..2c19d8d93a 100755
--- a/UnitTests/Makefile.unittests
+++ b/UnitTests/Makefile.unittests
@@ -447,6 +447,7 @@ SHELL_COMMON = \
                @top_srcdir@/js/common/tests/shell-index.js \
                @top_srcdir@/js/common/tests/shell-index-geo.js \
                @top_srcdir@/js/common/tests/shell-cap-constraint.js \
+               @top_srcdir@/js/common/tests/shell-cap-constraint-timecritical.js \
                @top_srcdir@/js/common/tests/shell-unique-constraint.js \
                @top_srcdir@/js/common/tests/shell-hash-index.js \
                @top_srcdir@/js/common/tests/shell-fulltext.js \
diff --git a/js/actions/api-foxx.js b/js/actions/api-foxx.js
index 7482710a3a..762fed8e02 100644
--- a/js/actions/api-foxx.js
+++ b/js/actions/api-foxx.js
@@ -155,7 +155,7 @@ actions.defineHttp({
     body: true,
     callback: function () {
       foxxManager.scanAppDirectory();
-      return true;
+      return { };
     }
   })
 });
diff --git a/js/server/modules/org/arangodb/foxx/base_middleware.js b/js/server/modules/org/arangodb/foxx/base_middleware.js
index 58082bd52e..40f50e42e2 100644
--- a/js/server/modules/org/arangodb/foxx/base_middleware.js
+++ b/js/server/modules/org/arangodb/foxx/base_middleware.js
@@ -152,7 +152,7 @@ BaseMiddleware = function () {
 ///
 /// `request.requestParts()`
 ///
-/// Returns a list containing the individual parts of a multi-part request.
+/// Returns an array containing the individual parts of a multi-part request.
 /// Each part contains a `headers` attribute with all headers of the part,
 /// and a `data` attribute with the content of the part in a Buffer object.
 /// If the request is not a multi-part request, this function will throw an