diff --git a/.npmrc b/.npmrc
index b07eade64d5..2c7c6c1b584 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="39.6.0"
-ms_build_id="13330601"
+target="39.6.1"
+ms_build_id="13369494"
 runtime="electron"
 ignore-scripts=false
 build_from_source="true"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 3df57a48a97..90e662c384d 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-1a1bb622d9788793310458b7bf9eedcea8347da9556dd1d7661b757c15ebfdd5 *chromedriver-v39.6.0-darwin-arm64.zip
-c84565c127adeca567ca69e85bbd8f387fff1f83c09e69f6f851528f5602dc4e *chromedriver-v39.6.0-darwin-x64.zip
-f50df11f99a2e3df84560d5331608cd0a9d7a147a1490f25edfd8a95531918a2 *chromedriver-v39.6.0-linux-arm64.zip
-a571fd25e33f3b3bded91506732a688319d93eb652e959bb19a09cd3f67f9e5f *chromedriver-v39.6.0-linux-armv7l.zip
-2a50751190bbfe07984f7d8cbf2f12c257a4c132a36922a78c4e320169b8f498 *chromedriver-v39.6.0-linux-x64.zip
-cf6034c20b727c48a6f44bb87b1ec89fd4189f56200a32cd39cedaab3f19e007 *chromedriver-v39.6.0-mas-arm64.zip
-d2107db701c41fa5f3aaa04c279275ac4dcffde4542c032c806939acd8c6cd6c *chromedriver-v39.6.0-mas-x64.zip
-1593ed5550fa11c549fd4ff5baea5cb7806548bff15b79340343ac24a86d6de3 *chromedriver-v39.6.0-win32-arm64.zip
-deee89cbeed935a57551294fbc59f6a346b76769e27dd78a59a35a82ae3037d9 *chromedriver-v39.6.0-win32-ia32.zip
-f88a23ebc246ed2a506d6d172eb9ffbb4c9d285103285a735e359268fcd08895 *chromedriver-v39.6.0-win32-x64.zip
-2e1ec8568f4fda21dc4bb7231cdb0427fa31bb03c4bc39f8aa36659894f2d23e *electron-api.json
-03e743428685b44beeab9aa51bad7437387dc2ce299b94745ed8fb0923dd9a07 *electron-v39.6.0-darwin-arm64-dsym-snapshot.zip
-723d64530286ebd58539bc29deb65e9334ae8450a714b075d369013b4bbfdce0 *electron-v39.6.0-darwin-arm64-dsym.zip
-8f529fbbed8c386f3485614fa059ea9408ebe17d3f0c793269ea52ef3efdf8df *electron-v39.6.0-darwin-arm64-symbols.zip
-dace1f9e5c49f4f63f32341f8b0fb7f16b8cf07ce5fcb17abcc0b33782966b8c *electron-v39.6.0-darwin-arm64.zip
-e2425514469c4382be374e676edff6779ef98ca1c679b1500337fa58aa863e98 *electron-v39.6.0-darwin-x64-dsym-snapshot.zip
-877e72afd7d8695e8a4420a74765d45c30fad30606d3dbab07a0e88fe600e3f6 *electron-v39.6.0-darwin-x64-dsym.zip
-ae958c150c6fe76fc7989a28ddb6104851f15d2e24bd32fe60f51e308954a816 *electron-v39.6.0-darwin-x64-symbols.zip
-bed88dac3ac28249a020397d83f3f61871c7eaea2099d5bf6b1e92878cb14f19 *electron-v39.6.0-darwin-x64.zip
-a86e9470d6084611f38849c9f9b3311584393fa81b55d0bbf7e284a649b729cf *electron-v39.6.0-linux-arm64-debug.zip
-e7d7aec3873a6d2f2c9fe406a27a8668910f8b4fdf55a36b5302d9db3ec390db *electron-v39.6.0-linux-arm64-symbols.zip
-d6ded47a49046eb031800cf70f2b5d763ccac11dac64e70a874c62aaa115ccba *electron-v39.6.0-linux-arm64.zip
-2bf6a75c9f3c2400698c325e48c9b6444d108e4d76544fb130d04605002ae084 *electron-v39.6.0-linux-armv7l-debug.zip
-421d02c8a063602b22e4f16a2614fe6cc13e07f9d4ead309fe40aeac296fe951 *electron-v39.6.0-linux-armv7l-symbols.zip
-ee34896d1317f1572ed4f3ed8eb1719f599f250d442fc6afb6ec40091c4f4cdc *electron-v39.6.0-linux-armv7l.zip
-233f55caae4514144310928248a96bd3a3ce7ac6dc1ff99e7531737a579793b1 *electron-v39.6.0-linux-x64-debug.zip
-eca69e741b00ce141b9c2e6e63c1f77cd834a85aa095385f032fdb58d3154fff *electron-v39.6.0-linux-x64-symbols.zip
-94bf4bee48f3c657edffd4556abbe62556ca8225cbb4528d62eb858233a3c34b *electron-v39.6.0-linux-x64.zip
-6dfebeb760627df74c65ff8da7088fb77e0ae222cab5590fea4cdd37c060ea06 *electron-v39.6.0-mas-arm64-dsym-snapshot.zip
-b327d41507546799451a684b6061caed10f1c16ee39a7e686aac71187f8b7afe *electron-v39.6.0-mas-arm64-dsym.zip
-02a56a9c3c3522ebc653f03ad88be9a2f46594c730a767a28e7322ddb7a789b7 *electron-v39.6.0-mas-arm64-symbols.zip
-2fe93cd39521371bb5722c358feebadc5e79d79628b07a79a00a9d918e261de4 *electron-v39.6.0-mas-arm64.zip
-f25ddc8a9b2b699d6d9e54fdf66220514e387ae36e45efeb4d8217b1462503f6 *electron-v39.6.0-mas-x64-dsym-snapshot.zip
-6732026b6a3728bea928af0c5928bf82d565eebeb3f5dc5b6991639d27e7c457 *electron-v39.6.0-mas-x64-dsym.zip
-5260dabf5b0fc369e0f69d3286fbcce9d67bc65e3364e17f7bb13dd49e320422 *electron-v39.6.0-mas-x64-symbols.zip
-905f7cf95270afa92972b6c9242fc50c0afd65ffd475a81ded6033588f27a613 *electron-v39.6.0-mas-x64.zip
-9204c9844e89f5ca0b32a8347cf9141d8dcb66671906e299afa06004f464d9b0 *electron-v39.6.0-win32-arm64-pdb.zip
-6778c54d8cf7a0d305e4334501c3b877daf4737197187120ac18064f4e093b23 *electron-v39.6.0-win32-arm64-symbols.zip
-efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.6.0-win32-arm64-toolchain-profile.zip
-22b96aca4cf8f7823b98e3b20b6131e521e0100c5cd03ab76f106eefbd0399cf *electron-v39.6.0-win32-arm64.zip
-f5b69c8c1c9349a1f3b4309fb3fa1cf6326953e0807d2063fc27ba9f1400232e *electron-v39.6.0-win32-ia32-pdb.zip
-1d6e103869acdeb0330b26ee08089667e0b5afc506efcd7021ba761ed8b786b5 *electron-v39.6.0-win32-ia32-symbols.zip
-efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.6.0-win32-ia32-toolchain-profile.zip
-2b30e5bc923fff1443e2a4d1971cb9b26f61bd6a454cfbb991042457bab4d623 *electron-v39.6.0-win32-ia32.zip
-5f93924c317206a2a4800628854e44e68662a9c40b3457c9e72690d6fff884d3 *electron-v39.6.0-win32-x64-pdb.zip
-eab07439f0a21210cd560c1169c04ea5e23c6fe0ab65bd60cffce2b9f69fd36e *electron-v39.6.0-win32-x64-symbols.zip
-efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.6.0-win32-x64-toolchain-profile.zip
-e8eee36be3bb85ba6fd8fcd26cf3a264bc946ac0717762c64e168896695c8e34 *electron-v39.6.0-win32-x64.zip
-2e84c606e40c7bab5530e4c83bbf3a24c28143b0a768dafa5ecf78b18d889297 *electron.d.ts
-27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.6.0-darwin-arm64.zip
-321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.6.0-darwin-x64.zip
-52ae6eccbdb4a9403a6c3eb46b356a28940ec25958b6b9181fb2f38e612e40ed *ffmpeg-v39.6.0-linux-arm64.zip
-622cb781fb1e3b9617e7e60c36384427f7b0d9b5ad888e9bc356a83b050e13f1 *ffmpeg-v39.6.0-linux-armv7l.zip
-ba441851788008362f013bf2983b22b0042af8df31bf90123328f928cc067492 *ffmpeg-v39.6.0-linux-x64.zip
-27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.6.0-mas-arm64.zip
-321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.6.0-mas-x64.zip
-2a358c2dbeeb259c0b6a18057b52ffb0109de69112086cb2ce02f3a79bd70cee *ffmpeg-v39.6.0-win32-arm64.zip
-4555510880a7b8dff5d5d0520f641665c62494689782adbed67fa0e24b45ae67 *ffmpeg-v39.6.0-win32-ia32.zip
-091ab3c97d5a1cda1e04c6bd263a2c07ea63ed7ec3fd06600af6d7e23bbbbe15 *ffmpeg-v39.6.0-win32-x64.zip
-650fb5fbc7e6cc27e5caeb016f72aba756469772bbfdfb3ec0b229f973d8ad46 *hunspell_dictionaries.zip
-669ef1bf8ed0f6378e67f4f8bc23d2907d7cc1db7369dbdf468e164f4ef49365 *libcxx-objects-v39.6.0-linux-arm64.zip
-996d81ad796524246144e15e22ffef75faff055a102c49021d70b03f039c3541 *libcxx-objects-v39.6.0-linux-armv7l.zip
-1ffb610613c11169640fa76e4790137034a0deb3b48e2aef51a01c9b96b7700a *libcxx-objects-v39.6.0-linux-x64.zip
-6dd8db57473992367c7914b50d06cae3a1b713cc09ceebecfcd4107df333e759 *libcxx_headers.zip
-e5c18f813cc64a7d3b0404ee9adeb9cbb49e7ee5e1054b62c71fa7d1a448ad1b *libcxxabi_headers.zip
-7f58d6e1d8c75b990f7d2259de8d0896414d0f2cff2f0fe4e5c7f8037d8fe879 *mksnapshot-v39.6.0-darwin-arm64.zip
-be1178e4aa1f4910ba2b8f35b5655e12182657b9e32d509b47f0b2db033f0ac5 *mksnapshot-v39.6.0-darwin-x64.zip
-5e36a594067fea08bb3d7bcd60873c3e240ebcee2208bcebfbc9f77d3075cc0d *mksnapshot-v39.6.0-linux-arm64-x64.zip
-2db9196d2af0148ebb7b6f1f597f46a535b7af482f95739bd1ced78e1ebf39e7 *mksnapshot-v39.6.0-linux-armv7l-x64.zip
-cd673e0a908fc950e0b4246e2b099018a8ee879d12a62973a01cb7de522f5bcf *mksnapshot-v39.6.0-linux-x64.zip
-0749d8735a1fd8c666862cd7020b81317c45203d01319c9be089d1e750cb2c15 *mksnapshot-v39.6.0-mas-arm64.zip
-81ae98e064485f8c6c69cd6c875ee72666c0cc801a8549620d382c2d0cea3b5c *mksnapshot-v39.6.0-mas-x64.zip
-2e44f75df797922e7c8bad61a1b41fed14b070a54257a6a751892b2b8b9dfe29 *mksnapshot-v39.6.0-win32-arm64-x64.zip
-fb5d73a8bf4b8db80f61b7073aa8458b5c46cce5c2a4b23591e851c6fcbd0144 *mksnapshot-v39.6.0-win32-ia32.zip
-118ae88dbcd6b260cfa370e46ccfb0ab00af5efbf59495aaeea56a2831f604b2 *mksnapshot-v39.6.0-win32-x64.zip
+71cee744399edac3516b0b56d6565b015a70abda53785501b94e7efe68efb556 *chromedriver-v39.6.1-darwin-arm64.zip
+2284eb7a536b6001d2b53b57a69d8b397f7245044c6055515268a472e780e9b3 *chromedriver-v39.6.1-darwin-x64.zip
+d64a85751e3b779ce9d4e88ab0e25db4970594f7c2b4995a21d5bfce8d6b63f0 *chromedriver-v39.6.1-linux-arm64.zip
+83e938f9b5c19785d32f510a4ef5eab9ac6e63d40944b0e759a5f85867a02b72 *chromedriver-v39.6.1-linux-armv7l.zip
+b1cd220f1c71edd4aeb57910cbf63bdf8862c62a1c3270ae7af5a4bd2098fe6f *chromedriver-v39.6.1-linux-x64.zip
+c63e4ea9a0bdb883d2a6369919262a7ff3f9b432dfdcd32c827debbabfa6e8e4 *chromedriver-v39.6.1-mas-arm64.zip
+d073ed5147b5adf3aefc88c5ee24c0998a8930849d10f886a1e553b99ed001b9 *chromedriver-v39.6.1-mas-x64.zip
+7d475b4bbddb9a6b2ab1fd7793cbe5fd2a3b3e8ee291b804ff1773d3a6432482 *chromedriver-v39.6.1-win32-arm64.zip
+ff7175e1953a604a3d033eac76c0be6c0c6cadce014459c23186b4ce35ee632b *chromedriver-v39.6.1-win32-ia32.zip
+2c3591abbc4a11ea9508d02eb9e9152eba7ef693746696723239cac8db4faac1 *chromedriver-v39.6.1-win32-x64.zip
+c97d31018c4f3229555607f71e14ddf44ecf78b684055dce548ae5117b4fd284 *electron-api.json
+9777c57ec393cb9961500f645166b3f05a9e1ddd8472474c3c6ae9f8224cc029 *electron-v39.6.1-darwin-arm64-dsym-snapshot.zip
+005d1a2b75c7e022eda48ecb5b8026e7556b9e12ad6bbd3de39b555a299edbd9 *electron-v39.6.1-darwin-arm64-dsym.zip
+fbd66751111a813295d29cfb152d67610d6fa3d606712f649c809883d087aae2 *electron-v39.6.1-darwin-arm64-symbols.zip
+287d3bbff9709e37abb9a8c2780e6227f99a165c066dc870a104e173ef4bfe95 *electron-v39.6.1-darwin-arm64.zip
+1dee7165235ead83950170805f84be03d6f89a4224e74ed9d570cd7393c2e9d3 *electron-v39.6.1-darwin-x64-dsym-snapshot.zip
+e8f1c0b4d61272f95db0fa43a83b181ca449c31665012bb4d65b7320d3b450e1 *electron-v39.6.1-darwin-x64-dsym.zip
+c04988ad2b72293fc5b26dba1c291cb3eb755dee9e1d274ec0553c35b306b339 *electron-v39.6.1-darwin-x64-symbols.zip
+a9d801eaa52cdfbcb0e238c77b264ef04dc3831e4ff960b666f9bd414cdcac27 *electron-v39.6.1-darwin-x64.zip
+43803eeeb2c85c8c122e7f2b036d577fdc761b469cfe503beffed96f6896dfbc *electron-v39.6.1-linux-arm64-debug.zip
+9bd95e9fbdf836c0bce62a9e071e54a544e10d3509753e09a71e9ad8c1b74ff7 *electron-v39.6.1-linux-arm64-symbols.zip
+fb5f0d71b908f9e49e845cda014ddcafa0637bbf21d811ad30ac799cb453d0a9 *electron-v39.6.1-linux-arm64.zip
+9451c34d1608030b841018ce5df2af4319c70e43528e8033c2c469b836a4e15f *electron-v39.6.1-linux-armv7l-debug.zip
+bfe9d26d2070ee4f330be8f89de9886ae121efffe6740f8af068b6c65be091eb *electron-v39.6.1-linux-armv7l-symbols.zip
+6346f457f12ac728eacb63a782873438580291b853d7c2f387387da363cd021e *electron-v39.6.1-linux-armv7l.zip
+d8b0d22e49cf1d7af1318608c791564637a6055584cae558f94a4c6c48422fee *electron-v39.6.1-linux-x64-debug.zip
+1e25737611d32a47aec6941d803f9affad90713d9fac695c926806f8d852ca03 *electron-v39.6.1-linux-x64-symbols.zip
+2c8ce4905bfeba655df1f8528981361225a3c8f2eb3e9fd1df1f7c2a6e0a03fa *electron-v39.6.1-linux-x64.zip
+ef108445cada7fd68a1ec43037e5dd5c542ebe9f579ef59b4c2f4ee33dcf2d2f *electron-v39.6.1-mas-arm64-dsym-snapshot.zip
+1139730349a8ab01f0c28f0c1066b58d79b815c6c99d88c19e9effe2e0f0ec37 *electron-v39.6.1-mas-arm64-dsym.zip
+08bb61490eca6157ef5e6fff36fe0fc194994446fcab3c2a779190b45d14c206 *electron-v39.6.1-mas-arm64-symbols.zip
+5c1e6db65a37e9810e88e172328b18bc7f6fa30f6edf865d600dbd3f399a9dd2 *electron-v39.6.1-mas-arm64.zip
+88879e5383ee0066d138587f47ee1eacce18d1494fdfef851f448621fb69de50 *electron-v39.6.1-mas-x64-dsym-snapshot.zip
+3125230a1c02498adbd404852eef94040114532990d2a84ced6f30f9fe58c0d1 *electron-v39.6.1-mas-x64-dsym.zip
+4a2d0deaa795d2488d3a708ddbf887d6d8421256a03ae0945ec7c8cca383874d *electron-v39.6.1-mas-x64-symbols.zip
+c1f9e7faef99ab132bdaf9cef3c773ca92a32683c7ba787d00abcfdbd87c99e2 *electron-v39.6.1-mas-x64.zip
+ed8ac6af71ad036a8b3b725db1f45ac92ea346f6c7d6f8f9a9e6af89fcb98405 *electron-v39.6.1-win32-arm64-pdb.zip
+66f0e675d11cf174960d0e700678dbbb92b993b52f058f1eb34613d3b66705e5 *electron-v39.6.1-win32-arm64-symbols.zip
+efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.6.1-win32-arm64-toolchain-profile.zip
+41e1368fe8ea044cc872c5da3d747ea9ab1576386b99580a55a8e14c7375dec9 *electron-v39.6.1-win32-arm64.zip
+8079d11539a2924eb07c05639d711ab12273e4d333aaeb3d6ae346bf7c5e45f6 *electron-v39.6.1-win32-ia32-pdb.zip
+b22f3898fbb0e49f8c0506bd45b4f3510a0a0fdd947c0a62114bbc709c061eb5 *electron-v39.6.1-win32-ia32-symbols.zip
+efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.6.1-win32-ia32-toolchain-profile.zip
+bb5563fc6ce349271e2bee3456a15445afd3af742c4d315b44ffd868d0211bfc *electron-v39.6.1-win32-ia32.zip
+4af89e83c7c56c9418f83f8f534133bc664287bbde49b066607b45217f5acfa9 *electron-v39.6.1-win32-x64-pdb.zip
+d6eda384bd6ebf6e39173b0363490f920fba92ecb8fdd53b3061080c72806c12 *electron-v39.6.1-win32-x64-symbols.zip
+efec460f92ff99a9d5970dd7a67fd0be5272989cfacc9389dec954c706b23f7d *electron-v39.6.1-win32-x64-toolchain-profile.zip
+87ddfa6c8f2c1178582dd79af76da6b267d09dcbb52cc59d40d30c01c39f49f0 *electron-v39.6.1-win32-x64.zip
+2ebffb8530e804319443d49288343c982c08cbae0aac314f70b9859cb2722f42 *electron.d.ts
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.6.1-darwin-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.6.1-darwin-x64.zip
+52ae6eccbdb4a9403a6c3eb46b356a28940ec25958b6b9181fb2f38e612e40ed *ffmpeg-v39.6.1-linux-arm64.zip
+622cb781fb1e3b9617e7e60c36384427f7b0d9b5ad888e9bc356a83b050e13f1 *ffmpeg-v39.6.1-linux-armv7l.zip
+ba441851788008362f013bf2983b22b0042af8df31bf90123328f928cc067492 *ffmpeg-v39.6.1-linux-x64.zip
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.6.1-mas-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.6.1-mas-x64.zip
+2a358c2dbeeb259c0b6a18057b52ffb0109de69112086cb2ce02f3a79bd70cee *ffmpeg-v39.6.1-win32-arm64.zip
+4555510880a7b8dff5d5d0520f641665c62494689782adbed67fa0e24b45ae67 *ffmpeg-v39.6.1-win32-ia32.zip
+091ab3c97d5a1cda1e04c6bd263a2c07ea63ed7ec3fd06600af6d7e23bbbbe15 *ffmpeg-v39.6.1-win32-x64.zip
+c98648b15b337bc6a6443ba009a46cfc696d657032445078a2475e5bc835cae9 *hunspell_dictionaries.zip
+7ac45cdcc0b3f46c92a23689aacae8f5d341d71bf61f7fbaf9254087840e0a8d *libcxx-objects-v39.6.1-linux-arm64.zip
+901825379fba3261a94e9967f6b3759366d4c0e59a3e1a2e0c787e3e3f725ebb *libcxx-objects-v39.6.1-linux-armv7l.zip
+832d867351c2a0ae6adc02efdd24bdf44173a011f07009f489df80e8a5ccc483 *libcxx-objects-v39.6.1-linux-x64.zip
+9d6081a9fc90693d7bd54bb0bdef147d9c37bd7a179a1eea63018570ee7813f0 *libcxx_headers.zip
+23be04f992ee37ce8f29ffb9e53bd5bf461c50a91b6eddedaecc9f20b8967937 *libcxxabi_headers.zip
+beccf9d63fc88de743a5497626096e886a70c631b08bc3e3a924a134bc32c9dc *mksnapshot-v39.6.1-darwin-arm64.zip
+40757d33f3e939efbc126b5c9a52cfc1e102098295bcd4c5ccdd588fb03fd918 *mksnapshot-v39.6.1-darwin-x64.zip
+68a16dd164cd6fcd2cc44fa530a60ac17061c5d3bbe4a95dc534fb8de74c06ee *mksnapshot-v39.6.1-linux-arm64-x64.zip
+5b6fee728d9a54afd8cd11b8c153c32c8ff1a7cdbe2473e4bb4edf771610b118 *mksnapshot-v39.6.1-linux-armv7l-x64.zip
+1653b0c1d087058be4f16f1b5877decfeb0705b3732f9428eadff003ffc0f166 *mksnapshot-v39.6.1-linux-x64.zip
+0a1d2064c80cc60bc44d7b4609fb83f1870bc66de5fbc2d4907f6baf0bc6e0a0 *mksnapshot-v39.6.1-mas-arm64.zip
+6294fc74584a6b20fb3cdd6fcff4c644234ce0471896728b9652ecac00b577f6 *mksnapshot-v39.6.1-mas-x64.zip
+d997856786ba5a72a9fddbdc13a085979a613a2c94a343286f0e136d2f3d84c5 *mksnapshot-v39.6.1-win32-arm64-x64.zip
+76dcbe1c3cf7d36bee79ecb7f8c02a9b75167c48983ecd8df047da5793d6248c *mksnapshot-v39.6.1-win32-ia32.zip
+4c9f0bd54704a6333f5268645625b65cd87d61aa8c6d52482d9d39cc1f85808a *mksnapshot-v39.6.1-win32-x64.zip
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index 2a8b9233957..25a36009486 100644
--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
@@ -31,6 +31,7 @@ import minimist from 'minimist';
 import { compileBuildWithoutManglingTask, compileBuildWithManglingTask } from './gulpfile.compile.ts';
 import { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask } from './gulpfile.extensions.ts';
 import { copyCodiconsTask } from './lib/compilation.ts';
