diff --git a/.github/workflows/integ-tests-with-security.yml b/.github/workflows/integ-tests-with-security.yml
index 4ff9ff6faa..72197a22a7 100644
--- a/.github/workflows/integ-tests-with-security.yml
+++ b/.github/workflows/integ-tests-with-security.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21 ]
 
     runs-on: ubuntu-latest
     container:
@@ -60,7 +60,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, macos-latest ]
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21 ]
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
index 34c45d2108..f962dc45e7 100644
--- a/.github/workflows/sql-test-and-build-workflow.yml
+++ b/.github/workflows/sql-test-and-build-workflow.yml
@@ -31,6 +31,7 @@ jobs:
         java:
           - 11
           - 17
+          - 21
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -108,6 +109,8 @@ jobs:
           - { os: macos-latest, java: 11}
           - { os: windows-latest, java: 17, os_build_args: -x doctest -PbuildPlatform=windows }
           - { os: macos-latest, java: 17 }
+          - { os: windows-latest, java: 21, os_build_args: -x doctest -PbuildPlatform=windows }
+          - { os: macos-latest, java: 21 }
     runs-on: ${{ matrix.entry.os }}
 
     steps:
diff --git a/docs/user/dql/functions.rst b/docs/user/dql/functions.rst
index 5af21df2bf..b445fffa63 100644
--- a/docs/user/dql/functions.rst
+++ b/docs/user/dql/functions.rst
@@ -4082,7 +4082,7 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> select * from books where multi_match(['title'], 'Pooh House');
+    os> select id, title, author from books where multi_match(['title'], 'Pooh House');
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4093,7 +4093,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
+    os> select id, title, author from books where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4152,7 +4152,7 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> select * from books where simple_query_string(['title'], 'Pooh House');
+    os> select id, title, author from books where simple_query_string(['title'], 'Pooh House');
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4163,7 +4163,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
+    os> select id, title, author from books where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4214,7 +4214,7 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> select * from books where query_string(['title'], 'Pooh House');
+    os> select id, title, author from books where query_string(['title'], 'Pooh House');
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4225,7 +4225,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where query_string(['title'], 'Pooh House', default_operator='AND');
+    os> select id, title, author from books where query_string(['title'], 'Pooh House', default_operator='AND');
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4276,7 +4276,7 @@ Available parameters include:
 
 Example with only ``query_expressions``, and all other parameters are set default values::
 
-    os> select * from books where query('title:Pooh House');
+    os> select id, title, author from books where query('title:Pooh House');
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4287,7 +4287,7 @@ Example with only ``query_expressions``, and all other parameters are set defaul
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where query('title:Pooh House', default_operator='AND');
+    os> select id, title, author from books where query('title:Pooh House', default_operator='AND');
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -4321,7 +4321,7 @@ The `score_query` and `scorequery` functions are alternative names for the `scor
 
 Example boosting score::
 
-    os> select *, _score from books where score(query('title:Pooh House', default_operator='AND'), 2.0);
+    os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 2.0);
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+-----------+
     | id   | title                    | author               | _score    |
@@ -4329,7 +4329,7 @@ Example boosting score::
     | 1    | The House at Pooh Corner | Alan Alexander Milne | 1.5884793 |
     +------+--------------------------+----------------------+-----------+
 
-    os> select *, _score from books where score(query('title:Pooh House', default_operator='AND'), 5.0) OR score(query('title:Winnie', default_operator='AND'), 1.5);
+    os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 5.0) OR score(query('title:Winnie', default_operator='AND'), 1.5);
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+-----------+
     | id   | title                    | author               | _score    |
diff --git a/docs/user/ppl/functions/relevance.rst b/docs/user/ppl/functions/relevance.rst
index 8eac6baade..fb31edb0d2 100644
--- a/docs/user/ppl/functions/relevance.rst
+++ b/docs/user/ppl/functions/relevance.rst
@@ -173,7 +173,7 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> source=books | where multi_match(['title'], 'Pooh House');
+    os> source=books | where multi_match(['title'], 'Pooh House') | fields id, title, author;
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -184,7 +184,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> source=books | where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
+    os> source=books | where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default) | fields id, title, author;
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -226,7 +226,7 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> source=books | where simple_query_string(['title'], 'Pooh House');
+    os> source=books | where simple_query_string(['title'], 'Pooh House') | fields id, title, author;
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -237,7 +237,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> source=books | where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
+    os> source=books | where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND') | fields id, title, author;
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -333,7 +333,7 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> source=books | where query_string(['title'], 'Pooh House');
+    os> source=books | where query_string(['title'], 'Pooh House') | fields id, title, author;
     fetched rows / total rows = 2/2
     +------+--------------------------+----------------------+
     | id   | title                    | author               |
@@ -344,7 +344,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> source=books | where query_string(['title'], 'Pooh House', default_operator='AND');
+    os> source=books | where query_string(['title'], 'Pooh House', default_operator='AND') | fields id, title, author;
     fetched rows / total rows = 1/1
     +------+--------------------------+----------------------+
     | id   | title                    | author               |