diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index 1ffec017b94a1a..c7e45a40d7c86a 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -54,7 +54,9 @@ apk
 AppConfig
 AppImpl
 ApplianceControl
+applianceeventsandalert
 ApplianceIdentification
+appliancestatistics
 ApplicationBasic
 ApplicationId
 ApplicationIdentifier
@@ -239,6 +241,7 @@ ColorControl
 Comcast
 Commandline
 Commissionable
+commissionables
 CommissioningFlow
 commondatastorage
 CONF
@@ -462,6 +465,7 @@ fb
 fbb
 fbd
 FC
+FCJ
 FDDE
 fddead
 fde
@@ -591,6 +595,7 @@ InetLayer
 Infineon
 ini
 init
+InitArgs
 inlined
 installDebug
 instantiation
@@ -1131,6 +1136,7 @@ subtype
 sudo
 SulfateConcentrationMeasurement
 SulfurDioxideConcentrationMeasurement
+suppressResponse
 svg
 SVR
 SWD
diff --git a/docs/guides/chip_tool_guide.md b/docs/guides/chip_tool_guide.md
index 99b403cd168698..0554951bb1394c 100644
--- a/docs/guides/chip_tool_guide.md
+++ b/docs/guides/chip_tool_guide.md
@@ -82,7 +82,7 @@ following steps depend on the application clusters that you implemented on the
 device.
 
 This tutorial is using the
-[Matter lighting app example](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app)
+[Matter Lighting Application Example](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app)
 with the Bluetooth LE commissioning method support. You can use other Matter
 examples and still follow this procedure. If you use a different example, the
 [Step 7](#step-7-control-application-data-model-clusters) may vary depending on
@@ -91,7 +91,7 @@ the clusters implemented in your application.
 ### Step 1: Prepare the Matter device
 
 Build and program the device with the Matter device firmware by following the
-[Matter lighting-app example](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app)
+[Matter Lighting Application Example](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app)
 documentation.
 
 ### Step 2: Enable Bluetooth LE advertising on Matter device
@@ -113,8 +113,9 @@ You must provide the CHIP Tool with network credentials that will be used in the
 device commissioning procedure to configure the device with a network interface,
 such as Thread or Wi-Fi.
 
-The Matter specification does not define how the network credentials are to be
-obtained by controller.
+The Matter specification does not define the preferred way of how the network
+credentials are to be obtained by controller. In this guide, we are going to
+obtain Thread network credentials.
 
 #### Thread network credentials
 
@@ -156,7 +157,7 @@ The steps required to determine the SSID and password may vary depending on the
 setup. For instance, you might need to contact your local Wi-Fi network
 administrator.
 
-### Step 5: Determine Matter device's _discriminator_ and _setup PIN code_
+### Step 5: Determine Matter device's discriminator and setup PIN code
 
 Matter uses a 12-bit value called _discriminator_ to discern between multiple
 commissionable device advertisements and a 27-bit _setup PIN code_ to
@@ -180,11 +181,13 @@ code_ is equal to `20202021`.
 
 ### Step 6: Commission Matter device into existing IP network
 
-Before communicating with the Matter device, first have it join the existing IP
-network. Matter devices may use different commissioning channel. Typically,
-devices which are not yet connected to the target IP network use Bluetooth LE as
-the commissioning channel. On the other hand, if the device is already joined to
-the IP network it is enough to only commission it to the Matter network over IP
+Before communicating with the Matter device, first it must join an existing IP
+network.
+
+Matter devices may use different commissioning channel. Typically, devices which
+are not yet connected to the target IP network use Bluetooth LE as the
+commissioning channel. However, if the device has already joined an IP network,
+the only thing needed is to commission it to the Matter network over the IP
 protocol.
 
 #### Commissioning over Bluetooth LE
@@ -249,6 +252,10 @@ $ ./chip-tool pairing ble-wifi <node_id> hex:<ssid> hex:<password> <pin_code> <d
 This option is available when the Matter device is already present in an IP
 network, but it has not been commissioned to a Matter network yet.
 
+To commission the device, you can use either the setup PIN code or the setup PIN
+code and the discriminator, both of which you obtained in the step 5.
+Alternatively, you can also use a QR code payload.
+
 ##### Commissioning with setup PIN code
 
 Use the following command pattern to discover devices and try to pair with the
@@ -314,10 +321,10 @@ Having completed all previous steps, you have the Matter device successfully
 commissioned to the network. You can now test the device by interacting with
 Data Model clusters.
 
-For instance, in case of the lighting app example, the application has `onoff`
-and `levelcontrol` clusters implemented. This means that you can test by
-toggling the bulb (using `onoff`) or manipulating its brightness (using
-`levelcontrol`).
+For instance, in case of the lighting application, the application has the
+On/Off and Level Control clusters implemented. This means that you can test it
+by toggling the bulb (using the `onoff` cluster commands) or manipulating its
+brightness (using the `levelcontrol` cluster commands).
 
 Use the following command pattern to toggle the LED state:
 
@@ -350,8 +357,8 @@ In this command:
 
 ### Step 8: Read basic information from the Matter device
 
-Every Matter device supports a Basic Cluster, which maintains the collection of
-attributes that a controller can obtain from a device. These attributes can
+Every Matter device supports the Basic cluster, which maintains the collection
+of attributes that a controller can obtain from a device. These attributes can
 include the vendor name, the product name, or the software version.
 
 Use the CHIP Tool's `read` command on the `basic` cluster to read those values