+import type { EmbeddedProductInfo } from './lib/embeddedType.ts';
 import { useEsbuildTranspile } from './buildConfig.ts';
 import { promisify } from 'util';
 import globCallback from 'glob';
@@ -388,7 +389,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 
 		const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
 		const embedded = isInsiderOrExploration
-			? (product as typeof product & { embedded?: { nameShort: string; nameLong: string; applicationName: string; dataFolderName: string; darwinBundleIdentifier: string; urlProtocol: string } }).embedded
+			? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
 			: undefined;
 
 		const packageSubJsonStream = isInsiderOrExploration
@@ -403,12 +404,9 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 		const productSubJsonStream = embedded
 			? gulp.src(['product.json'], { base: '.' })
 				.pipe(jsonEditor((json: Record<string, unknown>) => {
-					json.nameShort = embedded.nameShort;
-					json.nameLong = embedded.nameLong;
-					json.applicationName = embedded.applicationName;
-					json.dataFolderName = embedded.dataFolderName;
-					json.darwinBundleIdentifier = embedded.darwinBundleIdentifier;
-					json.urlProtocol = embedded.urlProtocol;
+					Object.keys(embedded).forEach(key => {
+						json[key] = embedded[key as keyof EmbeddedProductInfo];
+					});
 					return json;
 				}))
 				.pipe(rename('product.sub.json'))
