diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf1e0d57f7e31d..1d790493d73721 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,8 @@ release.
14.0.0
-12.18.2
+12.18.3
+12.18.2
12.18.1
12.18.0
12.17.0
diff --git a/Makefile b/Makefile
index 55f82d05512bdb..354996e3955dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -298,8 +298,8 @@ v8:
jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addon tests and JS tests
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
--skip-tests=$(CI_SKIP_TESTS) \
- $(CI_JS_SUITES) \
- $(CI_NATIVE_SUITES)
+ $(JS_SUITES) \
+ $(NATIVE_SUITES)
.PHONY: tooltest
tooltest:
@@ -492,9 +492,11 @@ test-all-valgrind: test-build
test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run all test suites.
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/*
+JS_SUITES ?= default
+NATIVE_SUITES ?= addons js-native-api node-api
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
-CI_NATIVE_SUITES ?= addons js-native-api node-api
-CI_JS_SUITES ?= default benchmark
+CI_NATIVE_SUITES ?= $(NATIVE_SUITES)
+CI_JS_SUITES ?= $(JS_SUITES) benchmark
ifeq ($(node_use_openssl), false)
CI_DOC := doctool
else
@@ -654,8 +656,8 @@ test-with-async-hooks:
$(MAKE) build-node-api-tests
$(MAKE) cctest
NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
- $(CI_JS_SUITES) \
- $(CI_NATIVE_SUITES)
+ $(JS_SUITES) \
+ $(NATIVE_SUITES)
.PHONY: test-v8
diff --git a/README.md b/README.md
index 35f8b4d84ff9cc..9cc3dd2c82ea3d 100644
--- a/README.md
+++ b/README.md
@@ -311,6 +311,8 @@ For information about the governance of the Node.js project, see
**Gireesh Punathil** <gpunathi@in.ibm.com> (he/him)
* [guybedford](https://github.com/guybedford) -
**Guy Bedford** <guybedford@gmail.com> (he/him)
+* [HarshithaKP](https://github.com/HarshithaKP) -
+**Harshitha K P** <harshitha014@gmail.com> (she/her)
* [hashseed](https://github.com/hashseed) -
**Yang Guo** <yangguo@chromium.org> (he/him)
* [himself65](https://github.com/himself65) -
diff --git a/doc/api/dns.md b/doc/api/dns.md
index 73f3d80254ac2f..e5ad6544a98599 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -96,7 +96,7 @@ The following methods from the `dns` module are available:
|