diff --git a/README.rst b/README.rst
index 1b539c67..abb3f5f6 100644
--- a/README.rst
+++ b/README.rst
@@ -93,6 +93,7 @@ Development Platforms
 * `RISC-V <https://platformio.org/platforms/riscv?utm_source=github&utm_medium=core>`_
 * `RISC-V GAP <https://platformio.org/platforms/riscv_gap?utm_source=github&utm_medium=core>`_
 * `Samsung ARTIK <https://platformio.org/platforms/samsung_artik?utm_source=github&utm_medium=core>`_
+* `Shakti <https://platformio.org/platforms/shakti?utm_source=github&utm_medium=core>`_
 * `Silicon Labs EFM32 <https://platformio.org/platforms/siliconlabsefm32?utm_source=github&utm_medium=core>`_
 * `ST STM32 <https://platformio.org/platforms/ststm32?utm_source=github&utm_medium=core>`_
 * `ST STM8 <https://platformio.org/platforms/ststm8?utm_source=github&utm_medium=core>`_
@@ -117,6 +118,7 @@ Frameworks
 * `mbed <https://platformio.org/frameworks/mbed?utm_source=github&utm_medium=core>`_
 * `PULP OS <https://platformio.org/frameworks/pulp-os?utm_source=github&utm_medium=core>`_
 * `Pumbaa <https://platformio.org/frameworks/pumbaa?utm_source=github&utm_medium=core>`_
+* `Shakti <https://platformio.org/frameworks/shakti?utm_source=github&utm_medium=core>`_
 * `Simba <https://platformio.org/frameworks/simba?utm_source=github&utm_medium=core>`_
 * `SPL <https://platformio.org/frameworks/spl?utm_source=github&utm_medium=core>`_
 * `STM32Cube <https://platformio.org/frameworks/stm32cube?utm_source=github&utm_medium=core>`_
diff --git a/docs b/docs
index 9bd32976..e755c715 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 9bd3297645386bb2b84bdbb9de793369ec76ce83
+Subproject commit e755c715fff103557eb4727f46c391216b378c08
diff --git a/examples b/examples
index 7e80325b..bf351dbc 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit 7e80325b974382034f1247372974bdfd2a6194ae
+Subproject commit bf351dbce107e39850bbc95385a6986b3088c302
diff --git a/tests/test_pkgmanifest.py b/tests/test_pkgmanifest.py
index 675169d4..db531b93 100644
--- a/tests/test_pkgmanifest.py
+++ b/tests/test_pkgmanifest.py
@@ -15,6 +15,7 @@
 import pytest
 
 from platformio import datamodel
+from platformio.compat import WINDOWS
 from platformio.package.manifest import model, parser
 
 
@@ -509,8 +510,8 @@ def test_examples_from_dir(tmpdir_factory):
     pio_dir.join(".vimrc").write("")
     pio_ini = pio_dir.join("platformio.ini")
     pio_ini.write("")
-    pio_dir.join("platformio.ini.copy").mksymlinkto(pio_ini)
-    pio_dir.join("platformio.ini").write("")
+    if not WINDOWS:
+        pio_dir.join("platformio.ini.copy").mksymlinkto(pio_ini)
     pio_dir.mkdir("include").join("main.h").write("")
     pio_dir.mkdir("src").join("main.cpp").write("")