@@ -499,6 +497,9 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 				'resources/win32/code_70x70.png',
 				'resources/win32/code_150x150.png'
 			], { base: '.' }));
+			if (embedded) {
+				all = es.merge(all, gulp.src('resources/win32/sessions.ico', { base: '.' }));
+			}
 		} else if (platform === 'linux') {
 			const policyDest = gulp.src('.build/policies/linux/**', { base: '.build/policies/linux' })
 				.pipe(rename(f => f.dirname = `policies/${f.dirname}`));
@@ -522,6 +523,8 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 				darwinMiniAppName: embedded.nameShort,
 				darwinMiniAppBundleIdentifier: embedded.darwinBundleIdentifier,
 				darwinMiniAppIcon: 'resources/darwin/sessions.icns',
+				win32ProxyAppName: embedded.nameShort,
+				win32ProxyIcon: 'resources/win32/sessions.ico',
 			} : {})
 		};
 
@@ -530,7 +533,13 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 			.pipe(util.fixWin32DirectoryPermissions())
 			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
 			.pipe(electron(electronConfig))
-			.pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
+			.pipe(filter([
+				'**',
+				'!LICENSE',
+				'!version',
+				...(platform === 'darwin' && !isInsiderOrExploration ? ['!**/Contents/Applications'] : []),
+				...(platform === 'win32' && !isInsiderOrExploration ? ['!**/electron_proxy.exe'] : []),
+			], { dot: true }));
 
 		if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
