diff --git a/windows/deployment/windows-10-poc-sc-config-mgr.md b/windows/deployment/windows-10-poc-sc-config-mgr.md
index 2a6a86ea3d..6c0aa24941 100644
--- a/windows/deployment/windows-10-poc-sc-config-mgr.md
+++ b/windows/deployment/windows-10-poc-sc-config-mgr.md
@@ -382,7 +382,7 @@ WDSUTIL /Set-Server /AnswerClients:None
     In the trace tool, click **Tools** on the menu and choose **Find**. Search for "**STATMSG: ID=2301**". For example:
 
     ```
-    STATMSG: ID=2301 SEV=I LEV=M SOURCE="SMS Server" COMP="SMS_DISTRIBUTION_MANAGER" SYS=SRV1.CONTOSO.COM SITE=PS1 PID=2476 TID=4636 GMTDATE=Wed Sep 14 22:11:09.363 2016 ISTR0="Configuration Manager Client Upgrade Package" ISTR1="PS100003" ISTR2="" ISTR3="" ISTR4="" ISTR5="" ISTR6="" ISTR7="" ISTR8="" ISTR9="" NUMATTRS=1 AID0=400 AVAL0="PS100003"	SMS_DISTRIBUTION_MANAGER	9/14/2016 3:11:09 PM	4636 (0x121C)
+    STATMSG: ID=2301 SEV=I LEV=M SOURCE="SMS Server" COMP="SMS_DISTRIBUTION_MANAGER" SYS=SRV1.CONTOSO.COM SITE=PS1 PID=924 TID=1424 GMTDATE=Tue Oct 09 22:36:30.986 2018 ISTR0="Zero Touch WinPE x64" ISTR1="PS10000A" ISTR2="" ISTR3="" ISTR4="" ISTR5="" ISTR6="" ISTR7="" ISTR8="" ISTR9="" NUMATTRS=1 AID0=400 AVAL0="PS10000A"	SMS_DISTRIBUTION_MANAGER	10/9/2018 3:36:30 PM	1424 (0x0590)
     ```
 
 11. You can also review status by clicking the **Zero Touch WinPE x64** image, and then clicking **Content Status** under **Related Objects** in the bottom right-hand corner of the console, or by entering **\Monitoring\Overview\Distribution Status\Content Status** on the location bar in the console. Double-click **Zero Touch WinPE x64** under **Content Status** in the console tree and verify that a status of **Successfully distributed content** is displayed on the **Success** tab.
diff --git a/windows/deployment/windows-autopilot/TOC.md b/windows/deployment/windows-autopilot/TOC.md
index ac183ef6d1..fb04b62d4d 100644
--- a/windows/deployment/windows-autopilot/TOC.md
+++ b/windows/deployment/windows-autopilot/TOC.md
@@ -4,6 +4,7 @@
 ### [Network requirements](windows-autopilot-requirements-network.md)
 ### [Licensing requirements](windows-autopilot-requirements-licensing.md)
 ## [Scenarios and Capabilities](windows-autopilot-scenarios.md)
+### [Support for existing devices](existing-devices.md)
 ### [User-driven mode](user-driven.md)
 ### [Self-deploying mode](self-deploying.md)
 ### [Enrollment status page](enrollment-status.md)
diff --git a/windows/deployment/windows-autopilot/add-devices.md b/windows/deployment/windows-autopilot/add-devices.md
index 1632f15877..46641b808c 100644
--- a/windows/deployment/windows-autopilot/add-devices.md
+++ b/windows/deployment/windows-autopilot/add-devices.md
@@ -8,8 +8,8 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/18
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Adding devices to Windows Autopilot
diff --git a/windows/deployment/windows-autopilot/configure-autopilot.md b/windows/deployment/windows-autopilot/configure-autopilot.md
index 7bdfb8857c..7444e0b565 100644
--- a/windows/deployment/windows-autopilot/configure-autopilot.md
+++ b/windows/deployment/windows-autopilot/configure-autopilot.md
@@ -8,8 +8,8 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/18
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Configure Autopilot deployment
diff --git a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
index 17268284ab..6a8c2d3e3d 100644
--- a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
+++ b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
@@ -9,7 +9,7 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
 ms.author: greg-lindsay
-ms.date: 07/13/18
+ms.date: 10/02/2018
 ---
 
 # Demonstrate Autopilot deployment on a VM
