diff --git a/HISTORY.rst b/HISTORY.rst
index f59d36aa..9e9e5a44 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,7 +7,9 @@ PlatformIO 3.0
 3.6.6 (2019-??-??)
 ~~~~~~~~~~~~~~~~~~
 
-* Fixed error with conflicting declaration of a prototype (Arduino sketch preprocessor)
+* Project Generator: fixed a warning "Property !!! WARNING !!! is not allowed" for VSCode
+  (`issue #2243 <https://github.com/platformio/platformio-core/issues/2243>`_)
+* Fixed an error with conflicting declaration of a prototype (Arduino sketch preprocessor)
 * Fixed "FileExistsError" when `platformio ci <https://docs.platformio.org/en/latest/userguide/cmd_ci.html>`__ command is used in pair with ``--keep-build-dir`` option
 
 3.6.5 (2019-03-07)
diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
index 5f0343de..75d77ffd 100644
--- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
@@ -1,7 +1,9 @@
 {
-    "!!! WARNING !!!": "PLEASE DO NOT MODIFY THIS FILE! USE https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags",
     "configurations": [
         {
+            "name": "!!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags"
+        },
+        {
 % import platform
 % from os.path import commonprefix, dirname
 %