diff --git a/build/gulpfile.vscode.win32.ts b/build/gulpfile.vscode.win32.ts
index d04e7f1f0e7..0f81323c98d 100644
--- a/build/gulpfile.vscode.win32.ts
+++ b/build/gulpfile.vscode.win32.ts
@@ -14,6 +14,7 @@ import product from '../product.json' with { type: 'json' };
 import { getVersion } from './lib/getVersion.ts';
 import * as task from './lib/task.ts';
 import * as util from './lib/util.ts';
+import type { EmbeddedProductInfo } from './lib/embeddedType.ts';
 
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
@@ -112,6 +113,17 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask {
 			Quality: quality
 		};
 
+		const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
+		const embedded = isInsiderOrExploration
+			? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
+			: undefined;
+
+		if (embedded) {
+			definitions['ProxyExeBasename'] = embedded.nameShort;
+			definitions['ProxyAppUserId'] = embedded.win32AppUserModelId;
+			definitions['ProxyNameLong'] = embedded.nameLong;
+		}
+
 		if (quality === 'stable' || quality === 'insider') {
 			definitions['AppxPackage'] = `${quality === 'stable' ? 'code' : 'code_insider'}_${arch}.appx`;
 			definitions['AppxPackageDll'] = `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`;
diff --git a/build/lib/embeddedType.ts b/build/lib/embeddedType.ts
new file mode 100644
index 00000000000..4b3075f4a71
--- /dev/null
+++ b/build/lib/embeddedType.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export type EmbeddedProductInfo = {
+	nameShort: string;
+	nameLong: string;
+	applicationName: string;
+	dataFolderName: string;
+	darwinBundleIdentifier: string;
+	urlProtocol: string;
+	win32AppUserModelId: string;
+	win32MutexName: string;
+	win32RegValueName: string;
+	win32NameVersion: string;
+	win32VersionedUpdate: boolean;
+};
diff --git a/build/win32/code.iss b/build/win32/code.iss
index f7091b28e55..935f17dbe41 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -95,9 +95,12 @@ Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{
 Name: "{app}"; AfterInstall: DisableAppDirInheritance
 
 [Files]
-Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\policies,\policies\*,\appx,\appx\*,\resources\app\product.json,\{#ExeBasename}.exe,\{#ExeBasename}.VisualElementsManifest.xml,\bin,\bin\*"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\policies,\policies\*,\appx,\appx\*,\resources\app\product.json,\{#ExeBasename}.exe,{#ifdef ProxyExeBasename}\{#ProxyExeBasename}.exe,{#endif}\{#ExeBasename}.VisualElementsManifest.xml,\bin,\bin\*"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#ExeBasename}.exe"; DestDir: "{code:GetDestDir}"; DestName: "{code:GetExeBasename}"; Flags: ignoreversion
 Source: "{#ExeBasename}.VisualElementsManifest.xml"; DestDir: "{code:GetDestDir}"; DestName: "{code:GetVisualElementsManifest}"; Flags: ignoreversion
+#ifdef ProxyExeBasename
+Source: "{#ProxyExeBasename}.exe"; DestDir: "{code:GetDestDir}"; DestName: "{code:GetProxyExeBasename}"; Flags: ignoreversion
+#endif
 Source: "tools\*"; DestDir: "{app}\{#VersionedResourcesFolder}\tools"; Flags: ignoreversion
 Source: "policies\*"; DestDir: "{code:GetDestDir}\{#VersionedResourcesFolder}\policies"; Flags: ignoreversion skipifsourcedoesntexist
 Source: "bin\{#TunnelApplicationName}.exe"; DestDir: "{code:GetDestDir}\bin"; DestName: "{code:GetBinDirTunnelApplicationFilename}"; Flags: ignoreversion skipifsourcedoesntexist
@@ -113,6 +116,11 @@ Source: "appx\{#AppxPackageDll}"; DestDir: "{code:GetDestDir}\{#VersionedResourc
 Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{group}\{#NameLong}.lnk'))
 Name: "{autodesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: desktopicon; AppUserModelID: "{#AppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{autodesktop}\{#NameLong}.lnk'))
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#AppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}.lnk'))
+#ifdef ProxyExeBasename
+Name: "{group}\{#ProxyExeBasename}"; Filename: "{app}\{#ProxyExeBasename}.exe"; AppUserModelID: "{#ProxyAppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{group}\{#ProxyExeBasename}.lnk'))
+Name: "{autodesktop}\{#ProxyNameLong}"; Filename: "{app}\{#ProxyExeBasename}.exe"; Tasks: desktopicon; AppUserModelID: "{#ProxyAppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{autodesktop}\{#ProxyNameLong}.lnk'))
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#ProxyNameLong}"; Filename: "{app}\{#ProxyExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#ProxyAppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#ProxyNameLong}.lnk'))
+#endif
 
 [Run]
 Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Tasks: runcode; Flags: nowait postinstall; Check: ShouldRunAfterUpdate
@@ -1562,6 +1570,16 @@ begin
     Result := ExpandConstant('{#ExeBasename}.exe');
 end;
 
+#ifdef ProxyExeBasename
+function GetProxyExeBasename(Value: string): string;
+begin
+  if IsBackgroundUpdate() and IsVersionedUpdate() then
+    Result := ExpandConstant('new_{#ProxyExeBasename}.exe')
+  else
+    Result := ExpandConstant('{#ProxyExeBasename}.exe');
+end;
+#endif
+
 function GetBinDirTunnelApplicationFilename(Value: string): string;
 begin
   if IsBackgroundUpdate() and IsVersionedUpdate() then
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index c3c4a0cd2bc..424e997bde5 100644
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ
diff --git a/cgmanifest.json b/cgmanifest.json
index 21554434500..45f578c1b97 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -529,13 +529,13 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "a229dbf7a56336b847b34dfff1bac79afc311eee",
-					"tag": "39.6.0"
+					"commitHash": "2ffb9e1e05c55975112ff6b23037af0eeda79142",
+					"tag": "39.6.1"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "39.6.0"
+			"version": "39.6.1"
 		},
 		{
 			"component": {
diff --git a/package-lock.json b/package-lock.json
index bf94454e495..587596d6666 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "@typescript/native-preview": "^7.0.0-dev.20260130",
         "@vscode/component-explorer": "^0.1.1-12",
         "@vscode/component-explorer-cli": "^0.1.1-8",
-        "@vscode/gulp-electron": "https://github.com/microsoft/vscode-gulp-electron.git#405e3df0e4e9c37fcf549cbe6f5cef8d5ba5ddff",
+        "@vscode/gulp-electron": "1.40.0",
         "@vscode/l10n-dev": "0.0.35",
         "@vscode/telemetry-extractor": "^1.10.2",
         "@vscode/test-cli": "^0.0.6",
@@ -103,7 +103,7 @@
         "css-loader": "^6.9.1",
         "debounce": "^1.0.0",
         "deemon": "^1.13.6",
-        "electron": "39.6.0",
+        "electron": "39.6.1",
         "eslint": "^9.36.0",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -3115,9 +3115,9 @@
       }
     },
     "node_modules/@vscode/gulp-electron": {
-      "version": "1.38.2",
-      "resolved": "git+ssh://git@github.com/microsoft/vscode-gulp-electron.git#405e3df0e4e9c37fcf549cbe6f5cef8d5ba5ddff",
-      "integrity": "sha512-SHFKIq0Gr8WOeVn9QOACkbxX5lsaj96Ux2npBHSb/a7S6ykyDD0Im1i+xCT96WimWLRQV0X20sK9IFli8I2Mkg==",
+      "version": "1.40.0",
+      "resolved": "git+ssh://git@github.com/microsoft/vscode-gulp-electron.git#580228be384d7942b39aca6466b5a5050e4744a2",
+      "integrity": "sha512-EfQqw/kFmqiUgBv7WXx3wIrtz9cujAgX2uKQzTq517MbVjlpg7BIAjNC4Iq/wVB4Vgpl/ZGB7/XuSN7LsaLdlA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6824,9 +6824,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "39.6.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-39.6.0.tgz",
-      "integrity": "sha512-KQK3sJ6JCyymY3HQxV0N/bVBQwKQETRW0N/+OYcrL9H6tZhpmTSaZY3qSxcruWrPIuouvoiP3Vk/JKUpw05ZIw==",
+      "version": "39.6.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-39.6.1.tgz",
+      "integrity": "sha512-pgmTbWnT3rP+eo3EolO5EdNw5f7/x/0S7vP+eXC8Zyp2sWGjP4+kmo1RyeAYCChwIRWJFKQ2rQVl/ZkqwK6O2Q==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/package.json b/package.json
index f0de36f12a6..cb5b8b6a963 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.110.0",
-  "distro": "2d57806cfc4400f602f114b4bfc0fb17ce7e1a32",
+  "distro": "fdfb55bde654559f3a3baea839e9797107b4e92e",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -154,7 +154,7 @@
     "@typescript/native-preview": "^7.0.0-dev.20260130",
     "@vscode/component-explorer": "^0.1.1-12",
     "@vscode/component-explorer-cli": "^0.1.1-8",
-    "@vscode/gulp-electron": "https://github.com/microsoft/vscode-gulp-electron.git#405e3df0e4e9c37fcf549cbe6f5cef8d5ba5ddff",
+    "@vscode/gulp-electron": "1.40.0",
     "@vscode/l10n-dev": "0.0.35",
     "@vscode/telemetry-extractor": "^1.10.2",
     "@vscode/test-cli": "^0.0.6",
@@ -171,7 +171,7 @@
     "css-loader": "^6.9.1",
     "debounce": "^1.0.0",
     "deemon": "^1.13.6",
-    "electron": "39.6.0",
+    "electron": "39.6.1",
     "eslint": "^9.36.0",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
@@ -249,4 +249,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.6.1"
   }
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index 23de97f6d23..842c6766924 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -70,7 +70,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 	protected override async initialize(): Promise<void> {
 		if ((process as INodeProcess).isEmbeddedApp) {
 			this.setState(State.Disabled(DisablementReason.EmbeddedApp));
-			this.logService.info('update#ctor - updates are disabled for embedded app');
+			this.logService.info('update#ctor - updates are disabled from embedded app');
 			return;
 		}
 
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 257edf1af19..25535f21252 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -33,6 +33,7 @@ import { asJson, IRequestService } from '../../request/common/request.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
 import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js';
+import { INodeProcess } from '../../../base/common/platform.js';
 
 interface IAvailableUpdate {
 	packagePath: string;
@@ -98,6 +99,12 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 	}
 
 	protected override async initialize(): Promise<void> {
+		if ((process as INodeProcess).isEmbeddedApp) {
+			this.setState(State.Disabled(DisablementReason.EmbeddedApp));
+			this.logService.info('update#ctor - updates are disabled from embedded app');
+			return;
+		}
+
 		if (this.productService.win32VersionedUpdate) {
 			const cachePath = await this.cachePath;
 			app.setPath('appUpdate', cachePath);
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index 50b1321e83e..75bcee0c678 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -7,7 +7,7 @@ import electron, { Display, Rectangle } from 'electron';
 import { Color } from '../../../base/common/color.js';
 import { Event } from '../../../base/common/event.js';
 import { join } from '../../../base/common/path.js';
-import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { INodeProcess, IProcessEnvironment, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
 import { URI } from '../../../base/common/uri.js';
 import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
@@ -177,8 +177,15 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 
 	if (isLinux) {
 		options.icon = join(environmentMainService.appRoot, 'resources/linux/code.png'); // always on Linux
-	} else if (isWindows && !environmentMainService.isBuilt) {
-		options.icon = join(environmentMainService.appRoot, 'resources/win32/code_150x150.png'); // only when running out of sources on Windows
+	} else if (isWindows) {
+		if (!environmentMainService.isBuilt) {
+			options.icon = join(environmentMainService.appRoot, 'resources/win32/code_150x150.png'); // only when running out of sources on Windows
+		} else if ((process as INodeProcess).isEmbeddedApp) {
+			// For sub app the proxy executable acts as a launcher to the main executable whose
+			// icon will be used when creating windows if the following override is not set.
+			// This avoids sharing icon with the main application.
+			options.icon = join(environmentMainService.appRoot, 'resources/win32/sessions.ico');
+		}
 	}
 
 	if (isMacintosh) {