diff --git a/windows/deployment/windows-autopilot/enrollment-status.md b/windows/deployment/windows-autopilot/enrollment-status.md
index 45d96d4f4b..60a302f3e0 100644
--- a/windows/deployment/windows-autopilot/enrollment-status.md
+++ b/windows/deployment/windows-autopilot/enrollment-status.md
@@ -9,8 +9,8 @@ ms.sitesec: library
 ms.pagetype:
 ms.localizationpriority: medium
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Windows Autopilot Enrollment Status page
diff --git a/windows/deployment/windows-autopilot/images/ap-ts-1.png b/windows/deployment/windows-autopilot/images/ap-ts-1.png
new file mode 100644
index 0000000000..5f4c33fd51
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/ap-ts-1.png differ
diff --git a/windows/deployment/windows-autopilot/images/ap-ts.png b/windows/deployment/windows-autopilot/images/ap-ts.png
new file mode 100644
index 0000000000..7c343176d0
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/ap-ts.png differ
diff --git a/windows/deployment/windows-autopilot/images/notepad.png b/windows/deployment/windows-autopilot/images/notepad.png
new file mode 100644
index 0000000000..0f243f95d6
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/notepad.png differ
diff --git a/windows/deployment/windows-autopilot/images/pc-01a.png b/windows/deployment/windows-autopilot/images/pc-01a.png
new file mode 100644
index 0000000000..a3d0f4cdea
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/pc-01a.png differ
diff --git a/windows/deployment/windows-autopilot/images/pc-01b.png b/windows/deployment/windows-autopilot/images/pc-01b.png
new file mode 100644
index 0000000000..07eda6e4bb
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/pc-01b.png differ
diff --git a/windows/deployment/windows-autopilot/images/pwd.png b/windows/deployment/windows-autopilot/images/pwd.png
new file mode 100644
index 0000000000..c9b0e7837c
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/pwd.png differ
diff --git a/windows/deployment/windows-autopilot/images/sc.png b/windows/deployment/windows-autopilot/images/sc.png
new file mode 100644
index 0000000000..bb326e6406
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/sc.png differ
diff --git a/windows/deployment/windows-autopilot/images/sc1.png b/windows/deployment/windows-autopilot/images/sc1.png
new file mode 100644
index 0000000000..380887a45c
Binary files /dev/null and b/windows/deployment/windows-autopilot/images/sc1.png differ
diff --git a/windows/deployment/windows-autopilot/profiles.md b/windows/deployment/windows-autopilot/profiles.md
index 4b3d210f36..c733e6576d 100644
--- a/windows/deployment/windows-autopilot/profiles.md
+++ b/windows/deployment/windows-autopilot/profiles.md
@@ -8,8 +8,8 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/18
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Configure Autopilot profiles
diff --git a/windows/deployment/windows-autopilot/self-deploying.md b/windows/deployment/windows-autopilot/self-deploying.md
index 5e6d1bd137..01d3e5e846 100644
--- a/windows/deployment/windows-autopilot/self-deploying.md
+++ b/windows/deployment/windows-autopilot/self-deploying.md
@@ -9,8 +9,13 @@ ms.sitesec: library
 ms.pagetype:
 ms.localizationpriority: medium
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Windows Autopilot Self-Deploying mode (Preview)
diff --git a/windows/deployment/windows-autopilot/troubleshooting.md b/windows/deployment/windows-autopilot/troubleshooting.md
index d03b5ca36e..2e98298d23 100644
--- a/windows/deployment/windows-autopilot/troubleshooting.md
+++ b/windows/deployment/windows-autopilot/troubleshooting.md
@@ -8,8 +8,8 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Troubleshooting Windows Autopilot
diff --git a/windows/deployment/windows-autopilot/user-driven-aad.md b/windows/deployment/windows-autopilot/user-driven-aad.md
index 1310d1aab1..accd62e4b6 100644
--- a/windows/deployment/windows-autopilot/user-driven-aad.md
+++ b/windows/deployment/windows-autopilot/user-driven-aad.md
@@ -8,12 +8,16 @@ ms.localizationpriority: low
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 10/11/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Windows Autopilot user-driven mode for Azure Active Directory
 
 **Applies to: Windows 10**
 
+<<<<<<< HEAD
+PLACEHOLDER.  This topic is a placeholder for the AAD-specific instuctions currently in user-driven.md.
+=======
 Placeholder. Content coming.
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
diff --git a/windows/deployment/windows-autopilot/user-driven-hybrid.md b/windows/deployment/windows-autopilot/user-driven-hybrid.md
index 8a55a84cc1..90ed790b77 100644
--- a/windows/deployment/windows-autopilot/user-driven-hybrid.md
+++ b/windows/deployment/windows-autopilot/user-driven-hybrid.md
@@ -8,8 +8,8 @@ ms.localizationpriority: low
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 10/11/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 
@@ -17,4 +17,8 @@ ms.date: 10/11/2018
 
 **Applies to: Windows 10**
 
+<<<<<<< HEAD
+PLACEHOLDER.  This topic is a placeholder for the AD-specific (hybrid) instuctions.
+=======
 Placeholder. Content coming.
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
diff --git a/windows/deployment/windows-autopilot/user-driven.md b/windows/deployment/windows-autopilot/user-driven.md
index b3ffeb0cd7..16e789f551 100644
--- a/windows/deployment/windows-autopilot/user-driven.md
+++ b/windows/deployment/windows-autopilot/user-driven.md
@@ -8,8 +8,13 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Windows Autopilot User-Driven Mode
diff --git a/windows/deployment/windows-autopilot/windows-10-autopilot.md b/windows/deployment/windows-autopilot/windows-10-autopilot.md
index 33f04c305b..9ad26de9d0 100644
--- a/windows/deployment/windows-autopilot/windows-10-autopilot.md
+++ b/windows/deployment/windows-autopilot/windows-10-autopilot.md
@@ -8,8 +8,8 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 08/22/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Overview of Windows Autopilot
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-requirements-configuration.md b/windows/deployment/windows-autopilot/windows-autopilot-requirements-configuration.md
index 7cdf271f76..a3c71ae225 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-requirements-configuration.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-requirements-configuration.md
@@ -8,8 +8,8 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Windows Autopilot configuration requirements
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-requirements-licensing.md b/windows/deployment/windows-autopilot/windows-autopilot-requirements-licensing.md
index c14fc72ee3..bb2dc47141 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-requirements-licensing.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-requirements-licensing.md
@@ -8,8 +8,13 @@ ms.localizationpriority: high
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Windows Autopilot licensing requirements
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-requirements-network.md b/windows/deployment/windows-autopilot/windows-autopilot-requirements-network.md
index d44ee7fbfe..952a30d8a5 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-requirements-network.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-requirements-network.md
@@ -8,8 +8,13 @@ ms.localizationpriority: high
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Windows Autopilot networking requirements
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-requirements.md b/windows/deployment/windows-autopilot/windows-autopilot-requirements.md
index 237de23838..3b1ede0e05 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-requirements.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-requirements.md
@@ -8,8 +8,8 @@ ms.localizationpriority: high
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Windows Autopilot requirements
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-reset-local.md b/windows/deployment/windows-autopilot/windows-autopilot-reset-local.md
index 2d8e2d0506..49ead2803e 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-reset-local.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-reset-local.md
@@ -9,8 +9,13 @@ ms.sitesec: library
 ms.pagetype:
 ms.localizationpriority: medium
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Reset devices with local Windows Autopilot Reset 
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-reset-remote.md b/windows/deployment/windows-autopilot/windows-autopilot-reset-remote.md
index 8b900be698..6cc308819d 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-reset-remote.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-reset-remote.md
@@ -9,8 +9,13 @@ ms.sitesec: library
 ms.pagetype:
 ms.localizationpriority: medium
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Reset devices with remote Windows Autopilot Reset (Preview)
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-reset.md b/windows/deployment/windows-autopilot/windows-autopilot-reset.md
index 8cd3d090a5..e4a54425ee 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-reset.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-reset.md
@@ -9,8 +9,13 @@ ms.sitesec: library
 ms.pagetype:
 ms.localizationpriority: medium
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Windows Autopilot Reset
diff --git a/windows/deployment/windows-autopilot/windows-autopilot-scenarios.md b/windows/deployment/windows-autopilot/windows-autopilot-scenarios.md
index 619ad5926c..f9cb365d54 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot-scenarios.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot-scenarios.md
@@ -8,8 +8,13 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
+<<<<<<< HEAD
+ms.author: greg-lindsay
+ms.date: 10/02/2018
+=======
 ms.author: greglin
 ms.date: 06/01/2018
+>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
 ---
 
 # Windows Autopilot scenarios
diff --git a/windows/deployment/windows-autopilot/windows-autopilot.md b/windows/deployment/windows-autopilot/windows-autopilot.md
index 01cad0042d..37f8070dad 100644
--- a/windows/deployment/windows-autopilot/windows-autopilot.md
+++ b/windows/deployment/windows-autopilot/windows-autopilot.md
@@ -8,8 +8,8 @@ ms.localizationpriority: high
 ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
-ms.author: greglin
-ms.date: 06/01/2018
+ms.author: greg-lindsay
+ms.date: 10/02/2018
 ---
 
 # Overview of Windows Autopilot