diff --git a/.gitignore b/.gitignore
index 4ec231dbc2..124351b1a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,10 +141,8 @@ Thumbs.db
 
 # ignore all build directories
 
-*build-*
+*build*
 .qmake.stash
 *Makefile*
 .qtc_clangd
 mocinclude.opt
-build/
-
diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp
index 4b40b204b0..51b3df5192 100644
--- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp
+++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayScenesInTabletopAR.h"
 
-// ArcGIS Maps SDK headers
 #include "Error.h"
 #include "MobileScenePackage.h"
 #include "Scene.h"
@@ -29,9 +27,8 @@
 #include "SceneViewTypes.h"
 #include "Surface.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h
index 16aff3057c..d9c32a6bf6 100644
--- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h
+++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef DISPLAYSCENESINTABLETOPAR_H
 #define DISPLAYSCENESINTABLETOPAR_H
 
-// toolkit headers
-#include "ArcGISArView.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISSceneLayer;
@@ -32,6 +26,9 @@ class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+#include "ArcGISArView.h"
+
 class DisplayScenesInTabletopAR : public QObject
 {
   Q_OBJECT
diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro
index 60a500c027..15d3e59645 100644
--- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro
+++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayScenesInTabletopAR
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml
index 6462a12057..725925d0ee 100644
--- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml
+++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp b/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp
index 74758c5606..9ec8f8c419 100644
--- a/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp
+++ b/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp
@@ -1,35 +1,26 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DisplayScenesInTabletopAR.h"
 
-// toolkit headers
 #include "ArcGISArView.h"
-
-// ArcGIS Maps SDK headers
+#include "DisplayScenesInTabletopAR.h"
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <QQuickWindow>
 #include <QSurfaceFormat>
+#include <QQuickWindow>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/main.qml b/CppSamples/AR/DisplayScenesInTabletopAR/main.qml
index b1694b0094..cd08b552c8 100644
--- a/CppSamples/AR/DisplayScenesInTabletopAR/main.qml
+++ b/CppSamples/AR/DisplayScenesInTabletopAR/main.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp
index 1a41f56eac..eea9c47059 100644
--- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp
+++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ExploreScenesInFlyoverAR.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
 #include "ElevationSourceListModel.h"
 #include "Envelope.h"
diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h
index 90990ae261..d33100058c 100644
--- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h
+++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef EXPLORESCENESINFLYOVERAR_H
 #define EXPLORESCENESINFLYOVERAR_H
 
-// toolkit headers
-#include "ArcGISArView.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -30,6 +24,9 @@ class SceneQuickView;
 class IntegratedMeshLayer;
 }
 
+#include <QObject>
+#include "ArcGISArView.h"
+
 class ExploreScenesInFlyoverAR : public QObject
 {
   Q_OBJECT
diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro
index a5dbc24d09..ff3d912aa4 100644
--- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro
+++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ExploreScenesInFlyoverAR
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml
index 1031a0a1c5..ff8dd0c594 100644
--- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml
+++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp b/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp
index e0a8be5747..2b05ae6587 100644
--- a/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp
+++ b/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp
@@ -1,32 +1,25 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ExploreScenesInFlyoverAR.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <QQuickWindow>
 #include <QSurfaceFormat>
+#include <QQuickWindow>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp
index 5c4fd62f80..46fe25f14b 100644
--- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp
+++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeHotspots, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AnalyzeHotspots.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "GeoprocessingJob.h"
-#include "GeoprocessingResult.h"
-#include "GeoprocessingString.h"
-#include "GeoprocessingTask.h"
-#include "GeoprocessingTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
+#include "GeoprocessingTask.h"
+#include "GeoprocessingJob.h"
+#include "GeoprocessingString.h"
+#include "GeoprocessingTypes.h"
+#include "ArcGISMapImageLayer.h"
+#include "Error.h"
 #include "TaskTypes.h"
+#include "LayerListModel.h"
+#include "GeoprocessingResult.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
@@ -77,6 +74,7 @@ void AnalyzeHotspots::componentComplete()
   });
 }
 
+
 void AnalyzeHotspots::executeTaskWithDates(const QString& fromDate, const QString& toDate)
 {
   // Create the GP Parameters
diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h
index 7633bbd4a2..294b40b7d2 100644
--- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h
+++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeHotspots, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef ANALYZEHOTSPOTS_H
 #define ANALYZEHOTSPOTS_H
 
-// ArcGIS Maps SDK headers
-#include "GeoprocessingParameters.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
     class Map;
@@ -32,6 +26,9 @@ namespace Esri::ArcGISRuntime
     class ArcGISMapImageLayer;
 }
 
+#include "GeoprocessingParameters.h"
+#include <QQuickItem>
+
 class AnalyzeHotspots : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro
index 6ed2a1d21f..b3d0828da2 100644
--- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro
+++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml
index fc876c9620..a33aa2c37b 100644
--- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml
+++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeHotspots, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/AnalyzeHotspots/main.cpp b/CppSamples/Analysis/AnalyzeHotspots/main.cpp
index dedda79ca2..d3a6408c4e 100644
--- a/CppSamples/Analysis/AnalyzeHotspots/main.cpp
+++ b/CppSamples/Analysis/AnalyzeHotspots/main.cpp
@@ -1,36 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "AnalyzeHotspots.h"
 
-// ArcGIS Maps SDK headers
+#include <QGuiApplication>
+#include <QQuickView>
+#include <QCommandLineParser>
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
-#include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "AnalyzeHotspots.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp
index d952383c7e..226a618409 100644
--- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp
+++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeViewshed, Category=Analysis]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,43 +18,40 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AnalyzeViewshed.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "Feature.h"
-#include "FeatureCollectionTable.h"
-#include "FeatureIterator.h"
-#include "Field.h"
-#include "GeoprocessingFeatures.h"
-#include "GeoprocessingJob.h"
-#include "GeoprocessingParameter.h"
-#include "GeoprocessingParameters.h"
-#include "GeoprocessingResult.h"
-#include "GeoprocessingTask.h"
-#include "GeoprocessingTypes.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
-#include "MapQuickView.h"
 #include "MapTypes.h"
+#include "MapQuickView.h"
 #include "MapViewTypes.h"
 #include "Point.h"
-#include "SimpleFillSymbol.h"
+#include "Viewpoint.h"
+#include "SpatialReference.h"
+#include "GraphicsOverlay.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SimpleMarkerSymbol.h"
+#include "SimpleFillSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "Graphic.h"
+#include "GeoprocessingTask.h"
+#include "GeoprocessingJob.h"
+#include "GeoprocessingFeatures.h"
+#include "GeoprocessingParameter.h"
+#include "GeoprocessingParameters.h"
+#include "GeoprocessingResult.h"
+#include "GeoprocessingTypes.h"
+#include "FeatureCollectionTable.h"
+#include "Feature.h"
 #include "SymbolTypes.h"
+#include "Error.h"
 #include "TaskTypes.h"
-#include "Viewpoint.h"
+#include "FeatureIterator.h"
+#include "Field.h"
 
-// Qt headers
 #include <QFuture>
-#include <QMouseEvent>
 #include <QUuid>
+#include <QMouseEvent>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h
index 7c5899a8c8..1aecadfd1b 100644
--- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h
+++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeViewshed, Category=Analysis]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ANALYZEVIEWSHED_H
 #define ANALYZEVIEWSHED_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
     class FeatureCollectionTable;
@@ -31,6 +28,8 @@ namespace Esri::ArcGISRuntime
     class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class AnalyzeViewshed : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro
index ea697d158d..671be4ee3d 100644
--- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro
+++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml
index 4f8c7f002f..dca583aeaa 100644
--- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml
+++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeViewshed, Category=Analysis]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/AnalyzeViewshed/main.cpp b/CppSamples/Analysis/AnalyzeViewshed/main.cpp
index 485c825300..96ebf953f4 100644
--- a/CppSamples/Analysis/AnalyzeViewshed/main.cpp
+++ b/CppSamples/Analysis/AnalyzeViewshed/main.cpp
@@ -1,36 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "AnalyzeViewshed.h"
 
-// ArcGIS Maps SDK headers
+#include <QGuiApplication>
+#include <QQuickView>
+#include <QCommandLineParser>
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
-#include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "AnalyzeViewshed.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp
index abfa5f482e..bc63fdb091 100644
--- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp
+++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DistanceMeasurementAnalysis, Category=Analysis]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DistanceMeasurementAnalysis.h"
 
-// ArcGIS Maps SDK headers
 #include "AnalysisListModel.h"
 #include "AnalysisOverlay.h"
 #include "AnalysisOverlayListModel.h"
@@ -42,7 +40,6 @@
 #include "Surface.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
@@ -181,6 +178,7 @@ void DistanceMeasurementAnalysis::connectSignals()
     m_isNavigating = false;
   });
 
+
   // Set a flag when viewpointChanged signal emits
   connect(m_sceneView, &SceneQuickView::viewpointChanged, this, [this]
   {
diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h
index bc5101dd5b..ec92b328a6 100644
--- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h
+++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DistanceMeasurementAnalysis, Category=Analysis]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISTANCEMEASUREMENTANALYSIS_H
 #define DISTANCEMEASUREMENTANALYSIS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class LocationDistanceMeasurement;
@@ -28,6 +25,8 @@ class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h");
 
 class DistanceMeasurementAnalysis : public QObject
diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro
index 2bbfa8aa21..0662715095 100644
--- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro
+++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DistanceMeasurementAnalysis
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml
index 17d8129437..4659e34ac9 100644
--- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml
+++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DistanceMeasurementAnalysis, Category=Analysis]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp b/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp
index 5815944647..0fb6c2bf03 100644
--- a/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp
+++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp
@@ -1,32 +1,26 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DistanceMeasurementAnalysis.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml b/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml
index aaf3cdf581..950213188d 100644
--- a/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml
+++ b/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Geotriggers, Category=Analysis]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.cpp b/CppSamples/Analysis/Geotriggers/Geotriggers.cpp
index 056788c5b1..85ab6df823 100644
--- a/CppSamples/Analysis/Geotriggers/Geotriggers.cpp
+++ b/CppSamples/Analysis/Geotriggers/Geotriggers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Geotriggers, Category=Analysis]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,41 +14,39 @@
 // limitations under the License.
 // [Legal]
 
+#include "ArcGISFeature.h"
 #ifdef PCH_BUILD
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Geotriggers.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
 #include "ArcadeExpression.h"
-#include "Attachment.h"
-#include "AttachmentListModel.h"
-#include "AttributeListModel.h"
-#include "FeatureEditResult.h"
-#include "FeatureFenceParameters.h"
 #include "FenceGeotrigger.h"
 #include "FenceGeotriggerNotificationInfo.h"
-#include "GeotriggerMonitor.h"
 #include "GeotriggerNotificationInfo.h"
+#include "GeotriggerMonitor.h"
 #include "GeotriggersTypes.h"
-#include "LocationDisplay.h"
+#include "FeatureEditResult.h"
+#include "FeatureFenceParameters.h"
 #include "LocationGeotriggerFeed.h"
+#include "LocationDisplay.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapViewTypes.h"
-#include "Polyline.h"
 #include "PortalItem.h"
 #include "ServiceFeatureTable.h"
 #include "SimulatedLocationDataSource.h"
 #include "SimulationParameters.h"
+#include "ArcGISFeature.h"
+#include "AttributeListModel.h"
+#include "Attachment.h"
+#include "AttachmentListModel.h"
+#include "Polyline.h"
 
-// Qt headers
-#include <QDateTime>
 #include <QFuture>
 #include <QUuid>
+#include <QDateTime>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.h b/CppSamples/Analysis/Geotriggers/Geotriggers.h
index e16754458d..b08f8c1284 100644
--- a/CppSamples/Analysis/Geotriggers/Geotriggers.h
+++ b/CppSamples/Analysis/Geotriggers/Geotriggers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Geotriggers, Category=Analysis]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,11 +17,6 @@
 #ifndef GEOTRIGGERS_H
 #define GEOTRIGGERS_H
 
-// Qt headers
-#include <QMap>
-#include <QObject>
-#include <QUrl>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISFeature;
@@ -37,6 +32,10 @@ class ServiceFeatureTable;
 class SimulatedLocationDataSource;
 }
 
+#include <QObject>
+#include <QMap>
+#include <QUrl>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class Geotriggers : public QObject
diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.pro b/CppSamples/Analysis/Geotriggers/Geotriggers.pro
index 12439bdd89..786d5d6b97 100644
--- a/CppSamples/Analysis/Geotriggers/Geotriggers.pro
+++ b/CppSamples/Analysis/Geotriggers/Geotriggers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = Geotriggers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.qml b/CppSamples/Analysis/Geotriggers/Geotriggers.qml
index 6e958033c2..d772df6e9f 100644
--- a/CppSamples/Analysis/Geotriggers/Geotriggers.qml
+++ b/CppSamples/Analysis/Geotriggers/Geotriggers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Geotriggers, Category=Analysis]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/Geotriggers/main.cpp b/CppSamples/Analysis/Geotriggers/main.cpp
index b17757a2f2..7be6e076a8 100644
--- a/CppSamples/Analysis/Geotriggers/main.cpp
+++ b/CppSamples/Analysis/Geotriggers/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "Geotriggers.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp
index 8433c69308..bfac9c9285 100644
--- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp
+++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=LineOfSightGeoElement, Category=Analysis]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,51 +18,46 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "LineOfSightGeoElement.h"
 
-// ArcGIS Maps SDK headers
-#include "AnalysisListModel.h"
-#include "AnalysisOverlay.h"
-#include "AnalysisOverlayListModel.h"
-#include "AngularUnit.h"
 #include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
-#include "AttributeListModel.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Error.h"
 #include "GeoElementLineOfSight.h"
-#include "GeodeticDistanceResult.h"
 #include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
 #include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
-#include "LayerSceneProperties.h"
-#include "LinearUnit.h"
-#include "MapTypes.h"
 #include "ModelSceneSymbol.h"
-#include "Point.h"
 #include "PointBuilder.h"
-#include "RendererSceneProperties.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
 #include "SceneViewTypes.h"
-#include "SimpleMarkerSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerListModel.h"
+#include "LayerSceneProperties.h"
+#include "RendererSceneProperties.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
+#include "Error.h"
+#include "AttributeListModel.h"
+#include "AnalysisOverlay.h"
+#include "AnalysisOverlayListModel.h"
+#include "AnalysisListModel.h"
+#include "Camera.h"
+#include "GeodeticDistanceResult.h"
+#include "LinearUnit.h"
+#include "AngularUnit.h"
+#include "SpatialReference.h"
+#include "Point.h"
+#include "Graphic.h"
+#include "SimpleMarkerSymbol.h"
 
-// Qt headers
+#include <array>
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
-
-// STL headers
-#include <array>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h
index d473a91a99..13ab16f4d5 100644
--- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h
+++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=LineOfSightGeoElement, Category=Analysis]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef LineOfSightGeoElement_H
 #define LineOfSightGeoElement_H
 
-// Qt headers
-#include <QObject>
-#include <QTimer>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -28,6 +24,9 @@ class SceneQuickView;
 class Graphic;
 }
 
+#include <QObject>
+#include <QTimer>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class LineOfSightGeoElement : public QObject
diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro
index f3adcee63a..312bbd0f0d 100644
--- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro
+++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = LineOfSightGeoElement
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml
index cfc56b361c..cd7f69d24c 100644
--- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml
+++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=LineOfSightGeoElement, Category=Analysis]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/LineOfSightGeoElement/main.cpp b/CppSamples/Analysis/LineOfSightGeoElement/main.cpp
index 5be37e7096..d5897b3838 100644
--- a/CppSamples/Analysis/LineOfSightGeoElement/main.cpp
+++ b/CppSamples/Analysis/LineOfSightGeoElement/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "LineOfSightGeoElement.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp
index 46256f12bc..73da6e3b30 100644
--- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp
+++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=LineOfSightLocation, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "LineOfSightLocation.h"
 
-// ArcGIS Maps SDK headers
-#include "AnalysisListModel.h"
-#include "AnalysisOverlay.h"
-#include "AnalysisOverlayListModel.h"
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "LocationLineOfSight.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SpatialReference.h"
+#include "LocationLineOfSight.h"
+#include "AnalysisOverlay.h"
+#include "Camera.h"
+#include "MapTypes.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "AnalysisOverlayListModel.h"
+#include "AnalysisListModel.h"
+#include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h
index 23ebd139d5..c56b9a6d9f 100644
--- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h
+++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=LineOfSightLocation, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef LINEOFSIGHTLOCATION_H
 #define LINEOFSIGHTLOCATION_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
@@ -27,6 +24,8 @@ class AnalysisOverlay;
 class LocationLineOfSight;
 }
 
+#include <QQuickItem>
+
 class LineOfSightLocation : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro
index 6f3267a000..763e34914e 100644
--- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro
+++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = LineOfSightLocation
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml
index 7e0916b84c..aac7378b4f 100644
--- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml
+++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=LineOfSightLocation, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/LineOfSightLocation/main.cpp b/CppSamples/Analysis/LineOfSightLocation/main.cpp
index de2619ca9e..6761355ee1 100644
--- a/CppSamples/Analysis/LineOfSightLocation/main.cpp
+++ b/CppSamples/Analysis/LineOfSightLocation/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "LineOfSightLocation.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "LineOfSightLocation.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp
index 1de3f0f937..03d211441e 100644
--- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp
+++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=StatisticalQuery, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,33 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "StatisticalQuery.h"
 
-// ArcGIS Maps SDK headers
-#include "CoreTypes.h"
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "Geometry.h"
-#include "LayerListModel.h"
 #include "Map.h"
-#include "MapQuickView.h"
 #include "MapTypes.h"
+#include "MapQuickView.h"
+#include "FeatureLayer.h"
 #include "ServiceFeatureTable.h"
+#include "StatisticalQuery.h"
+#include "StatisticsQueryParameters.h"
 #include "StatisticDefinition.h"
 #include "StatisticRecord.h"
 #include "StatisticRecordIterator.h"
-#include "StatisticsQueryParameters.h"
-#include "StatisticsQueryResult.h"
 #include "Viewpoint.h"
+#include "Error.h"
+#include "LayerListModel.h"
+#include "CoreTypes.h"
+#include "StatisticsQueryResult.h"
+#include "Geometry.h"
 
-// Qt headers
 #include <QFuture>
-#include <QUrl>
 #include <QUuid>
-
-// STL headers
 #include <memory>
+#include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h
index 046787126f..45824a1320 100644
--- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h
+++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=StatisticalQuery, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef STATISTICALQUERY_H
 #define STATISTICALQUERY_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -28,6 +25,8 @@ class ServiceFeatureTable;
 class StatisticsQueryResult;
 }
 
+#include <QQuickItem>
+
 class StatisticalQuery : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro
index 7165cd5119..53396b3668 100644
--- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro
+++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = StatisticalQuery
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml
index 6ebf40e5da..cc5988d8d9 100644
--- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml
+++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=StatisticalQuery, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/StatisticalQuery/main.cpp b/CppSamples/Analysis/StatisticalQuery/main.cpp
index 94d8115876..50dc734721 100644
--- a/CppSamples/Analysis/StatisticalQuery/main.cpp
+++ b/CppSamples/Analysis/StatisticalQuery/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "StatisticalQuery.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "StatisticalQuery.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml b/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml
index ed9e6d64ea..f18e9ef91e 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml
@@ -1,9 +1,9 @@
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml b/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml
index e571058b93..8c95f29ec1 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml
@@ -1,9 +1,9 @@
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp
index 94b3a4db4e..74fba0a931 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp
@@ -1,31 +1,26 @@
-// [Legal]
-// Copyright 2016 Esri.
+// Copyright 2016 ESRI
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
+//
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-// sample headers
-#include "StatisticResultListModel.h"
 
-// Qt headers
 #include <QAbstractListModel>
 #include <QByteArray>
-#include <QDir>
-#include <QFileInfo>
 #include <QHash>
-#include <QList>
 #include <QModelIndex>
 #include <QObject>
 #include <QVariant>
+#include <QFileInfo>
+#include <QDir>
+#include <QList>
+
+#include "StatisticResultListModel.h"
 
 StatisticResultListModel::StatisticResultListModel(QObject* parent) :
   QAbstractListModel(parent)
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h
index ef71ffd119..5288430eb8 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h
@@ -1,17 +1,14 @@
-// [Legal]
-// Copyright 2016 Esri.
+// Copyright 2016 ESRI
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
+//
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 #ifndef STATISTICRESULTISTMODEL_H
 #define STATISTICRESULTISTMODEL_H
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp
index d6746929f5..610dcc0433 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=StatisticalQueryGroupSort, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "StatisticResultListModel.h"
 #include "StatisticalQueryGroupSort.h"
-
-// ArcGIS Maps SDK headers
-#include "CoreTypes.h"
-#include "Error.h"
-#include "Field.h"
-#include "OrderBy.h"
 #include "ServiceFeatureTable.h"
 #include "StatisticDefinition.h"
 #include "StatisticRecord.h"
 #include "StatisticRecordIterator.h"
 #include "StatisticsQueryParameters.h"
 #include "StatisticsQueryResult.h"
+#include "Field.h"
+#include "StatisticResultListModel.h"
+#include "Error.h"
+#include "OrderBy.h"
+#include "CoreTypes.h"
 
-// Qt headers
 #include <QFuture>
-#include <QList>
-#include <QStringList>
 #include <QUuid>
+#include <QStringList>
 #include <QVariantList>
-
-// STL headers
+#include <QList>
 #include <memory>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h
index ba96fc4c0e..b4eaec4880 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=StatisticalQueryGroupSort, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef STATISTICALQUERYGROUPSORT_H
 #define STATISTICALQUERYGROUPSORT_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QObject>
-#include <QQuickItem>
-#include <QStringList>
-#include <QVariantList>
-
 namespace Esri::ArcGISRuntime
 {
   class ServiceFeatureTable;
@@ -35,6 +28,12 @@ namespace Esri::ArcGISRuntime
 
 class StatisticResultListModel;
 
+#include <QQuickItem>
+#include <QVariantList>
+#include <QStringList>
+#include <QAbstractListModel>
+#include <QObject>
+
 class StatisticalQueryGroupSort : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro
index 52869eb983..a9adef5cef 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = StatisticalQueryGroupSort
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml
index 83966d4d8c..5b215a6f15 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=StatisticalQueryGroupSort, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp b/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp
index 6ede4e9d08..a32c123181 100644
--- a/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp
+++ b/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "StatisticalQueryGroupSort.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "StatisticalQueryGroupSort.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp
index afcc400358..33db292683 100644
--- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp
+++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedCamera, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ViewshedCamera.h"
 
-// ArcGIS Maps SDK headers
-#include "AnalysisListModel.h"
-#include "AnalysisOverlay.h"
-#include "AnalysisOverlayListModel.h"
 #include "ArcGISTiledElevationSource.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
+#include "AnalysisOverlay.h"
+#include "Point.h"
 #include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "IntegratedMeshLayer.h"
-#include "LayerListModel.h"
+#include "Viewpoint.h"
 #include "LocationViewshed.h"
+#include "IntegratedMeshLayer.h"
 #include "MapTypes.h"
-#include "Point.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
-#include "SpatialReference.h"
 #include "Surface.h"
-#include "Viewpoint.h"
+#include "ElevationSourceListModel.h"
+#include "LayerListModel.h"
+#include "AnalysisOverlayListModel.h"
+#include "AnalysisListModel.h"
+#include "SpatialReference.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h
index 912ca705d8..f9f7cbf44d 100644
--- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h
+++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedCamera, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef VIEWSHEDCAMERA_H
 #define VIEWSHEDCAMERA_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -28,6 +25,8 @@ class AnalysisOverlay;
 class LocationViewshed;
 }
 
+#include <QQuickItem>
+
 class ViewshedCamera : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro
index 001e659dee..cfd65cdfd7 100644
--- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro
+++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewshedCamera
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml
index 7685f33435..947b44b9f1 100644
--- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml
+++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedCamera, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/ViewshedCamera/main.cpp b/CppSamples/Analysis/ViewshedCamera/main.cpp
index 9c4212e3b6..c8f43a8a96 100644
--- a/CppSamples/Analysis/ViewshedCamera/main.cpp
+++ b/CppSamples/Analysis/ViewshedCamera/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ViewshedCamera.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ViewshedCamera.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp
index 9eba31406b..cba19ef146 100644
--- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp
+++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedGeoElement, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,49 +18,46 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ViewshedGeoElement.h"
 
-// ArcGIS Maps SDK headers
-#include "AnalysisListModel.h"
-#include "AnalysisOverlay.h"
-#include "AnalysisOverlayListModel.h"
-#include "AngularUnit.h"
-#include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
-#include "AttributeListModel.h"
-#include "ElevationSourceListModel.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
+#include "Point.h"
+#include "ArcGISSceneLayer.h"
+#include "SimpleRenderer.h"
+#include "ModelSceneSymbol.h"
 #include "GeoElementViewshed.h"
-#include "GeodeticDistanceResult.h"
 #include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
+#include "OrbitGeoElementCameraController.h"
+#include "MapTypes.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
 #include "LayerListModel.h"
+#include "AnalysisOverlay.h"
+#include "AnalysisOverlayListModel.h"
+#include "AnalysisListModel.h"
+#include "GraphicsOverlayListModel.h"
 #include "LayerSceneProperties.h"
-#include "LinearUnit.h"
-#include "MapTypes.h"
-#include "ModelSceneSymbol.h"
-#include "OrbitGeoElementCameraController.h"
-#include "Point.h"
-#include "RendererSceneProperties.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
 #include "SceneViewTypes.h"
-#include "SimpleRenderer.h"
-#include "SpatialReference.h"
-#include "Surface.h"
+#include "RendererSceneProperties.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
+#include "GeodeticDistanceResult.h"
+#include "LinearUnit.h"
+#include "AngularUnit.h"
+#include "AttributeListModel.h"
+#include "Graphic.h"
+#include "GraphicsOverlay.h"
+#include "SpatialReference.h"
 
-// Qt headers
-#include <QList>
-#include <QStandardPaths>
-#include <QString>
 #include <QTimer>
+#include <QString>
 #include <QUrl>
 #include <QVariant>
+#include <QList>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h
index ebb69bfb57..9c5dfb1a68 100644
--- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h
+++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedGeoElement, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,6 @@
 #ifndef VIEWSHEDGEOELEMENT_H
 #define VIEWSHEDGEOELEMENT_H
 
-// ArcGIS Maps SDK headers
-#include "GeometryTypes.h"
-#include "Point.h"
-
-// Qt headers
-#include <QQuickItem>
-#include <QTimer>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
@@ -34,6 +26,11 @@ class GraphicsOverlay;
 class Graphic;
 }
 
+#include "Point.h"
+#include "GeometryTypes.h"
+#include <QQuickItem>
+#include <QTimer>
+
 class ViewshedGeoElement : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro
index 8bc0415e3a..95e6769c12 100644
--- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro
+++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewshedGeoElement
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml
index 84a995ba97..9d131837fd 100644
--- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml
+++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedGeoElement, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/ViewshedGeoElement/main.cpp b/CppSamples/Analysis/ViewshedGeoElement/main.cpp
index 97d3f4ab62..ed54fd0dd7 100644
--- a/CppSamples/Analysis/ViewshedGeoElement/main.cpp
+++ b/CppSamples/Analysis/ViewshedGeoElement/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ViewshedGeoElement.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ViewshedGeoElement.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml b/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml
index 7937e0a741..54491f560d 100644
--- a/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml
+++ b/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedLocation, Category=Analysis]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp
index 7f41992723..8bf66f917e 100644
--- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp
+++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedLocation, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ViewshedLocation.h"
 
-// ArcGIS Maps SDK headers
-#include "AnalysisListModel.h"
-#include "AnalysisOverlay.h"
-#include "AnalysisOverlayListModel.h"
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "LocationViewshed.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SpatialReference.h"
+#include "LocationViewshed.h"
+#include "Camera.h"
+#include "Point.h"
+#include "AnalysisOverlay.h"
+#include "MapTypes.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "AnalysisOverlayListModel.h"
+#include "AnalysisListModel.h"
+#include "SpatialReference.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h
index fbb3c9c712..10dcf99acb 100644
--- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h
+++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedLocation, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef VIEWSHEDLOCATION_H
 #define VIEWSHEDLOCATION_H
 
-// Qt headers
-#include <QColor>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
@@ -28,6 +24,9 @@ class LocationViewshed;
 class AnalysisOverlay;
 }
 
+#include <QQuickItem>
+#include <QColor>
+
 class ViewshedLocation : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro
index e8a3c55c84..1b5cf01b49 100644
--- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro
+++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewshedLocation
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml
index a1cd88c61d..54ab657381 100644
--- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml
+++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedLocation, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml b/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml
index ee262a92a1..ca4b14a0f5 100644
--- a/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml
+++ b/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewshedLocation, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Analysis/ViewshedLocation/main.cpp b/CppSamples/Analysis/ViewshedLocation/main.cpp
index c8ed0e6964..e847db95c5 100644
--- a/CppSamples/Analysis/ViewshedLocation/main.cpp
+++ b/CppSamples/Analysis/ViewshedLocation/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ViewshedLocation.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ViewshedLocation.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp
index c9364e0481..561d64e5a2 100644
--- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp
+++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp
@@ -1,42 +1,36 @@
 // [WriteFile Name=AddItemsToPortal, Category=CloudAndPortal]
 // [Legal]
-// Copyright 2016 Esri.
+// Copyright 2016 ESRI
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
 // [Legal]
 
 #ifdef PCH_BUILD
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "AddItemsToPortal.h"
-
-// ArcGIS Maps SDK headers
 #include "AuthenticationManager.h"
-#include "CoreTypes.h"
-#include "Credential.h"
-#include "Error.h"
-#include "ErrorException.h"
-#include "ErrorInformationKeys.h"
-#include "MapTypes.h"
-#include "OAuthClientInfo.h"
 #include "Portal.h"
 #include "PortalItem.h"
 #include "PortalItemListModel.h"
+#include "AddItemsToPortal.h"
+#include "MapTypes.h"
 #include "PortalTypes.h"
+#include "CoreTypes.h"
+#include "Credential.h"
+#include "OAuthClientInfo.h"
 #include "PortalUser.h"
+#include "Error.h"
+#include "ErrorException.h"
+#include "ErrorInformationKeys.h"
 
-// Qt headers
 #include <QFuture>
 #include <QVariantMap>
 
diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h
index 5f16fefa3d..48fcdb64b2 100644
--- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h
+++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h
@@ -1,25 +1,20 @@
 // [WriteFile Name=AddItemsToPortal, Category=CloudAndPortal]
 // [Legal]
-// Copyright 2016 Esri.
+// Copyright 2016 ESRI
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
 // [Legal]
 
 #ifndef ADDITEMSTOPORTAL_H
 #define ADDITEMSTOPORTAL_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
     class Portal;
@@ -27,6 +22,8 @@ namespace Esri::ArcGISRuntime
     class PortalUser;
 }
 
+#include <QQuickItem>
+
 class AddItemsToPortal : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro
index 3912523eed..a5ab82118b 100644
--- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro
+++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml
index 286b258be2..157871155b 100644
--- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml
+++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddItemsToPortal, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp b/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp
index f66bce3d13..0eea5fac9e 100644
--- a/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp
+++ b/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp
@@ -1,25 +1,21 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-
 #ifdef QT_WEBVIEW_WEBENGINE_BACKEND
 #include <QtWebEngineQuick>
 #endif // QT_WEBVIEW_WEBENGINE_BACKEND
diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp
index 192911aad7..3fd11de55f 100644
--- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp
+++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=IntegratedWindowsAuthentication, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "IntegratedWindowsAuthentication.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "Portal.h"
 #include "PortalItem.h"
+#include "PortalQueryResultSetForItems.h"
 #include "PortalItemListModel.h"
+#include "MapTypes.h"
 #include "PortalQueryParametersForItems.h"
-#include "PortalQueryResultSetForItems.h"
 #include "PortalTypes.h"
+#include "Error.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h
index 682f48fd9d..8b72f5968a 100644
--- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h
+++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=IntegratedWindowsAuthentication, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef INTEGRATEDWINDOWSAUTHENTICATION_H
 #define INTEGRATEDWINDOWSAUTHENTICATION_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -34,6 +30,9 @@ class PortalQueryResultSetForItems;
 class Error;
 }
 
+#include <QObject>
+#include <QAbstractListModel>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class IntegratedWindowsAuthentication : public QObject
diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro
index a3f5bda34b..8022b19a17 100644
--- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro
+++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = IntegratedWindowsAuthentication
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml
index 8783b3998b..e594084021 100644
--- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml
+++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=IntegratedWindowsAuthentication, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp
index a470583b91..e91ed5dbd5 100644
--- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp
+++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "IntegratedWindowsAuthentication.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QQmlEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp
index 304b0063c5..4907ac3ea6 100644
--- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp
+++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=PortalUserInfo, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "PortalUserInfo.h"
 
-// ArcGIS Maps SDK headers
 #include "AuthenticationManager.h"
-#include "CoreTypes.h"
 #include "Credential.h"
-#include "Error.h"
-#include "MapTypes.h"
-#include "OAuthClientInfo.h"
 #include "Portal.h"
-#include "PortalInfo.h"
+#include "PortalUser.h"
+#include "MapTypes.h"
 #include "PortalTypes.h"
+#include "CoreTypes.h"
+#include "Credential.h"
+#include "OAuthClientInfo.h"
 #include "PortalUser.h"
-
-// Qt headers
+#include "Error.h"
+#include "PortalInfo.h"
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h
index ae27bfcb15..5018c6e6be 100644
--- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h
+++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=PortalUserInfo, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef PORTALUSERINFO_H
 #define PORTALUSERINFO_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QUrl>
-
 namespace Esri::ArcGISRuntime
 {
     class Credential;
@@ -29,6 +25,9 @@ namespace Esri::ArcGISRuntime
     enum class LoadStatus;
 }
 
+#include <QQuickItem>
+#include <QUrl>
+
 class PortalUserInfo : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro
index ca33d13f7c..8456a8076e 100644
--- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro
+++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml
index 301f1a598d..4c5eb3415d 100644
--- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml
+++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=PortalUserInfo, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp b/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp
index 7a3756a783..18c3c6982d 100644
--- a/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp
+++ b/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp
@@ -1,25 +1,21 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-
 #ifdef QT_WEBVIEW_WEBENGINE_BACKEND
 #include <QtWebEngineQuick>
 #endif // QT_WEBVIEW_WEBENGINE_BACKEND
diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp
index a7d81ef40d..ad881b5b33 100644
--- a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp
+++ b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp
@@ -1,41 +1,35 @@
 // [WriteFile Name=SearchForWebmap, Category=CloudAndPortal]
 // [Legal]
-// Copyright 2016 Esri.
+// Copyright 2016 ESRI
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
 // [Legal]
 
 #ifdef PCH_BUILD
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "SearchForWebmap.h"
-
-// ArcGIS Maps SDK headers
 #include "AuthenticationManager.h"
-#include "Error.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "Portal.h"
 #include "PortalItem.h"
 #include "PortalItemListModel.h"
 #include "PortalQueryParametersForItems.h"
-#include "PortalQueryResultSetForItems.h"
+#include "SearchForWebmap.h"
+#include "MapTypes.h"
 #include "PortalTypes.h"
+#include "Error.h"
+#include "PortalQueryResultSetForItems.h"
+#include "MapViewTypes.h"
 
-// Qt headers
 #include <QDate>
 #include <QDateTime>
 #include <QFuture>
diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h
index 6334516189..56483185f8 100644
--- a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h
+++ b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h
@@ -1,26 +1,20 @@
 // [WriteFile Name=SearchForWebmap, Category=CloudAndPortal]
 // [Legal]
-// Copyright 2016 Esri.
+// Copyright 2016 ESRI
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
 // [Legal]
 
 #ifndef SEARCHFORWEBMAP_H
 #define SEARCHFORWEBMAP_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -31,6 +25,9 @@ namespace Esri::ArcGISRuntime
   class PortalQueryResultSetForItems;
 }
 
+#include <QAbstractListModel>
+#include <QQuickItem>
+
 class SearchForWebmap : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro
index 6a9085c71d..20f5f5085b 100644
--- a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro
+++ b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp b/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp
index e998d6ac1f..c81dbceced 100644
--- a/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp
+++ b/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp
@@ -1,25 +1,21 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-
 #ifdef QT_WEBVIEW_WEBENGINE_BACKEND
 #include <QtWebEngineQuick>
 #endif // QT_WEBVIEW_WEBENGINE_BACKEND
diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp
index 45d5646fe8..4c96bab4c3 100644
--- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp
+++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowOrgBasemaps, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "ShowOrgBasemaps.h"
-
-// ArcGIS Maps SDK headers
 #include "AuthenticationManager.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Basemap.h"
 #include "BasemapListModel.h"
+#include "Portal.h"
+#include "ShowOrgBasemaps.h"
+#include "MapTypes.h"
 #include "CoreTypes.h"
 #include "Credential.h"
-#include "Error.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
 #include "OAuthClientInfo.h"
-#include "Portal.h"
+#include "Error.h"
 #include "PortalInfo.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
@@ -55,6 +51,7 @@ void ShowOrgBasemaps::init()
   qmlRegisterType<ShowOrgBasemaps>("Esri.Samples", 1, 0, "ShowOrgBasemapsSample");
 }
 
+
 void ShowOrgBasemaps::connectLoadStatusSignal()
 {
   if (m_portal)
diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h
index d27d4274c5..ba291d0883 100644
--- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h
+++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowOrgBasemaps, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef SHOWORGBASEMAPS_H
 #define SHOWORGBASEMAPS_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class BasemapListModel;
@@ -29,6 +25,9 @@ namespace Esri::ArcGISRuntime
   class Portal;
 }
 
+#include <QAbstractListModel>
+#include <QQuickItem>
+
 class ShowOrgBasemaps : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro
index 50aa28bb0f..90b7034d5f 100644
--- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro
+++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml
index 9fdc4dce64..d114e7fd4a 100644
--- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml
+++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowOrgBasemaps, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp b/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp
index d533a56f3e..92365fd344 100644
--- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp
+++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp
@@ -1,26 +1,22 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// Qt headers
-#include <QAbstractListModel>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-
+#include <QAbstractListModel>
 #ifdef QT_WEBVIEW_WEBENGINE_BACKEND
 #include <QtWebEngineQuick>
 #endif // QT_WEBVIEW_WEBENGINE_BACKEND
diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp
index c7f0104eee..dca588a03c 100644
--- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp
+++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=TokenAuthentication, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "TokenAuthentication.h"
 
-// ArcGIS Maps SDK headers
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapViewTypes.h"
 #include "Portal.h"
 #include "PortalItem.h"
+#include "MapViewTypes.h"
 
-// Qt headers
 #include <QUrl>
 
 namespace
diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h
index 8fe7403e3d..3946301375 100644
--- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h
+++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=TokenAuthentication, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef TOKENAUTHENTICATION_H
 #define TOKENAUTHENTICATION_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class TokenAuthentication : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro
index 84e21c7ada..d2885d73ea 100644
--- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro
+++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml
index 8d1715fd0c..5257e40ebf 100644
--- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml
+++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=TokenAuthentication, Category=CloudAndPortal]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp b/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp
index 1550f0bf7d..a07fad3c06 100644
--- a/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp
+++ b/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp
@@ -1,24 +1,21 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
 #ifdef QT_WEBVIEW_WEBENGINE_BACKEND
 #include <QtWebEngineQuick>
diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp
index 5132ce7ad1..6156f0b8b6 100644
--- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp
+++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddGraphicsWithRenderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AddGraphicsWithRenderer.h"
 
-// ArcGIS Maps SDK headers
 #include "AngularUnit.h"
 #include "CubicBezierSegment.h"
 #include "EllipticArcSegment.h"
@@ -43,6 +41,7 @@
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
+#include "SimpleMarkerSymbol.h"
 #include "SimpleRenderer.h"
 #include "SpatialReference.h"
 #include "SymbolTypes.h"
diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h
index a071eea720..82c446ed6a 100644
--- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h
+++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddGraphicsWithRenderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ADDGRAPHICSWITHRENDERER_H
 #define ADDGRAPHICSWITHRENDERER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Geometry;
@@ -29,6 +26,8 @@ class MapQuickView;
 class Symbol;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class AddGraphicsWithRenderer : public QObject
diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro
index 9f4df4a779..63ce54ca6a 100644
--- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro
+++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AddGraphicsWithRenderer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml
index 56a49d96c3..e0bbdb6096 100644
--- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml
+++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddGraphicsWithRenderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp
index d1f1238e5b..668541f207 100644
--- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp
+++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AddGraphicsWithRenderer.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp
index 6abc3ed0d4..dca928c877 100644
--- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp
+++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=BuildLegend, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,21 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "BuildLegend.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "Basemap.h"
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
-#include "LegendInfoListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
+#include "Basemap.h"
+#include "ArcGISMapImageLayer.h"
+#include "FeatureLayer.h"
 #include "ServiceFeatureTable.h"
+#include "MapTypes.h"
+#include "LegendInfoListModel.h"
+#include "LayerListModel.h"
 #include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h
index 347b2a2268..2d36aef602 100644
--- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h
+++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=BuildLegend, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef BUILD_LEGEND_H
 #define BUILD_LEGEND_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -29,6 +25,9 @@ namespace Esri::ArcGISRuntime
 
 class QString;
 
+#include <QAbstractListModel>
+#include <QQuickItem>
+
 class BuildLegend : public QQuickItem
 {
   Q_OBJECT
@@ -55,3 +54,4 @@ class BuildLegend : public QQuickItem
 };
 
 #endif // BUILD_LEGEND_H
+
diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro
index b0c0326315..e781d7269d 100644
--- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro
+++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml
index 503cbf1e6a..6ce5e72f3f 100644
--- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml
+++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BuildLegend, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/BuildLegend/main.cpp b/CppSamples/DisplayInformation/BuildLegend/main.cpp
index 85f8b10d91..c951e3b3b1 100644
--- a/CppSamples/DisplayInformation/BuildLegend/main.cpp
+++ b/CppSamples/DisplayInformation/BuildLegend/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "BuildLegend.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "BuildLegend.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp
index ff39db59f4..726fb38915 100644
--- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp
+++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ControlAnnotationSublayerVisibility, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ControlAnnotationSublayerVisibility.h"
 
-// ArcGIS Maps SDK headers
+#include "Map.h"
+#include "MapQuickView.h"
+#include "MobileMapPackage.h"
 #include "AnnotationSublayer.h"
 #include "Error.h"
-#include "Layer.h"
 #include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
 #include "MapTypes.h"
-#include "MobileMapPackage.h"
+#include "Layer.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h
index 8ecae57a16..c2273d774e 100644
--- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h
+++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ControlAnnotationSublayerVisibility, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef CONTROLANNOTATIONSUBLAYERVISIBILITY_H
 #define CONTROLANNOTATIONSUBLAYERVISIBILITY_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -30,6 +27,8 @@ class LayerListModel;
 class Layer;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ControlAnnotationSublayerVisibility : public QObject
diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro
index fceaaac551..4669c9eaa1 100644
--- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro
+++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ControlAnnotationSublayerVisibility
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml
index 41ae4f0106..fc3ece2699 100644
--- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml
+++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ControlAnnotationSublayerVisibility, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp
index 485ae362fb..97e7e66558 100644
--- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp
+++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ControlAnnotationSublayerVisibility.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp
index f3d7bdc5a4..fe3b37e84d 100644
--- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp
+++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateSymbolStylesFromWebStyles, Category=DisplayInformation]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,25 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateSymbolStylesFromWebStyles.h"
 
-// ArcGIS Maps SDK headers
 #include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
-#include "Symbol.h"
 #include "SymbolStyle.h"
+#include "UniqueValueRenderer.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "SymbolStyleSearchParameters.h"
-#include "SymbolStyleSearchResult.h"
 #include "SymbolStyleSearchResultListModel.h"
+#include "SymbolStyleSearchResult.h"
 #include "UniqueValue.h"
 #include "UniqueValueListModel.h"
-#include "UniqueValueRenderer.h"
+#include "SpatialReference.h"
+#include "Point.h"
+#include "Symbol.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h
index e93ec193a2..94380c18f2 100644
--- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h
+++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateSymbolStylesFromWebStyles, Category=DisplayInformation]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,11 +17,6 @@
 #ifndef CREATESYMBOLSTYLESFROMWEBSTYLES_H
 #define CREATESYMBOLSTYLESFROMWEBSTYLES_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QMap>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
   class FeatureLayer;
@@ -35,6 +30,10 @@ namespace Esri::ArcGISRuntime
 
 class QAbstractListModel;
 
+#include <QObject>
+#include <QMap>
+#include <QAbstractListModel>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("QAbstractListModel")
 
diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro
index 9b76463b77..0d6a7840d2 100644
--- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro
+++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateSymbolStylesFromWebStyles
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml
index fca750512e..bf2055f5c3 100644
--- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml
+++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateSymbolStylesFromWebStyles, Category=DisplayInformation]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp
index 983566a61e..e32893953a 100644
--- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp
+++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateSymbolStylesFromWebStyles.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp
index 39c4d7143d..82fc14b7a9 100644
--- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp
+++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CustomDictionaryStyle, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CustomDictionaryStyle.h"
 
-// ArcGIS Maps SDK headers
 #include "DictionaryRenderer.h"
 #include "DictionarySymbolStyle.h"
 #include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "PortalItem.h"
 #include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "PortalItem.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h
index 217353378c..d14e2080f2 100644
--- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h
+++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CustomDictionaryStyle, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef CUSTOMDICTIONARYSTYLE_H
 #define CUSTOMDICTIONARYSTYLE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class DictionaryRenderer;
@@ -28,6 +25,8 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class CustomDictionaryStyle : public QObject
diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro
index f82f8a4cb9..09ea40f757 100644
--- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro
+++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CustomDictionaryStyle
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml
index 3e5438533b..cd8d9ee8d1 100644
--- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml
+++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CustomDictionaryStyle, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp b/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp
index bc79debfef..3f35945847 100644
--- a/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp
+++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CustomDictionaryStyle.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp
index 45e66c0c8c..f5f2aaaf0c 100644
--- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp
+++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayClusters, Category=DisplayInformation]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayClusters.h"
 
-// ArcGIS Maps SDK headers
 #include "AggregateGeoElement.h"
 #include "CalloutData.h"
 #include "Error.h"
@@ -39,7 +37,6 @@
 #include "PopupManager.h"
 #include "PortalItem.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
@@ -128,6 +125,7 @@ void DisplayClusters::onMouseClicked(const QMouseEvent &mouseClick)
     if (identifyResult->popups().isEmpty())
       return;
 
+
     Popup* popup = identifyResult->popups().constFirst();
 
     // if the identified object is a cluster, select it
diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h
index caa3b76368..5b13bb7128 100644
--- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h
+++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayClusters, Category=DisplayInformation]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef DISPLAYCLUSTERS_H
 #define DISPLAYCLUSTERS_H
 
-// Qt headers
-#include <QMouseEvent>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class AggregateGeoElement;
@@ -29,6 +25,9 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+#include <QMouseEvent>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class DisplayClusters : public QObject
diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro
index 9e1284adf4..5667fcf5a9 100644
--- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro
+++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayClusters
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml
index 26d2d06e3d..d6e737a7fb 100644
--- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml
+++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayClusters, Category=DisplayInformation]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/DisplayClusters/main.cpp b/CppSamples/DisplayInformation/DisplayClusters/main.cpp
index 25e7968259..e12a009d75 100644
--- a/CppSamples/DisplayInformation/DisplayClusters/main.cpp
+++ b/CppSamples/DisplayInformation/DisplayClusters/main.cpp
@@ -1,37 +1,29 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayClusters.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.cpp b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.cpp
new file mode 100644
index 0000000000..17d5d5414c
--- /dev/null
+++ b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.cpp
@@ -0,0 +1,313 @@
+// [WriteFile Name=DisplayGrid, Category=DisplayInformation]
+// [Legal]
+// Copyright 2016 Esri.
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// [Legal]
+
+#ifdef PCH_BUILD
+#include "pch.hpp"
+#endif // PCH_BUILD
+
+#include "DisplayGrid.h"
+
+#include "Map.h"
+#include "MapQuickView.h"
+#include "Grid.h"
+#include "LatitudeLongitudeGrid.h"
+#include "UTMGrid.h"
+#include "USNGGrid.h"
+#include "MGRSGrid.h"
+#include "SimpleLineSymbol.h"
+#include "TextSymbol.h"
+#include "Viewpoint.h"
+#include "Point.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "SpatialReference.h"
+
+using namespace Esri::ArcGISRuntime;
+
+const QString DisplayGrid::s_utmGrid = QStringLiteral("UTM");
+const QString DisplayGrid::s_usngGrid = QStringLiteral("USNG");
+const QString DisplayGrid::s_latlonGrid = QStringLiteral("LatLon");
+const QString DisplayGrid::s_mgrsGrid = QStringLiteral("MGRS");
+const QString DisplayGrid::s_ddFormat = QStringLiteral("Decimal degrees");
+const QString DisplayGrid::s_dmsFormat = QStringLiteral( "Degrees minutes seconds");
+const QString DisplayGrid::s_geographicPosition = QStringLiteral("Geographic");
+const QString DisplayGrid::s_bottomLeftPosition = QStringLiteral("Bottom left");
+const QString DisplayGrid::s_bottomRightPosition = QStringLiteral("Bottom right");
+const QString DisplayGrid::s_topLeftPosition = QStringLiteral("Top left");
+const QString DisplayGrid::s_topRightPosition = QStringLiteral("Top right");
+const QString DisplayGrid::s_centerPosition = QStringLiteral("Center");
+const QString DisplayGrid::s_allSidesPosition = QStringLiteral("All sides");
+
+DisplayGrid::DisplayGrid(QQuickItem* parent /* = nullptr */):
+  QQuickItem(parent)
+{
+}
+
+DisplayGrid::~DisplayGrid() = default;
+
+void DisplayGrid::init()
+{
+  qmlRegisterType<MapQuickView>("Esri.Samples", 1, 0, "MapView");
+  qmlRegisterType<DisplayGrid>("Esri.Samples", 1, 0, "DisplayGridSample");
+}
+
+void DisplayGrid::componentComplete()
+{
+  QQuickItem::componentComplete();
+
+  // find QML MapView component
+  m_mapView->setWrapAroundMode(WrapAroundMode::Disabled);
+
+  // Create a map using the imagery basemap
+  m_map = new Map(BasemapStyle::ArcGISImageryStandard, this);
+  double targetScale = 6450785;
+  m_map->setInitialViewpoint(Viewpoint(Point(-10336141.70018318, 5418213.05332071, SpatialReference::webMercator()), targetScale));
+
+  // Set map to map view
+  m_mapView->setMap(m_map);
+}
+
+// change the grid type
+void DisplayGrid::changeGrid(const QString& gridType)
+{
+  if (gridType == latlonGrid())
+  {
+    //! [DisplayGrid Set_LatLon_Grid_Cpp]
+    // create a grid for showing Latitude and Longitude (Meridians and Parallels)
+    LatitudeLongitudeGrid* latlonGrid = new LatitudeLongitudeGrid(this);
+    m_mapView->setGrid(latlonGrid);
+    //! [DisplayGrid Set_LatLon_Grid_Cpp]
+  }
+  else if (gridType == utmGrid())
+  {
+    UTMGrid* utmGrid = new UTMGrid(this);
+    m_mapView->setGrid(utmGrid);
+  }
+  else if (gridType == usngGrid())
+  {
+    USNGGrid* utmGrid = new USNGGrid(this);
+    m_mapView->setGrid(utmGrid);
+  }
+  else if (gridType == mgrsGrid())
+  {
+    MGRSGrid* utmGrid = new MGRSGrid(this);
+    m_mapView->setGrid(utmGrid);
+  }
+
+  // apply any styling that has been set
+  changeGridColor(currentGridColor());
+  changeLabelColor(currentLabelColor());
+  changeLabelFormat(currentLabelFormat());
+  changeLabelPosition(currentLabelPosition());
+  setGridLabelVisibility(gridVisibility());
+  setGridVisibility(gridVisibility());
+}
+
+// change the grid color
+void DisplayGrid::changeGridColor(const QString& color)
+{
+  if (m_mapView->grid())
+  {
+    // find the number of resolution levels in the grid
+    int gridLevels = m_mapView->grid()->levelCount();
+
+    //! [DisplayGrid Set_Grid_Lines_Cpp]
+    for (int level = 0; level < gridLevels; level++)
+    {
+      const float width = 1 + level;
+      SimpleLineSymbol* lineSym = new SimpleLineSymbol(SimpleLineSymbolStyle::Solid, QColor(color), width, this);
+      m_mapView->grid()->setLineSymbol(level, lineSym);
+    }
+    //! [DisplayGrid Set_Grid_Lines_Cpp]
+  }
+}
+
+// change the grid label color
+void DisplayGrid::changeLabelColor(const QString& color)
+{
+  if (m_mapView->grid())
+  {
+    //! [DisplayGrid Grid_Levels_Cpp]
+    // find the number of resolution levels in the grid
+    int gridLevels = m_mapView->grid()->levelCount();
+    //! [DisplayGrid Grid_Levels_Cpp]
+
+    //! [DisplayGrid Set_Grid_Labels_Cpp]
+    for (int level = 0; level < gridLevels; level++)
+    {
+      constexpr float size = 14.0f;
+      TextSymbol* textSym = new TextSymbol("text", QColor(color), size, HorizontalAlignment::Left, VerticalAlignment::Bottom, this);
+      textSym->setHaloColor(QColor("white"));
+      textSym->setHaloWidth(2.0f + level);
+      m_mapView->grid()->setTextSymbol(level, textSym);
+    }
+    //! [DisplayGrid Set_Grid_Labels_Cpp]
+  }
+}
+
+// change the grid label format
+void DisplayGrid::changeLabelFormat(const QString& format)
+{
+  if (m_mapView->grid())
+  {
+    if (m_mapView->grid()->gridType() == GridType::LatitudeLongitudeGrid)
+    {
+      if (format == ddFormat())
+      {
+        // format the labels to display in decimal degrees
+        static_cast<LatitudeLongitudeGrid*>(m_mapView->grid())->setLabelFormat(LatitudeLongitudeGridLabelFormat::DecimalDegrees);
+      }
+      else if (format == dmsFormat())
+      {
+        //! [DisplayGrid Set_Label_Format_Cpp]
+        // format the labels to display in degrees, minutes and seconds
+        static_cast<LatitudeLongitudeGrid*>(m_mapView->grid())->setLabelFormat(LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds);
+        //! [DisplayGrid Set_Label_Format_Cpp]
+      }
+    }
+  }
+}
+
+// change the grid label placement
+void DisplayGrid::changeLabelPosition(const QString& position)
+{
+  if (m_mapView->grid())
+  {
+    if (position == geographicPosition())
+    {
+      //! [DisplayGrid Set_Label_Placement_Geographic_Cpp]
+      // update the label positioning to geographic
+      m_mapView->grid()->setLabelPosition(GridLabelPosition::Geographic);
+      //! [DisplayGrid Set_Label_Placement_Geographic_Cpp]
+    }
+    else if (position == bottomLeftPosition())
+    {
+      // update the label positioning to bottom left
+      m_mapView->grid()->setLabelPosition(GridLabelPosition::BottomLeft);
+    }
+    else if (position == bottomRightPosition())
+    {
+      // update the label positioning to bottom right
+      m_mapView->grid()->setLabelPosition(GridLabelPosition::BottomRight);
+    }
+    else if (position == topLeftPosition())
+    {
+      // update the label positioning to top left
+      m_mapView->grid()->setLabelPosition(GridLabelPosition::TopLeft);
+    }
+    else if (position == topRightPosition())
+    {
+      //! [DisplayGrid Set_Label_Placement_Top_Right_Cpp]
+      // update the label positioning to top right
+      m_mapView->grid()->setLabelPosition(GridLabelPosition::TopRight);
+      //! [DisplayGrid Set_Label_Placement_Top_Right_Cpp]
+    }
+    else if (position == centerPosition())
+    {
+      // update the label positioning to center
+      m_mapView->grid()->setLabelPosition(GridLabelPosition::Center);
+    }
+    else if (position == allSidesPosition())
+    {
+      // update the label positioning to all sides
+      m_mapView->grid()->setLabelPosition(GridLabelPosition::AllSides);
+    }
+  }
+}
+
+MapQuickView* DisplayGrid::mapQuickView() const
+{
+  return m_mapView;
+}
+
+void DisplayGrid::setMapQuickView(MapQuickView* mapView)
+{
+  m_mapView = mapView;
+  emit mapQuickViewChanged();
+}
+
+QString DisplayGrid::currentGridColor() const
+{
+  return m_currentGridColor;
+}
+
+void DisplayGrid::setCurrentGridColor(const QString& gridColor)
+{
+  m_currentGridColor = gridColor;
+  changeGridColor(m_currentGridColor);
+}
+
+QString DisplayGrid::currentLabelColor() const
+{
+  return m_currentLabelColor;
+}
+
+void DisplayGrid::setCurrentLabelColor(const QString& labelColor)
+{
+  m_currentLabelColor = labelColor;
+  changeLabelColor(m_currentLabelColor);
+}
+
+QString DisplayGrid::currentLabelFormat() const
+{
+  return m_currentLabelFormat;
+}
+
+void DisplayGrid::setCurrentLabelFormat(const QString& labelFormat)
+{
+  m_currentLabelFormat = labelFormat;
+  changeLabelFormat(m_currentLabelFormat);
+}
+
+QString DisplayGrid::currentLabelPosition() const
+{
+  return m_currentLabelPosition;
+}
+
+void DisplayGrid::setCurrentLabelPosition(const QString& labelPosition)
+{
+  m_currentLabelPosition = labelPosition;
+  changeLabelPosition(m_currentLabelPosition);
+}
+
+bool DisplayGrid::gridVisibility()
+{
+  return m_gridVisibility;
+}
+
+void DisplayGrid::setGridVisibility(bool visible)
+{
+  m_gridVisibility = visible;
+
+  //! [DisplayGrid Grid_Visible_Cpp]
+  m_mapView->grid()->setVisible(m_gridVisibility);
+  //! [DisplayGrid Grid_Visible_Cpp]
+}
+
+bool DisplayGrid::gridLabelVisibility()
+{
+  return m_gridLabelVisibility;
+}
+
+void DisplayGrid::setGridLabelVisibility(bool visible)
+{
+  m_gridLabelVisibility = visible;
+
+  //! [DisplayGrid Label_Visible_Cpp]
+  m_mapView->grid()->setLabelsVisible(m_gridLabelVisibility);
+  //! [DisplayGrid Label_Visible_Cpp]
+}
diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.h b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.h
new file mode 100644
index 0000000000..97c3e4ec7b
--- /dev/null
+++ b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.h
@@ -0,0 +1,143 @@
+// [WriteFile Name=DisplayGrid, Category=DisplayInformation]
+// [Legal]
+// Copyright 2016 Esri.
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// [Legal]
+
+#ifndef DISPLAYGRID_H
+#define DISPLAYGRID_H
+
+namespace Esri::ArcGISRuntime
+{
+  class Map;
+  class MapQuickView;
+}
+
+#include <QQuickItem>
+
+Q_MOC_INCLUDE("MapQuickView.h")
+
+class DisplayGrid : public QQuickItem
+{
+  Q_OBJECT
+
+  Q_PROPERTY(Esri::ArcGISRuntime::MapQuickView* mapView READ mapQuickView WRITE setMapQuickView NOTIFY mapQuickViewChanged)
+
+  Q_PROPERTY(QString utmGrid READ utmGrid NOTIFY utmGridChanged)
+  Q_PROPERTY(QString usngGrid READ usngGrid NOTIFY usngGridChanged)
+  Q_PROPERTY(QString latlonGrid READ latlonGrid NOTIFY latlonGridChanged)
+  Q_PROPERTY(QString mgrsGrid READ mgrsGrid NOTIFY mgrsGridChanged)
+  Q_PROPERTY(QString ddFormat READ ddFormat NOTIFY ddFormatChanged)
+  Q_PROPERTY(QString dmsFormat READ dmsFormat NOTIFY dmsFormatChanged)
+  Q_PROPERTY(QString geographicPosition READ geographicPosition NOTIFY geographicPositionChanged)
+  Q_PROPERTY(QString bottomLeftPosition READ bottomLeftPosition NOTIFY bottomLeftPositionChanged)
+  Q_PROPERTY(QString bottomRightPosition READ bottomRightPosition NOTIFY bottomRightPositionChanged)
+  Q_PROPERTY(QString topLeftPosition READ topLeftPosition NOTIFY topLeftPositionChanged)
+  Q_PROPERTY(QString topRightPosition READ topRightPosition NOTIFY topRightPositionChanged)
+  Q_PROPERTY(QString centerPosition READ centerPosition NOTIFY centerPositionChanged)
+  Q_PROPERTY(QString allSidesPosition READ allSidesPosition NOTIFY allSidesPositionChanged)
+  Q_PROPERTY(QString currentGridColor READ currentGridColor WRITE setCurrentGridColor NOTIFY currentGridColorChanged)
+  Q_PROPERTY(QString currentLabelColor READ currentLabelColor WRITE setCurrentLabelColor NOTIFY currentLabelColorChanged)
+  Q_PROPERTY(QString currentLabelFormat READ currentLabelFormat WRITE setCurrentLabelFormat NOTIFY currentLabelFormatChanged)
+  Q_PROPERTY(QString currentLabelPosition READ currentLabelPosition WRITE setCurrentLabelPosition NOTIFY currentLabelPositionChanged)
+  Q_PROPERTY(bool gridVisibility READ gridVisibility WRITE setGridVisibility NOTIFY gridVisibilityChanged)
+  Q_PROPERTY(bool gridLabelVisibility READ gridLabelVisibility WRITE setGridLabelVisibility NOTIFY gridLabelVisibilityChanged)
+
+public:
+  explicit DisplayGrid(QQuickItem* parent = nullptr);
+  ~DisplayGrid() override;
+
+  void componentComplete() override;
+  static void init();
+  Q_INVOKABLE void changeGrid(const QString& gridType);
+  Q_INVOKABLE void changeGridColor(const QString& color);
+  Q_INVOKABLE void changeLabelColor(const QString& color);
+  Q_INVOKABLE void changeLabelFormat(const QString& format);
+  Q_INVOKABLE void changeLabelPosition(const QString& position);
+
+signals:
+  void utmGridChanged();
+  void usngGridChanged();
+  void latlonGridChanged();
+  void mgrsGridChanged();
+  void ddFormatChanged();
+  void dmsFormatChanged();
+  void geographicPositionChanged();
+  void bottomLeftPositionChanged();
+  void bottomRightPositionChanged();
+  void topLeftPositionChanged();
+  void topRightPositionChanged();
+  void centerPositionChanged();
+  void allSidesPositionChanged();
+  void currentGridColorChanged();
+  void currentLabelColorChanged();
+  void currentLabelFormatChanged();
+  void currentLabelPositionChanged();
+  void gridVisibilityChanged();
+  void gridLabelVisibilityChanged();
+  void mapQuickViewChanged();
+
+private:
+    static const QString utmGrid() { return s_utmGrid; }
+    static const QString usngGrid() { return s_usngGrid; }
+    static const QString latlonGrid() { return s_latlonGrid; }
+    static const QString mgrsGrid() { return s_mgrsGrid; }
+    static const QString ddFormat() { return s_ddFormat; }
+    static const QString dmsFormat() { return s_dmsFormat; }
+    static const QString geographicPosition() { return s_geographicPosition; }
+    static const QString bottomLeftPosition() { return s_bottomLeftPosition; }
+    static const QString bottomRightPosition() { return s_bottomRightPosition; }
+    static const QString topLeftPosition() { return s_topLeftPosition; }
+    static const QString topRightPosition() { return s_topRightPosition; }
+    static const QString centerPosition() { return s_centerPosition; }
+    static const QString allSidesPosition() { return s_allSidesPosition; }
+    Esri::ArcGISRuntime::MapQuickView* mapQuickView() const;
+    void setMapQuickView(Esri::ArcGISRuntime::MapQuickView* mapView);
+    QString currentGridColor() const;
+    void setCurrentGridColor(const QString& gridColor);
+    QString currentLabelColor() const;
+    void setCurrentLabelColor(const QString& labelColor);
+    QString currentLabelFormat() const;
+    void setCurrentLabelFormat(const QString& labelFormat);
+    QString currentLabelPosition() const;
+    void setCurrentLabelPosition(const QString& labelPosition);
+    bool gridVisibility();
+    void setGridVisibility(bool visible);
+    bool gridLabelVisibility();
+    void setGridLabelVisibility(bool visible);
+
+private:
+  Esri::ArcGISRuntime::Map* m_map = nullptr;
+  Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr;
+  static const QString s_utmGrid;
+  static const QString s_usngGrid;
+  static const QString s_latlonGrid;
+  static const QString s_mgrsGrid;
+  static const QString s_ddFormat;
+  static const QString s_dmsFormat;
+  static const QString s_geographicPosition;
+  static const QString s_bottomLeftPosition;
+  static const QString s_bottomRightPosition;
+  static const QString s_topLeftPosition;
+  static const QString s_topRightPosition;
+  static const QString s_centerPosition;
+  static const QString s_allSidesPosition;
+  QString m_currentGridColor = QStringLiteral("red");
+  QString m_currentLabelColor = QStringLiteral("black");
+  QString m_currentLabelFormat;
+  QString m_currentLabelPosition;
+  bool m_gridVisibility = true;
+  bool m_gridLabelVisibility = true;
+};
+
+#endif // DISPLAYGRID_H
diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.pro b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.pro
similarity index 79%
rename from CppSamples/DisplayInformation/ShowGrid/ShowGrid.pro
rename to CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.pro
index 3f4851e29e..9eb1fb5182 100644
--- a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.pro
+++ b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.pro
@@ -1,5 +1,5 @@
 #-------------------------------------------------
-# Copyright 2024 Esri.
+# Copyright 2015 Esri.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,39 +24,31 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
-TARGET = ShowGrid
-
-ARCGIS_RUNTIME_VERSION = 200.6.0
-include($$PWD/arcgisruntime.pri)
+TARGET = DisplayGrid
 
 #-------------------------------------------------------------------------------
 
-HEADERS += \
-    ShowGrid.h
+HEADERS += DisplayGrid.h
 
-SOURCES += \
-    main.cpp \
-    ShowGrid.cpp
+SOURCES += main.cpp DisplayGrid.cpp
 
-RESOURCES += ShowGrid.qrc
+RESOURCES += DisplayGrid.qrc
 
 #-------------------------------------------------------------------------------
 
 win32 {
-    LIBS += \
-        Ole32.lib
+    LIBS += Ole32.lib
 }
 
 ios {
     INCLUDEPATH += $$PWD
     DEPENDPATH += $$PWD
 
-    OTHER_FILES += \
-        $$PWD/Info.plist
+    OTHER_FILES += $$PWD/Info.plist
 
     QMAKE_INFO_PLIST = $$PWD/Info.plist
 }
@@ -65,3 +57,4 @@ android {
     INCLUDEPATH += $$PWD
     DEPENDPATH += $$PWD
 }
+
diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qml b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qml
similarity index 66%
rename from CppSamples/DisplayInformation/ShowGrid/ShowGrid.qml
rename to CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qml
index e468633a3e..354d249ab7 100644
--- a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qml
+++ b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qml
@@ -1,12 +1,12 @@
-// [WriteFile Name=ShowGrid, Category=DisplayInformation]
+// [WriteFile Name=DisplayGrid, Category=DisplayInformation]
 // [Legal]
-// Copyright 2024 Esri.
-//
+// Copyright 2016 Esri.
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,115 +19,24 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Esri.Samples
 
-Item {
-    id: root
-    property real centerWindowY: (root.height / 2) - (styleWindow.height / 2)
+DisplayGridSample {
+    id: displayGrid
+    clip: true
+    width: 800
+    height: 600
+
+    property real centerWindowY: (displayGrid.height / 2) - (styleWindow.height / 2)
 
     MapView {
         id: mapQuickView
         anchors.fill: parent
-        visible: gridSample.currentViewType == "MapView"
+
         Component.onCompleted: {
-            // Set and keep the focus on SceneView to enable keyboard navigation
+            // Set the focus on MapView to initially enable keyboard navigation
             forceActiveFocus();
         }
     }
-
-    SceneView {
-        id: sceneQuickView
-        anchors.fill: parent
-        visible: gridSample.currentViewType == "SceneView"
-    }
-
-    // Declare the C++ instance which creates the map, scene etc. and supply the views
-    ShowGridSample {
-        id: gridSample
-        mapView: mapQuickView
-        sceneView: sceneQuickView
-
-        onCurrentViewTypeChanged: {
-            if (gridSample.currentViewType === "MapView")
-                mapQuickView.forceActiveFocus();
-            else
-                sceneQuickView.forceActiveFocus();
-        }
-    }
-
-    Row {
-        id: viewButtonsRow
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            topMargin: 5
-        }
-
-        spacing: 2
-
-        Rectangle {
-            id: mapViewButton
-            property bool selected: gridSample.currentViewType === "MapView"
-
-            width: 100
-            height: 30
-
-            color: selected ? "#959595" : "#D6D6D6"
-            radius: 8
-            border {
-                color: selected ? "#7938b6" : "#585858"
-                width: selected ? 2 : 1
-            }
-
-            Text {
-                anchors.centerIn: parent
-                text: "Map View"
-                font.pixelSize: 14
-                color: "#474747"
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    gridSample.setViewType("MapView");
-                    positionCombo.enabled = true;
-                }
-            }
-        }
-
-        Rectangle {
-            id: sceneViewButton
-            property bool selected: gridSample.currentViewType === "SceneView"
-
-            width: 100
-            height: 30
-
-            color: selected ? "#959595" : "#D6D6D6"
-            radius: 8
-            border {
-                color: selected ? "#7938b6" : "#585858"
-                width: selected ? 2 : 1
-            }
-
-            Text {
-                anchors.centerIn: parent
-                text: "Scene View"
-                font.pixelSize: 14
-                color: "#474747"
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    gridSample.setViewType("SceneView");
-                    if (gridTypeComboBox.currentText !== "LatLong") {
-                        positionCombo.currentIndex = 0;
-                        positionCombo.enabled = false;
-                    } else {
-                        positionCombo.enabled = true;
-                    }
-                }
-            }
-        }
-    }
+    mapView: mapQuickView
 
     // Button to view the styling window
     Rectangle {
@@ -186,9 +95,7 @@ Item {
 
     Rectangle {
         id: styleWindow
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-        }
+        anchors.horizontalCenter: parent.horizontalCenter
         y: parent.height // initially display below the page
         height: childrenRect.height
         width: childrenRect.width
@@ -207,7 +114,7 @@ Item {
 
         SequentialAnimation {
             id: hideAnimation
-            NumberAnimation { target: styleWindow; property: "y"; to: root.height; duration: 200 }
+            NumberAnimation { target: styleWindow; property: "y"; to: displayGrid.height; duration: 200 }
         }
 
         GridLayout {
@@ -225,16 +132,8 @@ Item {
                 Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10)
                 Layout.rightMargin: 10
                 Layout.fillWidth: true
-                model: gridSample.gridTypes
-                onCurrentTextChanged: {
-                    gridSample.setGridType(currentText)
-                    if (currentText !== "LatLong" && gridSample.currentViewType === "SceneView") {
-                        positionCombo.currentIndex = 0;
-                        positionCombo.enabled = false;
-                    } else {
-                        positionCombo.enabled = true;
-                    }
-                }
+                model: [latlonGrid, mgrsGrid, utmGrid, usngGrid]
+                onCurrentTextChanged: changeGrid(currentText)
                 Component.onCompleted : {
                     for (let i = 0; i < model.length; ++i) {
                         metricsGridTypeComboBox.text = model[i];
@@ -248,30 +147,30 @@ Item {
             }
 
             Text {
+                text: "Labels visible"
                 Layout.leftMargin: 10
-                text: "Grid visible"
+                enabled: gridVisibleSwitch.checked
+                color: enabled ? "black" : "gray"
             }
 
             Switch {
-                id: gridVisibleSwitch
+                id: labelVisibleSwitch
                 Layout.rightMargin: 10
-                checked: gridSample.gridVisible
-                onCheckedChanged: gridSample.setGridVisible(checked);
+                checked: true
+                enabled: gridVisibleSwitch.checked
+                onCheckedChanged: gridLabelVisibility = checked
             }
 
             Text {
-                text: "Labels visible"
                 Layout.leftMargin: 10
-                enabled: gridVisibleSwitch.checked
-                color: enabled ? "black" : "gray"
+                text: "Grid visible"
             }
 
             Switch {
-                id: labelVisibleSwitch
+                id: gridVisibleSwitch
                 Layout.rightMargin: 10
-                checked: gridSample.labelsVisible
-                enabled: gridVisibleSwitch.checked
-                onCheckedChanged: gridSample.setLabelsVisible(checked);
+                checked: true
+                onCheckedChanged: gridVisibility = checked
             }
 
             Text {
@@ -285,8 +184,8 @@ Item {
                 Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10)
                 Layout.rightMargin: 10
                 Layout.fillWidth: true
-                model: gridSample.lineColors
-                onCurrentTextChanged: gridSample.setLineColor(currentText);
+                model: ["red", "white", "blue"]
+                onCurrentTextChanged: currentGridColor = currentText
                 Component.onCompleted : {
                     for (let i = 0; i < model.length; ++i) {
                         colorComboMetrics.text = model[i];
@@ -310,8 +209,8 @@ Item {
                 Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10)
                 Layout.rightMargin: 10
                 Layout.fillWidth: true
-                model: gridSample.labelColors
-                onCurrentTextChanged: gridSample.setLabelColor(currentText);
+                model: ["red", "black", "blue"]
+                onCurrentTextChanged: currentLabelColor = currentText;
                 Component.onCompleted : {
                     for (let i = 0; i < model.length; ++i) {
                         colorCombo2Metrics.text = model[i];
@@ -327,7 +226,6 @@ Item {
             Text {
                 Layout.leftMargin: 10
                 text: "Label position"
-                enabled: positionCombo.enabled
                 color: enabled ? "black"  : "gray"
             }
 
@@ -337,8 +235,8 @@ Item {
                 Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10)
                 Layout.rightMargin: 10
                 Layout.fillWidth: true
-                model: gridSample.labelPositions
-                onCurrentTextChanged: gridSample.setLabelPosition(currentText);
+                model: [geographicPosition, bottomLeftPosition, bottomRightPosition, topLeftPosition, topRightPosition, centerPosition, allSidesPosition]
+                onCurrentTextChanged: currentLabelPosition = currentText;
                 Component.onCompleted : {
                     for (let i = 0; i < model.length; ++i) {
                         positionComboMetrics.text = model[i];
@@ -354,7 +252,7 @@ Item {
             Text {
                 Layout.leftMargin: 10
                 text: "Label format"
-                enabled: formatCombo.enabled
+                enabled: gridTypeComboBox.currentText == latlonGrid
                 color: enabled ? "black"  : "gray"
             }
 
@@ -364,9 +262,9 @@ Item {
                 Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10)
                 Layout.rightMargin: 10
                 Layout.fillWidth: true
-                model: gridSample.labelFormats
-                enabled: gridSample.currentGridType === "LatLong"
-                onCurrentTextChanged: gridSample.setLabelFormat(currentText);
+                model: [ddFormat, dmsFormat]
+                enabled: gridTypeComboBox.currentText == latlonGrid
+                onCurrentTextChanged: currentLabelFormat = currentText;
                 Component.onCompleted : {
                     for (let i = 0; i < model.length; ++i) {
                         formatComboMetrics.text = model[i];
@@ -409,7 +307,7 @@ Item {
                     onReleased: hideButton.pressed = false
                     onClicked: {
                         background.visible = false;
-                        hideAnimation.restart();
+                        hideAnimation.restart()
                     }
                 }
             }
diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qrc b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qrc
new file mode 100644
index 0000000000..4c03c49b27
--- /dev/null
+++ b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/Samples/DisplayInformation/DisplayGrid">
+        <file alias="sample.json">README.metadata.json</file>
+        <file>screenshot.png</file>
+        <file>DisplayGrid.qml</file>
+	    <file>DisplayGrid.h</file>
+	    <file>DisplayGrid.cpp</file>
+        <file>README.md</file>
+    </qresource>
+</RCC>
diff --git a/CppSamples/DisplayInformation/ShowGrid/Info.plist b/CppSamples/DisplayInformation/DisplayGrid/Info.plist
similarity index 92%
rename from CppSamples/DisplayInformation/ShowGrid/Info.plist
rename to CppSamples/DisplayInformation/DisplayGrid/Info.plist
index d2ddec78f1..5e8b024576 100644
--- a/CppSamples/DisplayInformation/ShowGrid/Info.plist
+++ b/CppSamples/DisplayInformation/DisplayGrid/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDisplayName</key>
-	<string>ShowGrid</string>
+	<string>DisplayGrid</string>
 	<key>CFBundleExecutable</key>
-	<string>ShowGrid</string>
+	<string>DisplayGrid</string>
 	<key>CFBundleGetInfoString</key>
 	<string>ArcGIS</string>
 	<key>CFBundleIcons~ipad</key>
@@ -48,8 +48,8 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-        <key>UILaunchStoryboardName</key>
-        <string>LaunchScreen</string>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
 </dict>
 </plist>
 
diff --git a/CppSamples/DisplayInformation/DisplayGrid/README.md b/CppSamples/DisplayInformation/DisplayGrid/README.md
new file mode 100644
index 0000000000..dc0eccbda6
--- /dev/null
+++ b/CppSamples/DisplayInformation/DisplayGrid/README.md
@@ -0,0 +1,38 @@
+# Display a grid
+
+Display coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view. Also, toggle label visibility and change the color of grid lines and grid labels.
+
+![](screenshot.png)
+
+## Use case
+
+Grids are often used on printed maps, but can also be helpful on digital maps, to identify locations on a map.
+
+## How to use the sample
+
+Tap on the `Change Grid` button in the toolbar to open a settings view. You can select type of grid from `Grid Type` (LatLong, MGRS, UTM and USNG) and modify its properties like label visibility, grid line color, and grid label color.
+
+## How it works
+
+1. Create an instance of one of the `Grid` types.
+1. Grid lines and labels can be styled per grid level with `setLineSymbol(gridLevel, lineSymbol)` and `setTextSymbol(gridLevel, textSymbol)` methods on the grid.
+1. The label position can be set with `setLabelPosition(labelPosition)` method on the grid.
+1. For the `LatitudeLongitudeGrid` type, you can specify a label format of `DecimalDegrees` or `DegreesMinutesSeconds`.
+1. To set the grid, use the `setGrid(grid)` method on the map view.
+
+## Relevant API
+
+* ArcGISGrid
+* LatitudeLongitudeGrid
+* LatitudeLongitudeGridLabelFormat::DecimalDegrees
+* LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds
+* MapView
+* MGRSGrid
+* SimpleLineSymbol
+* TextSymbol
+* USNGGrid
+* UTMGrid
+
+## Tags
+
+coordinates, degrees, graticule, grid, latitude, longitude, MGRS, minutes, seconds, USNG, UTM
diff --git a/CppSamples/DisplayInformation/ShowGrid/README.metadata.json b/CppSamples/DisplayInformation/DisplayGrid/README.metadata.json
similarity index 78%
rename from CppSamples/DisplayInformation/ShowGrid/README.metadata.json
rename to CppSamples/DisplayInformation/DisplayGrid/README.metadata.json
index b0cdd37438..bb372c6023 100644
--- a/CppSamples/DisplayInformation/ShowGrid/README.metadata.json
+++ b/CppSamples/DisplayInformation/DisplayGrid/README.metadata.json
@@ -1,6 +1,6 @@
 {
     "category": "Display information",
-    "description": "Display and customize coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view or scene view.",
+    "description": "Display coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view. Also, toggle label visibility and change the color of grid lines and grid labels.",
     "featured": false,
     "ignore": false,
     "images": [
@@ -25,7 +25,6 @@
         "MGRSGrid",
         "MapView",
         "SimpleLineSymbol",
-        "SceneView",
         "TextSymbol",
         "USNGGrid",
         "UTMGrid"
@@ -41,15 +40,14 @@
         "MGRSGrid",
         "MapView",
         "SimpleLineSymbol",
-        "SceneView",
         "TextSymbol",
         "USNGGrid",
         "UTMGrid"
     ],
     "snippets": [
-        "ShowGrid.cpp",
-        "ShowGrid.h",
-        "ShowGrid.qml"
+        "DisplayGrid.cpp",
+        "DisplayGrid.h",
+        "DisplayGrid.qml"
     ],
-    "title": "Show grid"
+    "title": "Display a grid"
 }
diff --git a/CppSamples/DisplayInformation/DisplayGrid/arcgisruntime.pri b/CppSamples/DisplayInformation/DisplayGrid/arcgisruntime.pri
new file mode 100644
index 0000000000..0a3989e404
--- /dev/null
+++ b/CppSamples/DisplayInformation/DisplayGrid/arcgisruntime.pri
@@ -0,0 +1,27 @@
+#-------------------------------------------------
+#  Copyright 2017 ESRI
+#
+#  All rights reserved under the copyright laws of the United States
+#  and applicable international laws, treaties, and conventions.
+#
+#  You may freely redistribute and use this sample code, with or
+#  without modification, provided you include the original copyright
+#  notice and use restrictions.
+#
+#  See the Sample code usage restrictions document for further information.
+#-------------------------------------------------
+
+contains(QMAKE_HOST.os, Windows):{
+  iniPath = $$(ALLUSERSPROFILE)\\EsriRuntimeQt\\ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini
+}
+else {
+  userHome = $$system(echo $HOME)
+  iniPath = $${userHome}/.config/EsriRuntimeQt/ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini
+}
+iniLine = $$cat($${iniPath}, "lines")
+dirPath = $$find(iniLine, "InstallDir")
+cleanDirPath = $$replace(dirPath, "InstallDir=", "")
+priLocation = $$replace(cleanDirPath, '"', "")
+!include($$priLocation/sdk/ideintegration/arcgis_runtime_qml_cpp.pri) {
+  message("Error. Cannot locate ArcGIS Runtime PRI file")
+}
diff --git a/CppSamples/DisplayInformation/ShowGrid/main.cpp b/CppSamples/DisplayInformation/DisplayGrid/main.cpp
similarity index 57%
rename from CppSamples/DisplayInformation/ShowGrid/main.cpp
rename to CppSamples/DisplayInformation/DisplayGrid/main.cpp
index 65b0deae27..3d3781ff9e 100644
--- a/CppSamples/DisplayInformation/ShowGrid/main.cpp
+++ b/CppSamples/DisplayInformation/DisplayGrid/main.cpp
@@ -1,33 +1,36 @@
-// Copyright 2024 Esri.
-//
+// Copyright 2015 Esri.
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ShowGrid.h"
-
-#include "ArcGISRuntimeEnvironment.h"
-
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
+#include <QQmlEngine>
 
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DisplayGrid.h"
+#include "ArcGISRuntimeEnvironment.h"
+
+#define STRINGIZE(x) #x
+#define QUOTE(x) STRINGIZE(x)
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
-  app.setApplicationName(QString("ShowGrid"));
+  app.setApplicationName(QString("Display Grid"));
 
   // Use of ArcGIS location services, such as basemap styles, geocoding, and routing services,
   // requires an access token. For more information see
@@ -47,28 +50,40 @@ int main(int argc, char *argv[])
 
   if (accessToken.isEmpty())
   {
-    qWarning() << "Use of ArcGIS location services, such as the basemap styles service, requires" <<
-                  "you to authenticate with an ArcGIS account or set the API Key property.";
+      qWarning() << "Use of ArcGIS location services, such as the basemap styles service, requires" <<
+                    "you to authenticate with an ArcGIS account or set the API Key property.";
   }
   else
   {
-    Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::setApiKey(accessToken);
+      Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::setApiKey(accessToken);
   }
 
   // Initialize the sample
-  ShowGrid::init();
+  DisplayGrid::init();
 
   // Initialize application view
-  QQmlApplicationEngine engine;
+  QQuickView view;
+  view.setResizeMode(QQuickView::SizeRootObjectToView);
+
   // Add the import Path
-  engine.addImportPath(QDir(QCoreApplication::applicationDirPath()).filePath("qml"));
+  view.engine()->addImportPath(QDir(QCoreApplication::applicationDirPath()).filePath("qml"));
 
-#ifdef ARCGIS_RUNTIME_IMPORT_PATH_2
-  engine.addImportPath(ARCGIS_RUNTIME_IMPORT_PATH_2);
-#endif
+  QString arcGISRuntimeImportPath = QUOTE(ARCGIS_RUNTIME_IMPORT_PATH);
+
+ #if defined(LINUX_PLATFORM_REPLACEMENT)
+  // on some linux platforms the string 'linux' is replaced with 1
+  // fix the replacement paths which were created
+  QString replaceString = QUOTE(LINUX_PLATFORM_REPLACEMENT);
+  arcGISRuntimeImportPath = arcGISRuntimeImportPath.replace(replaceString, "linux", Qt::CaseSensitive);
+ #endif
+
+  // Add the Runtime and Extras path
+  view.engine()->addImportPath(arcGISRuntimeImportPath);
 
   // Set the source
-  engine.load(QUrl("qrc:/Samples/DisplayInformation/ShowGrid/main.qml"));
+  view.setSource(QUrl("qrc:/Samples/DisplayInformation/DisplayGrid/DisplayGrid.qml"));
+
+  view.show();
 
   return app.exec();
 }
diff --git a/CppSamples/DisplayInformation/DisplayGrid/screenshot.png b/CppSamples/DisplayInformation/DisplayGrid/screenshot.png
new file mode 100644
index 0000000000..f6b2d7c04d
Binary files /dev/null and b/CppSamples/DisplayInformation/DisplayGrid/screenshot.png differ
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp
index 5f4b409339..5ebedd0042 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GODictionaryRenderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,27 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GODictionaryRenderer.h"
 
-// ArcGIS Maps SDK headers
 #include "DictionaryRenderer.h"
-#include "DictionarySymbolStyle.h"
-#include "DictionarySymbolStyleConfiguration.h"
-#include "Graphic.h"
 #include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MultipointBuilder.h"
-#include "Point.h"
+#include "DictionarySymbolStyle.h"
+#include "DictionarySymbolStyleConfiguration.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
 #include "PointCollection.h"
+#include "GraphicsOverlay.h"
 #include "SpatialReference.h"
+#include "Point.h"
+#include "Graphic.h"
 
-// Qt headers
-#include <QFile>
+#include <QtCore/qglobal.h>
 #include <QFuture>
+#include <QFile>
 #include <QStandardPaths>
-#include <QtCore/qglobal.h>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h
index 3d96018ecf..38b74bb7e7 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GODictionaryRenderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 #ifndef GraphicsOverlayDictionaryRenderer_H
 #define GraphicsOverlayDictionaryRenderer_H
 
-// ArcGIS Maps SDK headers
+// C++ API headers
 #include "Envelope.h"
 
 // Qt headers
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro
index f5e0c79183..5ef0335d4d 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml
index fcf2efd1d5..74adf6a31e 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GODictionaryRenderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp
index 408d231ba5..da3046b817 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp
@@ -1,35 +1,28 @@
-// [Legal]
 // Copyright 2015-2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GODictionaryRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
-#include <QDir>
 #include <QGuiApplication>
-#include <QQmlEngine>
 #include <QQuickView>
+#include <QDir>
+#include <QQmlEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GODictionaryRenderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp
index 2b6f6450b7..4bf61a0fea 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GODictionaryRenderer_3D, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GODictionaryRenderer_3D.h"
 
-// ArcGIS Maps SDK headers
+#include <QFileInfo>
+
 #include "ArcGISTiledElevationSource.h"
 #include "Camera.h"
 #include "DictionaryRenderer.h"
-#include "DictionarySymbolStyle.h"
-#include "ElevationSourceListModel.h"
 #include "GeometryEngine.h"
-#include "Graphic.h"
 #include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
 #include "Surface.h"
+#include "DictionarySymbolStyle.h"
+#include "MapTypes.h"
+#include "ElevationSourceListModel.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
+#include "Point.h"
 
-// Qt headers
-#include <QFileInfo>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
+
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h
index 967f94eac1..7c0085ac80 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GODictionaryRenderer_3D, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 #ifndef GraphicsOverlayDictionaryRenderer_3D_H
 #define GraphicsOverlayDictionaryRenderer_3D_H
 
-// ArcGIS Maps SDK headers
+// C++ API headers
 #include "Envelope.h"
 #include "Error.h"
 #include "SpatialReference.h"
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro
index e12a0182d4..80fdd08e4b 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml
index 41debdbf43..6b04358ec1 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GraphicsOverlayDictionaryRenderer_3D, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp
index 0a3042b825..17eb6175c6 100644
--- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp
+++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015-2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GODictionaryRenderer_3D.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
-#include <QDir>
 #include <QGuiApplication>
-#include <QQmlEngine>
 #include <QQuickView>
+#include <QDir>
+#include <QQmlEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GODictionaryRenderer_3D.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp
index c3f51dd5a2..9bdd3a1049 100644
--- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp
+++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GOSymbols, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GOSymbols.h"
 
-// ArcGIS Maps SDK headers
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "SpatialReference.h"
 #include "Point.h"
-#include "PolygonBuilder.h"
 #include "Polyline.h"
-#include "SimpleFillSymbol.h"
-#include "SimpleLineSymbol.h"
+#include "PolygonBuilder.h"
+#include "Graphic.h"
+#include "GraphicsOverlay.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
-#include "SymbolTypes.h"
+#include "SimpleLineSymbol.h"
+#include "SimpleFillSymbol.h"
 #include "TextSymbol.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "SymbolTypes.h"
+#include "GraphicListModel.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QList>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h
index 9fbd7ff217..6d6e58e7a3 100644
--- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h
+++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GOSymbols, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef GO_SYMBOLS_H
 #define GO_SYMBOLS_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class GraphicsOverlay;
 }
 
+#include <QQuickItem>
+
 class GOSymbols : public QQuickItem
 {
   Q_OBJECT
@@ -52,3 +51,4 @@ class GOSymbols : public QQuickItem
 };
 
 #endif // GOSYMBOLS_H
+
diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro
index fff2946940..7d49bf8705 100644
--- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro
+++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml
index d9498409ea..9de477cf0a 100644
--- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml
+++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GOSymbols, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/GOSymbols/main.cpp b/CppSamples/DisplayInformation/GOSymbols/main.cpp
index f90660cf18..3e8d5f34b3 100644
--- a/CppSamples/DisplayInformation/GOSymbols/main.cpp
+++ b/CppSamples/DisplayInformation/GOSymbols/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GOSymbols.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GOSymbols.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp
index acf672e504..4d6eed2ef6 100644
--- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp
+++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyGraphics, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,32 +18,27 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "IdentifyGraphics.h"
 
-// ArcGIS Maps SDK headers
-#include "Geometry.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyGraphicsOverlayResult.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "PolygonBuilder.h"
+#include "SpatialReference.h"
+#include "GraphicsOverlay.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "PolygonBuilder.h"
+#include "Graphic.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "IdentifyGraphicsOverlayResult.h"
+#include "Geometry.h"
 
-// Qt headers
 #include <QFuture>
-#include <QList>
 #include <QMouseEvent>
+#include <QList>
 #include <QUuid>
-
-// STL headers
 #include <memory>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h
index 12b8286cb7..5c263c1873 100644
--- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h
+++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyGraphics, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef IDENTIFY_GRAPHICS_H
 #define IDENTIFY_GRAPHICS_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
   class GraphicsOverlay;
 }
 
+#include <QQuickItem>
+
 class IdentifyGraphics : public QQuickItem
 {
   Q_OBJECT
@@ -56,3 +55,4 @@ class IdentifyGraphics : public QQuickItem
 };
 
 #endif // IDENTIFY_GRAPHICS_H
+
diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro
index 312382f107..752693bd11 100644
--- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro
+++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml
index e86514720f..d276772594 100644
--- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml
+++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyGraphics, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp b/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp
index 1aabf08e8a..12016e2640 100644
--- a/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp
+++ b/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "IdentifyGraphics.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "IdentifyGraphics.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp
index 2306473bc1..1265a8a076 100644
--- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp
+++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Picture_Marker_Symbol, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Picture_Marker_Symbol.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
+#include "Point.h"
+#include "Graphic.h"
+#include "Viewpoint.h"
 #include "MapQuickView.h"
+#include "GraphicsOverlay.h"
+#include "SpatialReference.h"
+#include "PictureMarkerSymbol.h"
 #include "MapTypes.h"
 #include "MapViewTypes.h"
-#include "PictureMarkerSymbol.h"
-#include "Point.h"
-#include "SpatialReference.h"
-#include "Viewpoint.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Envelope.h"
 
-// Qt headers
-#include <QStandardPaths>
-#include <QString>
 #include <QUrl>
+#include <QString>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h
index 9113e4cf91..eaee0ade88 100644
--- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h
+++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Picture_Marker_Symbol, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef PICTURE_MARKER_SYMBOL_H
 #define PICTURE_MARKER_SYMBOL_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QString>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -30,6 +26,9 @@ namespace Esri::ArcGISRuntime
   class Point;
 }
 
+#include <QString>
+#include <QQuickItem>
+
 class Picture_Marker_Symbol : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro
index 23f5b9c605..106522c81d 100644
--- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro
+++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml
index e29a1f2e93..9254bcb0fb 100644
--- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml
+++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Picture_Marker_Symbol, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp b/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp
index 6a7fc9026e..a0c252b066 100644
--- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp
+++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Picture_Marker_Symbol.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Picture_Marker_Symbol.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp
index f0402fadfa..0b9b19ce33 100644
--- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp
+++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=QueryFeaturesWithArcadeExpression, Category=DisplayInformation]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,27 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "QueryFeaturesWithArcadeExpression.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "ArcadeEvaluationResult.h"
 #include "ArcadeEvaluator.h"
+#include "ArcadeEvaluationResult.h"
 #include "ArcadeExpression.h"
 #include "CalloutData.h"
-#include "ExpressionTypes.h"
-#include "IdentifyLayerResult.h"
-#include "Layer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "Point.h"
-#include "Portal.h"
 #include "PortalItem.h"
+#include "MapTypes.h"
+#include "Portal.h"
+#include "LayerListModel.h"
+#include "IdentifyLayerResult.h"
+#include "ArcGISFeature.h"
+#include "ExpressionTypes.h"
+#include "Layer.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 #include <QVariantMap>
diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h
index ab2576b5bb..76b18d3fcb 100644
--- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h
+++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=QueryFeaturesWithArcadeExpression, Category=DisplayInformation]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,8 @@
 #ifndef QUERYFEATURESWITHARCADEEXPRESSION_H
 #define QUERYFEATURESWITHARCADEEXPRESSION_H
 
-// ArcGIS Maps SDK headers
 #include "Point.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISFeature;
@@ -32,6 +28,8 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class QueryFeaturesWithArcadeExpression : public QObject
diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro
index 1920791f95..73ae40ff2f 100644
--- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro
+++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = QueryFeaturesWithArcadeExpression
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml
index 85e0090dbb..0e009bc295 100644
--- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml
+++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=QueryFeaturesWithArcadeExpression, Category=DisplayInformation]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp
index e0bb6ecf1f..66f2dd41de 100644
--- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp
+++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "QueryFeaturesWithArcadeExpression.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
@@ -72,6 +65,7 @@ int main(int argc, char *argv[])
   // Add the import Path
   engine.addImportPath(QDir(QCoreApplication::applicationDirPath()).filePath("qml"));
 
+
 #ifdef ARCGIS_RUNTIME_IMPORT_PATH_2
   engine.addImportPath(ARCGIS_RUNTIME_IMPORT_PATH_2);
 #endif
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp
index 069970260e..60a22552d4 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,36 +18,33 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ReadSymbolsFromMobileStyle.h"
-#include "SymbolImageProvider.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MultilayerPointSymbol.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
+#include "SymbolStyle.h"
 #include "MultilayerSymbol.h"
 #include "Point.h"
-#include "SymbolLayer.h"
-#include "SymbolLayerListModel.h"
-#include "SymbolStyle.h"
+#include "MultilayerPointSymbol.h"
+#include "SymbolImageProvider.h"
+#include "SymbolStyleSearchResultListModel.h"
+#include "MapTypes.h"
+#include "Error.h"
 #include "SymbolStyleSearchParameters.h"
+#include "SymbolLayerListModel.h"
+#include "SymbolLayer.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolStyleSearchResult.h"
-#include "SymbolStyleSearchResultListModel.h"
 
-// Qt headers
 #include <QFuture>
 #include <QObject>
 #include <QQmlContext>
-#include <QStandardPaths>
 #include <QTemporaryDir>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h
index 76076c813f..41cc2d8d83 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,6 @@
 #ifndef READSYMBOLSFROMMOBILESTYLE_H
 #define READSYMBOLSFROMMOBILESTYLE_H
 
-// Qt headers
-#include <QColor>
-#include <QList>
-#include <QObject>
-#include <QScopedPointer>
-#include <QUrl>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -37,6 +29,13 @@ class SymbolStyleSearchResultListModel;
 class SymbolImageProvider;
 class QAbstractListModel;
 
+#include <QObject>
+#include <QUuid>
+#include <QColor>
+#include <QUrl>
+#include <QList>
+#include <QScopedPointer>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("SymbolStyleSearchResultListModel.h")
 
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro
index cfc8c60aa0..465e2c913b 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ReadSymbolsFromMobileStyle
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml
index acb8e2c80c..a064824e8f 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml
index 5f8361ff94..e414a5a59c 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp
index 1c33cf3134..87b540b731 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp
@@ -1,22 +1,18 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "SymbolImageProvider.h"
 
-// Qt headers
 #include <QQuickImageProvider>
 
 SymbolImageProvider::SymbolImageProvider() :
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h
index 0c92d0b464..621d4d557f 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h
@@ -1,17 +1,4 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp
index a5054c508f..855f8b6bba 100644
--- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp
+++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ReadSymbolsFromMobileStyle.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp
index 373830542f..8c2f7c0313 100644
--- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp
+++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowCallout, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,16 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ShowCallout.h"
 
-// ArcGIS Maps SDK headers
-#include "CalloutData.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "CalloutData.h"
 #include "MapTypes.h"
 #include "MapViewTypes.h"
-#include "Point.h"
 #include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
-
-// Qt headers
 #include <QImage>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h
index c9820731c6..4261aeb7aa 100644
--- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h
+++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowCallout, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef SHOWCALLOUT_H
 #define SHOWCALLOUT_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class ShowCallout : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro
index bf89180778..8ffd0bc448 100644
--- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro
+++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml
index 334a703565..089cd8fc13 100644
--- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml
+++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowCallout, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/ShowCallout/main.cpp b/CppSamples/DisplayInformation/ShowCallout/main.cpp
index aa5ac85aac..804ce2c72a 100644
--- a/CppSamples/DisplayInformation/ShowCallout/main.cpp
+++ b/CppSamples/DisplayInformation/ShowCallout/main.cpp
@@ -1,39 +1,31 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ShowCallout.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ShowCallout.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/ShowGrid/README.md b/CppSamples/DisplayInformation/ShowGrid/README.md
deleted file mode 100644
index 18568020a2..0000000000
--- a/CppSamples/DisplayInformation/ShowGrid/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Show grid
-
-Display and customize coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view or scene view.
-
-![](screenshot.png)
-
-## Use case
-
-Grids are often used on printed maps, but can also be helpful on digital 2D maps or 3D scenes, to identify locations.
-
-## How to use the sample
-
-Tap on the `Change Grid` button in the toolbar to open a settings view. You can change the view from 2D or 3D, select the type of grid from `Grid Type` (LatLong, MGRS, UTM, and USNG) and modify its properties like label visibility, grid line color, grid label color, and label formatting.
-
-## How it works
-
-1. Create an instance of one of the `Grid` types.
-2. Grid lines and labels can be styled per grid level with `setLineSymbol(gridLevel, lineSymbol)` and `setTextSymbol(gridLevel, textSymbol)` methods on the grid.
-3. The label position can be set with `setLabelPosition(labelPosition)` method on the grid.
-   * Note that as of 200.6, MGRS, UTM, and USNG grids in a SceneView only support the `Geographic` label position.
-4. For the `LatitudeLongitudeGrid` type, you can specify a label format of `DECIMAL_DEGREES` or `DEGREES_MINUTES_SECONDS`.
-5. To set the grid, use the `setGrid(grid)` method on the map view or scene view.
-
-## Relevant API
-
-* ArcGISGrid
-* LatitudeLongitudeGrid
-* LatitudeLongitudeGridLabelFormat::DecimalDegrees
-* LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds
-* MapView
-* MGRSGrid
-* SceneView
-* SimpleLineSymbol
-* TextSymbol
-* USNGGrid
-* UTMGrid
-
-## Tags
-
-coordinates, degrees, graticule, grid, latitude, longitude, MGRS, minutes, seconds, USNG, UTM
diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.cpp b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.cpp
deleted file mode 100644
index 73d86ad5e7..0000000000
--- a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-// [WriteFile Name=ShowGrid, Category=DisplayInformation]
-// [Legal]
-// Copyright 2024 Esri.
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-#ifdef PCH_BUILD
-#include "pch.hpp"
-#endif // PCH_BUILD
-
-#include "ShowGrid.h"
-
-#include "ArcGISTiledElevationSource.h"
-#include "ElevationSourceListModel.h"
-#include "LatitudeLongitudeGrid.h"
-#include "Map.h"
-#include "MapTypes.h"
-#include "MapQuickView.h"
-#include "MapViewTypes.h"
-#include "MGRSGrid.h"
-#include "Point.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
-#include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
-#include "Surface.h"
-#include "TextSymbol.h"
-#include "USNGGrid.h"
-#include "UTMGrid.h"
-#include "Viewpoint.h"
-
-#include <QFuture>
-
-using namespace Esri::ArcGISRuntime;
-
-ShowGrid::ShowGrid(QObject* parent /* = nullptr */):
-  QObject(parent),
-  m_map(new Map(BasemapStyle::ArcGISImagery, this)),
-  m_scene(new Scene(BasemapStyle::ArcGISImagery, this))
-{
-  // create a new elevation source from Terrain3D REST service
-  ArcGISTiledElevationSource* elevationSource = new ArcGISTiledElevationSource(
-        QUrl("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer"), this);
-
-  // add the elevation source to the scene to display elevation
-  m_scene->baseSurface()->elevationSources()->append(elevationSource);
-
-  // Set the sample's initial GeoView type to MapView
-  m_currentViewType = s_mapView;
-
-  // Set the initial viewpoint of the map
-  constexpr double targetScale = 6450785;
-  m_map->setInitialViewpoint(Viewpoint(Point(-10336141.70018318, 5418213.05332071, SpatialReference::webMercator()), targetScale));
-
-  // Set the intial grid to LatitudeLongitudeGrid
-  m_grid = new LatitudeLongitudeGrid(this);
-}
-
-ShowGrid::~ShowGrid() = default;
-
-void ShowGrid::init()
-{
-  // Register classes for QML
-  qmlRegisterType<MapQuickView>("Esri.Samples", 1, 0, "MapView");
-  qmlRegisterType<SceneQuickView>("Esri.Samples", 1, 0, "SceneView");
-  qmlRegisterType<ShowGrid>("Esri.Samples", 1, 0, "ShowGridSample");
-}
-
-MapQuickView* ShowGrid::mapView() const
-{
-  return m_mapView;
-}
-
-// Set the view (created in QML)
-void ShowGrid::setMapView(MapQuickView* mapView)
-{
-  if (!mapView || mapView == m_mapView)
-    return;
-
-  m_mapView = mapView;
-  m_mapView->setMap(m_map);
-
-  m_mapView->setGrid(m_grid);
-
-  emit mapViewChanged();
-}
-
-SceneQuickView* ShowGrid::sceneView() const
-{
-  return m_sceneView;
-}
-
-// Set the view (created in QML)
-void ShowGrid::setSceneView(SceneQuickView* sceneView)
-{
-  if (!sceneView || sceneView == m_sceneView)
-    return;
-
-  m_sceneView = sceneView;
-  m_sceneView->setArcGISScene(m_scene);
-
-  // Set the SceneView initially to be invisible
-  m_sceneView->setVisible(false);
-
-  emit sceneViewChanged();
-}
-
-
-void ShowGrid::setViewType(const QString& viewType)
-{
-  if (m_currentViewType == viewType)
-    return;
-
-  m_currentViewType = viewType;
-
-  // MapView and SceneView share the same inherited class GeoView
-  GeoView* newGeoView = viewType == s_mapView ? dynamic_cast<GeoView*>(m_mapView) : dynamic_cast<GeoView*>(m_sceneView);
-  GeoView* oldGeoView = viewType != s_mapView ? dynamic_cast<GeoView*>(m_mapView) : dynamic_cast<GeoView*>(m_sceneView);
-
-  // Set the viewpoint of the new view to the current viewpoint of the old view
-  newGeoView->setViewpointAsync(oldGeoView->currentViewpoint(ViewpointType::BoundingGeometry), 0);
-
-  // The Grid cannot be shared between a MapView and a SceneView so we need to unset it first
-  oldGeoView->setGrid(nullptr);
-  newGeoView->setGrid(m_grid);
-
-  emit viewTypeChanged();
-}
-
-void ShowGrid::setGridType(const QString& gridType)
-{
-  if (m_currentGridType == gridType)
-    return;
-
-  m_currentGridType = gridType;
-
-  if (m_grid)
-  {
-    delete m_grid;
-    m_grid = nullptr;
-  }
-
-  // Create a new Grid of the selected type
-  if (gridType == s_latLong)
-    m_grid = new LatitudeLongitudeGrid(this);
-  else if (gridType == s_mgrs)
-    m_grid = new MGRSGrid(this);
-  else if (gridType == s_utm)
-    m_grid = new UTMGrid(this);
-  else if (gridType == s_usng)
-    m_grid = new USNGGrid(this);
-
-  // Set the grid on the current view
-  if (m_currentViewType == s_mapView)
-    m_mapView->setGrid(m_grid);
-  else
-    m_sceneView->setGrid(m_grid);
-
-  // Set properties from current UI values
-  setGridVisible(m_gridVisible);
-  setLabelsVisible(m_labelsVisible);
-  setLineColor(m_currentLineColor);
-  setLabelColor(m_currentLabelColor);
-  setLabelPosition(m_currentLabelPosition);
-  setLabelFormat(m_currentLabelFormat);
-
-  emit gridTypeChanged();
-}
-
-void ShowGrid::setGridVisible(bool visible)
-{
-  if (m_grid->isVisible() == visible)
-    return;
-
-  m_gridVisible = visible;
-  m_grid->setVisible(visible);
-
-  emit gridVisibleChanged();
-}
-
-void ShowGrid::setLabelsVisible(bool visible)
-{
-  if (m_grid->isLabelsVisible() == visible)
-    return;
-
-  m_labelsVisible = visible;
-  m_grid->setLabelsVisible(visible);
-
-  emit labelsVisibleChanged();
-}
-
-void ShowGrid::setLineColor(const QString& lineColor)
-{  
-  m_currentLineColor = lineColor;
-
-  SimpleLineSymbol* lineSymbol = static_cast<SimpleLineSymbol*>(m_grid->lineSymbol(0));
-  lineSymbol->setColor(lineColor.toLower());
-
-  // Some grids have multiple levels, in this sample we set the same symbol for all levels
-  for (int level = 0; level < m_grid->levelCount(); ++level)
-    m_grid->setLineSymbol(level, lineSymbol);
-
-  emit lineColorChanged();
-}
-
-void ShowGrid::setLabelColor(const QString& labelColor)
-{
-  m_currentLabelColor = labelColor;
-
-  TextSymbol* labelSymbol = static_cast<TextSymbol*>(m_grid->textSymbol(0));
-  labelSymbol->setColor(labelColor.toLower());
-
-  // Some grids have multiple levels, in this sample we set the same symbol for all levels
-  for (int level = 0; level < m_grid->levelCount(); ++level)
-    m_grid->setTextSymbol(level, labelSymbol);
-
-  emit labelColorChanged();
-}
-
-void ShowGrid::setLabelPosition(const QString& labelPosition)
-{
-  m_currentLabelPosition = labelPosition;
-
-  if (labelPosition == s_geographic)
-    m_grid->setLabelPosition(GridLabelPosition::Geographic);
-  else if (labelPosition == s_bottomLeft)
-    m_grid->setLabelPosition(GridLabelPosition::BottomLeft);
-  else if (labelPosition == s_bottomRight)
-    m_grid->setLabelPosition(GridLabelPosition::BottomRight);
-  else if (labelPosition == s_topLeft)
-    m_grid->setLabelPosition(GridLabelPosition::TopLeft);
-  else if (labelPosition == s_topRight)
-    m_grid->setLabelPosition(GridLabelPosition::TopRight);
-  else if (labelPosition == s_center)
-    m_grid->setLabelPosition(GridLabelPosition::Center);
-  else if (labelPosition == s_allSides)
-    m_grid->setLabelPosition(GridLabelPosition::AllSides);
-
-  emit labelPositionChanged();
-}
-
-void ShowGrid::setLabelFormat(const QString& labelFormat)
-{
-  m_currentLabelFormat = labelFormat;
-
-  // Only LatitudeLongitudeGrid supports label formats
-  if (m_grid->gridType() != GridType::LatitudeLongitudeGrid)
-    return;
-
-  if (labelFormat == s_decimalDegrees)
-    static_cast<LatitudeLongitudeGrid*>(m_grid)->setLabelFormat(LatitudeLongitudeGridLabelFormat::DecimalDegrees);
-  else if (labelFormat == s_degreesMinutesSeconds)
-    static_cast<LatitudeLongitudeGrid*>(m_grid)->setLabelFormat(LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds);
-
-  emit labelFormatChanged();
-}
diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.h b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.h
deleted file mode 100644
index 8e9a86d1e4..0000000000
--- a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// [WriteFile Name=ShowGrid, Category=DisplayInformation]
-// [Legal]
-// Copyright 2024 Esri.
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-#ifndef SHOWGRID_H
-#define SHOWGRID_H
-
-#include <QObject>
-
-namespace Esri::ArcGISRuntime
-{
-class Grid;
-class Map;
-class MapQuickView;
-class Scene;
-class SceneQuickView;
-class SimpleLineSymbol;
-class TextSymbol;
-}
-
-Q_MOC_INCLUDE("MapQuickView.h");
-Q_MOC_INCLUDE("SceneQuickView.h");
-
-class ShowGrid : public QObject
-{
-  Q_OBJECT
-
-  Q_PROPERTY(Esri::ArcGISRuntime::MapQuickView* mapView READ mapView WRITE setMapView NOTIFY mapViewChanged)
-  Q_PROPERTY(Esri::ArcGISRuntime::SceneQuickView* sceneView READ sceneView WRITE setSceneView NOTIFY sceneViewChanged)
-  Q_PROPERTY(QString currentViewType MEMBER m_currentViewType NOTIFY viewTypeChanged)
-  Q_PROPERTY(QStringList viewTypes MEMBER m_viewTypes CONSTANT)
-  Q_PROPERTY(QString currentGridType MEMBER m_currentGridType NOTIFY gridTypeChanged)
-  Q_PROPERTY(QStringList gridTypes MEMBER m_gridTypes CONSTANT)
-  Q_PROPERTY(bool gridVisible MEMBER m_gridVisible NOTIFY gridVisibleChanged)
-  Q_PROPERTY(bool labelsVisible MEMBER m_labelsVisible NOTIFY labelsVisibleChanged)
-  Q_PROPERTY(QString currentLineColor MEMBER m_currentLineColor NOTIFY lineColorChanged)
-  Q_PROPERTY(QStringList lineColors MEMBER m_lineColors CONSTANT)
-  Q_PROPERTY(QString currentLabelColor MEMBER m_currentLabelColor NOTIFY labelColorChanged)
-  Q_PROPERTY(QStringList labelColors MEMBER m_labelColors CONSTANT)
-  Q_PROPERTY(QString currentLabelPosition MEMBER m_currentLabelPosition NOTIFY labelPositionChanged)
-  Q_PROPERTY(QStringList labelFormats MEMBER m_labelFormats CONSTANT)
-  Q_PROPERTY(QString currentLabelFormat MEMBER m_currentLabelFormat NOTIFY labelFormatChanged)
-  Q_PROPERTY(QStringList labelPositions MEMBER m_labelPositions CONSTANT)
-
-public:
-  explicit ShowGrid(QObject* parent = nullptr);
-  ~ShowGrid() override;
-
-  static void init();
-
-  Q_INVOKABLE void setGridVisible(bool visible);
-  Q_INVOKABLE void setLabelsVisible(bool visible);
-  Q_INVOKABLE void setViewType(const QString& viewType);
-  Q_INVOKABLE void setGridType(const QString& gridType);
-  Q_INVOKABLE void setLineColor(const QString& lineColor);
-  Q_INVOKABLE void setLabelColor(const QString& labelColor);
-  Q_INVOKABLE void setLabelPosition(const QString& labelPosition);
-  Q_INVOKABLE void setLabelFormat(const QString& labelFormat);
-
-signals:
-  void mapViewChanged();
-  void sceneViewChanged();
-  void viewTypeChanged();
-  void gridTypeChanged();
-  void gridVisibleChanged();
-  void labelsVisibleChanged();
-  void lineColorChanged();
-  void labelColorChanged();
-  void labelPositionChanged();
-  void labelFormatChanged();
-
-private:
-  // Declare private methods
-  Esri::ArcGISRuntime::MapQuickView* mapView() const;
-  void setMapView(Esri::ArcGISRuntime::MapQuickView* mapView);
-  Esri::ArcGISRuntime::SceneQuickView* sceneView() const;
-  void setSceneView(Esri::ArcGISRuntime::SceneQuickView* sceneView);
-
-  // Declare private members
-  Esri::ArcGISRuntime::Grid* m_grid = nullptr;
-  Esri::ArcGISRuntime::Map* m_map = nullptr;
-  Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr;
-  Esri::ArcGISRuntime::Scene* m_scene = nullptr;
-  Esri::ArcGISRuntime::SceneQuickView* m_sceneView = nullptr;
-
-  // Properties
-  QString m_currentViewType;
-  QString m_currentGridType;
-  bool m_gridVisible = true;
-  bool m_labelsVisible = true;
-  QString m_currentLineColor;
-  QString m_currentLabelColor;
-  QString m_currentLabelPosition;
-  QString m_currentLabelFormat;
-
-  // Constants
-  const QString s_mapView = QStringLiteral("MapView");
-  const QString s_sceneView = QStringLiteral("SceneView");
-  const QStringList m_viewTypes = {s_mapView, s_sceneView};
-
-  const QString s_latLong = QStringLiteral("LatLong");
-  const QString s_mgrs = QStringLiteral("MGRS");
-  const QString s_utm = QStringLiteral("UTM");
-  const QString s_usng = QStringLiteral("USNG");
-  const QStringList m_gridTypes = {s_latLong, s_mgrs, s_utm, s_usng};
-
-  const QString s_white = QStringLiteral("White");
-  const QString s_red = QStringLiteral("Red");
-  const QString s_blue = QStringLiteral("Blue");
-  const QString s_black = QStringLiteral("Black");
-  const QStringList m_lineColors = {s_white, s_red, s_blue};
-  const QStringList m_labelColors = {s_black, s_red, s_blue};
-
-  const QString s_geographic = QStringLiteral("Geographic");
-  const QString s_topLeft = QStringLiteral("Top Left");
-  const QString s_topRight = QStringLiteral("Top Right");
-  const QString s_bottomLeft = QStringLiteral("Bottom Left");
-  const QString s_bottomRight = QStringLiteral("Bottom Right");
-  const QString s_center = QStringLiteral("Center");
-  const QString s_allSides = QStringLiteral("All sides");
-  const QStringList m_labelPositions = {s_geographic, s_topLeft, s_topRight, s_bottomLeft, s_bottomRight, s_center, s_allSides};
-
-  const QString s_decimalDegrees = QStringLiteral("Decimal Degrees");
-  const QString s_degreesMinutesSeconds = QStringLiteral("Degrees Minutes Seconds");
-  const QStringList m_labelFormats = {s_decimalDegrees, s_degreesMinutesSeconds};
-};
-
-#endif // SHOWGRID_H
diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qrc b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qrc
deleted file mode 100644
index 91524ad8ed..0000000000
--- a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qrc
+++ /dev/null
@@ -1,11 +0,0 @@
-<RCC>
-    <qresource prefix="/Samples/DisplayInformation/ShowGrid">
-        <file alias="sample.json">README.metadata.json</file>
-        <file>ShowGrid.qml</file>
-        <file>ShowGrid.h</file>
-        <file>ShowGrid.cpp</file>
-        <file>main.qml</file>
-        <file>screenshot.png</file>
-        <file>README.md</file>
-    </qresource>
-</RCC>
diff --git a/CppSamples/DisplayInformation/ShowGrid/arcgisruntime.pri b/CppSamples/DisplayInformation/ShowGrid/arcgisruntime.pri
deleted file mode 100644
index 23b71ebbe0..0000000000
--- a/CppSamples/DisplayInformation/ShowGrid/arcgisruntime.pri
+++ /dev/null
@@ -1,29 +0,0 @@
-#-------------------------------------------------
-# Copyright 2024 Esri.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------
-
-contains(QMAKE_HOST.os, Windows):{
-  iniPath = $$(ALLUSERSPROFILE)\EsriRuntimeQt\ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini
-}
-else {
-  userHome = $$system(echo $HOME)
-  iniPath = $${userHome}/.config/EsriRuntimeQt/ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini
-}
-iniLine = $$cat($${iniPath}, "lines")
-dirPath = $$find(iniLine, "InstallDir")
-cleanDirPath = $$replace(dirPath, "InstallDir=", "")
-priLocation = $$replace(cleanDirPath, '"', "")
-!include($$priLocation/sdk/ideintegration/arcgis_runtime_qml_cpp.pri) {
-  message("Error. Cannot locate ArcGIS Runtime PRI file")
-}
diff --git a/CppSamples/DisplayInformation/ShowGrid/main.qml b/CppSamples/DisplayInformation/ShowGrid/main.qml
deleted file mode 100644
index 8f64dc79b6..0000000000
--- a/CppSamples/DisplayInformation/ShowGrid/main.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2024 Esri.
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import QtQuick.Controls
-import Esri.Samples
-
-ApplicationWindow {
-    visible: true
-    width: 800
-    height: 600
-
-    ShowGrid {
-        anchors.fill: parent
-    }
-}
diff --git a/CppSamples/DisplayInformation/ShowGrid/screenshot.png b/CppSamples/DisplayInformation/ShowGrid/screenshot.png
deleted file mode 100644
index 16b138835b..0000000000
Binary files a/CppSamples/DisplayInformation/ShowGrid/screenshot.png and /dev/null differ
diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp
index 92236d6f3d..3e1f0ddfae 100644
--- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp
+++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowLabelsOnLayers, Category=DisplayInformation]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,25 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ShowLabelsOnLayers.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcadeLabelExpression.h"
-#include "Envelope.h"
-#include "Error.h"
 #include "FeatureLayer.h"
 #include "LabelDefinition.h"
-#include "LabelDefinitionListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
-#include "SymbolTypes.h"
 #include "TextSymbol.h"
+#include "MapTypes.h"
+#include "Error.h"
+#include "LayerListModel.h"
+#include "LabelDefinitionListModel.h"
+#include "SymbolTypes.h"
+#include "Envelope.h"
+#include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h
index c77e6125c1..277f38ab7c 100644
--- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h
+++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowLabelsOnLayers, Category=DisplayInformation]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SHOWLABELSONLAYERS_H
 #define SHOWLABELSONLAYERS_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -27,6 +24,8 @@ class MapQuickView;
 class LabelDefinition;
 }
 
+#include <QQuickItem>
+
 class ShowLabelsOnLayers : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro
index de5ddf774e..08536d37d7 100644
--- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro
+++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ShowLabelsOnLayers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml
index 2f856640c2..72f317b1d4 100644
--- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml
+++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowLabelsOnLayers, Category=DisplayInformation]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp b/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp
index 9554c02d20..86f1da3384 100644
--- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp
+++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ShowLabelsOnLayers.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ShowLabelsOnLayers.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp
index 539721b9d6..a8f0ffdc50 100644
--- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp
+++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowPopup, Category=DisplayInformation]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ShowPopup.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "Feature.h"
 #include "FeatureLayer.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "PopupManager.h"
 #include "PopupAttachmentListModel.h"
+#include "IdentifyLayerResult.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "Feature.h"
+#include "PopupManager.h"
 #include "PopupAttachmentManager.h"
 #include "PopupAttributeListModel.h"
-#include "PopupManager.h"
+#include "PopupAttachmentListModel.h"
 
-// Qt headers
 #include <QUuid>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h
index 7169936153..de82320694 100644
--- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h
+++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowPopup, Category=DisplayInformation]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef SHOWPOPUP_H
 #define SHOWPOPUP_H
 
-// Qt headers
-#include <QFuture>
-#include <QMouseEvent>
-#include <QObject>
-#include <QQmlListProperty>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -34,6 +27,12 @@ class MapQuickView;
 class PopupManager;
 }
 
+#include <QObject>
+#include <QQmlListProperty>
+#include <QMouseEvent>
+#include <QFuture>
+#include <QUuid>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("PopupManager.h")
 
diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro
index ae3770d164..a6f0d28437 100644
--- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro
+++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ShowPopup
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml
index 98df711b9b..8749f113df 100644
--- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml
+++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowPopup, Category=DisplayInformation]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/ShowPopup/main.cpp b/CppSamples/DisplayInformation/ShowPopup/main.cpp
index b2e0d5ab73..7f81092058 100644
--- a/CppSamples/DisplayInformation/ShowPopup/main.cpp
+++ b/CppSamples/DisplayInformation/ShowPopup/main.cpp
@@ -1,37 +1,29 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ShowPopup.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp
index 6238bb541d..d7394e6b6f 100644
--- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp
+++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Simple_Marker_Symbol, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Simple_Marker_Symbol.h"
-
-// ArcGIS Maps SDK headers
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
+#include "Point.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "Point.h"
 #include "SimpleMarkerSymbol.h"
 #include "SpatialReference.h"
-#include "SymbolTypes.h"
 #include "Viewpoint.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "GraphicListModel.h"
+#include "GraphicsOverlayListModel.h"
+#include "SymbolTypes.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h
index 709bbb4734..c0993735cd 100644
--- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h
+++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Simple_Marker_Symbol, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SIMPLE_MARKER_SYMBOL_H
 #define SIMPLE_MARKER_SYMBOL_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
     class Map;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
     class GraphicsOverlay;
 }
 
+#include <QQuickItem>
+
 class Simple_Marker_Symbol : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro
index ad959383f6..22bf31e135 100644
--- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro
+++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml
index 7912e56d2d..875d866a0a 100644
--- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml
+++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Simple_Marker_Symbol, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp b/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp
index 49e6aa1f0b..5e9ff0987f 100644
--- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp
+++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Simple_Marker_Symbol.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Simple_Marker_Symbol.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp
index d7c6386308..250dd493dd 100644
--- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp
+++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Simple_Renderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Simple_Renderer.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "Point.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
 #include "SimpleMarkerSymbol.h"
 #include "SimpleRenderer.h"
 #include "SpatialReference.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h
index 83d946020e..06eee6e6ff 100644
--- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h
+++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Simple_Renderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SIMPLE_RENDERER_H
 #define SIMPLE_RENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
     class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
     class Point;
 }
 
+#include <QQuickItem>
+
 class Simple_Renderer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro
index 7474afc07b..0c0544ec6b 100644
--- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro
+++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml
index 56aad6b9d4..c2ff9237c6 100644
--- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml
+++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Simple_Renderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/Simple_Renderer/main.cpp b/CppSamples/DisplayInformation/Simple_Renderer/main.cpp
index 61faa7b4fe..bc5faa6a70 100644
--- a/CppSamples/DisplayInformation/Simple_Renderer/main.cpp
+++ b/CppSamples/DisplayInformation/Simple_Renderer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Simple_Renderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Simple_Renderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml b/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml
index 58efdd12b9..2502549105 100644
--- a/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml
+++ b/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SketchOnMap, Category=DisplayInformation]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp
index 8bec7686aa..8ee80ca643 100644
--- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp
+++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SketchOnMap, Category=DisplayInformation]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,25 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SketchOnMap.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "Point.h"
 #include "SimpleFillSymbol.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
 #include "SketchEditor.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "MapViewTypes.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
+#include "GraphicsOverlay.h"
+#include "SpatialReference.h"
+#include "Point.h"
+#include "SimpleLineSymbol.h"
+#include "Envelope.h"
+#include "Graphic.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h
index 36fbf79a90..e076032dc6 100644
--- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h
+++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SketchOnMap, Category=DisplayInformation]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SKETCHONMAP_H
 #define SKETCHONMAP_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -32,6 +29,8 @@ class SimpleLineSymbol;
 class SimpleFillSymbol;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class SketchOnMap : public QObject
diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro
index 0b8788775c..b4c3d0d5ff 100644
--- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro
+++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SketchOnMap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml
index 40133de126..3822989fea 100644
--- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml
+++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SketchOnMap, Category=DisplayInformation]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/SketchOnMap/main.cpp b/CppSamples/DisplayInformation/SketchOnMap/main.cpp
index 4cbcf5d9a2..ded654a372 100644
--- a/CppSamples/DisplayInformation/SketchOnMap/main.cpp
+++ b/CppSamples/DisplayInformation/SketchOnMap/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "SketchOnMap.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp
index 9f7a265ec7..66f415453a 100644
--- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp
+++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SymbolizeShapefile, Category=DisplayInformation]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,25 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SymbolizeShapefile.h"
 
-// ArcGIS Maps SDK headers
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "ShapefileFeatureTable.h"
+#include "FeatureLayer.h"
+#include "SimpleRenderer.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
-#include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "SymbolTypes.h"
+#include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QUrl>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h
index ad86cc9dd3..46d2b754f8 100644
--- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h
+++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SymbolizeShapefile, Category=DisplayInformation]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SYMBOLIZESHAPEFILE_H
 #define SYMBOLIZESHAPEFILE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -27,6 +24,8 @@ class MapQuickView;
 class FeatureLayer;
 }
 
+#include <QQuickItem>
+
 class SymbolizeShapefile : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro
index 55a7aad063..c33043e950 100644
--- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro
+++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SymbolizeShapefile
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml
index 05751e06e1..469f05dc87 100644
--- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml
+++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SymbolizeShapefile, Category=DisplayInformation]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp b/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp
index 04a1088ace..3d03fd17dc 100644
--- a/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp
+++ b/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SymbolizeShapefile.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SymbolizeShapefile.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp
index fd5010e1c3..a284f31125 100644
--- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp
+++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Unique_Value_Renderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,36 +14,35 @@
 // limitations under the License.
 // [Legal]
 
+
 #ifdef PCH_BUILD
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Unique_Value_Renderer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "Basemap.h"
 #include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "UniqueValueRenderer.h"
 #include "SimpleFillSymbol.h"
-#include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
+#include "Viewpoint.h"
+#include "Envelope.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "SymbolTypes.h"
 #include "UniqueValue.h"
 #include "UniqueValueListModel.h"
-#include "UniqueValueRenderer.h"
-#include "Viewpoint.h"
+#include "SimpleLineSymbol.h"
+#include "SpatialReference.h"
 
-// Qt headers
-#include <QStringList>
 #include <QUrl>
+#include <QStringList>
 #include <QVariantList>
 
+
 using namespace Esri::ArcGISRuntime;
 
 Unique_Value_Renderer::Unique_Value_Renderer(QQuickItem* parent) :
diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h
index 27b98e0dfb..99df6c9e28 100644
--- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h
+++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Unique_Value_Renderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef UNIQUE_VALUE_RENDERER_H
 #define UNIQUE_VALUE_RENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -30,6 +27,8 @@ namespace Esri::ArcGISRuntime
   class SimpleFillSymbol;
 }
 
+#include <QQuickItem>
+
 class Unique_Value_Renderer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro
index 1f5f3c98d5..a5f96c2729 100644
--- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro
+++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml
index f8bd6c75c5..f3e2057bf9 100644
--- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml
+++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Unique_Value_Renderer, Category=DisplayInformation]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp b/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp
index 40f45ad1d7..3e12065c3c 100644
--- a/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp
+++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Unique_Value_Renderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Unique_Value_Renderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp
index 80fbdc8fbd..857909758d 100644
--- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp
+++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddFeaturesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AddFeaturesFeatureService.h"
 
-// ArcGIS Maps SDK headers
 #include "Basemap.h"
 #include "Feature.h"
 #include "FeatureEditResult.h"
@@ -35,7 +33,6 @@
 #include "SpatialReference.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 #include <QMap>
 #include <QMouseEvent>
diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h
index cb3df6a055..fb2cbfb81f 100644
--- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h
+++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddFeaturesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ADDFEATURESFEATURESERVICE_H
 #define ADDFEATURESFEATURESERVICE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -28,6 +25,8 @@ class MapQuickView;
 class ServiceFeatureTable;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class AddFeaturesFeatureService : public QObject
diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro
index b4afd8c897..74d8b579cd 100644
--- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro
+++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AddFeaturesFeatureService
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml
index b6457f235e..f6c3a40553 100644
--- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml
+++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddFeaturesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/AddFeaturesFeatureService/main.cpp b/CppSamples/EditData/AddFeaturesFeatureService/main.cpp
index dab94c0da7..1618ad3993 100644
--- a/CppSamples/EditData/AddFeaturesFeatureService/main.cpp
+++ b/CppSamples/EditData/AddFeaturesFeatureService/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AddFeaturesFeatureService.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.cpp b/CppSamples/EditData/ContingentValues/ContingentValues.cpp
index d8535930a2..dd3301d7cb 100644
--- a/CppSamples/EditData/ContingentValues/ContingentValues.cpp
+++ b/CppSamples/EditData/ContingentValues/ContingentValues.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ContingentValues, Category=EditData]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,47 +18,44 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ContingentValues.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
 #include "ArcGISVectorTiledLayer.h"
-#include "AttributeListModel.h"
-#include "Basemap.h"
 #include "CodedValueDomain.h"
 #include "ContingentCodedValue.h"
 #include "ContingentRangeValue.h"
 #include "ContingentValuesDefinition.h"
 #include "ContingentValuesResult.h"
-#include "FeatureIterator.h"
 #include "FeatureLayer.h"
-#include "FeatureQueryResult.h"
 #include "Geodatabase.h"
 #include "GeodatabaseFeatureTable.h"
-#include "GeodatabaseTypes.h"
 #include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "Polygon.h"
-#include "QueryParameters.h"
-#include "SimpleFillSymbol.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
+#include "GraphicsOverlayListModel.h"
 #include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "ArcGISFeature.h"
+#include "MapTypes.h"
+#include "GeodatabaseTypes.h"
+#include "AttributeListModel.h"
+#include "GraphicListModel.h"
+#include "QueryParameters.h"
+#include "FeatureIterator.h"
+#include "FeatureQueryResult.h"
+#include "Point.h"
+#include "Basemap.h"
 #include "Viewpoint.h"
+#include "GraphicsOverlay.h"
+#include "SimpleLineSymbol.h"
+#include "SimpleFillSymbol.h"
+#include "Polygon.h"
+#include "Graphic.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QUuid>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.h b/CppSamples/EditData/ContingentValues/ContingentValues.h
index f0621abe8b..a93de18946 100644
--- a/CppSamples/EditData/ContingentValues/ContingentValues.h
+++ b/CppSamples/EditData/ContingentValues/ContingentValues.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ContingentValues, Category=EditData]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef CONTINGENTVALUES_H
 #define CONTINGENTVALUES_H
 
-// Qt headers
-#include <QMouseEvent>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISFeature;
@@ -32,6 +28,9 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+#include <QMouseEvent>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ContingentValues : public QObject
diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.pro b/CppSamples/EditData/ContingentValues/ContingentValues.pro
index fb6dee4d9c..3a6fee005b 100644
--- a/CppSamples/EditData/ContingentValues/ContingentValues.pro
+++ b/CppSamples/EditData/ContingentValues/ContingentValues.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ContingentValues
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.qml b/CppSamples/EditData/ContingentValues/ContingentValues.qml
index e868e19c02..56302338d1 100644
--- a/CppSamples/EditData/ContingentValues/ContingentValues.qml
+++ b/CppSamples/EditData/ContingentValues/ContingentValues.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ContingentValues, Category=EditData]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/ContingentValues/main.cpp b/CppSamples/EditData/ContingentValues/main.cpp
index f1c5e7d590..2e12ad1483 100644
--- a/CppSamples/EditData/ContingentValues/main.cpp
+++ b/CppSamples/EditData/ContingentValues/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ContingentValues.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp
index de13becbce..65a41df814 100644
--- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp
+++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DeleteFeaturesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,40 +18,35 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DeleteFeaturesFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "AttributeListModel.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Basemap.h"
-#include "CalloutData.h"
-#include "Envelope.h"
+#include "Viewpoint.h"
+#include "Point.h"
+#include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
 #include "Feature.h"
+#include "ArcGISFeature.h"
 #include "FeatureEditResult.h"
-#include "FeatureIterator.h"
-#include "FeatureLayer.h"
 #include "FeatureQueryResult.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MapViewTypes.h"
-#include "Point.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "IdentifyLayerResult.h"
 #include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
-#include "Viewpoint.h"
+#include "AttributeListModel.h"
+#include "FeatureIterator.h"
+#include "CalloutData.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
-#include <QMouseEvent>
-#include <QString>
 #include <QUrl>
 #include <QUuid>
-
-// STL headers
+#include <QMouseEvent>
+#include <QString>
 #include <memory>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h
index 69abb25ad4..5c677b99e1 100644
--- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h
+++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DeleteFeaturesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DELETE_FEATURES_FEATURE_SERVICE_H
 #define DELETE_FEATURES_FEATURE_SERVICE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -33,6 +30,8 @@ namespace Esri::ArcGISRuntime
 
 class QString;
 
+#include <QQuickItem>
+
 class DeleteFeaturesFeatureService : public QQuickItem
 {
   Q_OBJECT
@@ -63,3 +62,4 @@ class DeleteFeaturesFeatureService : public QQuickItem
 };
 
 #endif // DELETE_FEATURES_FEATURE_SERVICE_H
+
diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro
index 31c2090169..1d73f1e82b 100644
--- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro
+++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml
index 8bd18df183..ac258a5b4e 100644
--- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml
+++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DeleteFeaturesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp b/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp
index d827e26509..11951dd7f1 100644
--- a/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp
+++ b/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp
@@ -1,40 +1,32 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DeleteFeaturesFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DeleteFeaturesFeatureService.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp
index eec24077af..b655e454e4 100644
--- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp
+++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditAndSyncFeatures, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,43 +18,40 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "EditAndSyncFeatures.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
+#include "Map.h"
+#include "MapQuickView.h"
+#include "TileCache.h"
 #include "ArcGISTiledLayer.h"
 #include "Basemap.h"
+#include "Viewpoint.h"
 #include "Envelope.h"
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "GenerateGeodatabaseJob.h"
 #include "GenerateGeodatabaseParameters.h"
-#include "GenerateLayerOption.h"
-#include "Geodatabase.h"
-#include "GeodatabaseFeatureTable.h"
+#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
 #include "GeodatabaseSyncTask.h"
+#include "GeodatabaseFeatureTable.h"
 #include "GeometryEngine.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapViewTypes.h"
+#include "Geodatabase.h"
 #include "Point.h"
-#include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
-#include "SyncGeodatabaseJob.h"
+#include "MapViewTypes.h"
+#include "LayerListModel.h"
+#include "ArcGISFeature.h"
+#include "IdentifyLayerResult.h"
+#include "GenerateLayerOption.h"
 #include "SyncLayerOption.h"
 #include "TaskTypes.h"
-#include "TileCache.h"
-#include "Viewpoint.h"
+#include "GenerateGeodatabaseJob.h"
+#include "Error.h"
+#include "SyncGeodatabaseJob.h"
+#include "SpatialReference.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
-#include <QUrl>
 #include <QUuid>
+#include <QUrl>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h
index 821e4ee817..5eee9b97b8 100644
--- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h
+++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditAndSyncFeatures, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,16 +17,6 @@
 #ifndef EDITANDSYNCFEATURES_H
 #define EDITANDSYNCFEATURES_H
 
-// ArcGIS Maps SDK headers
-#include "GenerateGeodatabaseParameters.h"
-#include "SyncGeodatabaseParameters.h"
-
-// Qt headers
-#include <QQuickItem>
-#include <QString>
-#include <QTemporaryDir>
-#include <QUrl>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -37,6 +27,14 @@ namespace Esri::ArcGISRuntime
   class Envelope;
 }
 
+#include "GenerateGeodatabaseParameters.h"
+#include "SyncGeodatabaseParameters.h"
+
+#include <QQuickItem>
+#include <QString>
+#include <QTemporaryDir>
+#include <QUrl>
+
 class EditAndSyncFeatures : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro
index 8be5a19044..56a1dc8d43 100644
--- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro
+++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml
index 13693e1340..833df6eac0 100644
--- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml
+++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditAndSyncFeatures, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/EditAndSyncFeatures/main.cpp b/CppSamples/EditData/EditAndSyncFeatures/main.cpp
index 63060a21db..68d7a67573 100644
--- a/CppSamples/EditData/EditAndSyncFeatures/main.cpp
+++ b/CppSamples/EditData/EditAndSyncFeatures/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "EditAndSyncFeatures.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "EditAndSyncFeatures.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp
index a6a9e95d49..6674c6d72a 100644
--- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp
+++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditFeatureAttachments, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,41 +18,38 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "EditFeatureAttachments.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "Attachment.h"
-#include "AttachmentListModel.h"
-#include "AttributeListModel.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Basemap.h"
-#include "CalloutData.h"
-#include "Envelope.h"
-#include "Error.h"
+#include "Viewpoint.h"
+#include "Point.h"
+#include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
 #include "Feature.h"
+#include "ArcGISFeature.h"
 #include "FeatureEditResult.h"
-#include "FeatureIterator.h"
-#include "FeatureLayer.h"
 #include "FeatureQueryResult.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
+#include "AttachmentListModel.h"
 #include "MapViewTypes.h"
-#include "Point.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "IdentifyLayerResult.h"
 #include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
-#include "Viewpoint.h"
+#include "AttributeListModel.h"
+#include "FeatureIterator.h"
+#include "CalloutData.h"
+#include "Error.h"
+#include "Attachment.h"
+#include "Envelope.h"
 
-// Qt headers
-#include <QFile>
-#include <QFileInfo>
-#include <QMouseEvent>
 #include <QUrl>
 #include <QUuid>
+#include <QMouseEvent>
+#include <QFile>
+#include <QFileInfo>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h
index b7394ce675..536a453975 100644
--- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h
+++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditFeatureAttachments, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,11 +17,6 @@
 #ifndef EDIT_FEATURE_ATTACHMENTS_H
 #define EDIT_FEATURE_ATTACHMENTS_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-#include <QtContainerFwd>
-
 namespace Esri::ArcGISRuntime
 {
   class CalloutData;
@@ -37,6 +32,10 @@ namespace Esri::ArcGISRuntime
 
 class QString;
 
+#include <QAbstractListModel>
+#include <QQuickItem>
+#include <QtContainerFwd>
+
 class EditFeatureAttachments : public QQuickItem
 {
   Q_OBJECT
@@ -76,3 +75,4 @@ class EditFeatureAttachments : public QQuickItem
 };
 
 #endif // EDIT_FEATURE_ATTACHMENTS_H
+
diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro
index 0ff4329a7f..33e44ba6ca 100644
--- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro
+++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml
index 6b4234185b..39744dd519 100644
--- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml
+++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditFeatureAttachments, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/EditFeatureAttachments/main.cpp b/CppSamples/EditData/EditFeatureAttachments/main.cpp
index eba10bb4b4..bd172b417f 100644
--- a/CppSamples/EditData/EditFeatureAttachments/main.cpp
+++ b/CppSamples/EditData/EditFeatureAttachments/main.cpp
@@ -1,41 +1,33 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
-#include "EditFeatureAttachments.h"
-
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
+#include <QQmlApplicationEngine>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "EditFeatureAttachments.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp
index 5390935efb..ae20887fc2 100644
--- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp
+++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditFeaturesWithFeatureLinkedAnnotation, Category=EditData]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,44 +18,42 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "EditFeaturesWithFeatureLinkedAnnotation.h"
 
-// ArcGIS Maps SDK headers
+#include "Map.h"
+#include "MapQuickView.h"
+#include "Geodatabase.h"
 #include "AnnotationLayer.h"
-#include "AttributeListModel.h"
-#include "Feature.h"
 #include "FeatureLayer.h"
-#include "GeoElement.h"
-#include "Geodatabase.h"
+#include "AnnotationLayer.h"
 #include "GeodatabaseFeatureTable.h"
 #include "GeometryEngine.h"
+#include "PolylineBuilder.h"
+#include "PartCollection.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "IdentifyLayerResult.h"
-#include "ImmutablePart.h"
+#include "GeoElement.h"
+#include "Feature.h"
 #include "ImmutablePartCollection.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
+#include "ImmutablePart.h"
+#include "AttributeListModel.h"
+#include "ProximityResult.h"
 #include "Part.h"
-#include "PartCollection.h"
+#include "Viewpoint.h"
 #include "Polyline.h"
-#include "PolylineBuilder.h"
-#include "ProximityResult.h"
 #include "SpatialReference.h"
-#include "Viewpoint.h"
 
 // Qt headers
-#include <QFile>
 #include <QFuture>
-#include <QStandardPaths>
 #include <QString>
+#include <QFile>
+#include <QtCore/qglobal.h>
 #include <QTimer>
 #include <QUuid>
-#include <QtCore/qglobal.h>
 
-// STL headers
 #include <memory>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h
index 4d1bad11e6..de39c69ba9 100644
--- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h
+++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditFeaturesWithFeatureLinkedAnnotation, Category=EditData]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,16 +17,6 @@
 #ifndef EDITFEATURESWITHFEATURELINKEDANNOTATION_H
 #define EDITFEATURESWITHFEATURELINKEDANNOTATION_H
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "Point.h"
-
-// Qt headers
-#include <QDir>
-#include <QMouseEvent>
-#include <QObject>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
 class AnnotationLayer;
@@ -38,6 +28,14 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+#include <QDir>
+#include <QMouseEvent>
+#include <QUuid>
+
+#include "Point.h"
+#include "Error.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("IdentifyLayerResult.h")
 
diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro
index 6034343add..2dade24657 100644
--- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro
+++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = EditFeaturesWithFeatureLinkedAnnotation
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml
index 0996a36ff1..9f1f2009bb 100644
--- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml
+++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditFeaturesWithFeatureLinkedAnnotation, Category=EditData]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp
index b1cbc4281f..99679e1c83 100644
--- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp
+++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "EditFeaturesWithFeatureLinkedAnnotation.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp
index d1ad315426..a17ab70419 100644
--- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp
+++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditKmlGroundOverlay, Category=EditData]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,25 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "EditKmlGroundOverlay.h"
 
-// ArcGIS Maps SDK headers
-#include "Camera.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "KmlDataset.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
+#include "KmlLayer.h"
 #include "KmlGroundOverlay.h"
+#include "KmlDataset.h"
 #include "KmlIcon.h"
-#include "KmlLayer.h"
-#include "LayerListModel.h"
+#include "Envelope.h"
+#include "Camera.h"
 #include "MapTypes.h"
-#include "Point.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
+#include "Error.h"
+#include "LayerListModel.h"
 #include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
@@ -127,3 +124,4 @@ void EditKmlGroundOverlay::setSceneView(SceneQuickView* sceneView)
 
   emit sceneViewChanged();
 }
+
diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h
index 32a74c4ebf..bfdf7e8b9d 100644
--- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h
+++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditKmlGroundOverlay, Category=EditData]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef EDITKMLGROUNDOVERLAY_H
 #define EDITKMLGROUNDOVERLAY_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -27,6 +24,8 @@ class SceneQuickView;
 class KmlGroundOverlay;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class EditKmlGroundOverlay : public QObject
diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro
index e9ea4db9ae..7aea72c41b 100644
--- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro
+++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = EditKmlGroundOverlay
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml
index 5e55bdee94..9f69cba0e1 100644
--- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml
+++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditKmlGroundOverlay, Category=EditData]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/EditKmlGroundOverlay/main.cpp b/CppSamples/EditData/EditKmlGroundOverlay/main.cpp
index 07448decd8..006e610aee 100644
--- a/CppSamples/EditData/EditKmlGroundOverlay/main.cpp
+++ b/CppSamples/EditData/EditKmlGroundOverlay/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "EditKmlGroundOverlay.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp
index bca2df2efd..b326d65ff1 100644
--- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp
+++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditWithBranchVersioning, Category=EditData]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,36 +18,33 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "EditWithBranchVersioning.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "AttributeListModel.h"
 #include "AuthenticationManager.h"
-#include "CalloutData.h"
-#include "Credential.h"
-#include "Envelope.h"
 #include "ErrorException.h"
 #include "FeatureEditResult.h"
 #include "FeatureLayer.h"
 #include "FeatureTableEditResult.h"
-#include "IdentifyLayerResult.h"
 #include "Layer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "Polyline.h"
 #include "ServiceFeatureTable.h"
 #include "ServiceGeodatabase.h"
-#include "ServiceTypes.h"
 #include "ServiceVersionInfo.h"
 #include "ServiceVersionParameters.h"
+#include "MapTypes.h"
+#include "Credential.h"
+#include "IdentifyLayerResult.h"
+#include "ArcGISFeature.h"
+#include "AttributeListModel.h"
+#include "CalloutData.h"
+#include "LayerListModel.h"
+#include "ServiceTypes.h"
+#include "Point.h"
+#include "Envelope.h"
+#include "Polyline.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h
index ae16fa41c2..2479429138 100644
--- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h
+++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditWithBranchVersioning, Category=EditData]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,6 @@
 #ifndef EDITWITHBRANCHVERSIONING_H
 #define EDITWITHBRANCHVERSIONING_H
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-
-// Qt headers
-#include <QObject>
-#include <QUrl>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
 class AuthenticationManager;
@@ -43,6 +35,12 @@ class ErrorException;
 class FeatureTableEditResult;
 }
 
+#include "Error.h"
+
+#include <QUuid>
+#include <QObject>
+#include <QUrl>
+
 Q_MOC_INCLUDE("AuthenticationManager.h")
 Q_MOC_INCLUDE("MapQuickView.h")
 
diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro
index cc8416ab6b..8bf84892be 100644
--- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro
+++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = EditWithBranchVersioning
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TOOLKIT_PRI_PATH = $$PWD/../../../arcgis-maps-sdk-toolkit-qt
diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml
index 020700913e..297bc2d06a 100644
--- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml
+++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=EditWithBranchVersioning, Category=EditData]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/EditWithBranchVersioning/main.cpp b/CppSamples/EditData/EditWithBranchVersioning/main.cpp
index 29941033af..a53841b2e4 100644
--- a/CppSamples/EditData/EditWithBranchVersioning/main.cpp
+++ b/CppSamples/EditData/EditWithBranchVersioning/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "EditWithBranchVersioning.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml b/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml
index 834ed8f0f9..9216f9b023 100644
--- a/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml
+++ b/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SnapGeometryEdits, Category=EditData]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/SnapGeometryEdits/README.md b/CppSamples/EditData/SnapGeometryEdits/README.md
index c687b66b64..abe60fc6d4 100644
--- a/CppSamples/EditData/SnapGeometryEdits/README.md
+++ b/CppSamples/EditData/SnapGeometryEdits/README.md
@@ -12,7 +12,7 @@ A field worker can create new features by editing and snapping the vertices of a
 
 To create a geometry, press the create button to choose the geometry type you want to create (i.e. points, multipoints, polyline, or polygon) and interactively tap and drag on the map view to create the geometry.
 
-Snap settings can be configured by enabling and disabling snapping, feature snapping, geometry guides and snap sources.
+To configure snapping, press the snap settings button to enable or disable snapping and choose which snap sources to snap to.
 
 To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source and move the mouse pointer or drag a vertex to nearby an existing feature or graphic. When the pointer is close to that existing geoelement, the edit position will be adjusted to coincide with (or snap to), edges and vertices of its geometry. Click or release the touch pointer to place the vertex at the snapped location.
 
@@ -31,8 +31,7 @@ To save your edits, press the save button.
 3. Create a `GeometryEditor` and connect it to the map view.
 4. Call `syncSourceSettings` after the map's operational layers are loaded and the geometry editor connected to the map view.
 5. Set `SnapSettings.isEnabled` and `SnapSourceSettings.isEnabled` to true for the `SnapSource` of interest.
-6. Toggle geometry guides using `SnapSettings.IsGeometryGuidesEnabled` and feature snapping using `SnapSettings.IsFeatureSnappingEnabled`.
-7. Start the geometry editor with a `GeometryType`.
+6. Start the geometry editor with a `GeometryType`.
 
 ## Relevant API
 
@@ -58,10 +57,6 @@ To snap to polygon and polyline layers, the recommended approach is to set the `
 
 Snapping can be used during interactive edits that move existing vertices using the `VertexTool` or `ReticleVertexTool`. When adding new vertices, snapping also works with a hover event (such as a mouse move without a mouse button press). Using the `ReticleVertexTool` to add and move vertices allows users of touch screen devices to clearly see the visual cues for snapping.
 
-Geometry guides are enabled by default when snapping is enabled. These allow for snapping to a point coinciding with, parallel to, perpendicular to or extending an existing geometry.
-
-On supported platforms haptic feedback on `SnapState::SnappedToFeature` and `SnapState::SnappedToGeometryGuide` is enabled by default when snapping is enabled. Custom haptic feedback can be configured by setting `SnapSettings::isHapticFeedbackEnabled` to false and listening to `GeometryEditor::snapChanged` events to provide specific feedback depending on the `SnapState`.
-
 ## Tags
 
 edit, feature, geometry editor, graphics, layers, map, snapping
diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp
index e0c1e0c1ac..8b522f14ac 100644
--- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp
+++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SnapGeometryEdits, Category=EditData]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,11 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SnapGeometryEdits.h"
-#include "SnapSourceListModel.h"
 
-// ArcGIS Maps SDK headers
 #include "FeatureLayer.h"
 #include "FeatureTable.h"
 #include "Geometry.h"
@@ -46,21 +43,16 @@
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
+#include "SnapGeometryEdits.h"
 #include "SnapSettings.h"
 #include "SnapSourceSettings.h"
 #include "SymbolTypes.h"
 
-// Qt headers
+#include "SnapSourceListModel.h"
+
 #include <QFuture>
 #include <QtGlobal>
 
-#ifdef Q_OS_ANDROID
-#include "ArcGISRuntimeEnvironment.h"
-
-#include <QCoreApplication>
-#include <QJniObject>
-#endif
-
 using namespace Esri::ArcGISRuntime;
 
 SnapGeometryEdits::SnapGeometryEdits(QObject* parent /* = nullptr */) :
@@ -70,10 +62,6 @@ SnapGeometryEdits::SnapGeometryEdits(QObject* parent /* = nullptr */) :
   PortalItem* portalItem = new PortalItem("b95fe18073bc4f7788f0375af2bb445e", this);
   m_map = new Map(portalItem, this);
 
-  #ifdef Q_OS_ANDROID
-  ArcGISRuntimeEnvironment::setAndroidApplicationContext(QJniObject{QNativeInterface::QAndroidApplication::context()});
-  #endif
-
   m_geometryEditor = new GeometryEditor(this);
   m_graphicsOverlay = new GraphicsOverlay(this);
 
@@ -204,18 +192,6 @@ void SnapGeometryEdits::snappingEnabledStatus(bool snappingCheckedState)
   m_geometryEditor->snapSettings()->setEnabled(snappingCheckedState);
 }
 
-// Toggles geometry guides using the enabled state from the snap settings
-void SnapGeometryEdits::geometryGuidesEnabledStatus(bool geometryGuidesCheckedState)
-{
-  m_geometryEditor->snapSettings()->setGeometryGuidesEnabled(geometryGuidesCheckedState);
-}
-
-// Toggles feature snapping using the enabled state from the snap settings
-void SnapGeometryEdits::featureSnappingEnabledStatus(bool featureSnappingCheckedState)
-{
-  m_geometryEditor->snapSettings()->setFeatureSnappingEnabled(featureSnappingCheckedState);
-}
-
 // Starts the GeometryEditor using the selected geometry type
 void SnapGeometryEdits::startEditor(GeometryEditorMode geometryEditorMode)
 {
diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h
index 5b707a30ca..70fa5a9738 100644
--- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h
+++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SnapGeometryEdits, Category=EditData]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SNAPGEOMETRYEDITS_H
 #define SNAPGEOMETRYEDITS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime {
   class Geometry;
   class GeometryEditor;
@@ -40,6 +37,8 @@ namespace Esri::ArcGISRuntime {
 class SnapSourceListModel;
 class QAbstractListModel;
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 Q_MOC_INCLUDE("QAbstractListModel");
 
@@ -73,8 +72,6 @@ class SnapGeometryEdits : public QObject
   Q_INVOKABLE void deleteSelection();
   Q_INVOKABLE void editorUndo();
   Q_INVOKABLE void snappingEnabledStatus(bool checkedValue);
-  Q_INVOKABLE void geometryGuidesEnabledStatus(bool checkedValue);
-  Q_INVOKABLE void featureSnappingEnabledStatus(bool checkedValue);
   Q_INVOKABLE void displaySnapSources();
   Q_INVOKABLE void enableAllLayersInSection(const QString& section);
 
@@ -101,6 +98,7 @@ class SnapGeometryEdits : public QObject
   QAbstractListModel* snapSourceListModel() const;
   Esri::ArcGISRuntime::Symbol* determineGeometrySymbol(const Esri::ArcGISRuntime::Geometry& geometry);
 
+
   Esri::ArcGISRuntime::Map* m_map = nullptr;
   Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr;
   Esri::ArcGISRuntime::GraphicsOverlay* m_graphicsOverlay = nullptr;
diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro
index ff344274bb..2261fa8992 100644
--- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro
+++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SnapGeometryEdits
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml
index 74f49aa84b..9ad2719a34 100644
--- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml
+++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SnapGeometryEdits, Category=EditData]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -222,10 +222,9 @@ Item {
                     }
                 }
 
-                ColumnLayout {
+                RowLayout {
                     Layout.minimumWidth: optionPanel.width
                     Layout.minimumHeight: 35
-                    spacing: 0
                     Rectangle {
                         Layout.alignment: Qt.AlignLeft
                         Layout.minimumWidth: snapSourceView.width - (snapSourceView.anchors.margins / 2)
@@ -233,7 +232,7 @@ Item {
                         color: "#E9DFEA"
 
                         Text {
-                            text: qsTr("Snapping enabled")
+                            text: qsTr("Enabled")
                             font.pixelSize: 15
                             anchors {
                                 left: parent.left
@@ -251,57 +250,6 @@ Item {
                             onCheckedChanged: snapGeometryEditsSampleModel.snappingEnabledStatus(checked)
                         }
                     }
-                    Rectangle {
-                        Layout.alignment: Qt.AlignLeft
-                        Layout.minimumWidth: snapSourceView.width - (snapSourceView.anchors.margins / 2)
-                        Layout.minimumHeight: 35
-                        color: "#E9DFEA"
-
-                        Text {
-                            text: qsTr("Geometry guides")
-                            font.pixelSize: 15
-                            anchors {
-                                left: parent.left
-                                margins: 10
-                                verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        Switch {
-                            anchors {
-                                right: parent.right
-                                margins: 10
-                                verticalCenter: parent.verticalCenter
-                            }
-                            onCheckedChanged: snapGeometryEditsSampleModel.geometryGuidesEnabledStatus(checked)
-                        }
-                    }
-                    Rectangle {
-                        Layout.alignment: Qt.AlignLeft
-                        Layout.minimumWidth: snapSourceView.width - (snapSourceView.anchors.margins / 2)
-                        Layout.minimumHeight: 35
-                        color: "#E9DFEA"
-
-
-                        Text {
-                            text: qsTr("Feature snapping")
-                            font.pixelSize: 15
-                            anchors {
-                                left: parent.left
-                                margins: 10
-                                verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        Switch {
-                            anchors {
-                                right: parent.right
-                                margins: 10
-                                verticalCenter: parent.verticalCenter
-                            }
-                            onCheckedChanged: snapGeometryEditsSampleModel.featureSnappingEnabledStatus(checked)
-                        }
-                    }
                 }
             }
 
diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp
index d28d07875f..7ac2d01a9f 100644
--- a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp
+++ b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp
@@ -1,38 +1,33 @@
-// [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SnapSourceListModel.h"
-
-// ArcGIS Maps SDK headers
-#include "FeatureLayer.h"
-#include "FeatureTable.h"
-#include "GeometryTypes.h"
-#include "GraphicsOverlay.h"
-#include "SnapSourceSettings.h"
 
-// Qt headers
 #include <QAbstractListModel>
 #include <QByteArray>
-#include <QDir>
-#include <QFileInfo>
 #include <QHash>
-#include <QList>
 #include <QModelIndex>
 #include <QObject>
 #include <QVariant>
+#include <QFileInfo>
+#include <QDir>
+#include <QList>
+
+#include "GraphicsOverlay.h"
+#include "GeometryTypes.h"
+#include "FeatureTable.h"
+#include "FeatureLayer.h"
+#include "SnapSourceSettings.h"
+
+#include "SnapSourceListModel.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h
index 3d24589250..fb6f955147 100644
--- a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h
+++ b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h
@@ -1,17 +1,4 @@
-// [Legal]
 // Copyright 2024 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/CppSamples/EditData/SnapGeometryEdits/main.cpp b/CppSamples/EditData/SnapGeometryEdits/main.cpp
index dbd3ed6425..4e7870cfb0 100644
--- a/CppSamples/EditData/SnapGeometryEdits/main.cpp
+++ b/CppSamples/EditData/SnapGeometryEdits/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
-#include "SnapGeometryEdits.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
+#include "SnapGeometryEdits.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp
index 53a6e02fe6..69e8ee30fb 100644
--- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp
+++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=UpdateAttributesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,37 +18,34 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "UpdateAttributesFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "AttributeListModel.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Basemap.h"
-#include "CalloutData.h"
-#include "Envelope.h"
+#include "Viewpoint.h"
+#include "Point.h"
+#include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
 #include "Feature.h"
+#include "ArcGISFeature.h"
 #include "FeatureEditResult.h"
-#include "FeatureIterator.h"
-#include "FeatureLayer.h"
 #include "FeatureQueryResult.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MapViewTypes.h"
-#include "Point.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "IdentifyLayerResult.h"
 #include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
-#include "Viewpoint.h"
+#include "AttributeListModel.h"
+#include "FeatureIterator.h"
+#include "CalloutData.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
-#include <QMouseEvent>
 #include <QUrl>
 #include <QUuid>
+#include <QMouseEvent>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h
index 1263a91937..dcf5fc0abc 100644
--- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h
+++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=UpdateAttributesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef UPDATE_ATTRIBUTES_FEATURE_SERVICE_H
 #define UPDATE_ATTRIBUTES_FEATURE_SERVICE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -34,6 +31,8 @@ namespace Esri::ArcGISRuntime
 
 class QString;
 
+#include <QQuickItem>
+
 class UpdateAttributesFeatureService : public QQuickItem
 {
   Q_OBJECT
@@ -70,3 +69,4 @@ class UpdateAttributesFeatureService : public QQuickItem
 };
 
 #endif // UPDATE_ATTRIBUTES_FEATURE_SERVICE_H
+
diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro
index ac99df7a2c..07a3b5a0bc 100644
--- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro
+++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml
index a2e767dc38..f9716ccd5b 100644
--- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml
+++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=UpdateAttributesFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp b/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp
index c9291b16fb..55ff4c9103 100644
--- a/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp
+++ b/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp
@@ -1,40 +1,32 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "UpdateAttributesFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "UpdateAttributesFeatureService.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp
index 3dd48d6c4b..8cc99040d4 100644
--- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp
+++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=UpdateGeometryFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,27 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "UpdateGeometryFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Feature.h"
-#include "FeatureEditResult.h"
-#include "FeatureLayer.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
+#include "Basemap.h"
+#include "Viewpoint.h"
 #include "Point.h"
-#include "ServiceFeatureTable.h"
 #include "SpatialReference.h"
-#include "Viewpoint.h"
+#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "Feature.h"
+#include "FeatureEditResult.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "IdentifyLayerResult.h"
 
-// Qt headers
 #include <QFuture>
-#include <QList>
-#include <QMouseEvent>
 #include <QUrl>
+#include <QMouseEvent>
+#include <QList>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h
index 45d9c57cc7..422710cd88 100644
--- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h
+++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=UpdateGeometryFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef UPDATE_GEOMETRY_FEATURE_SERVICE_H
 #define UPDATE_GEOMETRY_FEATURE_SERVICE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -29,6 +26,8 @@ namespace Esri::ArcGISRuntime
   class Feature;
 }
 
+#include <QQuickItem>
+
 class UpdateGeometryFeatureService : public QQuickItem
 {
   Q_OBJECT
@@ -53,3 +52,4 @@ class UpdateGeometryFeatureService : public QQuickItem
 };
 
 #endif // UPDATE_GEOMETRY_FEATURE_SERVICE_H
+
diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro
index e0f970e4f7..e4b9630b60 100644
--- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro
+++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml
index aab27ca47f..b5e243330e 100644
--- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml
+++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=UpdateGeometryFeatureService, Category=EditData]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp b/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp
index 13fcea0ea2..26ef7af339 100644
--- a/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp
+++ b/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "UpdateGeometryFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "UpdateGeometryFeatureService.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp
index 2888fa0c85..fbd19533b7 100644
--- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp
+++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ControlTimeExtentTimeSlider, Category=Features]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ControlTimeExtentTimeSlider.h"
 
-// ArcGIS Maps SDK headers
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "FeatureLayer.h"
 #include "ServiceFeatureTable.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h
index 0d774a5d25..3e1e76e8e5 100644
--- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h
+++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ControlTimeExtentTimeSlider, Category=Features]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef CONTROLTIMEEXTENTTIMESLIDER_H
 #define CONTROLTIMEEXTENTTIMESLIDER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ControlTimeExtentTimeSlider : public QObject
diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro
index 449fe99fb1..510c63b580 100644
--- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro
+++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ControlTimeExtentTimeSlider
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 
diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml
index 8e3a2150d5..9ab9f864d5 100644
--- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml
+++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ControlTimeExtentTimeSlider, Category=Features]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp b/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp
index 7c20ec99f0..054003cefb 100644
--- a/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp
+++ b/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp
@@ -1,34 +1,26 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ControlTimeExtentTimeSlider.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp
index 58a30d5528..8080414790 100644
--- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp
+++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateMobileGeodatabase, Category=Features]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,11 +18,10 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateMobileGeodatabase.h"
+
 #include "FeatureListModel.h"
 
-// ArcGIS Maps SDK headers
 #include "FeatureIterator.h"
 #include "FeatureLayer.h"
 #include "FeatureQueryResult.h"
@@ -37,12 +36,17 @@
 #include "MapTypes.h"
 #include "Point.h"
 #include "QueryParameters.h"
-#include "ServiceTypes.h"
-#include "SpatialReference.h"
 #include "TableDescription.h"
+#include "ServiceTypes.h"
+#include "LayerListModel.h"
+#include "FieldDescriptionListModel.h"
+#include "QueryParameters.h"
+#include "FeatureIterator.h"
+#include "FeatureQueryResult.h"
 #include "Viewpoint.h"
+#include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h
index ed80b93446..dd7e18cc45 100644
--- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h
+++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateMobileGeodatabase, Category=Features]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,6 @@
 #ifndef CREATEMOBILEGEODATABASE_H
 #define CREATEMOBILEGEODATABASE_H
 
-// sample headers
-#include "FeatureListModel.h"
-
-// Qt headers
-#include <QMouseEvent>
-#include <QObject>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureTable;
@@ -33,6 +25,12 @@ class Map;
 class MapQuickView;
 }
 
+#include <FeatureListModel.h>
+
+#include <QMouseEvent>
+#include <QObject>
+#include <QTemporaryDir>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class CreateMobileGeodatabase : public QObject
diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro
index d01f76afc7..54ed590209 100644
--- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro
+++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateMobileGeodatabase
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml
index 330784949f..866804436d 100644
--- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml
+++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateMobileGeodatabase, Category=Features]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp
index 07b9a4c1a4..7c8f059206 100644
--- a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp
+++ b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureListModel, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,12 +14,10 @@
 // limitations under the License.
 // [Legal]
 
-// sample headers
 #include "FeatureListModel.h"
 
-// ArcGIS Maps SDK headers
-#include "AttributeListModel.h"
 #include "Feature.h"
+#include "AttributeListModel.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h
index 36f9bee992..b9fd03fa82 100644
--- a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h
+++ b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h
@@ -1,22 +1,6 @@
-// [Legal]
-// Copyright 2024 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
 #ifndef FEATURELISTMODEL_H
 #define FEATURELISTMODEL_H
 
-// Qt headers
 #include <QAbstractListModel>
 
 namespace Esri::ArcGISRuntime
diff --git a/CppSamples/Features/CreateMobileGeodatabase/main.cpp b/CppSamples/Features/CreateMobileGeodatabase/main.cpp
index 01267b8e06..d8d99babd5 100644
--- a/CppSamples/Features/CreateMobileGeodatabase/main.cpp
+++ b/CppSamples/Features/CreateMobileGeodatabase/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateMobileGeodatabase.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp
index 511e594556..2a78603336 100644
--- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp
+++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerChangeRenderer, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureLayerChangeRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
+#include "FeatureLayer.h"
+#include "Basemap.h"
+#include "SpatialReference.h"
 #include "ServiceFeatureTable.h"
+#include "Viewpoint.h"
+#include "Envelope.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "SymbolTypes.h"
-#include "Viewpoint.h"
 
-// Qt headers
 #include <QColor>
 #include <QUrl>
 
diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h
index 3ae5fee175..6ec08f5b60 100644
--- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h
+++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerChangeRenderer, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef FEATURE_LAYER_CHANGE_RENDERER_H
 #define FEATURE_LAYER_CHANGE_RENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
   class FeatureLayer;
 }
 
+#include <QQuickItem>
+
 class FeatureLayerChangeRenderer : public QQuickItem
 {
   Q_OBJECT
@@ -56,3 +55,4 @@ class FeatureLayerChangeRenderer : public QQuickItem
 };
 
 #endif // FEATURE_LAYER_CHANGE_RENDERER_H
+
diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro
index 9f1d4d1338..d8ec449343 100644
--- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro
+++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml
index 6c47be108f..96944203b5 100644
--- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml
+++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerChangeRenderer, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp b/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp
index ae9b66b835..e6655228f5 100644
--- a/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp
+++ b/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FeatureLayerChangeRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FeatureLayerChangeRenderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp
index e08ffa671b..4b9f13dc47 100644
--- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp
+++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerDictionaryRenderer, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureLayerDictionaryRenderer.h"
 
-// ArcGIS Maps SDK headers
 #include "DictionaryRenderer.h"
-#include "DictionarySymbolStyle.h"
-#include "Envelope.h"
 #include "FeatureLayer.h"
 #include "Geodatabase.h"
 #include "GeodatabaseFeatureTable.h"
 #include "GeometryEngine.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "DictionarySymbolStyle.h"
 #include "MapTypes.h"
+#include "LayerListModel.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h
index b761023d63..014145409b 100644
--- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h
+++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerDictionaryRenderer, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
 #ifndef FEATURELAYERDICTIONARYRENDERER_H
 #define FEATURELAYERDICTIONARYRENDERER_H
 
-// Qt headers
 #include <QQuickItem>
 
 namespace Esri::ArcGISRuntime
diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro
index 48c2c5701b..efd3abeadf 100644
--- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro
+++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml
index a19291dfaf..7298bca65d 100644
--- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml
+++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerDictionaryRenderer, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp b/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp
index c2fbe4e24d..9a8ef7943e 100644
--- a/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp
+++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp
@@ -1,35 +1,28 @@
-// [Legal]
 // Copyright 2015-2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FeatureLayerDictionaryRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
-#include <QDir>
 #include <QGuiApplication>
-#include <QQmlEngine>
 #include <QQuickView>
+#include <QDir>
+#include <QQmlEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FeatureLayerDictionaryRenderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp
index e9f8f1d703..1c34ec4886 100644
--- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp
+++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerQuery, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,38 +18,34 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureLayerQuery.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Feature.h"
-#include "FeatureIterator.h"
-#include "FeatureLayer.h"
-#include "FeatureQueryResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "Point.h"
-#include "QueryParameters.h"
+#include "FeatureLayer.h"
+#include "Basemap.h"
+#include "SpatialReference.h"
 #include "ServiceFeatureTable.h"
-#include "SimpleFillSymbol.h"
+#include "Viewpoint.h"
+#include "Point.h"
 #include "SimpleLineSymbol.h"
+#include "SimpleFillSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "QueryParameters.h"
+#include "FeatureQueryResult.h"
+#include "Feature.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
-#include "Viewpoint.h"
+#include "LayerListModel.h"
+#include "FeatureIterator.h"
 
-// Qt headers
 #include <QColor>
 #include <QFuture>
 #include <QList>
-#include <QUrl>
 #include <QUuid>
+#include <QUrl>
 
-// STL headers
 #include <memory>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h
index 6c6fceb9b2..9005d57311 100644
--- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h
+++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerQuery, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef FEATURE_LAYER_QUERY_H
 #define FEATURE_LAYER_QUERY_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class ServiceFeatureTable;
 }
 
+#include <QQuickItem>
+
 class FeatureLayerQuery : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro
index f6c58e259b..a25a445f6b 100644
--- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro
+++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml
index 0ec51a23ba..141df37d17 100644
--- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml
+++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerQuery, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/FeatureLayerQuery/main.cpp b/CppSamples/Features/FeatureLayerQuery/main.cpp
index bbaad615e1..e41f33963b 100644
--- a/CppSamples/Features/FeatureLayerQuery/main.cpp
+++ b/CppSamples/Features/FeatureLayerQuery/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FeatureLayerQuery.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FeatureLayerQuery.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp
index 7ddbdb9eb5..6a2f3559df 100644
--- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp
+++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerSelection, Category=Features]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureLayerSelection.h"
 
-// ArcGIS Maps SDK headers
 #include "Envelope.h"
 #include "Feature.h"
 #include "FeatureLayer.h"
@@ -34,11 +32,8 @@
 #include "SpatialReference.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
-
-// STL headers
 #include <memory>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h
index 225156087f..0efff8eec6 100644
--- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h
+++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerSelection, Category=Features]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef FEATURELAYERSELECTION_H
 #define FEATURELAYERSELECTION_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -29,6 +26,8 @@ class ServiceFeatureTable;
 class IdentifyLayerResult;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class FeatureLayerSelection : public QObject
diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro
index ee10f05f8c..18699313ad 100644
--- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro
+++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FeatureLayerSelection
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml
index 7e476f24d5..e78d20b7bf 100644
--- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml
+++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerSelection, Category=Features]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/FeatureLayerSelection/main.cpp b/CppSamples/Features/FeatureLayerSelection/main.cpp
index 7f394ea6fc..057d9970a7 100644
--- a/CppSamples/Features/FeatureLayerSelection/main.cpp
+++ b/CppSamples/Features/FeatureLayerSelection/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "FeatureLayerSelection.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp
index a8151fd852..5697d1d263 100644
--- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp
+++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FilterByDefinitionExpressionOrDisplayFilter, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,27 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FilterByDefinitionExpressionOrDisplayFilter.h"
 
-// ArcGIS Maps SDK headers
 #include "Basemap.h"
 #include "DisplayFilter.h"
 #include "DisplayFilterDefinition.h"
 #include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "ManualDisplayFilterDefinition.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "Point.h"
-#include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
 #include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
 #include "Viewpoint.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "QueryParameters.h"
 
-// Qt headers
 #include <QFuture>
-#include <QUrl>
 #include <QUuid>
+#include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h
index 4efd9ec9d8..9e4973940f 100644
--- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h
+++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FilterByDefinitionExpressionOrDisplayFilter, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef FILTER_BY_DEFINITION_EXPRESSION_OR_DISPLAY_FILTER_H
 #define FILTER_BY_DEFINITION_EXPRESSION_OR_DISPLAY_FILTER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class ServiceFeatureTable;
 }
 
+#include <QQuickItem>
+
 class FilterByDefinitionExpressionOrDisplayFilter : public QQuickItem
 {
   Q_OBJECT
@@ -69,3 +68,4 @@ class FilterByDefinitionExpressionOrDisplayFilter : public QQuickItem
 };
 
 #endif // FILTER_BY_DEFINITION_EXPRESSION_OR_DISPLAY_FILTER_H
+
diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro
index 9db2012a1e..9ae42d9d09 100644
--- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro
+++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml
index 0f75759d2a..0f5256da06 100644
--- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml
+++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FilterByDefinitionExpressionOrDisplayFilter, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp
index 291fa75810..c2e78f5eaf 100644
--- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp
+++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FilterByDefinitionExpressionOrDisplayFilter.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FilterByDefinitionExpressionOrDisplayFilter.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp
index 64b8c3b071..1248f49a04 100644
--- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp
+++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateGeodatabaseReplicaFromFeatureService, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,40 +18,37 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GenerateGeodatabaseReplicaFromFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeatureServiceInfo.h"
-#include "ArcGISTiledLayer.h"
+#include "Map.h"
+#include "MapQuickView.h"
+#include "FeatureLayer.h"
 #include "Basemap.h"
+#include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
+#include "ArcGISTiledLayer.h"
+#include "ArcGISFeatureServiceInfo.h"
 #include "Envelope.h"
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "GenerateGeodatabaseJob.h"
 #include "GenerateGeodatabaseParameters.h"
-#include "GenerateLayerOption.h"
-#include "Geodatabase.h"
-#include "GeodatabaseFeatureTable.h"
 #include "GeodatabaseSyncTask.h"
 #include "GeometryEngine.h"
+#include "GenerateLayerOption.h"
+#include "GeodatabaseFeatureTable.h"
+#include "MapViewTypes.h"
+#include "TileCache.h"
+#include "Error.h"
 #include "IdInfo.h"
 #include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapViewTypes.h"
-#include "Point.h"
-#include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
+#include "GenerateGeodatabaseJob.h"
 #include "TaskTypes.h"
-#include "TileCache.h"
+#include "Geodatabase.h"
 #include "Viewpoint.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
-#include <QUrl>
 #include <QtCore/qglobal.h>
+#include <QUrl>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h
index 1b7235e402..e477588cf0 100644
--- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h
+++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateGeodatabaseReplicaFromFeatureService, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,16 +17,6 @@
 #ifndef GENERATE_GEODATABASE_H
 #define GENERATE_GEODATABASE_H
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeatureServiceInfo.h"
-#include "Envelope.h"
-#include "GenerateGeodatabaseParameters.h"
-
-// Qt headers
-#include <QQuickItem>
-#include <QStringList>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -35,6 +25,13 @@ namespace Esri::ArcGISRuntime
   class Geodatabase;
 }
 
+#include "Envelope.h"
+#include "GenerateGeodatabaseParameters.h"
+#include "ArcGISFeatureServiceInfo.h"
+#include <QQuickItem>
+#include <QStringList>
+#include <QTemporaryDir>
+
 class GenerateGeodatabaseReplicaFromFeatureService : public QQuickItem
 {
   Q_OBJECT
@@ -68,3 +65,4 @@ class GenerateGeodatabaseReplicaFromFeatureService : public QQuickItem
 };
 
 #endif // GENERATE_GEODATABASE_H
+
diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro
index d990bf7891..b0fe651a95 100644
--- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro
+++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml
index 9b7c68699d..9d18968753 100644
--- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml
+++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateGeodatabaseReplicaFromFeatureService, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp
index 7af1e220f5..f3415678b1 100644
--- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp
+++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GenerateGeodatabaseReplicaFromFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GenerateGeodatabaseReplicaFromFeatureService.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp
index aeac6e2a88..391524425a 100644
--- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp
+++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListRelatedFeatures, Category=Features]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,40 +18,35 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ListRelatedFeatures.h"
-#include "RelatedFeature.h"
-#include "RelatedFeatureListModel.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "ArcGISFeatureLayerInfo.h"
-#include "ArcGISFeatureTable.h"
-#include "AttributeListModel.h"
-#include "CoreTypes.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "FeatureIterator.h"
-#include "FeatureLayer.h"
-#include "FeatureQueryResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
+#include "FeatureLayer.h"
+#include "ViewInsets.h"
+#include "Envelope.h"
 #include "QueryParameters.h"
+#include "ArcGISFeature.h"
+#include "ArcGISFeatureTable.h"
 #include "RelatedFeatureQueryResult.h"
+#include "FeatureQueryResult.h"
+#include "RelatedFeature.h"
+#include "RelatedFeatureListModel.h"
 #include "SelectionProperties.h"
+#include "Error.h"
+#include "LayerListModel.h"
+#include "FeatureIterator.h"
+#include "ArcGISFeatureLayerInfo.h"
+#include "AttributeListModel.h"
 #include "SpatialReference.h"
-#include "ViewInsets.h"
+#include "CoreTypes.h"
+#include "MapTypes.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
+#include <QUuid>
 #include <QList>
 #include <QUrl>
-#include <QUuid>
-
-// STL headers
 #include <memory>
 
 using namespace Esri::ArcGISRuntime;
@@ -199,8 +194,3 @@ void ListRelatedFeatures::connectSignals()
     });
   });
 }
-
-QAbstractListModel* ListRelatedFeatures::relatedFeaturesModel() const
-{
-  return m_relatedFeaturesModel;
-}
diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h
index bccea8b872..354a880388 100644
--- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h
+++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListRelatedFeatures, Category=Features]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef LISTRELATEDFEATURES_H
 #define LISTRELATEDFEATURES_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class ArcGISFeature;
@@ -29,15 +26,16 @@ namespace Esri::ArcGISRuntime
   class MapQuickView;
 }
 class RelatedFeatureListModel;
-class QAbstractListModel;
 
-Q_MOC_INCLUDE("QAbstractListModel")
+#include <QQuickItem>
+
+Q_MOC_INCLUDE("RelatedFeatureListModel.h")
 
 class ListRelatedFeatures : public QQuickItem
 {
   Q_OBJECT
 
-  Q_PROPERTY(QAbstractListModel* relatedFeaturesModel READ relatedFeaturesModel NOTIFY relatedFeaturesModelChanged)
+  Q_PROPERTY(RelatedFeatureListModel* relatedFeaturesModel MEMBER m_relatedFeaturesModel NOTIFY relatedFeaturesModelChanged)
 
 public:
   explicit ListRelatedFeatures(QQuickItem* parent = nullptr);
@@ -53,8 +51,8 @@ class ListRelatedFeatures : public QQuickItem
 
 private:
   void connectSignals();
-  QAbstractListModel* relatedFeaturesModel() const;
 
+private:
   Esri::ArcGISRuntime::Map* m_map = nullptr;
   Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr;
   Esri::ArcGISRuntime::FeatureLayer* m_alaskaNationalParks = nullptr;
diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro
index 6ce0961a91..e0a5f76c50 100644
--- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro
+++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ListRelatedFeatures
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml
index f595532d04..7fda7603d3 100644
--- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml
+++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListRelatedFeatures, Category=Features]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp
index 9f54b8c839..cf563fc2a4 100644
--- a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp
+++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListRelatedFeatures, Category=Features]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,12 +18,10 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "RelatedFeature.h"
-
-// Qt headers
 #include <QString>
 
+#include "RelatedFeature.h"
+
 RelatedFeature::RelatedFeature(const QString& displayFieldName, const QString& displayFieldValue,
                                const QString& serviceLayerName) :
   m_displayFieldName(displayFieldName),
diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h
index 2a62802139..d171fbaed7 100644
--- a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h
+++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListRelatedFeatures, Category=Features]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp
index 67e8d9cc8d..17d4a6b891 100644
--- a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp
+++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListRelatedFeatures, Category=Features]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,11 +18,6 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "RelatedFeature.h"
-#include "RelatedFeatureListModel.h"
-
-// Qt headers
 #include <QAbstractListModel>
 #include <QByteArray>
 #include <QHash>
@@ -30,6 +25,9 @@
 #include <QObject>
 #include <QVariant>
 
+#include "RelatedFeatureListModel.h"
+#include "RelatedFeature.h"
+
 RelatedFeatureListModel::RelatedFeatureListModel(QObject* parent) :
   QAbstractListModel(parent)
 {
diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h
index 5a699b2e1b..f83e1889b0 100644
--- a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h
+++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListRelatedFeatures, Category=Features]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,11 @@
 #ifndef RELATEDFEATURELISTMODEL_H
 #define RELATEDFEATURELISTMODEL_H
 
-// sample headers
-#include "RelatedFeature.h"
-
-// Qt headers
 #include <QAbstractListModel>
 #include <QByteArray>
 #include <QHash>
 #include <QList>
+#include <RelatedFeature.h>
 
 class RelatedFeatureListModel : public QAbstractListModel
 {
diff --git a/CppSamples/Features/ListRelatedFeatures/main.cpp b/CppSamples/Features/ListRelatedFeatures/main.cpp
index f78168ec46..bf9f2e5bd8 100644
--- a/CppSamples/Features/ListRelatedFeatures/main.cpp
+++ b/CppSamples/Features/ListRelatedFeatures/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ListRelatedFeatures.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ListRelatedFeatures.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp
index 7d35de4faa..67f300a5d5 100644
--- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp
+++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ServiceFeatureTableCache.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "Basemap.h"
 #include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
 #include "Viewpoint.h"
-
-// Qt headers
+#include "Envelope.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h
index bbc67cef81..9f1145381f 100644
--- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h
+++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SERVICE_FEATURE_TABLE_CACHE_H
 #define SERVICE_FEATURE_TABLE_CACHE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class ServiceFeatureTable;
 }
 
+#include <QQuickItem>
+
 class ServiceFeatureTableCache : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro
index f7e973df6a..9d3d0073f6 100644
--- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro
+++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml
index e2ec6c3e78..3880682403 100644
--- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml
+++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/ServiceFeatureTableCache/main.cpp b/CppSamples/Features/ServiceFeatureTableCache/main.cpp
index 227edea29c..3c4f237f5a 100644
--- a/CppSamples/Features/ServiceFeatureTableCache/main.cpp
+++ b/CppSamples/Features/ServiceFeatureTableCache/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ServiceFeatureTableCache.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ServiceFeatureTableCache.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp
index 136aca6c45..e78f858eb6 100644
--- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp
+++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableManualCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ServiceFeatureTableManualCache.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "Point.h"
-#include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "Basemap.h"
 #include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
 #include "Viewpoint.h"
+#include "Point.h"
+#include "QueryParameters.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "GeodatabaseTypes.h"
+#include "LayerListModel.h"
 
-// Qt headers
 #include <QFuture>
 #include <QStringList>
 #include <QUrl>
diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h
index 66e149e243..b46ffafad3 100644
--- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h
+++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableManualCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SERVICE_FEATURE_TABLE_MANUAL_CACHE_H
 #define SERVICE_FEATURE_TABLE_MANUAL_CACHE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class ServiceFeatureTable;
 }
 
+#include <QQuickItem>
+
 class ServiceFeatureTableManualCache : public QQuickItem
 {
   Q_OBJECT
@@ -48,3 +47,4 @@ class ServiceFeatureTableManualCache : public QQuickItem
 };
 
 #endif // SERVICE_FEATURE_TABLE_MANUAL_CACHE_H
+
diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro
index db048f6fbb..6ccbd7599a 100644
--- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro
+++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml
index f4e1364f2f..3a0a124333 100644
--- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml
+++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableManualCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp b/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp
index cfc91d5845..cc4cdd728d 100644
--- a/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp
+++ b/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ServiceFeatureTableManualCache.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ServiceFeatureTableManualCache.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp
index 3c1dc7784a..ff5577d463 100644
--- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp
+++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableNoCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ServiceFeatureTableNoCache.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
-#include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "Basemap.h"
 #include "SpatialReference.h"
+#include "ServiceFeatureTable.h"
 #include "Viewpoint.h"
-
-// Qt headers
+#include "Envelope.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "GeodatabaseTypes.h"
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h
index 90e0352e0c..c323ec8827 100644
--- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h
+++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableNoCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SERVICE_FEATURE_TABLE_NO_CACHE_H
 #define SERVICE_FEATURE_TABLE_NO_CACHE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class ServiceFeatureTable;
 }
 
+#include <QQuickItem>
+
 class ServiceFeatureTableNoCache : public QQuickItem
 {
   Q_OBJECT
@@ -47,3 +46,4 @@ class ServiceFeatureTableNoCache : public QQuickItem
 };
 
 #endif // SERVICE_FEATURE_TABLE_NO_CACHE_H
+
diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro
index 020c000d2f..5f7b35cc83 100644
--- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro
+++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml
index ab9679366d..4e583d8768 100644
--- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml
+++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceFeatureTableNoCache, Category=Features]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp b/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp
index e87b402dcc..6765c6ac01 100644
--- a/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp
+++ b/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ServiceFeatureTableNoCache.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ServiceFeatureTableNoCache.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/Buffer/Buffer.cpp b/CppSamples/Geometry/Buffer/Buffer.cpp
index e7b8ddacb4..3801172aeb 100644
--- a/CppSamples/Geometry/Buffer/Buffer.cpp
+++ b/CppSamples/Geometry/Buffer/Buffer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Buffer, Category=Geometry]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Buffer.h"
 
-// ArcGIS Maps SDK headers
 #include "GeometryEngine.h"
 #include "Graphic.h"
 #include "GraphicListModel.h"
@@ -39,7 +37,6 @@
 #include "SimpleRenderer.h"
 #include "SymbolTypes.h"
 
-// STL headers
 #include <cmath>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Geometry/Buffer/Buffer.h b/CppSamples/Geometry/Buffer/Buffer.h
index 3f9c1c3a01..a6f2a094c5 100644
--- a/CppSamples/Geometry/Buffer/Buffer.h
+++ b/CppSamples/Geometry/Buffer/Buffer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Buffer, Category=Geometry]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-// Qt headers
-#include <QMouseEvent>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class GraphicsOverlay;
@@ -30,6 +26,9 @@ class SimpleMarkerSymbol;
 class SimpleFillSymbol;
 }
 
+#include <QObject>
+#include <QMouseEvent>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class Buffer : public QObject
diff --git a/CppSamples/Geometry/Buffer/Buffer.pro b/CppSamples/Geometry/Buffer/Buffer.pro
index 173521dd27..3586835c09 100644
--- a/CppSamples/Geometry/Buffer/Buffer.pro
+++ b/CppSamples/Geometry/Buffer/Buffer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = Buffer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/Buffer/Buffer.qml b/CppSamples/Geometry/Buffer/Buffer.qml
index bbc7f1e24c..2f01f401be 100644
--- a/CppSamples/Geometry/Buffer/Buffer.qml
+++ b/CppSamples/Geometry/Buffer/Buffer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Buffer, Category=Geometry]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/Buffer/main.cpp b/CppSamples/Geometry/Buffer/main.cpp
index 7a630b7709..0bcdb56a3d 100644
--- a/CppSamples/Geometry/Buffer/main.cpp
+++ b/CppSamples/Geometry/Buffer/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "Buffer.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp b/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp
index c7011096b8..12bae41033 100644
--- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp
+++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ClipGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ClipGeometry.h"
 
-// ArcGIS Maps SDK headers
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Geometry.h"
-#include "GeometryEngine.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
+#include "GeometryEngine.h"
+#include "Viewpoint.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
+#include "SimpleFillSymbol.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
 #include "SymbolTypes.h"
-#include "Viewpoint.h"
+#include "GraphicListModel.h"
+#include "SpatialReference.h"
+#include "Point.h"
+
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.h b/CppSamples/Geometry/ClipGeometry/ClipGeometry.h
index d4ee80e11b..9d287878f5 100644
--- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.h
+++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ClipGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef CLIPGEOMETRY_H
 #define CLIPGEOMETRY_H
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -33,6 +27,9 @@ class SimpleLineSymbol;
 class SimpleFillSymbol;
 }
 
+#include <QQuickItem>
+#include "Envelope.h"
+
 class ClipGeometry : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro b/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro
index 30d167e146..89c5c5a879 100644
--- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro
+++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ClipGeometry
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml b/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml
index 83656af400..f4f24aadde 100644
--- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml
+++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ClipGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/ClipGeometry/main.cpp b/CppSamples/Geometry/ClipGeometry/main.cpp
index 1c05030890..ebf1a48bcb 100644
--- a/CppSamples/Geometry/ClipGeometry/main.cpp
+++ b/CppSamples/Geometry/ClipGeometry/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ClipGeometry.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ClipGeometry.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.cpp b/CppSamples/Geometry/ConvexHull/ConvexHull.cpp
index bef9416d50..9ed2234ae5 100644
--- a/CppSamples/Geometry/ConvexHull/ConvexHull.cpp
+++ b/CppSamples/Geometry/ConvexHull/ConvexHull.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConvexHull, Category=Geometry]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,27 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ConvexHull.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "Geometry.h"
 #include "GeometryEngine.h"
-#include "GeometryTypes.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MultipointBuilder.h"
-#include "Point.h"
 #include "PointCollection.h"
 #include "SimpleFillSymbol.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "Geometry.h"
+#include "GeometryTypes.h"
+#include "SimpleLineSymbol.h"
+#include "Point.h"
+#include "SpatialReference.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.h b/CppSamples/Geometry/ConvexHull/ConvexHull.h
index 28a75a74ab..d66bd52786 100644
--- a/CppSamples/Geometry/ConvexHull/ConvexHull.h
+++ b/CppSamples/Geometry/ConvexHull/ConvexHull.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConvexHull, Category=Geometry]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef CONVEXHULL_H
 #define CONVEXHULL_H
 
-// Qt headers
-#include <QList>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Graphic;
@@ -33,6 +29,9 @@ class SimpleLineSymbol;
 class SimpleMarkerSymbol;
 }
 
+#include <QObject>
+#include <QList>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ConvexHull : public QObject
diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.pro b/CppSamples/Geometry/ConvexHull/ConvexHull.pro
index 20f63a57d3..eac65e6836 100644
--- a/CppSamples/Geometry/ConvexHull/ConvexHull.pro
+++ b/CppSamples/Geometry/ConvexHull/ConvexHull.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ConvexHull
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.qml b/CppSamples/Geometry/ConvexHull/ConvexHull.qml
index fe590a195f..46ec955712 100644
--- a/CppSamples/Geometry/ConvexHull/ConvexHull.qml
+++ b/CppSamples/Geometry/ConvexHull/ConvexHull.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConvexHull, Category=Geometry]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/ConvexHull/main.cpp b/CppSamples/Geometry/ConvexHull/main.cpp
index c5f0aae5a5..bae4fc8aca 100644
--- a/CppSamples/Geometry/ConvexHull/main.cpp
+++ b/CppSamples/Geometry/ConvexHull/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ConvexHull.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp
index 4fdfd301c2..18b4fe7534 100644
--- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp
+++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndEditGeometries, Category=Geometry]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateAndEditGeometries.h"
 
-// ArcGIS Maps SDK headers
 #include "FreehandTool.h"
 #include "GeometryEditor.h"
 #include "GeometryEditorElement.h"
@@ -53,7 +51,6 @@
 #include "SymbolTypes.h"
 #include "VertexTool.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h
index 98b0dcdb52..7c8ee28c74 100644
--- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h
+++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndEditGeometries, Category=Geometry]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef CREATEANDEDITGEOMETRIES_H
 #define CREATEANDEDITGEOMETRIES_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
   class GeometryEditor;
@@ -36,6 +33,8 @@ namespace Esri::ArcGISRuntime
   class ReticleVertexTool;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class CreateAndEditGeometries : public QObject
diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro
index caa1ff0cb8..744f567b25 100644
--- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro
+++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateAndEditGeometries
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml
index 98770b8cf9..a7edc722b6 100644
--- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml
+++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndEditGeometries, Category=Geometry]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml b/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml
index 98ec22042f..d9c2f51428 100644
--- a/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml
+++ b/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndEditGeometries, Category=Geometry]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/CreateAndEditGeometries/main.cpp b/CppSamples/Geometry/CreateAndEditGeometries/main.cpp
index ef4b761f2f..06d18b16e1 100644
--- a/CppSamples/Geometry/CreateAndEditGeometries/main.cpp
+++ b/CppSamples/Geometry/CreateAndEditGeometries/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateAndEditGeometries.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp b/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp
index 9ee8c60b5e..bc3fe4e272 100644
--- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp
+++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateGeometries, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,32 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateGeometries.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
-#include "Geometry.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MultipointBuilder.h"
+#include "Graphic.h"
+#include "GraphicsOverlay.h"
+#include "Geometry.h"
 #include "Point.h"
-#include "PointCollection.h"
 #include "PolygonBuilder.h"
 #include "PolylineBuilder.h"
+#include "MultipointBuilder.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
+#include "PointCollection.h"
+#include "SpatialReference.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.h b/CppSamples/Geometry/CreateGeometries/CreateGeometries.h
index 6b3792746b..2a5bdebe6e 100644
--- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.h
+++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateGeometries, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef CREATEGEOMETRIES_H
 #define CREATEGEOMETRIES_H
 
-// ArcGIS Maps SDK headers
-#include "Geometry.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -30,6 +24,9 @@ class MapQuickView;
 class GraphicsOverlay;
 }
 
+#include "Geometry.h"
+#include <QQuickItem>
+
 class CreateGeometries : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro b/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro
index cbe2008278..79093f4856 100644
--- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro
+++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateGeometries
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml b/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml
index e04cabb45b..75d05e7e5a 100644
--- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml
+++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateGeometries, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/CreateGeometries/main.cpp b/CppSamples/Geometry/CreateGeometries/main.cpp
index 3233747e5e..ec2104ced4 100644
--- a/CppSamples/Geometry/CreateGeometries/main.cpp
+++ b/CppSamples/Geometry/CreateGeometries/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "CreateGeometries.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "CreateGeometries.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.cpp b/CppSamples/Geometry/CutGeometry/CutGeometry.cpp
index 8c4d8f1ae6..630153ec9c 100644
--- a/CppSamples/Geometry/CutGeometry/CutGeometry.cpp
+++ b/CppSamples/Geometry/CutGeometry/CutGeometry.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CutGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CutGeometry.h"
 
-// ArcGIS Maps SDK headers
-#include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "PolygonBuilder.h"
+#include "Graphic.h"
+#include "GraphicsOverlay.h"
+#include "GeometryEngine.h"
+#include "SpatialReference.h"
 #include "PolylineBuilder.h"
-#include "SimpleFillSymbol.h"
+#include "PolygonBuilder.h"
 #include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
+#include "SimpleFillSymbol.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.h b/CppSamples/Geometry/CutGeometry/CutGeometry.h
index 279eecd23a..3ecaec2810 100644
--- a/CppSamples/Geometry/CutGeometry/CutGeometry.h
+++ b/CppSamples/Geometry/CutGeometry/CutGeometry.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CutGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef CUTGEOMETRY_H
 #define CUTGEOMETRY_H
 
-// ArcGIS Maps SDK headers
-#include "Polygon.h"
-#include "Polyline.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -32,6 +25,10 @@ class Graphic;
 class GraphicsOverlay;
 }
 
+#include <QQuickItem>
+#include "Polygon.h"
+#include "Polyline.h"
+
 class CutGeometry : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.pro b/CppSamples/Geometry/CutGeometry/CutGeometry.pro
index 42fde2c63f..9752b4a2b1 100644
--- a/CppSamples/Geometry/CutGeometry/CutGeometry.pro
+++ b/CppSamples/Geometry/CutGeometry/CutGeometry.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CutGeometry
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.qml b/CppSamples/Geometry/CutGeometry/CutGeometry.qml
index 5a1329094e..9ec02e4e2e 100644
--- a/CppSamples/Geometry/CutGeometry/CutGeometry.qml
+++ b/CppSamples/Geometry/CutGeometry/CutGeometry.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CutGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/CutGeometry/main.cpp b/CppSamples/Geometry/CutGeometry/main.cpp
index 6449742f8a..a37db41f66 100644
--- a/CppSamples/Geometry/CutGeometry/main.cpp
+++ b/CppSamples/Geometry/CutGeometry/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "CutGeometry.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "CutGeometry.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp
index 119fd25ea6..ff0582d64c 100644
--- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp
+++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DensifyAndGeneralize, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,33 +18,31 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DensifyAndGeneralize.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "GeometryEngine.h"
+#include "Map.h"
+#include "MapQuickView.h"
+#include "PointCollection.h"
+#include "SpatialReference.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
+#include "SimpleMarkerSymbol.h"
+#include "SimpleLineSymbol.h"
+#include "MultipointBuilder.h"
+#include "PolylineBuilder.h"
+#include "GeometryEngine.h"
+#include "PointCollection.h"
+#include "MapTypes.h"
 #include "GraphicsOverlayListModel.h"
-#include "ImmutablePart.h"
+#include "GraphicListModel.h"
+#include "SymbolTypes.h"
 #include "ImmutablePartCollection.h"
+#include "ImmutablePart.h"
 #include "ImmutablePointCollection.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MultipointBuilder.h"
+#include "GraphicsOverlay.h"
 #include "Point.h"
-#include "PointCollection.h"
 #include "Polyline.h"
-#include "PolylineBuilder.h"
-#include "SimpleLineSymbol.h"
-#include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
-#include "SymbolTypes.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h
index 017b5a8e6c..2e29741512 100644
--- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h
+++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DensifyAndGeneralize, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef DENSIFYANDGENERALIZE_H
 #define DENSIFYANDGENERALIZE_H
 
-// Qt headers
-#include <QQuickItem>
-
-// STL headers
-#include <PointCollection.h>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -32,6 +26,9 @@ class Graphic;
 class PointCollection;
 }
 
+#include <QQuickItem>
+#include <PointCollection.h>
+
 class DensifyAndGeneralize : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro
index 0cd1c161ba..f239aab6ea 100644
--- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro
+++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DensifyAndGeneralize
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml
index 8b1088d76b..e6dc385462 100644
--- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml
+++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DensifyAndGeneralize, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/DensifyAndGeneralize/main.cpp b/CppSamples/Geometry/DensifyAndGeneralize/main.cpp
index 907c3258c7..a878ae5c83 100644
--- a/CppSamples/Geometry/DensifyAndGeneralize/main.cpp
+++ b/CppSamples/Geometry/DensifyAndGeneralize/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DensifyAndGeneralize.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DensifyAndGeneralize.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp
index c008f2ee46..9f9cf009fb 100644
--- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp
+++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FormatCoordinates, Category=Geometry]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FormatCoordinates.h"
 
-// ArcGIS Maps SDK headers
 #include "CoordinateFormatter.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "Point.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "SpatialReference.h"
+#include "GraphicsOverlay.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h
index 161a00ab01..1ea6d1930d 100644
--- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h
+++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FormatCoordinates, Category=Geometry]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef FORMATCOORDINATES_H
 #define FORMATCOORDINATES_H
 
-// ArcGIS Maps SDK headers
-#include "Point.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -30,6 +24,10 @@ class MapQuickView;
 class GraphicsOverlay;
 }
 
+#include <QObject>
+
+#include "Point.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class FormatCoordinates : public QObject
@@ -84,3 +82,4 @@ class FormatCoordinates : public QObject
 };
 
 #endif // FORMATCOORDINATES_H
+
diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro
index 3706f2b177..112e5aeb47 100644
--- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro
+++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml
index 27f5a42b12..0b63e8e75f 100644
--- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml
+++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FormatCoordinates, Category=Geometry]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/FormatCoordinates/main.cpp b/CppSamples/Geometry/FormatCoordinates/main.cpp
index 8cc3fe2ae4..af33332de5 100644
--- a/CppSamples/Geometry/FormatCoordinates/main.cpp
+++ b/CppSamples/Geometry/FormatCoordinates/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FormatCoordinates.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FormatCoordinates.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/FormatCoordinates/main.qml b/CppSamples/Geometry/FormatCoordinates/main.qml
index 184a230717..822456cc62 100644
--- a/CppSamples/Geometry/FormatCoordinates/main.qml
+++ b/CppSamples/Geometry/FormatCoordinates/main.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FormatCoordinates, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp
index aeef77a540..8ea168bbbf 100644
--- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp
+++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GeodesicOperations, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GeodesicOperations.h"
 
-// ArcGIS Maps SDK headers
-#include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LinearUnit.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "PolylineBuilder.h"
-#include "SimpleLineSymbol.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
 #include "SimpleMarkerSymbol.h"
+#include "SimpleLineSymbol.h"
+#include "GeometryEngine.h"
 #include "SpatialReference.h"
+#include "PolylineBuilder.h"
+#include "Point.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
+#include "LinearUnit.h"
 
 using namespace Esri::ArcGISRuntime;
 
@@ -131,3 +129,4 @@ QString GeodesicOperations::distanceText() const
 {
   return m_distanceText;
 }
+
diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h
index d55a55227a..e3e9f26a18 100644
--- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h
+++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GeodesicOperations, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef GEODESICOPERATIONS_H
 #define GEODESICOPERATIONS_H
 
-// ArcGIS Maps SDK headers
-#include "Point.h"
-#include "Polyline.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -31,6 +24,10 @@ class MapQuickView;
 class Graphic;
 }
 
+#include "Point.h"
+#include "Polyline.h"
+#include <QQuickItem>
+
 class GeodesicOperations : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro
index d34df77685..b79b24af42 100644
--- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro
+++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = GeodesicOperations
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml
index be013528f8..aaeb53de3c 100644
--- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml
+++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GeodesicOperations, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/GeodesicOperations/main.cpp b/CppSamples/Geometry/GeodesicOperations/main.cpp
index 6924540475..a6c551d522 100644
--- a/CppSamples/Geometry/GeodesicOperations/main.cpp
+++ b/CppSamples/Geometry/GeodesicOperations/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GeodesicOperations.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GeodesicOperations.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.cpp b/CppSamples/Geometry/ListTransformations/ListTransformations.cpp
index c2102a2902..e69284de77 100644
--- a/CppSamples/Geometry/ListTransformations/ListTransformations.cpp
+++ b/CppSamples/Geometry/ListTransformations/ListTransformations.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListTransformations, Category=Geometry]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,36 +18,33 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ListTransformations.h"
 
-// ArcGIS Maps SDK headers
-#include "DatumTransformation.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "GeographicTransformation.h"
-#include "GeographicTransformationStep.h"
-#include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "TransformationCatalog.h"
+#include "GeometryEngine.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
 #include "Point.h"
-#include "Polygon.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
+#include "DatumTransformation.h"
+#include "GeographicTransformationStep.h"
+#include "GeographicTransformation.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
-#include "TransformationCatalog.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "Envelope.h"
+#include "Polygon.h"
 
-// Qt headers
-#include <QStandardPaths>
+#include <QtCore/qglobal.h>
 #include <QUrl>
+#include <QStandardPaths>
 #include <QVariantMap>
-#include <QtCore/qglobal.h>
 
 using namespace Esri::ArcGISRuntime;
 
@@ -149,6 +146,7 @@ void ListTransformations::addGraphics()
   overlay->graphics()->append(m_projectedGraphic);
 }
 
+
 void ListTransformations::refreshTransformationList(bool orderBySuitability)
 {
   // get the input/output spatial reference
diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.h b/CppSamples/Geometry/ListTransformations/ListTransformations.h
index 6257083df8..b8bce0c7b6 100644
--- a/CppSamples/Geometry/ListTransformations/ListTransformations.h
+++ b/CppSamples/Geometry/ListTransformations/ListTransformations.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListTransformations, Category=Geometry]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,6 @@
 #ifndef LISTTRANSFORMATIONS_H
 #define LISTTRANSFORMATIONS_H
 
-// ArcGIS Maps SDK headers
-#include "Point.h"
-
-// Qt headers
-#include <QList>
-#include <QQuickItem>
-#include <QVariantList>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -33,6 +25,12 @@ class Graphic;
 class DatumTransformation;
 }
 
+#include "Point.h"
+
+#include <QQuickItem>
+#include <QList>
+#include <QVariantList>
+
 class ListTransformations : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.pro b/CppSamples/Geometry/ListTransformations/ListTransformations.pro
index f253585f36..d20a7148c5 100644
--- a/CppSamples/Geometry/ListTransformations/ListTransformations.pro
+++ b/CppSamples/Geometry/ListTransformations/ListTransformations.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ListTransformations
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.qml b/CppSamples/Geometry/ListTransformations/ListTransformations.qml
index eeb0a71e67..c00c678c4a 100644
--- a/CppSamples/Geometry/ListTransformations/ListTransformations.qml
+++ b/CppSamples/Geometry/ListTransformations/ListTransformations.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListTransformations, Category=Geometry]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/ListTransformations/main.cpp b/CppSamples/Geometry/ListTransformations/main.cpp
index 273ba97ec3..0aa42dd824 100644
--- a/CppSamples/Geometry/ListTransformations/main.cpp
+++ b/CppSamples/Geometry/ListTransformations/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ListTransformations.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ListTransformations.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.cpp b/CppSamples/Geometry/NearestVertex/NearestVertex.cpp
index 9fb20d26c7..2bb8429d8c 100644
--- a/CppSamples/Geometry/NearestVertex/NearestVertex.cpp
+++ b/CppSamples/Geometry/NearestVertex/NearestVertex.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=NearestVertex, Category=Geometry]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,32 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "NearestVertex.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
 #include "FeatureLayer.h"
 #include "GeometryEngine.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "Point.h"
 #include "PolygonBuilder.h"
 #include "PortalItem.h"
-#include "ProximityResult.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
 #include "SpatialReference.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "ProximityResult.h"
+#include "Basemap.h"
+#include "Envelope.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.h b/CppSamples/Geometry/NearestVertex/NearestVertex.h
index 2303d89480..3d6047a941 100644
--- a/CppSamples/Geometry/NearestVertex/NearestVertex.h
+++ b/CppSamples/Geometry/NearestVertex/NearestVertex.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=NearestVertex, Category=Geometry]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef NEARESTVERTEX_H
 #define NEARESTVERTEX_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class NearestVertex : public QObject
diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.pro b/CppSamples/Geometry/NearestVertex/NearestVertex.pro
index 3ecf63c949..431963173c 100644
--- a/CppSamples/Geometry/NearestVertex/NearestVertex.pro
+++ b/CppSamples/Geometry/NearestVertex/NearestVertex.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = NearestVertex
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.qml b/CppSamples/Geometry/NearestVertex/NearestVertex.qml
index 51b6e167b8..0082b23df5 100644
--- a/CppSamples/Geometry/NearestVertex/NearestVertex.qml
+++ b/CppSamples/Geometry/NearestVertex/NearestVertex.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=NearestVertex, Category=Geometry]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/NearestVertex/main.cpp b/CppSamples/Geometry/NearestVertex/main.cpp
index eca142b40c..6459396b03 100644
--- a/CppSamples/Geometry/NearestVertex/main.cpp
+++ b/CppSamples/Geometry/NearestVertex/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "NearestVertex.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp
index 38c65862b4..6b3c23a9ac 100644
--- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp
+++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ProjectGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ProjectGeometry.h"
 
-// ArcGIS Maps SDK headers
-#include "CalloutData.h"
+#include "Map.h"
+#include "MapQuickView.h"
+#include "Viewpoint.h"
 #include "Envelope.h"
 #include "GeometryEngine.h"
+#include "Point.h"
+#include "SimpleMarkerSymbol.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
+#include "CalloutData.h"
 #include "MapTypes.h"
-#include "Point.h"
-#include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
-#include "Viewpoint.h"
+#include "SpatialReference.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h
index 6770eb97ae..dd23bff0e3 100644
--- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h
+++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ProjectGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef PROJECTGEOMETRY_H
 #define PROJECTGEOMETRY_H
 
-// Qt headers
-#include <QMouseEvent>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -29,6 +25,9 @@ class Graphic;
 class CalloutData;
 }
 
+#include <QQuickItem>
+#include <QMouseEvent>
+
 class ProjectGeometry : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro
index 54495added..a2d90de6f2 100644
--- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro
+++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ProjectGeometry
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml
index 5b4654897a..f72ad4f47f 100644
--- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml
+++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ProjectGeometry, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/ProjectGeometry/main.cpp b/CppSamples/Geometry/ProjectGeometry/main.cpp
index 11b1a4f2c3..1b819dd4e4 100644
--- a/CppSamples/Geometry/ProjectGeometry/main.cpp
+++ b/CppSamples/Geometry/ProjectGeometry/main.cpp
@@ -1,39 +1,31 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ProjectGeometry.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ProjectGeometry.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp b/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp
index 585d1145fb..7f523aaa09 100755
--- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp
+++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SpatialOperations, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SpatialOperations.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Part.h"
-#include "PartCollection.h"
+#include "Basemap.h"
 #include "Point.h"
+#include "Part.h"
 #include "PolygonBuilder.h"
 #include "SimpleFillSymbol.h"
-#include "SpatialReference.h"
+#include "GeometryEngine.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Graphic.h"
 #include "SymbolTypes.h"
+#include "PartCollection.h"
+#include "GraphicsOverlay.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.h b/CppSamples/Geometry/SpatialOperations/SpatialOperations.h
index f51a5435eb..051ec167ed 100755
--- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.h
+++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SpatialOperations, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef SpatialOperations_H
 #define SpatialOperations_H
 
-// ArcGIS Maps SDK headers
-#include "Geometry.h"
-
-// Qt headers
-#include <QQuickItem>
-#include <QStringList>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -31,6 +24,10 @@ namespace Esri::ArcGISRuntime
   class GraphicsOverlay;
 }
 
+#include <QQuickItem>
+#include <QStringList>
+#include "Geometry.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class SpatialOperations : public QQuickItem
diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro b/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro
index b3af46cd98..7b17c3fc64 100644
--- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro
+++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SpatialOperations
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml b/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml
index 186dfa63e6..1cac07c1ea 100755
--- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml
+++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SpatialOperations, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/SpatialOperations/main.cpp b/CppSamples/Geometry/SpatialOperations/main.cpp
index 3a2e757f95..419a7c2bab 100755
--- a/CppSamples/Geometry/SpatialOperations/main.cpp
+++ b/CppSamples/Geometry/SpatialOperations/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SpatialOperations.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SpatialOperations.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp
index 02de4d6f7f..87b6f7e73f 100644
--- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp
+++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SpatialRelationships, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,39 +18,34 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SpatialRelationships.h"
 
-// ArcGIS Maps SDK headers
-#include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyGraphicsOverlayResult.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "Polygon.h"
-#include "PolygonBuilder.h"
-#include "Polyline.h"
-#include "PolylineBuilder.h"
-#include "SelectionProperties.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
+#include "Point.h"
+#include "PolylineBuilder.h"
+#include "Polyline.h"
+#include "PolygonBuilder.h"
+#include "Polygon.h"
+#include "GeometryEngine.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
-
-// Qt headers
-#include <QFuture>
-#include <QStringList>
+#include "SelectionProperties.h"
+#include "IdentifyGraphicsOverlayResult.h"
+#include "SpatialReference.h"
 #include <QUuid>
-
-// STL headers
+#include <QStringList>
 #include <memory>
 
+#include <QFuture>
+
 using namespace Esri::ArcGISRuntime;
 
 SpatialRelationships::SpatialRelationships(QQuickItem* parent /* = nullptr */):
diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h
index 16e5758b78..74d3bbc45c 100644
--- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h
+++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SpatialRelationships, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef SPATIALRELATIONSHIPS_H
 #define SPATIALRELATIONSHIPS_H
 
-// ArcGIS Maps SDK headers
-#include "Geometry.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -31,6 +25,9 @@ class Graphic;
 class GraphicsOverlay;
 }
 
+#include "Geometry.h"
+#include <QQuickItem>
+
 class SpatialRelationships : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro
index d8b86da0c9..3a099419a1 100644
--- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro
+++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SpatialRelationships
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml
index 2ed02b2e3d..c28d3d48e8 100644
--- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml
+++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SpatialRelationships, Category=Geometry]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Geometry/SpatialRelationships/main.cpp b/CppSamples/Geometry/SpatialRelationships/main.cpp
index 21cc7e2515..0eee45981b 100644
--- a/CppSamples/Geometry/SpatialRelationships/main.cpp
+++ b/CppSamples/Geometry/SpatialRelationships/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SpatialRelationships.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SpatialRelationships.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp
index 1eaeadfa77..b29a12628d 100644
--- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp
+++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddCustomDynamicEntityDataSource, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,35 +18,33 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AddCustomDynamicEntityDataSource.h"
-#include "CustomDataSource.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "AttributeListModel.h"
-#include "Basemap.h"
-#include "CalloutData.h"
-#include "DynamicEntity.h"
-#include "DynamicEntityChangedInfo.h"
+#include "CustomDataSource.h"
+#include "ServiceTypes.h"
 #include "DynamicEntityDataSource.h"
-#include "DynamicEntityDataSourcePurgeOptions.h"
 #include "DynamicEntityLayer.h"
-#include "DynamicEntityObservation.h"
-#include "IdentifyLayerResult.h"
-#include "LabelDefinition.h"
-#include "LabelDefinitionListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
-#include "ServiceTypes.h"
+#include "Viewpoint.h"
+#include "LayerListModel.h"
+#include "Basemap.h"
+#include "ArcGISMapImageLayer.h"
+#include "TrackDisplayProperties.h"
 #include "SimpleLabelExpression.h"
 #include "TextSymbol.h"
-#include "TrackDisplayProperties.h"
-#include "Viewpoint.h"
+#include "LabelDefinition.h"
+#include "ServiceTypes.h"
+#include "LabelDefinitionListModel.h"
+#include "CalloutData.h"
+#include "IdentifyLayerResult.h"
+#include "DynamicEntityObservation.h"
+#include "DynamicEntity.h"
+#include "AttributeListModel.h"
+#include "DynamicEntityChangedInfo.h"
+#include "DynamicEntityDataSourcePurgeOptions.h"
 
-// Qt headers
 #include <QFuture>
 #include <QtConcurrent/QtConcurrent>
 
diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h
index 9c8294abed..23a1611eb1 100644
--- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h
+++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddCustomDynamicEntityDataSource, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef ADDCUSTOMDYNAMICENTITYDATASOURCE_H
 #define ADDCUSTOMDYNAMICENTITYDATASOURCE_H
 
-// Qt headers
-#include <QMouseEvent>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class DynamicEntity;
@@ -29,6 +25,9 @@ class Map;
 class MapQuickView;
 }
 
+#include <QMouseEvent>
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class AddCustomDynamicEntityDataSource : public QObject
diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro
index 8dc56baf56..e525598476 100644
--- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro
+++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AddCustomDynamicEntityDataSource
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml
index b7a1ac6b51..9823d41cbd 100644
--- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml
+++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddCustomDynamicEntityDataSource, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp
index 08e150fe01..8d37738d85 100644
--- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp
+++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp
@@ -1,35 +1,16 @@
-// [Legal]
-// Copyright 2024 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-// sample headers
-#include "CustomDataSource.h"
-
-// ArcGIS Maps SDK headers
 #include "Domain.h"
-#include "DynamicEntityDataSource.h"
 #include "DynamicEntityDataSourceInfo.h"
 #include "Field.h"
-#include "Point.h"
 #include "ServiceTypes.h"
+#include "CustomDataSource.h"
+#include "DynamicEntityDataSource.h"
 #include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
+#include <QtConcurrent/QtConcurrent>
 #include <QFile>
 #include <QFuture>
 #include <QTextStream>
-#include <QtConcurrent/QtConcurrent>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h
index ff5a211b7b..b06cfa01a7 100644
--- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h
+++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h
@@ -1,35 +1,21 @@
-// [Legal]
-// Copyright 2024 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
 #ifndef CUSTOMDATASOURCE_H
 #define CUSTOMDATASOURCE_H
 
-// ArcGIS Maps SDK headers
 #include "DynamicEntityDataSource.h"
 #include "Field.h"
+#include "Geometry.h"
+#include "RealTimeTypes.h"
 
-// Qt headers
-#include <QFile>
+#include <QTextStream>
+#include <QUrl>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QJsonObject>
 #include <QObject>
 #include <QString>
-#include <QTextStream>
-#include <QUrl>
+#include <QObject>
 #include <QVariantMap>
+#include <QJsonObject>
+#include <QFile>
 
 namespace Esri::ArcGISRuntime {
 
diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp b/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp
index 2e172ad37b..aef9956075 100644
--- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp
+++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp
@@ -1,34 +1,26 @@
-// [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AddCustomDynamicEntityDataSource.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp
index a912f0734c..6ca0688aeb 100644
--- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp
+++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddDynamicEntityLayer, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,7 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AddDynamicEntityLayer.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISStreamService.h"
 #include "ArcGISStreamServiceFilter.h"
 #include "CalloutData.h"
@@ -52,7 +49,6 @@
 #include "UniqueValueRenderer.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h
index a6c0b4a8ff..0d2fd4cf77 100644
--- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h
+++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddDynamicEntityLayer, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ADDDYNAMICENTITYLAYER_H
 #define ADDDYNAMICENTITYLAYER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISStreamService;
@@ -30,6 +27,8 @@ class MapQuickView;
 
 class QMouseEvent;
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class AddDynamicEntityLayer : public QObject
diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro
index f1b00bbe1f..5a5515e6f2 100644
--- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro
+++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AddDynamicEntityLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml
index 4ea7fa09d8..ed4e2e33c1 100644
--- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml
+++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddDynamicEntityLayer, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/AddDynamicEntityLayer/main.cpp b/CppSamples/Layers/AddDynamicEntityLayer/main.cpp
index 6dfbce43ce..c87fbf46e8 100644
--- a/CppSamples/Layers/AddDynamicEntityLayer/main.cpp
+++ b/CppSamples/Layers/AddDynamicEntityLayer/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
-// Copyright 2023 Esri.
-//
+// COPYRIGHT 2023 ESRI
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AddDynamicEntityLayer.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp
index dff425c849..2f59190d1a 100644
--- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp
+++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddEncExchangeSet, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,25 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AddEncExchangeSet.h"
 
-// ArcGIS Maps SDK headers
-#include "EncCell.h"
-#include "EncDataset.h"
-#include "EncEnvironmentSettings.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "EncExchangeSet.h"
 #include "EncLayer.h"
+#include "EncDataset.h"
+#include "EncCell.h"
+#include "EncEnvironmentSettings.h"
 #include "Envelope.h"
-#include "Error.h"
 #include "GeometryEngine.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
+#include "Error.h"
 #include "MapTypes.h"
+#include "LayerListModel.h"
 #include "Viewpoint.h"
 
-// Qt headers
+#include <QtCore/qglobal.h>
 #include <QFuture>
 #include <QStandardPaths>
-#include <QtCore/qglobal.h>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h
index 1f1909ab92..b2b25bbdd3 100644
--- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h
+++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddEncExchangeSet, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ADDENCEXCHANGESET_H
 #define ADDENCEXCHANGESET_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -28,6 +25,8 @@ class EncExchangeSet;
 class Geometry;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class AddEncExchangeSet : public QObject
diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro
index c0434806e6..80b5456214 100644
--- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro
+++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AddEncExchangeSet
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml
index f3cfb04b01..60007bb64d 100644
--- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml
+++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddEncExchangeSet, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/AddEncExchangeSet/README.metadata.json b/CppSamples/Layers/AddEncExchangeSet/README.metadata.json
index 18070425c4..3ecd3c5c7c 100644
--- a/CppSamples/Layers/AddEncExchangeSet/README.metadata.json
+++ b/CppSamples/Layers/AddEncExchangeSet/README.metadata.json
@@ -6,7 +6,7 @@
             "path": "~/ArcGIS/Runtime/Data/ENC/ExchangeSetwithoutUpdates.zip"
         },
         {
-            "itemId": "5028bf3513ff4c38b28822d010a4937c",
+            "itemId": "af74ccbb69c846ef97085e4bebd3e76a",
             "path": "~/ArcGIS/Runtime/Data/ENC/hydrography.zip"
         }
     ],
diff --git a/CppSamples/Layers/AddEncExchangeSet/main.cpp b/CppSamples/Layers/AddEncExchangeSet/main.cpp
index 6d3a294d30..0d841bbd9a 100644
--- a/CppSamples/Layers/AddEncExchangeSet/main.cpp
+++ b/CppSamples/Layers/AddEncExchangeSet/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AddEncExchangeSet.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp
index 3275138c81..4b9e27f96a 100644
--- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp
+++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyMosaicRuleToRasters, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ApplyMosaicRuleToRasters.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
 #include "ImageServiceRaster.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MosaicRule.h"
-#include "Point.h"
 #include "RasterLayer.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "RasterTypes.h"
+#include "Envelope.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h
index 04d77ef301..194dc70d81 100644
--- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h
+++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyMosaicRuleToRasters, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef APPLYMOSAICRULETORASTERS_H
 #define APPLYMOSAICRULETORASTERS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ImageServiceRaster;
@@ -29,6 +26,8 @@ class MosaicRule;
 class RasterLayer;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ApplyMosaicRuleToRasters : public QObject
diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro
index 952ac27e40..df5f1e3e9d 100644
--- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro
+++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ApplyMosaicRuleToRasters
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml
index 1dec98a782..042915e983 100644
--- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml
+++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyMosaicRuleToRasters, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp b/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp
index d95b8ca713..cac6741c45 100644
--- a/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp
+++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ApplyMosaicRuleToRasters.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp
index dc8acf2bc9..53d9fffa30 100644
--- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp
+++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyUniqueValuesWithAlternateSymbols, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ApplyUniqueValuesWithAlternateSymbols.h"
 
-// ArcGIS Maps SDK headers
 #include "Basemap.h"
 #include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MultilayerPointSymbol.h"
-#include "Point.h"
 #include "ServiceFeatureTable.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
 #include "SymbolReferenceProperties.h"
+#include "UniqueValueRenderer.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
-#include "UniqueValue.h"
+#include "LayerListModel.h"
 #include "UniqueValueListModel.h"
-#include "UniqueValueRenderer.h"
+#include "UniqueValue.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h
index 0ba7064d5b..cc02395b76 100644
--- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h
+++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyUniqueValuesWithAlternateSymbols, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef APPLYUNIQUEVALUESWITHALTERNATESYMBOLS_H
 #define APPLYUNIQUEVALUESWITHALTERNATESYMBOLS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -31,6 +28,8 @@ class Symbol;
 class UniqueValueRenderer;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ApplyUniqueValuesWithAlternateSymbols : public QObject
diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro
index d94b961538..642b49cb84 100644
--- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro
+++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ApplyUniqueValuesWithAlternateSymbols
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml
index a89357495d..b5060c2eda 100644
--- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml
+++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyUniqueValuesWithAlternateSymbols, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp
index 9f6a9ccd05..05dd48a5f2 100644
--- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp
+++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ApplyUniqueValuesWithAlternateSymbols.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp
index 2cdc5f649a..a89f82a0fd 100644
--- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp
+++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ArcGISMapImageLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,12 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ArcGISMapImageLayerUrl.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
-
-// Qt headers
+#include "Basemap.h"
+#include "ArcGISMapImageLayer.h"
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
@@ -64,3 +60,4 @@ void ArcGISMapImageLayerUrl::componentComplete()
   // set map on the map view
   m_mapView->setMap(m_map);
 }
+
diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h
index 2f27678d79..b1c794e72c 100644
--- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h
+++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ArcGISMapImageLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef ARCGIS_MAP_IMAGE_LAYER_URL_H
 #define ARCGIS_MAP_IMAGE_LAYER_URL_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class ArcGISMapImageLayerUrl : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro
index a867a1bc2d..961059198c 100644
--- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro
+++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml
index 8fed0082bd..f4fee8b3e2 100644
--- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml
+++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ArcGISMapImageLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp b/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp
index f1d7f70683..ddaadc81b2 100644
--- a/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp
+++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
-#include "ArcGISMapImageLayerUrl.h"
-
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-#include "MapQuickView.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MapQuickView.h"
+#include "ArcGISMapImageLayerUrl.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp
index 117d271e34..9110cc3eb5 100644
--- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp
+++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ArcGISTiledLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,12 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ArcGISTiledLayerUrl.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledLayer.h"
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
-
-// Qt headers
+#include "Basemap.h"
+#include "ArcGISTiledLayer.h"
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h
index 5a0337c3bb..9c1ecf5fa8 100644
--- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h
+++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ArcGISTiledLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef ARCGIS_TILED_LAYER_URL_H
 #define ARCGIS_TILED_LAYER_URL_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class ArcGISTiledLayerUrl : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro
index 2a1016421c..99414a4c63 100644
--- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro
+++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml
index 02beddf0f5..f986b17a82 100644
--- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml
+++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ArcGISTiledLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp b/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp
index f5a3ad47d9..e041d5ef38 100644
--- a/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp
+++ b/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
-#include "ArcGISTiledLayerUrl.h"
-
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-#include "MapQuickView.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MapQuickView.h"
+#include "ArcGISTiledLayerUrl.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp
index f6185037d4..f853ca0075 100644
--- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp
+++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=BlendRasterLayer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "BlendRasterLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "BlendRenderer.h"
-#include "ColorRamp.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapViewTypes.h"
 #include "Raster.h"
 #include "RasterLayer.h"
+#include "BlendRenderer.h"
+#include "MapViewTypes.h"
 #include "RasterTypes.h"
+#include "ColorRamp.h"
+#include "Basemap.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h
index b0eb1586b6..4cf5d265ac 100644
--- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h
+++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=BlendRasterLayer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef BLENDRASTERLAYER_H
 #define BLENDRASTERLAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Basemap;
@@ -29,6 +26,8 @@ namespace Esri::ArcGISRuntime
   class RasterLayer;
 }
 
+#include <QQuickItem>
+
 class BlendRasterLayer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro
index a56ca39613..0426e03d18 100644
--- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro
+++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = BlendRasterLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml
index 8f98aae72f..398eaadd22 100644
--- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml
+++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BlendRasterLayer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml b/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml
index 0db9293853..6d217488c1 100644
--- a/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml
+++ b/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BlendRasterLayer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml b/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml
index ae355d915d..7311b16fbb 100644
--- a/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml
+++ b/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BlendRasterLayer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/BlendRasterLayer/main.cpp b/CppSamples/Layers/BlendRasterLayer/main.cpp
index 79c92ad4c9..9aca51e353 100644
--- a/CppSamples/Layers/BlendRasterLayer/main.cpp
+++ b/CppSamples/Layers/BlendRasterLayer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "BlendRasterLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "BlendRasterLayer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp
index b8909fd1bc..5443aaf1bb 100644
--- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp
+++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseOGCAPIFeatureService, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "BrowseOGCAPIFeatureService.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
 #include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "OgcFeatureCollectionInfo.h"
 #include "OgcFeatureCollectionTable.h"
 #include "OgcFeatureService.h"
 #include "OgcFeatureServiceInfo.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "QueryParameters.h"
+#include "GeodatabaseTypes.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 #include <QQmlEngine>
 
diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h
index 4f2d33d16e..40823e0590 100644
--- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h
+++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseOGCAPIFeatureService, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef BROWSEOGCAPIFEATURESERVICE_H
 #define BROWSEOGCAPIFEATURESERVICE_H
 
-// Qt headers
-#include <QObject>
-#include <QUrl>
-
 namespace Esri::ArcGISRuntime
 {
 class Error;
@@ -33,6 +29,9 @@ class OgcFeatureService;
 class OgcFeatureServiceInfo;
 }
 
+#include <QObject>
+#include <QUrl>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class BrowseOGCAPIFeatureService : public QObject
diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro
index 81f5eb0a8d..bf6443eeaf 100644
--- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro
+++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = BrowseOGCAPIFeatureService
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml
index e92f88585d..83f73a2047 100644
--- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml
+++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseOGCAPIFeatureService, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp b/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp
index bd51ed0e12..b81e948eef 100644
--- a/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp
+++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "BrowseOGCAPIFeatureService.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp
index af39306799..52f4628cfb 100644
--- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp
+++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseWfsLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,32 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "BrowseWfsLayers.h"
 
-// ArcGIS Maps SDK headers
-#include "CoreTypes.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "FeatureQueryResult.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Polygon.h"
+#include "WfsFeatureTable.h"
+#include "FeatureLayer.h"
 #include "QueryParameters.h"
+#include "SimpleRenderer.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
-#include "SimpleRenderer.h"
-#include "SymbolTypes.h"
-#include "WfsFeatureTable.h"
-#include "WfsLayerInfo.h"
 #include "WfsService.h"
 #include "WfsServiceInfo.h"
+#include "WfsLayerInfo.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "GeodatabaseTypes.h"
+#include "CoreTypes.h"
+#include "FeatureQueryResult.h"
+#include "Polygon.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h
index 3164a4924a..18b688df01 100644
--- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h
+++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseWfsLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,11 +17,6 @@
 #ifndef BROWSEWFSLAYERS_H
 #define BROWSEWFSLAYERS_H
 
-// Qt headers
-#include <QList>
-#include <QObject>
-#include <QStringListModel>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -32,6 +27,10 @@ class WfsLayerInfo;
 class LayerListModel;
 }
 
+#include <QObject>
+#include <QList>
+#include <QStringListModel>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class BrowseWfsLayers : public QObject
@@ -70,6 +69,7 @@ class BrowseWfsLayers : public QObject
   bool m_loadingIndicator = false;
   bool m_swapAxis = false;
 
+
 };
 
 #endif // BROWSEWFSLAYERS_H
diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro
index 9496eed274..0fadee7ebf 100644
--- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro
+++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = BrowseWfsLayers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml
index 5a2fbb9eab..0b50803e06 100644
--- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml
+++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseWfsLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/BrowseWfsLayers/main.cpp b/CppSamples/Layers/BrowseWfsLayers/main.cpp
index 5b970c8836..94f09018b1 100644
--- a/CppSamples/Layers/BrowseWfsLayers/main.cpp
+++ b/CppSamples/Layers/BrowseWfsLayers/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "BrowseWfsLayers.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp
index 3d3721f81c..e531193df4 100644
--- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp
+++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeSublayerRenderer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ChangeSublayerRenderer.h"
 
-// ArcGIS Maps SDK headers
+#include "Map.h"
+#include "MapQuickView.h"
 #include "ArcGISMapImageLayer.h"
 #include "ArcGISMapImageSublayer.h"
-#include "ArcGISSublayerListModel.h"
+#include "Viewpoint.h"
 #include "ClassBreaksRenderer.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
+#include "Error.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
-#include "Viewpoint.h"
+#include "LayerListModel.h"
+#include "ArcGISSublayerListModel.h"
+#include "SpatialReference.h"
+#include "Envelope.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h
index c50199b0d5..9b2fe016ff 100644
--- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h
+++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeSublayerRenderer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef CHANGESUBLAYERRENDERER_H
 #define CHANGESUBLAYERRENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -30,6 +27,8 @@ class ArcGISMapImageSublayer;
 class ClassBreak;
 }
 
+#include <QQuickItem>
+
 class ChangeSublayerRenderer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro
index 6c23d6ac8c..36bde76a16 100644
--- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro
+++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ChangeSublayerRenderer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml
index 21e2847c62..b602934bf2 100644
--- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml
+++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeSublayerRenderer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ChangeSublayerRenderer/main.cpp b/CppSamples/Layers/ChangeSublayerRenderer/main.cpp
index 09601225f7..e1efa0a706 100644
--- a/CppSamples/Layers/ChangeSublayerRenderer/main.cpp
+++ b/CppSamples/Layers/ChangeSublayerRenderer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ChangeSublayerRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ChangeSublayerRenderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp
index b2b4517201..c514701a07 100644
--- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp
+++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeSublayerVisibility, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ChangeSublayerVisibility.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "ArcGISSublayerListModel.h"
-#include "Basemap.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "Basemap.h"
+#include "ArcGISMapImageLayer.h"
+#include "ArcGISSublayerListModel.h"
 #include "Point.h"
-#include "SpatialReference.h"
 #include "Viewpoint.h"
-
-// Qt headers
+#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
@@ -79,3 +75,4 @@ QAbstractListModel* ChangeSublayerVisibility::sublayerModel()
 {
   return m_sublayerModel;
 }
+
diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h
index 6d711a87e0..ee746a1395 100644
--- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h
+++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeSublayerVisibility, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef CHANGE_SUBLAYER_VISIBILITY_H
 #define CHANGE_SUBLAYER_VISIBILITY_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +24,9 @@ namespace Esri::ArcGISRuntime
   class ArcGISMapImageLayer;
 }
 
+#include <QAbstractListModel>
+#include <QQuickItem>
+
 class ChangeSublayerVisibility : public QQuickItem
 {
   Q_OBJECT
@@ -55,3 +54,4 @@ class ChangeSublayerVisibility : public QQuickItem
 };
 
 #endif // CHANGE_SUBLAYER_VISIBILITY_H
+
diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro
index fa40834e8e..95cce6dd2d 100644
--- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro
+++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml
index e454c93e9b..42536d74cb 100644
--- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml
+++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeSublayerVisibility, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ChangeSublayerVisibility/main.cpp b/CppSamples/Layers/ChangeSublayerVisibility/main.cpp
index eb37917b1d..14bdbcafe6 100644
--- a/CppSamples/Layers/ChangeSublayerVisibility/main.cpp
+++ b/CppSamples/Layers/ChangeSublayerVisibility/main.cpp
@@ -1,39 +1,32 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ChangeSublayerVisibility.h"
-
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-#include "ArcGISSublayerListModel.h"
-#include "MapQuickView.h"
 
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MapQuickView.h"
+#include "ArcGISSublayerListModel.h"
+#include "ChangeSublayerVisibility.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp
index b40db52751..f3c33c698f 100644
--- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp
+++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureClusters, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,13 +18,11 @@
 #include "pch.hpp" // IWYU pragma: keep
 #endif // PCH_BUILD
 
-// sample headers
 #include "ConfigureClusters.h"
 
-// ArcGIS Maps SDK headers
+#include "AggregateGeoElement.h"
 #include "AggregateField.h"
 #include "AggregateFieldListModel.h"
-#include "AggregateGeoElement.h"
 #include "AttributeListModel.h"
 #include "ClassBreaksRenderer.h"
 #include "ClusteringFeatureReduction.h"
@@ -48,7 +46,6 @@
 #include "TextSymbol.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QColor>
 #include <QFuture>
 
diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h
index ff58abc507..588a240b61 100644
--- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h
+++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureClusters, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ConfigureClusters_H
 #define ConfigureClusters_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
   class AggregateGeoElement;
@@ -31,6 +28,8 @@ namespace Esri::ArcGISRuntime
 
 class QMouseEvent;
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class ConfigureClusters : public QObject
diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro
index b10e626381..f4d5b9cadc 100644
--- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro
+++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick gui
 TEMPLATE = app
 TARGET = ConfigureClusters
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml
index c4fb8d865e..3a3e4f01f5 100644
--- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml
+++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureClusters, Category=Layers]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ConfigureClusters/main.cpp b/CppSamples/Layers/ConfigureClusters/main.cpp
index 2430ca0e5b..f7ce5aaa9f 100644
--- a/CppSamples/Layers/ConfigureClusters/main.cpp
+++ b/CppSamples/Layers/ConfigureClusters/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ConfigureClusters.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp
index 661cb36d06..da3605593f 100644
--- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp
+++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndSaveKmlFile, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,33 +18,30 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateAndSaveKmlFile.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
-#include "KmlDataset.h"
+#include "Map.h"
+#include "MapQuickView.h"
+#include "PolygonBuilder.h"
+#include "PolylineBuilder.h"
 #include "KmlDocument.h"
-#include "KmlGeometry.h"
-#include "KmlIcon.h"
-#include "KmlIconStyle.h"
+#include "KmlPlacemark.h"
+#include "KmlNodeListModel.h"
+#include "KmlDataset.h"
 #include "KmlLayer.h"
 #include "KmlLineStyle.h"
-#include "KmlNodeListModel.h"
-#include "KmlPlacemark.h"
+#include "KmlIcon.h"
+#include "KmlIconStyle.h"
 #include "KmlPolygonStyle.h"
 #include "KmlStyle.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
+#include "Error.h"
 #include "MapTypes.h"
-#include "PolygonBuilder.h"
-#include "PolylineBuilder.h"
+#include "LayerListModel.h"
+#include "KmlGeometry.h"
 #include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h
index 63f31074ca..6310a33a8e 100644
--- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h
+++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndSaveKmlFile, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,17 +17,6 @@
 #ifndef CREATEANDSAVEKMLFILE_H
 #define CREATEANDSAVEKMLFILE_H
 
-// ArcGIS Maps SDK headers
-#include "Geometry.h"
-#include "Point.h"
-#include "Polygon.h"
-#include "Polyline.h"
-
-// Qt headers
-#include <QObject>
-#include <QTemporaryDir>
-#include <QUrl>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -38,6 +27,15 @@ class KmlLayer;
 class KmlStyle;
 }
 
+#include <QObject>
+#include <QUrl>
+#include <QTemporaryDir>
+
+#include "Geometry.h"
+#include "Point.h"
+#include "Polyline.h"
+#include "Polygon.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class CreateAndSaveKmlFile : public QObject
diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro
index b3c225f1bf..a5557e5e28 100644
--- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro
+++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateAndSaveKmlFile
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml
index 46a884d950..fd49406ac4 100644
--- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml
+++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndSaveKmlFile, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp b/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp
index 0046c4e0b6..39f4952647 100644
--- a/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp
+++ b/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateAndSaveKmlFile.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp
index 8fcd08cd6a..23444edaee 100644
--- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp
+++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayAnnotation, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayAnnotation.h"
 
-// ArcGIS Maps SDK headers
 #include "AnnotationLayer.h"
 #include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "ServiceFeatureTable.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h
index 682820e3d0..1d1f04a650 100644
--- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h
+++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayAnnotation, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef DISPLAYANNOTATION_H
 #define DISPLAYANNOTATION_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayAnnotation : public QObject
diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro
index 9c9f342d41..8b201cb6c2 100644
--- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro
+++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayAnnotation
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml
index f4155bd8dd..77a9fa1a1e 100644
--- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml
+++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayAnnotation, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayAnnotation/main.cpp b/CppSamples/Layers/DisplayAnnotation/main.cpp
index f06f7f389b..0e783c8825 100644
--- a/CppSamples/Layers/DisplayAnnotation/main.cpp
+++ b/CppSamples/Layers/DisplayAnnotation/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayAnnotation.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp
index cd37c01b3d..22bf13f9fd 100644
--- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp
+++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDimensions, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,16 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayDimensions.h"
 
-// ArcGIS Maps SDK headers
 #include "DimensionLayer.h"
-#include "Error.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MobileMapPackage.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 
-// Qt headers
 #include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h
index 922bea4e51..6d509c8721 100644
--- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h
+++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDimensions, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISPLAYDIMENSIONS_H
 #define DISPLAYDIMENSIONS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class DimensionLayer;
@@ -29,6 +26,8 @@ class MapQuickView;
 class MobileMapPackage;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayDimensions : public QObject
diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro
index 05c562a0ad..6cc1334e30 100644
--- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro
+++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayDimensions
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml
index 318fb4c85d..108e8efbb3 100644
--- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml
+++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDimensions, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayDimensions/main.cpp b/CppSamples/Layers/DisplayDimensions/main.cpp
index 131e8fd7a5..3fedd0953c 100644
--- a/CppSamples/Layers/DisplayDimensions/main.cpp
+++ b/CppSamples/Layers/DisplayDimensions/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayDimensions.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp
index 71df5dc9b0..b959ccf09b 100644
--- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp
+++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayFeatureLayers, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,15 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayFeatureLayers.h"
 
-// ArcGIS Maps SDK headers
 #include "Envelope.h"
 #include "Error.h"
 #include "FeatureLayer.h"
-#include "GeoPackage.h"
-#include "GeoPackageFeatureTable.h"
 #include "Geodatabase.h"
 #include "GeodatabaseFeatureTable.h"
+#include "GeoPackage.h"
+#include "GeoPackageFeatureTable.h"
 #include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
@@ -41,7 +39,6 @@
 #include "SpatialReference.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 #include <QStandardPaths>
 
diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h
index b943f92433..a1ec542ddb 100644
--- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h
+++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayFeatureLayers, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISPLAYFEATURELAYERS_H
 #define DISPLAYFEATURELAYERS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -27,6 +24,8 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class DisplayFeatureLayers : public QObject
diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro
index a50165a0cc..d871ad85be 100644
--- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro
+++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro
@@ -27,7 +27,7 @@ QT += qml quick
 TEMPLATE = app
 TARGET = DisplayFeatureLayers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml
index f74255ffcc..fdf4dcad40 100644
--- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml
+++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayFeatureLayers, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayFeatureLayers/main.cpp b/CppSamples/Layers/DisplayFeatureLayers/main.cpp
index e38a6a0dd4..ffc7eea56c 100644
--- a/CppSamples/Layers/DisplayFeatureLayers/main.cpp
+++ b/CppSamples/Layers/DisplayFeatureLayers/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayFeatureLayers.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.cpp b/CppSamples/Layers/DisplayKml/DisplayKml.cpp
index 5098c07920..626c3996cd 100644
--- a/CppSamples/Layers/DisplayKml/DisplayKml.cpp
+++ b/CppSamples/Layers/DisplayKml/DisplayKml.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayKml, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayKml.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "KmlDataset.h"
-#include "KmlLayer.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "PortalItem.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "Viewpoint.h"
+#include "Camera.h"
 #include "SpatialReference.h"
+#include "KmlLayer.h"
+#include "KmlDataset.h"
+#include "PortalItem.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "Surface.h"
-#include "Viewpoint.h"
+#include "ElevationSourceListModel.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.h b/CppSamples/Layers/DisplayKml/DisplayKml.h
index 0699b7f34a..09c0f74e93 100644
--- a/CppSamples/Layers/DisplayKml/DisplayKml.h
+++ b/CppSamples/Layers/DisplayKml/DisplayKml.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayKml, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef DISPLAYKML_H
 #define DISPLAYKML_H
 
-// ArcGIS Maps SDK headers
-#include "Viewpoint.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
@@ -32,6 +26,9 @@ class KmlDataset;
 class PortalItem;
 }
 
+#include "Viewpoint.h"
+#include <QQuickItem>
+
 class DisplayKml : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.pro b/CppSamples/Layers/DisplayKml/DisplayKml.pro
index 910f8f2cf8..6c24e100e3 100644
--- a/CppSamples/Layers/DisplayKml/DisplayKml.pro
+++ b/CppSamples/Layers/DisplayKml/DisplayKml.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayKml
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.qml b/CppSamples/Layers/DisplayKml/DisplayKml.qml
index 037f36f7b7..8130a5bd8b 100644
--- a/CppSamples/Layers/DisplayKml/DisplayKml.qml
+++ b/CppSamples/Layers/DisplayKml/DisplayKml.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayKml, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayKml/main.cpp b/CppSamples/Layers/DisplayKml/main.cpp
index fe50e432ab..f65ca25d20 100644
--- a/CppSamples/Layers/DisplayKml/main.cpp
+++ b/CppSamples/Layers/DisplayKml/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DisplayKml.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DisplayKml.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp
index 056fc7e4c4..3566d1079a 100644
--- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp
+++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayKmlNetworkLinks.h"
 
-// ArcGIS Maps SDK headers
 #include "KmlDataset.h"
 #include "KmlLayer.h"
-#include "KmlNetworkLink.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "KmlNetworkLink.h"
 #include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
@@ -88,3 +85,4 @@ void DisplayKmlNetworkLinks::componentComplete()
   m_sceneView->setViewpointAsync(Viewpoint { Point { 8.150526, 50.472421, SpatialReference::wgs84() }, 20000000 } );
   m_sceneView->setArcGISScene(scene);
 }
+
diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h
index 5fad6fb0bd..c6712118ed 100644
--- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h
+++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,13 @@
 #ifndef DISPLAYKMLNETWORKLINKS_H
 #define DISPLAYKMLNETWORKLINKS_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
 }
 
+#include <QQuickItem>
+
 class DisplayKmlNetworkLinks : public QQuickItem
 {
   Q_PROPERTY(QString currentKmlNetworkMessage READ currentKmlNetworkMessage WRITE setCurrentKmlNetworkMessage NOTIFY kmlMessageRecieved)
diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro
index bc68046d3f..76855c96a9 100644
--- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro
+++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayKmlNetworkLinks
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml
index a4ed2f8867..b768c8e234 100644
--- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml
+++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml b/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml
index 7c4f3070de..1b73e7b99a 100644
--- a/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml
+++ b/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp b/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp
index efdf552f36..d3814e1deb 100644
--- a/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp
+++ b/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DisplayKmlNetworkLinks.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DisplayKmlNetworkLinks.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp
index b0d4492ac4..88c233cf8a 100644
--- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp
+++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayOgcApiFeatureCollection, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayOgcApiFeatureCollection.h"
 
-// ArcGIS Maps SDK headers
-#include "CoreTypes.h"
 #include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "Geometry.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "OgcFeatureCollectionTable.h"
 #include "QueryParameters.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "CoreTypes.h"
+#include "GeodatabaseTypes.h"
 #include "Viewpoint.h"
+#include "Geometry.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h
index 456b9501dd..64e66bfcb4 100644
--- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h
+++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayOgcApiFeatureCollection, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,8 @@
 #ifndef DisplayOgcApiFeatureCollection_H
 #define DisplayOgcApiFeatureCollection_H
 
-// ArcGIS Maps SDK headers
 #include "QueryParameters.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -32,6 +28,8 @@ class OgcFeatureCollectionTable;
 class QueryParameters;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayOgcApiFeatureCollection : public QObject
diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro
index 7b3bd77c10..293ed939ec 100644
--- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro
+++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayOgcApiFeatureCollection
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml
index ad05dadc1d..67b5d4c98e 100644
--- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml
+++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayOgcApiFeatureCollection, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp b/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp
index 02ff11942a..8cf4e1bacf 100644
--- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp
+++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp
@@ -1,30 +1,24 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayOgcApiFeatureCollection.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp
index b277c11f16..75c8f2a67b 100644
--- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp
+++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplaySubtypeFeatureLayer, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,31 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplaySubtypeFeatureLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "Credential.h"
-#include "Envelope.h"
-#include "Error.h"
 #include "FeatureLayer.h"
 #include "LabelDefinition.h"
-#include "LabelDefinitionListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "ServiceFeatureTable.h"
-#include "ServiceTypes.h"
 #include "SimpleLabelExpression.h"
-#include "SimpleMarkerSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
 #include "SubtypeFeatureLayer.h"
 #include "SubtypeSublayer.h"
-#include "SymbolTypes.h"
 #include "TextSymbol.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "Credential.h"
+#include "LabelDefinitionListModel.h"
+#include "ServiceTypes.h"
+#include "SimpleMarkerSymbol.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "Envelope.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h
index 92db3b6e4f..304b2f2dfa 100644
--- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h
+++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplaySubtypeFeatureLayer, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef DISPLAYSUBTYPEFEATURELAYER_H
 #define DISPLAYSUBTYPEFEATURELAYER_H
 
-// ArcGIS Maps SDK headers
-#include "SubtypeSublayer.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -36,6 +30,10 @@ class SubtypeFeatureLayer;
 class SubtypeSublayer;
 }
 
+#include <QObject>
+
+#include "SubtypeSublayer.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplaySubtypeFeatureLayer : public QObject
diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro
index 68a06ede16..73d942634c 100644
--- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro
+++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplaySubtypeFeatureLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml
index e49749fb7a..70dfae5018 100644
--- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml
+++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplaySubtypeFeatureLayer, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp b/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp
index 60c86b2d70..a23f336e32 100644
--- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp
+++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplaySubtypeFeatureLayer.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp
index 3e2049066e..0259e43b87 100644
--- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp
+++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayWfsLayer, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayWfsLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "CoreTypes.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Polygon.h"
+#include "WfsFeatureTable.h"
+#include "FeatureLayer.h"
 #include "QueryParameters.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "SimpleLineSymbol.h"
+#include "Error.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "GeodatabaseTypes.h"
+#include "CoreTypes.h"
+#include "SpatialReference.h"
+#include "Envelope.h"
 #include "Viewpoint.h"
-#include "WfsFeatureTable.h"
+#include "Polygon.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h
index db0017d45f..ebfbc60ea9 100644
--- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h
+++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayWfsLayer, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISPLAYWFSLAYER_H
 #define DISPLAYWFSLAYER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -27,6 +24,8 @@ class MapQuickView;
 class WfsFeatureTable;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayWfsLayer : public QObject
diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro
index 0cc22f61f8..94880fc074 100644
--- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro
+++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayWfsLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml
index 7c8ed0246d..bc735d0c82 100644
--- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml
+++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayWfsLayer, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/DisplayWfsLayer/main.cpp b/CppSamples/Layers/DisplayWfsLayer/main.cpp
index f68cf78e47..5a6c6a6730 100644
--- a/CppSamples/Layers/DisplayWfsLayer/main.cpp
+++ b/CppSamples/Layers/DisplayWfsLayer/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayWfsLayer.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.cpp b/CppSamples/Layers/ExportTiles/ExportTiles.cpp
index 04bcadd8d4..2349e324b0 100644
--- a/CppSamples/Layers/ExportTiles/ExportTiles.cpp
+++ b/CppSamples/Layers/ExportTiles/ExportTiles.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExportTiles, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,28 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "ExportTiles.h"
+// C++ API headers
+#include "ExportTileCacheParameters.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledLayer.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Basemap.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "ExportTileCacheJob.h"
-#include "ExportTileCacheParameters.h"
+#include "ExportTiles.h"
+#include "ArcGISTiledLayer.h"
 #include "ExportTileCacheTask.h"
+#include "Envelope.h"
 #include "GeometryEngine.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "SpatialReference.h"
-#include "TaskTypes.h"
 #include "TileCache.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "ExportTileCacheJob.h"
+#include "TaskTypes.h"
+#include "Point.h"
+#include "Envelope.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUrl>
 #include <QUuid>
diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.h b/CppSamples/Layers/ExportTiles/ExportTiles.h
index ce05e7fd49..8bf728679d 100644
--- a/CppSamples/Layers/ExportTiles/ExportTiles.h
+++ b/CppSamples/Layers/ExportTiles/ExportTiles.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExportTiles, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef EXPORT_TILES
 #define EXPORT_TILES
 
-// Qt headers
-#include <QQuickItem>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
   class ExportTileCacheParameters;
@@ -30,6 +26,9 @@ namespace Esri::ArcGISRuntime
   class TileCache;
 }
 
+#include <QQuickItem>
+#include <QTemporaryDir>
+
 class ExportTiles : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.pro b/CppSamples/Layers/ExportTiles/ExportTiles.pro
index 8d76d45cf4..f3ab8f051a 100644
--- a/CppSamples/Layers/ExportTiles/ExportTiles.pro
+++ b/CppSamples/Layers/ExportTiles/ExportTiles.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.qml b/CppSamples/Layers/ExportTiles/ExportTiles.qml
index bc6fbd7050..c96e3d3c70 100644
--- a/CppSamples/Layers/ExportTiles/ExportTiles.qml
+++ b/CppSamples/Layers/ExportTiles/ExportTiles.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExportTiles, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ExportTiles/main.cpp b/CppSamples/Layers/ExportTiles/main.cpp
index 455fd76a0a..4730a3ea46 100644
--- a/CppSamples/Layers/ExportTiles/main.cpp
+++ b/CppSamples/Layers/ExportTiles/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ExportTiles.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ExportTiles.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp
index 7d65d68967..0a0dc02e5c 100644
--- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp
+++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExportVectorTiles, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,35 +18,32 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ExportVectorTiles.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISVectorTiledLayer.h"
-#include "Basemap.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "ExportVectorTilesJob.h"
-#include "ExportVectorTilesParameters.h"
-#include "ExportVectorTilesResult.h"
 #include "ExportVectorTilesTask.h"
+#include "ExportVectorTilesParameters.h"
 #include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "ServiceTypes.h"
 #include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "ServiceTypes.h"
+#include "ExportVectorTilesJob.h"
+#include "Error.h"
+#include "ExportVectorTilesResult.h"
 #include "Viewpoint.h"
+#include "Graphic.h"
+#include "Envelope.h"
+#include "Point.h"
+#include "Basemap.h"
+#include "SpatialReference.h"
 
-// Qt headers
 #include <QFuture>
 #include <QTemporaryDir>
 #include <QUuid>
diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h
index ce6ef97bb2..15e458c573 100644
--- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h
+++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExportVectorTiles, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef EXPORTVECTORTILES_H
 #define EXPORTVECTORTILES_H
 
-// Qt headers
-#include <QObject>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
 class ExportVectorTilesJob;
@@ -30,6 +26,9 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+#include <QTemporaryDir>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ExportVectorTiles : public QObject
diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro
index e33700c714..3b64e2999f 100644
--- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro
+++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ExportVectorTiles
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml
index a175f4e7fd..25c5768505 100644
--- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml
+++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExportVectorTiles, Category=Layers]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ExportVectorTiles/main.cpp b/CppSamples/Layers/ExportVectorTiles/main.cpp
index 2a58abaace..73c8da4bcc 100644
--- a/CppSamples/Layers/ExportVectorTiles/main.cpp
+++ b/CppSamples/Layers/ExportVectorTiles/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ExportVectorTiles.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp
index ce4c130b78..db60a1b45b 100644
--- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp
+++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureCollectionLayerFromPortal, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureCollectionLayerFromPortal.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
 #include "FeatureCollection.h"
 #include "FeatureCollectionLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "Portal.h"
 #include "PortalItem.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "PortalTypes.h"
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h
index 1fc56b854c..7ed677aeaf 100644
--- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h
+++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureCollectionLayerFromPortal, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef FEATURECOLLECTIONLAYERFROMPORTAL_H
 #define FEATURECOLLECTIONLAYERFROMPORTAL_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -27,6 +24,8 @@ class MapQuickView;
 class PortalItem;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class FeatureCollectionLayerFromPortal : public QObject
diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro
index 9b75ce231f..0e4211d0d0 100644
--- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro
+++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FeatureCollectionLayerFromPortal
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml
index b3ece8ed60..f547497e01 100644
--- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml
+++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureCollectionLayerFromPortal, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp b/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp
index 445d7b078b..592807ecf9 100644
--- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp
+++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "FeatureCollectionLayerFromPortal.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp
index 572ab3fe78..82f4953f68 100644
--- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp
+++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureCollectionLayerQuery, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureCollectionLayerQuery.h"
 
-// ArcGIS Maps SDK headers
 #include "FeatureCollection.h"
 #include "FeatureCollectionLayer.h"
 #include "FeatureCollectionTable.h"
-#include "FeatureQueryResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "ServiceFeatureTable.h"
 #include "MapTypes.h"
+#include "LayerListModel.h"
 #include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
+#include "FeatureCollectionTable.h"
+#include "FeatureQueryResult.h"
 
-// Qt headers
 #include <QFuture>
 #include <QString>
 #include <QUuid>
diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h
index 1614d561cd..ab0988d068 100644
--- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h
+++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureCollectionLayerQuery, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef FEATURECOLLECTIONLAYERQUERY_H
 #define FEATURECOLLECTIONLAYERQUERY_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
   class ServiceFeatureTable;
 }
 
+#include <QQuickItem>
+
 class FeatureCollectionLayerQuery : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro
index 7a1db756c1..3df71d47ce 100644
--- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro
+++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FeatureCollectionLayerQuery
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml
index 62c919b9b5..2eb84e6ddf 100644
--- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml
+++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureCollectionLayerQuery, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp b/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp
index 7dea43d6e9..316f94ec7d 100644
--- a/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp
+++ b/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FeatureCollectionLayerQuery.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FeatureCollectionLayerQuery.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp
index cdffceeef7..df262dfea9 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp
+++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerRenderingModeMap, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureLayerRenderingModeMap.h"
 
-// ArcGIS Maps SDK headers
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
-#include "LoadSettings.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "Point.h"
 #include "SpatialReference.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "LoadSettings.h"
 
-// Qt headers
 #include <QFuture>
 #include <QString>
 #include <QStringList>
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h
index 3ac1d63a9f..438d6bb419 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h
+++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerRenderingModeMap, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef FEATURELAYERRENDERINGMODEMAP_H
 #define FEATURELAYERRENDERINGMODEMAP_H
 
-// ArcGIS Maps SDK headers
-#include "Viewpoint.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class MapQuickView;
@@ -31,6 +25,9 @@ class Map;
 
 class QTimer;
 
+#include "Viewpoint.h"
+#include <QQuickItem>
+
 class FeatureLayerRenderingModeMap : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro
index 80f4e2a3b2..ef48873702 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro
+++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FeatureLayerRenderingModeMap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml
index 2ea4960ce3..5117cac67c 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml
+++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerRenderingModeMap, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp b/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp
index 747fb78c76..c8608486ed 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp
+++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FeatureLayerRenderingModeMap.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FeatureLayerRenderingModeMap.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp
index 0d5dd9cfcc..aa7c2f5416 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp
+++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerRenderingModeScene, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureLayerRenderingModeScene.h"
 
-// ArcGIS Maps SDK headers
-#include "Camera.h"
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
-#include "LoadSettings.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "LoadSettings.h"
 #include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "Point.h"
 #include "SpatialReference.h"
+#include "Camera.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 
-// Qt headers
 #include <QFuture>
 #include <QString>
 #include <QStringList>
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h
index 46c98ce5f4..bd2d501a60 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h
+++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerRenderingModeScene, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef FEATURELAYERRENDERINGMODESCENE_H
 #define FEATURELAYERRENDERINGMODESCENE_H
 
-// ArcGIS Maps SDK headers
-#include "Camera.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
@@ -31,6 +25,9 @@ class Scene;
 
 class QTimer;
 
+#include "Camera.h"
+#include <QQuickItem>
+
 class FeatureLayerRenderingModeScene : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro
index 171008b454..e3fe5ffd30 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro
+++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FeatureLayerRenderingModeScene
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml
index 5453a343cc..97920e394c 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml
+++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerRenderingModeScene, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp b/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp
index 44901a15ae..677828ae14 100644
--- a/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp
+++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FeatureLayerRenderingModeScene.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FeatureLayerRenderingModeScene.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp
index 8732222171..8be5716f9e 100644
--- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp
+++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Feature_Collection_Layer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,36 +18,33 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Feature_Collection_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "AttributeListModel.h"
-#include "Basemap.h"
+#include "Map.h"
+#include "MapQuickView.h"
+#include "Viewpoint.h"
 #include "Envelope.h"
+#include "Basemap.h"
 #include "Feature.h"
 #include "FeatureCollection.h"
 #include "FeatureCollectionLayer.h"
 #include "FeatureCollectionTable.h"
-#include "FeatureCollectionTableListModel.h"
 #include "Field.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "Point.h"
 #include "PolygonBuilder.h"
 #include "PolylineBuilder.h"
+#include "SpatialReference.h"
+#include "SimpleRenderer.h"
+#include "SimpleMarkerSymbol.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
-#include "SimpleMarkerSymbol.h"
-#include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
 #include "SymbolTypes.h"
-#include "Viewpoint.h"
+#include "LayerListModel.h"
+#include "FeatureCollectionTableListModel.h"
+#include "AttributeListModel.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h
index e4c6d01d37..cb6fb34080 100644
--- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h
+++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Feature_Collection_Layer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef FEATURE_COLLECTION_LAYER_H
 #define FEATURE_COLLECTION_LAYER_H
 
-// ArcGIS Maps SDK headers
-#include "Point.h"
-
-// Qt headers
-#include <QList>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -33,6 +26,10 @@ namespace Esri::ArcGISRuntime
   class FeatureCollectionTable;
 }
 
+#include "Point.h"
+#include <QQuickItem>
+#include <QList>
+
 class Feature_Collection_Layer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro
index 796b18199b..1548e1c50f 100644
--- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro
+++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml
index ffe78991e0..c1c0fdef8c 100644
--- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml
+++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Feature_Collection_Layer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/Feature_Collection_Layer/main.cpp b/CppSamples/Layers/Feature_Collection_Layer/main.cpp
index 8d851aa983..e28bbf1758 100644
--- a/CppSamples/Layers/Feature_Collection_Layer/main.cpp
+++ b/CppSamples/Layers/Feature_Collection_Layer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Feature_Collection_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Feature_Collection_Layer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.cpp b/CppSamples/Layers/GroupLayers/GroupLayers.cpp
index 05c4d417a3..ecd79f748c 100644
--- a/CppSamples/Layers/GroupLayers/GroupLayers.cpp
+++ b/CppSamples/Layers/GroupLayers/GroupLayers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GroupLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GroupLayers.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
-#include "ElevationSourceListModel.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "GroupLayer.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "GroupLayer.h"
+#include "ArcGISSceneLayer.h"
+#include "FeatureLayer.h"
 #include "ServiceFeatureTable.h"
-#include "Surface.h"
 #include "Viewpoint.h"
+#include "Envelope.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.h b/CppSamples/Layers/GroupLayers/GroupLayers.h
index 1b1d86bec5..b8435d6318 100644
--- a/CppSamples/Layers/GroupLayers/GroupLayers.h
+++ b/CppSamples/Layers/GroupLayers/GroupLayers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GroupLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef GROUPLAYERS_H
 #define GROUPLAYERS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -29,6 +26,8 @@ class LayerListModel;
 
 class QAbstractListModel;
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 Q_MOC_INCLUDE("LayerListModel.h")
 
diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.pro b/CppSamples/Layers/GroupLayers/GroupLayers.pro
index 12825dcae6..62ba8e0061 100644
--- a/CppSamples/Layers/GroupLayers/GroupLayers.pro
+++ b/CppSamples/Layers/GroupLayers/GroupLayers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = GroupLayers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.qml b/CppSamples/Layers/GroupLayers/GroupLayers.qml
index 7a3b909a35..113f487764 100644
--- a/CppSamples/Layers/GroupLayers/GroupLayers.qml
+++ b/CppSamples/Layers/GroupLayers/GroupLayers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GroupLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/GroupLayers/main.cpp b/CppSamples/Layers/GroupLayers/main.cpp
index 01d24f34a0..348ce13801 100644
--- a/CppSamples/Layers/GroupLayers/main.cpp
+++ b/CppSamples/Layers/GroupLayers/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "GroupLayers.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml b/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml
index 73327a8553..401d8ca1bd 100644
--- a/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml
+++ b/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Hillshade_Renderer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml b/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml
index f5dfa11731..3fd3d4b759 100644
--- a/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml
+++ b/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Hillshade_Renderer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp
index 2e4e1b1f81..af8fc0c196 100644
--- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp
+++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Hillshade_Renderer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Hillshade_Renderer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "HillshadeRenderer.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "Raster.h"
 #include "RasterLayer.h"
+#include "Basemap.h"
+#include "HillshadeRenderer.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
 #include "RasterTypes.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QUrl>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h
index 3b5d899733..31717fb0c1 100644
--- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h
+++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Hillshade_Renderer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef HILLSHADE_RENDERER_H
 #define HILLSHADE_RENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class MapQuickView;
   class RasterLayer;
 }
 
+#include <QQuickItem>
+
 class Hillshade_Renderer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro
index 51b96a49ad..cc6f1c9530 100644
--- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro
+++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml
index 409fdf6dfa..838155512e 100644
--- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml
+++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Hillshade_Renderer, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/Hillshade_Renderer/main.cpp b/CppSamples/Layers/Hillshade_Renderer/main.cpp
index 536e028424..68a2d00b76 100644
--- a/CppSamples/Layers/Hillshade_Renderer/main.cpp
+++ b/CppSamples/Layers/Hillshade_Renderer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Hillshade_Renderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Hillshade_Renderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp
index 7b30037f65..557fa6018f 100644
--- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp
+++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyKmlFeatures, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "IdentifyKmlFeatures.h"
 
-// ArcGIS Maps SDK headers
 #include "CalloutData.h"
-#include "Envelope.h"
-#include "IdentifyLayerResult.h"
 #include "KmlDataset.h"
 #include "KmlLayer.h"
-#include "KmlPlacemark.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
+#include "LayerListModel.h"
+#include "IdentifyLayerResult.h"
+#include "KmlPlacemark.h"
 #include "SpatialReference.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h
index a71ae6f5d6..3a019fd47a 100644
--- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h
+++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyKmlFeatures, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,8 @@
 #ifndef IDENTIFYKMLFEATURES_H
 #define IDENTIFYKMLFEATURES_H
 
-// ArcGIS Maps SDK headers
 #include "Point.h"
 
-// Qt headers
-#include <QObject>
-#include <QString>
-
 namespace Esri::ArcGISRuntime
 {
 class CalloutData;
@@ -32,6 +27,9 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+#include <QString>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("CalloutData.h")
 
diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro
index a301b74995..d293795a42 100644
--- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro
+++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = IdentifyKmlFeatures
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml
index 1d16b2bbcd..a5eced35c3 100644
--- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml
+++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyKmlFeatures, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/IdentifyKmlFeatures/main.cpp b/CppSamples/Layers/IdentifyKmlFeatures/main.cpp
index b5f1237fbc..e4c961be44 100644
--- a/CppSamples/Layers/IdentifyKmlFeatures/main.cpp
+++ b/CppSamples/Layers/IdentifyKmlFeatures/main.cpp
@@ -1,37 +1,29 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "IdentifyKmlFeatures.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp
index 3030e94755..58c6b11335 100644
--- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp
+++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyRasterCell, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,31 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "IdentifyRasterCell.h"
 
-// ArcGIS Maps SDK headers
-#include "AttributeListModel.h"
 #include "CalloutData.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "Raster.h"
-#include "RasterCell.h"
 #include "RasterLayer.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "RasterCell.h"
+#include "IdentifyLayerResult.h"
+#include "AttributeListModel.h"
+#include "Envelope.h"
 
-// Qt headers
+#include <memory>
 #include <QFuture>
-#include <QStandardPaths>
 #include <QString>
 #include <QUuid>
-
-// STL headers
-#include <memory>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h
index fc305f399b..e7d8cbc40b 100644
--- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h
+++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyRasterCell, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,8 @@
 #ifndef IDENTIFYRASTERCELL_H
 #define IDENTIFYRASTERCELL_H
 
-// ArcGIS Maps SDK headers
 #include "Point.h"
 
-// Qt headers
 #include <QObject>
 
 namespace Esri::ArcGISRuntime
diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro
index a9c8991782..95a24ba7f9 100644
--- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro
+++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = IdentifyRasterCell
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml
index 8ca5bf5cbc..060082c6ae 100644
--- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml
+++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyRasterCell, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/IdentifyRasterCell/main.cpp b/CppSamples/Layers/IdentifyRasterCell/main.cpp
index 6787d33c73..1bc9500e5f 100644
--- a/CppSamples/Layers/IdentifyRasterCell/main.cpp
+++ b/CppSamples/Layers/IdentifyRasterCell/main.cpp
@@ -1,37 +1,29 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "IdentifyRasterCell.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp b/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp
index 0ef1d3ee1b..6d201a5c38 100644
--- a/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp
+++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListKmlContents, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,37 +18,32 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ListKmlContents.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Envelope.h"
-#include "Error.h"
 #include "KmlContainer.h"
 #include "KmlDataset.h"
 #include "KmlLayer.h"
 #include "KmlNetworkLink.h"
 #include "KmlNode.h"
 #include "KmlNodeListModel.h"
-#include "KmlViewpoint.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SpatialReference.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "KmlViewpoint.h"
+#include "Camera.h"
+#include "Envelope.h"
+#include "Point.h"
+#include "SpatialReference.h"
 
-// Qt headers
+#include <algorithm>
 #include <QFuture>
-#include <QStandardPaths>
 #include <QUuid>
-
-// STL headers
-#include <algorithm>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.h b/CppSamples/Layers/ListKmlContents/ListKmlContents.h
index 3c8f198c95..0fc53bf083 100644
--- a/CppSamples/Layers/ListKmlContents/ListKmlContents.h
+++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListKmlContents, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,8 @@
 #ifndef LISTKMLCONTENTS_H
 #define LISTKMLCONTENTS_H
 
-// ArcGIS Maps SDK headers
 #include "Viewpoint.h"
 
-// Qt headers
-#include <QList>
-#include <QObject>
-#include <QStringList>
-
 namespace Esri::ArcGISRuntime
 {
 class KmlDataset;
@@ -34,6 +28,10 @@ class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+#include <QList>
+#include <QStringList>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class ListKmlContents : public QObject
diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.pro b/CppSamples/Layers/ListKmlContents/ListKmlContents.pro
index dd537ce4e9..6f2a9c10ba 100644
--- a/CppSamples/Layers/ListKmlContents/ListKmlContents.pro
+++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ListKmlContents
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.qml b/CppSamples/Layers/ListKmlContents/ListKmlContents.qml
index 2fa85f1a6d..b9a9a803f2 100644
--- a/CppSamples/Layers/ListKmlContents/ListKmlContents.qml
+++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ListKmlContents, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ListKmlContents/main.cpp b/CppSamples/Layers/ListKmlContents/main.cpp
index 4c6e72b57e..ac2b234a45 100644
--- a/CppSamples/Layers/ListKmlContents/main.cpp
+++ b/CppSamples/Layers/ListKmlContents/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ListKmlContents.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp
index 24201d71dd..55f9b58087 100644
--- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp
+++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=LoadWfsXmlQuery, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "LoadWfsXmlQuery.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "FeatureLayer.h"
 #include "WfsFeatureTable.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "GeodatabaseTypes.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h
index 5be7ed28d5..90e6bbb93c 100644
--- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h
+++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=LoadWfsXmlQuery, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef LOADWFSXMLQUERY_H
 #define LOADWFSXMLQUERY_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class LoadWfsXmlQuery : public QObject
diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro
index 61c2a99ca6..0acd1c7d97 100644
--- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro
+++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = LoadWfsXmlQuery
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml
index ce0281f554..f67099dae9 100644
--- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml
+++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=LoadWfsXmlQuery, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/LoadWfsXmlQuery/main.cpp b/CppSamples/Layers/LoadWfsXmlQuery/main.cpp
index 530e18a744..3d932eafc2 100644
--- a/CppSamples/Layers/LoadWfsXmlQuery/main.cpp
+++ b/CppSamples/Layers/LoadWfsXmlQuery/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "LoadWfsXmlQuery.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp
index e40e59b4e6..bc203e538b 100644
--- a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp
+++ b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp
@@ -1,19 +1,16 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DrawOrderLayerListModel.h"
 
 DrawOrderLayerListModel::DrawOrderLayerListModel(QObject* parent):
diff --git a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h
index 81e639cec6..007bc20839 100644
--- a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h
+++ b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h
@@ -1,17 +1,4 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,7 +14,6 @@
 #ifndef DRAWORDERLAYERLISTMODEL_H
 #define DRAWORDERLAYERLISTMODEL_H
 
-// Qt headers
 #include <QSortFilterProxyModel>
 
 class DrawOrderLayerListModel : public QSortFilterProxyModel
diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp
index 4978a9d314..bb82b02827 100644
--- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp
+++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ManageOperationalLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "DrawOrderLayerListModel.h"
 #include "ManageOperationalLayers.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "ArcGISMapImageLayer.h"
+#include "DrawOrderLayerListModel.h"
 #include "MapTypes.h"
+#include "LayerListModel.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h
index bbb7a72329..5a57edc097 100644
--- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h
+++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ManageOperationalLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef MANAGEOPERATIONALLAYERS_H
 #define MANAGEOPERATIONALLAYERS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -31,6 +28,8 @@ class Layer;
 class DrawOrderLayerListModel;
 class QAbstractItemModel;
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("QAbstractItemModel")
 
diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro
index d610030172..7d029153b3 100644
--- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro
+++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ManageOperationalLayers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml
index ef6b8cd15a..96575e6810 100644
--- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml
+++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ManageOperationalLayers, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/ManageOperationalLayers/main.cpp b/CppSamples/Layers/ManageOperationalLayers/main.cpp
index 71cc5a11d2..02fe18a206 100644
--- a/CppSamples/Layers/ManageOperationalLayers/main.cpp
+++ b/CppSamples/Layers/ManageOperationalLayers/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ManageOperationalLayers.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp b/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp
index f6f9fd07d2..7906666360 100644
--- a/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp
+++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OSM_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,15 +18,13 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OSM_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "OpenStreetMapLayer.h"
+#include "Basemap.h"
+#include "LayerListModel.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.h b/CppSamples/Layers/OSM_Layer/OSM_Layer.h
index 556006a993..f4e015d465 100644
--- a/CppSamples/Layers/OSM_Layer/OSM_Layer.h
+++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OSM_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef OSM_LAYER_H
 #define OSM_LAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class OSM_Layer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.pro b/CppSamples/Layers/OSM_Layer/OSM_Layer.pro
index 2620751124..1a8fd49a41 100644
--- a/CppSamples/Layers/OSM_Layer/OSM_Layer.pro
+++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = OSM_Layer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.qml b/CppSamples/Layers/OSM_Layer/OSM_Layer.qml
index c828e69a85..c5133a5bd0 100644
--- a/CppSamples/Layers/OSM_Layer/OSM_Layer.qml
+++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OSM_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/OSM_Layer/main.cpp b/CppSamples/Layers/OSM_Layer/main.cpp
index bea797c84f..080977519d 100644
--- a/CppSamples/Layers/OSM_Layer/main.cpp
+++ b/CppSamples/Layers/OSM_Layer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "OSM_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "OSM_Layer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp
index 0d73d5c99c..4c8f0f4565 100644
--- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp
+++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=PlayAKmlTour, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,25 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "PlayAKmlTour.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "ElevationSourceListModel.h"
-#include "Error.h"
-#include "KmlContainer.h"
-#include "KmlDataset.h"
-#include "KmlLayer.h"
-#include "KmlNodeListModel.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
 #include "KmlTour.h"
 #include "KmlTourController.h"
-#include "LayerListModel.h"
+#include "KmlLayer.h"
+#include "KmlContainer.h"
+#include "KmlNodeListModel.h"
+#include "Error.h"
 #include "MapTypes.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
+#include "LayerListModel.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "KmlDataset.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h
index 98c5010589..dfd714c130 100644
--- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h
+++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=PlayAKmlTour, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef PLAYAKMLTOUR_H
 #define PLAYAKMLTOUR_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -32,6 +29,8 @@ class KmlNode;
 class KmlNodeListModel;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class PlayAKmlTour : public QObject
@@ -65,6 +64,7 @@ class PlayAKmlTour : public QObject
   Esri::ArcGISRuntime::KmlTour* findFirstKMLTour(const QList<Esri::ArcGISRuntime::KmlNode*>& nodes);
   Esri::ArcGISRuntime::KmlTour* findFirstKMLTourFromListModel(const Esri::ArcGISRuntime::KmlNodeListModel& nodes);
 
+
   Esri::ArcGISRuntime::Scene* m_scene = nullptr;
   Esri::ArcGISRuntime::SceneQuickView* m_sceneView = nullptr;
   Esri::ArcGISRuntime::KmlTour* m_kmlTour = nullptr;
diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro
index 69c7b14622..5e42edff23 100644
--- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro
+++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = PlayAKmlTour
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml
index 1c62a0cce5..827800e165 100644
--- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml
+++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=PlayAKmlTour, Category=Layers]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/PlayAKmlTour/main.cpp b/CppSamples/Layers/PlayAKmlTour/main.cpp
index 772bd6d3de..9acf36ff79 100644
--- a/CppSamples/Layers/PlayAKmlTour/main.cpp
+++ b/CppSamples/Layers/PlayAKmlTour/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "PlayAKmlTour.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp
index 8e1365a5a8..01cc254edc 100644
--- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp
+++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=QueryMapImageSublayer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,38 +18,36 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "QueryMapImageSublayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "ArcGISMapImageSublayer.h"
-#include "ArcGISSublayerListModel.h"
 #include "Basemap.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "Feature.h"
-#include "FeatureIterator.h"
-#include "FeatureQueryResult.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
+#include "ArcGISMapImageLayer.h"
+#include "ArcGISMapImageSublayer.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
+#include "QueryParameters.h"
+#include "Graphic.h"
+#include "GraphicsOverlay.h"
+#include "GraphicListModel.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "ArcGISSublayerListModel.h"
+#include "FeatureQueryResult.h"
+#include "FeatureIterator.h"
+#include "Feature.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "Point.h"
+#include "ServiceFeatureTable.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h
index 9272120a55..0295214918 100644
--- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h
+++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=QueryMapImageSublayer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef QUERYMAPIMAGESUBLAYER_H
 #define QUERYMAPIMAGESUBLAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -33,6 +30,8 @@ class Symbol;
 class FeatureQueryResult;
 }
 
+#include <QQuickItem>
+
 class QueryMapImageSublayer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro
index 190bbdb7b3..27b325a954 100644
--- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro
+++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = QueryMapImageSublayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml
index 6139738c67..b4b5329aab 100644
--- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml
+++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=QueryMapImageSublayer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/QueryMapImageSublayer/main.cpp b/CppSamples/Layers/QueryMapImageSublayer/main.cpp
index fca3297f55..e2faaf51d8 100644
--- a/CppSamples/Layers/QueryMapImageSublayer/main.cpp
+++ b/CppSamples/Layers/QueryMapImageSublayer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "QueryMapImageSublayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "QueryMapImageSublayer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp
index 5909918ccc..5b43a19e64 100644
--- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp
+++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Query_OGC, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "QueryOGCAPICQLFilters.h"
 
-// ArcGIS Maps SDK headers
 #include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "OgcFeatureCollectionTable.h"
-#include "QueryParameters.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "LayerListModel.h"
+#include "GeodatabaseTypes.h"
+#include "QueryParameters.h"
 #include "TimeExtent.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QDateTime>
 #include <QFuture>
 
diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h
index 21623801f5..8f35c23bfe 100644
--- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h
+++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=QueryOGCAPICQLFiltersQuery_OGC, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,8 @@
 #ifndef QUERYOGCAPICQLFILTERS_H
 #define QUERYOGCAPICQLFILTERS_H
 
-// ArcGIS Maps SDK headers
 #include "Envelope.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -31,6 +27,8 @@ class MapQuickView;
 class OgcFeatureCollectionTable;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class QueryOGCAPICQLFilters : public QObject
diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro
index 660e8cac48..48727b5ced 100644
--- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro
+++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = QueryOGCAPICQLFilters
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml
index 3114478aa9..314898d974 100644
--- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml
+++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Query_OGC, Category=Layers]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp b/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp
index d665a5c012..3545b73c2a 100644
--- a/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp
+++ b/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "QueryOGCAPICQLFilters.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp
index d7aa3f5bc4..d9efb64886 100644
--- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp
+++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterColormapRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterColormapRenderer.h"
 
-// ArcGIS Maps SDK headers
 #include "ColormapRenderer.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "Raster.h"
 #include "RasterLayer.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
+#include "LayerListModel.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h
index ca06744fe5..a53e78c2f2 100644
--- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h
+++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterColormapRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef COLORMAPRENDERER_H
 #define COLORMAPRENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class ColormapRenderer;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class RasterLayer;
 }
 
+#include <QQuickItem>
+
 class RasterColormapRenderer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro
index defa91ec18..9ca3295cff 100644
--- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro
+++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RasterColormapRenderer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml
index 3a987bcc84..db3ad4131e 100644
--- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml
+++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterColormapRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterColormapRenderer/main.cpp b/CppSamples/Layers/RasterColormapRenderer/main.cpp
index 2b8562e00b..ca0441243e 100644
--- a/CppSamples/Layers/RasterColormapRenderer/main.cpp
+++ b/CppSamples/Layers/RasterColormapRenderer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterColormapRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterColormapRenderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp
index 138ff07168..212a0b2a1d 100644
--- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp
+++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterFunctionFile, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,27 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterFunctionFile.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "Basemap.h"
 #include "Raster.h"
+#include "RasterLayer.h"
 #include "RasterFunction.h"
+#include "Envelope.h"
+#include "MapTypes.h"
+#include "Error.h"
+#include "LayerListModel.h"
 #include "RasterFunctionArguments.h"
-#include "RasterLayer.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFileInfo>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h
index dd5a70118c..d7e5d07d03 100644
--- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h
+++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterFunctionFile, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef RASTERFUNCTIONFILE_H
 #define RASTERFUNCTIONFILE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class RasterFunction;
 }
 
+#include <QQuickItem>
+
 class RasterFunctionFile : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro
index 2e00fb3b95..ac8b19cddf 100644
--- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro
+++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RasterFunctionFile
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml
index 35ecaaf412..26be672876 100644
--- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml
+++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterFunctionFile, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterFunctionFile/main.cpp b/CppSamples/Layers/RasterFunctionFile/main.cpp
index 649d039c85..5e36b537c3 100644
--- a/CppSamples/Layers/RasterFunctionFile/main.cpp
+++ b/CppSamples/Layers/RasterFunctionFile/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterFunctionFile.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterFunctionFile.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp
index 5ed1f3df01..8ed0d2c82f 100644
--- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp
+++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterFunctionService, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,31 +18,28 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterFunctionService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISImageServiceInfo.h"
-#include "Basemap.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "ImageServiceRaster.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "RasterLayer.h"
+#include "Basemap.h"
+#include "ImageServiceRaster.h"
+#include "RasterFunction.h"
+#include "Error.h"
 #include "MapTypes.h"
 #include "MapViewTypes.h"
-#include "Point.h"
-#include "RasterFunction.h"
+#include "LayerListModel.h"
 #include "RasterFunctionArguments.h"
-#include "RasterLayer.h"
+#include "ArcGISImageServiceInfo.h"
+#include "Envelope.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
-// Qt headers
+#include <QtCore/qglobal.h>
 #include <QFile>
 #include <QFuture>
 #include <QStandardPaths>
-#include <QtCore/qglobal.h>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h
index f1dbc59b57..94486421e7 100644
--- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h
+++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterFunctionService, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef RASTERFUNCTIONSERVICE_H
 #define RASTERFUNCTIONSERVICE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Basemap;
@@ -29,6 +26,8 @@ namespace Esri::ArcGISRuntime
   class RasterLayer;
 }
 
+#include <QQuickItem>
+
 class RasterFunctionService : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro
index ac18165a7b..cd067154b6 100644
--- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro
+++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RasterFunctionService
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml
index 03641597f4..d7bf1adb92 100644
--- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml
+++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterFunctionService, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterFunctionService/main.cpp b/CppSamples/Layers/RasterFunctionService/main.cpp
index 83ea8f9d82..3b1d4a4f8c 100644
--- a/CppSamples/Layers/RasterFunctionService/main.cpp
+++ b/CppSamples/Layers/RasterFunctionService/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterFunctionService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterFunctionService.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp
index 700d55f17c..d8aa93a257 100644
--- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp
+++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerFile, Category=Analysis]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,27 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterLayerFile.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Raster.h"
+#include "RasterLayer.h"
+#include "Basemap.h"
+#include "Error.h"
 #include "MapTypes.h"
 #include "MapViewTypes.h"
+#include "LayerListModel.h"
+#include "Envelope.h"
 #include "Point.h"
-#include "Raster.h"
-#include "RasterLayer.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QUrl>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h
index 5ce4a9a5bb..393990c256 100644
--- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h
+++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerFile, Category=Analysis]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef RASTERLAYERFILE_H
 #define RASTERLAYERFILE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class RasterLayerFile : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro
index e5abfa2d1d..f5e401ae37 100644
--- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro
+++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml
index 1190eb7a4e..3abfb805ba 100644
--- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml
+++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerFile, Category=Analysis]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterLayerFile/RasterLoader.qml b/CppSamples/Layers/RasterLayerFile/RasterLoader.qml
index 10dc7dd896..c3f1c88d7a 100644
--- a/CppSamples/Layers/RasterLayerFile/RasterLoader.qml
+++ b/CppSamples/Layers/RasterLayerFile/RasterLoader.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerFile, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterLayerFile/main.cpp b/CppSamples/Layers/RasterLayerFile/main.cpp
index 9522631e54..8c738deddc 100644
--- a/CppSamples/Layers/RasterLayerFile/main.cpp
+++ b/CppSamples/Layers/RasterLayerFile/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterLayerFile.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
 #include <QQmlEngine>
-#include <QQuickView>
+#include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterLayerFile.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp
index 473b897406..6f856d99d7 100644
--- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp
+++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerGeoPackage, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterLayerGeoPackage.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "GeoPackage.h"
-#include "GeoPackageRaster.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
+#include "GeoPackage.h"
+#include "GeoPackageRaster.h"
 #include "RasterLayer.h"
-#include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "SpatialReference.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QUrl>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h
index 366181015d..c228c8213d 100644
--- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h
+++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerGeoPackage, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef RASTERLAYERGEOPACKAGE_H
 #define RASTERLAYERGEOPACKAGE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class RasterLayerGeoPackage : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro
index 2534492da5..80d0c5e4f9 100644
--- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro
+++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RasterLayerGeoPackage
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml
index cb0f1b11b3..2631a7f717 100644
--- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml
+++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerGeoPackage, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterLayerGeoPackage/main.cpp b/CppSamples/Layers/RasterLayerGeoPackage/main.cpp
index 420dcd5652..53044bfc74 100644
--- a/CppSamples/Layers/RasterLayerGeoPackage/main.cpp
+++ b/CppSamples/Layers/RasterLayerGeoPackage/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterLayerGeoPackage.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterLayerGeoPackage.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp b/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp
index 185ff43184..9656af384f 100644
--- a/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp
+++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerService, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterLayerService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledLayer.h"
-#include "Basemap.h"
-#include "Error.h"
-#include "ImageServiceRaster.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "Point.h"
 #include "RasterLayer.h"
+#include "Basemap.h"
+#include "ArcGISTiledLayer.h"
+#include "ImageServiceRaster.h"
+#include "Error.h"
+#include "MapViewTypes.h"
+#include "LayerListModel.h"
 #include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "Point.h"
+#include "MapTypes.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.h b/CppSamples/Layers/RasterLayerService/RasterLayerService.h
index 612005155d..b8ab777032 100644
--- a/CppSamples/Layers/RasterLayerService/RasterLayerService.h
+++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerService, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef RASTERLAYERSERVICE_H
 #define RASTERLAYERSERVICE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Basemap;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class RasterLayer;
 }
 
+#include <QQuickItem>
+
 class RasterLayerService : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.pro b/CppSamples/Layers/RasterLayerService/RasterLayerService.pro
index 32472a06e7..40931bf98e 100644
--- a/CppSamples/Layers/RasterLayerService/RasterLayerService.pro
+++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RasterLayerService
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.qml b/CppSamples/Layers/RasterLayerService/RasterLayerService.qml
index 75ac4616d8..90b32bd128 100644
--- a/CppSamples/Layers/RasterLayerService/RasterLayerService.qml
+++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterLayerService, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterLayerService/main.cpp b/CppSamples/Layers/RasterLayerService/main.cpp
index bf52984065..65d7009cf7 100644
--- a/CppSamples/Layers/RasterLayerService/main.cpp
+++ b/CppSamples/Layers/RasterLayerService/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterLayerService.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterLayerService.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp
index 9a4da2cbff..680a83bf6f 100644
--- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp
+++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterRenderingRule, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterRenderingRule.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISImageServiceInfo.h"
-#include "Basemap.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "ImageServiceRaster.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "RasterLayer.h"
+#include "Basemap.h"
+#include "ImageServiceRaster.h"
 #include "RenderingRule.h"
 #include "RenderingRuleInfo.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
+#include "LayerListModel.h"
+#include "ArcGISImageServiceInfo.h"
+#include "Envelope.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
-#include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonDocument>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h
index 0f91fcb165..4bc9627455 100644
--- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h
+++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterRenderingRule, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef RasterRenderingRule_H
 #define RasterRenderingRule_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Basemap;
@@ -29,6 +26,8 @@ namespace Esri::ArcGISRuntime
   class ImageServiceRaster;
 }
 
+#include <QQuickItem>
+
 class RasterRenderingRule : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro
index bccb86cb16..8e5667ddd6 100644
--- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro
+++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RasterRenderingRule
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml
index c88ad86df3..bc917f63a3 100644
--- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml
+++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterRenderingRule, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterRenderingRule/main.cpp b/CppSamples/Layers/RasterRenderingRule/main.cpp
index c3fe1f2158..7184f81699 100644
--- a/CppSamples/Layers/RasterRenderingRule/main.cpp
+++ b/CppSamples/Layers/RasterRenderingRule/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterRenderingRule.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterRenderingRule.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp
index 913657bbfe..f341f84ed9 100644
--- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp
+++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterRgbRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,21 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterRgbRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapViewTypes.h"
 #include "MinMaxStretchParameters.h"
 #include "PercentClipStretchParameters.h"
-#include "RGBRenderer.h"
 #include "Raster.h"
 #include "RasterLayer.h"
+#include "RGBRenderer.h"
 #include "StandardDeviationStretchParameters.h"
+#include "MapViewTypes.h"
+#include "Basemap.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h
index 05fe55d6c3..06bdef24c2 100644
--- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h
+++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterRgbRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef RGBRENDERER_H
 #define RGBRENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
   class RasterLayer;
 }
 
+#include <QQuickItem>
+
 class RasterRgbRenderer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro
index 15e81006f3..458b45efba 100644
--- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro
+++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RgbRenderer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml
index 6b93a567bd..1a7b871552 100644
--- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml
+++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterRgbRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterRgbRenderer/main.cpp b/CppSamples/Layers/RasterRgbRenderer/main.cpp
index 2d7d66345f..2b5ae3fe65 100644
--- a/CppSamples/Layers/RasterRgbRenderer/main.cpp
+++ b/CppSamples/Layers/RasterRgbRenderer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterRgbRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterRgbRenderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml b/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml
index abcab43e67..2ba81324f9 100644
--- a/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml
+++ b/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterRgbRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp
index fa4d2bae5c..738ec6d760 100644
--- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp
+++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterStretchRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,21 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RasterStretchRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapViewTypes.h"
 #include "MinMaxStretchParameters.h"
 #include "PercentClipStretchParameters.h"
 #include "Raster.h"
 #include "RasterLayer.h"
-#include "StandardDeviationStretchParameters.h"
 #include "StretchRenderer.h"
+#include "StandardDeviationStretchParameters.h"
+#include "MapViewTypes.h"
+#include "Basemap.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h
index f8e3c033ba..107ea0dec4 100644
--- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h
+++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterStretchRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef STRETCHRENDERER_H
 #define STRETCHRENDERER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
   class RasterLayer;
 }
 
+#include <QQuickItem>
+
 class RasterStretchRenderer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro
index 655212b1b6..b099b3d6ad 100644
--- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro
+++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RasterStretchRenderer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml
index 166a61b46c..eed1bc3471 100644
--- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml
+++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RasterStretchRenderer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/RasterStretchRenderer/main.cpp b/CppSamples/Layers/RasterStretchRenderer/main.cpp
index e1acf959f3..adc40671c7 100644
--- a/CppSamples/Layers/RasterStretchRenderer/main.cpp
+++ b/CppSamples/Layers/RasterStretchRenderer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "RasterStretchRenderer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "RasterStretchRenderer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp
index dec9addb69..bd5d0a26ae 100644
--- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp
+++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=StyleWmsLayer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "StyleWmsLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "SpatialReference.h"
 #include "WmsLayer.h"
-#include "WmsLayerInfo.h"
 #include "WmsSublayer.h"
+#include "WmsLayerInfo.h"
+#include "Error.h"
+#include "LayerListModel.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h
index 5119f94168..04a1c66eff 100644
--- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h
+++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=StyleWmsLayer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef STYLEWMSLAYER_H
 #define STYLEWMSLAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -27,6 +24,8 @@ class MapQuickView;
 class WmsSublayer;
 }
 
+#include <QQuickItem>
+
 class StyleWmsLayer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro
index 9b65325a5d..8df91c47e2 100644
--- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro
+++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = StyleWmsLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml
index 1835dd59b5..163c206b21 100644
--- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml
+++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=StyleWmsLayer, Category=Layers]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/StyleWmsLayer/main.cpp b/CppSamples/Layers/StyleWmsLayer/main.cpp
index b864fd5a01..0ba11fbbb4 100644
--- a/CppSamples/Layers/StyleWmsLayer/main.cpp
+++ b/CppSamples/Layers/StyleWmsLayer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "StyleWmsLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "StyleWmsLayer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp
index 73d31f7bca..4d8ea3fcef 100644
--- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp
+++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=TileCacheLayer, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,13 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "TileCacheLayer.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledLayer.h"
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "TileCache.h"
+#include "Basemap.h"
 
-// Qt headers
 #include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h
index 6a55af9cc6..a526a4da66 100644
--- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h
+++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=TileCacheLayer, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef TILECACHELAYER_H
 #define TILECACHELAYER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class TileCacheLayer : public QObject
diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro
index 852c698977..084f59fb10 100644
--- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro
+++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = TileCacheLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml
index 08e91681d3..211af4f392 100644
--- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml
+++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=TileCacheLayer, Category=Layers]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/TileCacheLayer/main.cpp b/CppSamples/Layers/TileCacheLayer/main.cpp
index da646b0e9e..90949f3a88 100644
--- a/CppSamples/Layers/TileCacheLayer/main.cpp
+++ b/CppSamples/Layers/TileCacheLayer/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "TileCacheLayer.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp
index 32cd9c89f9..53f7671d54 100644
--- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp
+++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=VectorTiledLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "VectorTiledLayerUrl.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISVectorTiledLayer.h"
-#include "Basemap.h"
+#include <QUrl>
+
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "Basemap.h"
+#include "ArcGISVectorTiledLayer.h"
 #include "Point.h"
-#include "SpatialReference.h"
 #include "Viewpoint.h"
-
-// Qt headers
-#include <QUrl>
+#include "MapTypes.h"
+#include "SpatialReference.h"
 
 using namespace Esri::ArcGISRuntime;
 
@@ -92,3 +89,4 @@ void VectorTiledLayerUrl::changeBasemap(const QString& basemap)
     m_map->setBasemap(basemap);
   }
 }
+
diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h
index 3b9304691e..a62d483873 100644
--- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h
+++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=VectorTiledLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef VECTOR_TILED_LAYER_URL
 #define VECTOR_TILED_LAYER_URL
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class VectorTiledLayerUrl : public QQuickItem
 {
   Q_OBJECT
@@ -44,3 +43,4 @@ class VectorTiledLayerUrl : public QQuickItem
 };
 
 #endif // VECTOR_TILED_LAYER_URL
+
diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro
index 202cf7d32c..bd53c83ea6 100644
--- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro
+++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml
index 37a16b679c..c467eda955 100644
--- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml
+++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=VectorTiledLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/VectorTiledLayerUrl/main.cpp b/CppSamples/Layers/VectorTiledLayerUrl/main.cpp
index d93feb10f2..046ab8eb00 100644
--- a/CppSamples/Layers/VectorTiledLayerUrl/main.cpp
+++ b/CppSamples/Layers/VectorTiledLayerUrl/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "VectorTiledLayerUrl.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "VectorTiledLayerUrl.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp
index 6bc9640db9..0308b0ee22 100644
--- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp
+++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=WMTS_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +18,16 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "WMTS_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Error.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "WmtsLayer.h"
-#include "WmtsLayerInfo.h"
 #include "WmtsService.h"
 #include "WmtsServiceInfo.h"
+#include "WmtsLayerInfo.h"
+#include "Basemap.h"
+#include "Error.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h
index 5c8cfded9f..3323cc0598 100644
--- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h
+++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=WMTS_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef WMTS_LAYER_H
 #define WMTS_LAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class MapQuickView;
   class WmtsService;
 }
 
+#include <QQuickItem>
+
 class WMTS_Layer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro
index 2cbb43ec91..0b37f99146 100644
--- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro
+++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = WMTS_Layer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml
index 3e9c3e6a8a..69e4902a0d 100644
--- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml
+++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=WMTS_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/WMTS_Layer/main.cpp b/CppSamples/Layers/WMTS_Layer/main.cpp
index d957c6c357..4abb824152 100644
--- a/CppSamples/Layers/WMTS_Layer/main.cpp
+++ b/CppSamples/Layers/WMTS_Layer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "WMTS_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "WMTS_Layer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp
index 42434882b2..1dc245394f 100644
--- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp
+++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Web_Tiled_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,16 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Web_Tiled_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Basemap.h"
+#include "WebTiledLayer.h"
+#include "Viewpoint.h"
 #include "Point.h"
 #include "SpatialReference.h"
-#include "Viewpoint.h"
-#include "WebTiledLayer.h"
 
-// Qt headers
 #include <QStringList>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h
index 7959078f39..9bb4817093 100644
--- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h
+++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Web_Tiled_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef WEB_TILED_LAYER_H
 #define WEB_TILED_LAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class Web_Tiled_Layer : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro
index fcd3aa85da..f08274eafb 100644
--- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro
+++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = Web_Tiled_Layer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml
index 3951fa46a0..455a136143 100644
--- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml
+++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Web_Tiled_Layer, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/Web_Tiled_Layer/main.cpp b/CppSamples/Layers/Web_Tiled_Layer/main.cpp
index ac90237920..661a40da10 100644
--- a/CppSamples/Layers/Web_Tiled_Layer/main.cpp
+++ b/CppSamples/Layers/Web_Tiled_Layer/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Web_Tiled_Layer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Web_Tiled_Layer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp
index ff7a3d86fd..c4a39f8330 100644
--- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp
+++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=WmsLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "WmsLayerUrl.h"
 
-// ArcGIS Maps SDK headers
 #include "Envelope.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "WmsLayer.h"
 #include "MapTypes.h"
+#include "LayerListModel.h"
 #include "SpatialReference.h"
-#include "WmsLayer.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStringList>
 #include <QUrl>
+#include <QStringList>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h
index be3d5bdcf9..796b4e8581 100644
--- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h
+++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=WmsLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef WMSLAYERURL_H
 #define WMSLAYERURL_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class WmsLayerUrl : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro
index c2bb84edad..2b6efdee4a 100644
--- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro
+++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = WmsLayerUrl
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml
index 017dfd5f50..46555dd8d1 100644
--- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml
+++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=WmsLayerUrl, Category=Layers]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Layers/WmsLayerUrl/main.cpp b/CppSamples/Layers/WmsLayerUrl/main.cpp
index 016a1c26db..a70f9024c5 100644
--- a/CppSamples/Layers/WmsLayerUrl/main.cpp
+++ b/CppSamples/Layers/WmsLayerUrl/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "WmsLayerUrl.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "WmsLayerUrl.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp
index a13ad7b749..45587d9a42 100644
--- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp
+++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,29 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "LocalServerFeatureLayer.h"
 
-// ArcGIS Maps SDK headers
 #include "Basemap.h"
 #include "Envelope.h"
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
-#include "LocalFeatureService.h"
-#include "LocalServer.h"
-#include "LocalServerTypes.h"
-#include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
+#include "Map.h"
+#include "LocalServer.h"
+#include "LocalFeatureService.h"
 #include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
 #include "Viewpoint.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "LocalServerTypes.h"
+#include "LayerListModel.h"
 
-// Qt headers
 #include <QDir>
-#include <QFile>
 #include <QFuture>
 #include <QTemporaryDir>
+#include <QFile>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h
index bd2c511a77..18322e1553 100644
--- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h
+++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef LOCAL_SERVER_FEATURELAYER_H
 #define LOCAL_SERVER_FEATURELAYER_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QStringListModel>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -32,6 +28,9 @@ namespace Esri::ArcGISRuntime
 
 class QTemporaryDir;
 
+#include <QQuickItem>
+#include <QStringListModel>
+
 class LocalServerFeatureLayer : public QQuickItem
 {
   Q_OBJECT
@@ -56,3 +55,4 @@ class LocalServerFeatureLayer : public QQuickItem
 };
 
 #endif // LOCAL_SERVER_FEATURELAYER_H
+
diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro
index e3a06af9df..88888d7846 100644
--- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro
+++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml
index 0eb7877965..54df777432 100644
--- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml
+++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp b/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp
index cd9e1f791d..43a44cfdea 100644
--- a/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp
+++ b/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "LocalServerFeatureLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "LocalServerFeatureLayer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp
index c556678bd0..d45cc5d8cb 100644
--- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp
+++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerGeoprocessing, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,33 +18,30 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "LocalServerGeoprocessing.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "ArcGISTiledLayer.h"
 #include "Basemap.h"
 #include "Envelope.h"
-#include "GeoprocessingDouble.h"
+#include "MapQuickView.h"
+#include "Map.h"
+#include "LocalServer.h"
+#include "Viewpoint.h"
+#include "TileCache.h"
+#include "LocalGeoprocessingService.h"
+#include "ArcGISTiledLayer.h"
+#include "GeoprocessingTask.h"
 #include "GeoprocessingJob.h"
 #include "GeoprocessingParameter.h"
 #include "GeoprocessingParameters.h"
-#include "GeoprocessingTask.h"
-#include "GeoprocessingTypes.h"
+#include "GeoprocessingDouble.h"
+#include "ArcGISMapImageLayer.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
 #include "LayerListModel.h"
-#include "LocalGeoprocessingService.h"
-#include "LocalServer.h"
 #include "LocalServerTypes.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "TaskTypes.h"
-#include "TileCache.h"
-#include "Viewpoint.h"
+#include "GeoprocessingTypes.h"
 
-// Qt headers
 #include <QDir>
 #include <QFuture>
 #include <QTemporaryDir>
diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h
index 7ada8b0814..33101a6260 100644
--- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h
+++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerGeoprocessing, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef LOCAL_SERVER_GEOPROCESSING_H
 #define LOCAL_SERVER_GEOPROCESSING_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QStringListModel>
-
-// STL headers
-#include <memory>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -36,6 +29,10 @@ class GeoprocessingTask;
 
 class QTemporaryDir;
 
+#include <memory>
+#include <QQuickItem>
+#include <QStringListModel>
+
 class LocalServerGeoprocessing : public QQuickItem
 {
   Q_OBJECT
@@ -70,3 +67,4 @@ class LocalServerGeoprocessing : public QQuickItem
 };
 
 #endif // LOCAL_SERVER_GEOPROCESSING_H
+
diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro
index 84e0ecc425..8b70a05170 100644
--- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro
+++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml
index 0a4ad991d9..f3205e8bc0 100644
--- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml
+++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp b/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp
index 6a00ce8a06..3ff60f8fe7 100644
--- a/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp
+++ b/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "LocalServerGeoprocessing.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "LocalServerGeoprocessing.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp
index d85843b0c1..26d9ab06d0 100644
--- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp
+++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerMapImageLayer, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,21 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "LocalServerMapImageLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
 #include "Basemap.h"
 #include "Envelope.h"
-#include "LayerListModel.h"
-#include "LocalMapService.h"
-#include "LocalServer.h"
-#include "LocalServerTypes.h"
-#include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
+#include "Map.h"
+#include "LocalServer.h"
+#include "LocalMapService.h"
+#include "ArcGISMapImageLayer.h"
 #include "Viewpoint.h"
+#include "MapViewTypes.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "LocalServerTypes.h"
 
-// Qt headers
 #include <QDir>
 #include <QFuture>
 #include <QTemporaryDir>
diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h
index de4edecf34..b639b6ad9b 100644
--- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h
+++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerMapImageLayer, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef LOCAL_SERVER_MAPIMAGELAYER_H
 #define LOCAL_SERVER_MAPIMAGELAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -30,6 +27,8 @@ namespace Esri::ArcGISRuntime
 
 class QTemporaryDir;
 
+#include <QQuickItem>
+
 class LocalServerMapImageLayer : public QQuickItem
 {
   Q_OBJECT
@@ -53,3 +52,4 @@ class LocalServerMapImageLayer : public QQuickItem
 };
 
 #endif // LOCAL_SERVER_MAPIMAGELAYER_H
+
diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro
index aba5d2b82f..ee75781df1 100644
--- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro
+++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml
index 849ce41c28..642f73d651 100644
--- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml
+++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerMapImageLayer, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp b/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp
index 1e4c12a21b..9c38de33fb 100644
--- a/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp
+++ b/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "LocalServerMapImageLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "LocalServerMapImageLayer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp
index 1fed682892..d1e3811fa8 100644
--- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp
+++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerServices, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "LocalServerServices.h"
 
-// ArcGIS Maps SDK headers
+#include "LocalServer.h"
+#include "LocalMapService.h"
 #include "LocalFeatureService.h"
 #include "LocalGeoprocessingService.h"
-#include "LocalMapService.h"
-#include "LocalServer.h"
 #include "LocalServerTypes.h"
 
-// Qt headers
 #include <QDesktopServices>
 #include <QDir>
 #include <QTemporaryDir>
diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h
index c5697baaaa..b386e16769 100644
--- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h
+++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerServices, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef LOCAL_SERVER_SERVICES_H
 #define LOCAL_SERVER_SERVICES_H
 
-// Qt headers
-#include <QQuickItem>
-
-// STL headers
-#include <memory>
-
 namespace Esri::ArcGISRuntime
 {
   class LocalServer;
@@ -34,6 +28,9 @@ namespace Esri::ArcGISRuntime
 
 class QTemporaryDir;
 
+#include <memory>
+#include <QQuickItem>
+
 class LocalServerServices : public QQuickItem
 {
   Q_OBJECT
@@ -84,3 +81,4 @@ class LocalServerServices : public QQuickItem
 };
 
 #endif // LOCAL_SERVER_SERVICES_H
+
diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro
index c84b62cbc7..24f2984d62 100644
--- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro
+++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml
index 6c14ae178d..f3729b74a1 100644
--- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml
+++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=LocalServerServices, Category=LocalServer]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/LocalServer/LocalServerServices/main.cpp b/CppSamples/LocalServer/LocalServerServices/main.cpp
index 6f1d3e90a5..37664840fa 100644
--- a/CppSamples/LocalServer/LocalServerServices/main.cpp
+++ b/CppSamples/LocalServer/LocalServerServices/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
-#include "LocalServerServices.h"
-
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
+#include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "LocalServerServices.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp
index a48473c5a9..8d470ed2e4 100644
--- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp
+++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyScheduledMapUpdates, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ApplyScheduledMapUpdates.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MobileMapPackage.h"
-#include "OfflineMapSyncJob.h"
-#include "OfflineMapSyncParameters.h"
-#include "OfflineMapSyncResult.h"
 #include "OfflineMapSyncTask.h"
-#include "OfflineMapTypes.h"
 #include "OfflineMapUpdatesInfo.h"
+#include "OfflineMapSyncParameters.h"
+#include "OfflineMapSyncJob.h"
+#include "Error.h"
+#include "OfflineMapUpdatesInfo.h"
+#include "OfflineMapTypes.h"
+#include "OfflineMapSyncResult.h"
 
-// Qt headers
 #include <QFile>
 #include <QFileInfo>
 #include <QFuture>
-#include <QStandardPaths>
-#include <QUuid>
 #include <QtCore/qglobal.h>
+#include <QUuid>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h
index 63ee08b4ca..4a33699190 100644
--- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h
+++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyScheduledMapUpdates, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef APPLYSCHEDULEDMAPUPDATES_H
 #define APPLYSCHEDULEDMAPUPDATES_H
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-
-// Qt headers
-#include <QObject>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -33,6 +26,11 @@ class OfflineMapSyncTask;
 class OfflineMapSyncJob;
 }
 
+#include <QObject>
+#include <QTemporaryDir>
+
+#include "Error.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ApplyScheduledMapUpdates : public QObject
diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro
index 87e5507205..859719a8a2 100644
--- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro
+++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ApplyScheduledMapUpdates
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml
index 50c2293d7e..bc61f015dd 100644
--- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml
+++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ApplyScheduledMapUpdates, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp b/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp
index 32c7843184..acd0a3c4f3 100644
--- a/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp
+++ b/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ApplyScheduledMapUpdates.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp
index bc8e5a4801..476ba0cc68 100644
--- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp
+++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseBuildingFloors, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,15 +18,13 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "BrowseBuildingFloors.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
 #include "FloorLevel.h"
 #include "FloorManager.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Error.h"
 #include "MapTypes.h"
 #include "Portal.h"
 #include "PortalItem.h"
diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h
index dbed2b12b4..a33784f01e 100644
--- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h
+++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseBuildingFloors, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef BROWSEBUILDINGFLOORS_H
 #define BROWSEBUILDINGFLOORS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -28,6 +25,8 @@ class FloorManager;
 class FloorLevel;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class BrowseBuildingFloors : public QObject
diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro
index 94a7749d8d..b7fed5871e 100644
--- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro
+++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = BrowseBuildingFloors
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml
index f478d4507e..1527582a80 100644
--- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml
+++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BrowseBuildingFloors, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/BrowseBuildingFloors/main.cpp b/CppSamples/Maps/BrowseBuildingFloors/main.cpp
index 8528fdbb11..7f7ecb05aa 100644
--- a/CppSamples/Maps/BrowseBuildingFloors/main.cpp
+++ b/CppSamples/Maps/BrowseBuildingFloors/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "BrowseBuildingFloors.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp
index 55b94d2bc6..8957b63022 100644
--- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp
+++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeBasemap, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ChangeBasemap.h"
 
-// ArcGIS Maps SDK headers
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
@@ -32,6 +30,7 @@ ChangeBasemap::ChangeBasemap(QObject* parent /* = nullptr */):
   QObject(parent),
   m_map(new Map(BasemapStyle::ArcGISTopographic, this))
 {
+
 }
 
 ChangeBasemap::~ChangeBasemap() = default;
diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h
index ff4221d4c6..d1dd3fa943 100644
--- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h
+++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeBasemap, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef CHANGEBASEMAP_H
 #define CHANGEBASEMAP_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ChangeBasemap : public QObject
diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro
index 2b26fc2ff2..fe0c77db69 100644
--- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro
+++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ChangeBasemap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml
index 3aadd37eff..eb835639a4 100644
--- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml
+++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeBasemap, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ChangeBasemap/main.cpp b/CppSamples/Maps/ChangeBasemap/main.cpp
index c659e60822..ecf84be3e3 100644
--- a/CppSamples/Maps/ChangeBasemap/main.cpp
+++ b/CppSamples/Maps/ChangeBasemap/main.cpp
@@ -1,34 +1,26 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ChangeBasemap.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp
index ee72815534..d91e7e79cd 100644
--- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp
+++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeViewpoint, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ChangeViewpoint.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
+#include "Basemap.h"
 #include "Point.h"
 #include "SpatialReference.h"
+#include "Envelope.h"
 #include "Viewpoint.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h
index d5f65b80d4..494325e556 100644
--- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h
+++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeViewpoint, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef CHANGE_VIEWPOINT_H
 #define CHANGE_VIEWPOINT_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ChangeViewpoint : public QQuickItem
diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro
index 255f5d3258..52ea74f3c1 100644
--- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro
+++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml
index c4f1717709..8836a7d56e 100644
--- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml
+++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeViewpoint, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ChangeViewpoint/main.cpp b/CppSamples/Maps/ChangeViewpoint/main.cpp
index 405849345c..55fb408b8e 100644
--- a/CppSamples/Maps/ChangeViewpoint/main.cpp
+++ b/CppSamples/Maps/ChangeViewpoint/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ChangeViewpoint.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ChangeViewpoint.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp
index 2caa9efc69..7fdfc8ea22 100644
--- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp
+++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureBasemapStyleLanguage, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,12 +18,9 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "ConfigureBasemapStyleLanguage.h"
-
-// ArcGIS Maps SDK headers
 #include "Basemap.h"
 #include "BasemapStyleParameters.h"
+#include "ConfigureBasemapStyleLanguage.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
@@ -31,7 +28,6 @@
 #include "SpatialReference.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h
index 20f141221e..837f471cdb 100644
--- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h
+++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureBasemapStyleLanguage, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef CONFIGUREBASEMAPSTYLELANGUAGE_H
 #define CONFIGUREBASEMAPSTYLELANGUAGE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime {
   class Basemap;
   class BasemapStyleParameters;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime {
   class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class ConfigureBasemapStyleLanguage : public QObject
diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro
index 8acd2149a3..13f4557a6e 100644
--- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro
+++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ConfigureBasemapStyleLanguage
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml
index aa03e686ad..c408bb8913 100644
--- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml
+++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureBasemapStyleLanguage, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp b/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp
index 7dbb0f4e5e..504204efa7 100644
--- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp
+++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ConfigureBasemapStyleLanguage.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp
index 4577637657..4b3dd2a468 100644
--- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp
+++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndSaveMap, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateAndSaveMap.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "Basemap.h"
-#include "Error.h"
 #include "ErrorException.h"
-#include "Item.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "Basemap.h"
+#include "ArcGISMapImageLayer.h"
 #include "Portal.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "Error.h"
+#include "Item.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h
index 06b1426f9d..31692b1859 100644
--- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h
+++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndSaveMap, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef CREATEANDSAVEMAP_H
 #define CREATEANDSAVEMAP_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -27,6 +24,8 @@ class MapQuickView;
 class Portal;
 }
 
+#include <QQuickItem>
+
 class CreateAndSaveMap : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro
index 9d91d18e04..0ebb55b5c3 100644
--- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro
+++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateAndSaveMap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml
index fd9029b59a..974e7917b2 100644
--- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml
+++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateAndSaveMap, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/CreateAndSaveMap/main.cpp b/CppSamples/Maps/CreateAndSaveMap/main.cpp
index a05baee5ce..381ac7d45f 100644
--- a/CppSamples/Maps/CreateAndSaveMap/main.cpp
+++ b/CppSamples/Maps/CreateAndSaveMap/main.cpp
@@ -1,24 +1,21 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
 #ifdef QT_WEBVIEW_WEBENGINE_BACKEND
 #include <QtWebEngineQuick>
diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp
index 091c76b259..a00f171930 100644
--- a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp
+++ b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,10 +14,8 @@
 // limitations under the License.
 // [Legal]
 
-// sample headers
 #include "BasemapStyleListModel.h"
 
-// ArcGIS Maps SDK headers
 #include "BasemapStyleInfo.h"
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h
index 6eeeecd564..6fe25fc157 100644
--- a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h
+++ b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
 #ifndef BASEMAPSTYLELISTMODEL_H
 #define BASEMAPSTYLELISTMODEL_H
 
-// Qt headers
 #include <QAbstractListModel>
 #include <QObject>
 #include <QUrl>
diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp
index 46243ca0b2..a5da025bef 100644
--- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp
+++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,14 +18,12 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "BasemapStyleListModel.h"
 #include "CreateDynamicBasemapGallery.h"
 
-// ArcGIS Maps SDK headers
 #include "Basemap.h"
 #include "BasemapStyleInfo.h"
 #include "BasemapStyleLanguageInfo.h"
+#include "BasemapStyleListModel.h"
 #include "BasemapStyleParameters.h"
 #include "BasemapStylesService.h"
 #include "BasemapStylesServiceInfo.h"
@@ -36,7 +34,6 @@
 #include "Viewpoint.h"
 #include "Worldview.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h
index 493d6bdcb3..f95ec6dcea 100644
--- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h
+++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,14 @@
 #ifndef CREATEDYNAMICBASEMAPGALLERY_H
 #define CREATEDYNAMICBASEMAPGALLERY_H
 
-// Qt headers
 #include <QAbstractListModel>
 #include <QMap>
 #include <QObject>
 #include <QUrl>
 
 Q_MOC_INCLUDE("MapQuickView.h")
+Q_MOC_INCLUDE("BasemapStyleInfo.h")
+Q_MOC_INCLUDE("BasemapStyleListModel.h")
 
 class BasemapStyleListModel;
 class QAbstractListModel;
diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro
index cdd1e27a56..745827ded9 100644
--- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro
+++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateDynamicBasemapGallery
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml
index da2290023a..c164e8c354 100644
--- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml
+++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp b/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp
index 09e5993ad5..06f9ba19b6 100644
--- a/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp
+++ b/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateDynamicBasemapGallery.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp
index a151355d70..e5c6b3c581 100644
--- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp
+++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDeviceLocation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayDeviceLocation.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "LocationDisplay.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Basemap.h"
 #include "MapTypes.h"
 #include "MapViewTypes.h"
+#include "LocationDisplay.h"
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID)
 #define PERMISSIONS_PLATFORM
diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h
index bf8fe286da..f204fcb10f 100644
--- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h
+++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDeviceLocation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef DISPLAY_DEVICE_LOCATION_H
 #define DISPLAY_DEVICE_LOCATION_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class DisplayDeviceLocation : public QQuickItem
 {
   Q_OBJECT
@@ -77,3 +76,4 @@ class DisplayDeviceLocation : public QQuickItem
 };
 
 #endif // DISPLAY_DEVICE_LOCATION_H
+
diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro
index 7c7c4dfb09..5258999645 100644
--- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro
+++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml
index 46915161a1..428d34e2fa 100644
--- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml
+++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDeviceLocation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/DisplayDeviceLocation/main.cpp b/CppSamples/Maps/DisplayDeviceLocation/main.cpp
index 32e56af451..8f210b1212 100644
--- a/CppSamples/Maps/DisplayDeviceLocation/main.cpp
+++ b/CppSamples/Maps/DisplayDeviceLocation/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DisplayDeviceLocation.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DisplayDeviceLocation.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp
index 18251adbd0..11364e221a 100644
--- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp
+++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDeviceLocationWithNmeaDataSources, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayDeviceLocationWithNmeaDataSources.h"
 
-// ArcGIS Maps SDK headers
-#include "LocationDisplay.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "NmeaLocationDataSource.h"
 #include "MapTypes.h"
 #include "MapViewTypes.h"
-#include "NmeaLocationDataSource.h"
-#include "Point.h"
+#include "LocationDisplay.h"
 #include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFile>
 #include <QFuture>
 #include <QTimer>
@@ -158,3 +155,4 @@ bool DisplayDeviceLocationWithNmeaDataSources::loadMockDataFile(const QString& f
   mockDataFile.close();
   return true;
 }
+
diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h
index 72b63f5215..782b10903d 100644
--- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h
+++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDeviceLocationWithNmeaDataSources, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef DISPLAYDEVICELOCATIONWITHNMEADATASOURCES_H
 #define DISPLAYDEVICELOCATIONWITHNMEADATASOURCES_H
 
-// Qt headers
-#include <QByteArray>
-#include <QFile>
-#include <QObject>
-#include <QTimer>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -30,6 +24,11 @@ class MapQuickView;
 class NmeaLocationDataSource;
 }
 
+#include <QObject>
+#include <QByteArray>
+#include <QFile>
+#include <QTimer>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayDeviceLocationWithNmeaDataSources : public QObject
diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml
index 46cdef15ac..dfc7ff4807 100644
--- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml
+++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDeviceLocationWithNmeaDataSources, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro
index 935dfae861..cfbbea0cc5 100644
--- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro
+++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayDeviceLocationWithNmeaDataSources
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp
index 8747e3e86a..688e1e9de3 100644
--- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp
+++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayDeviceLocationWithNmeaDataSources.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp
index 597bf3616b..7e2eefa87d 100644
--- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp
+++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDrawingStatus, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,22 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayDrawingStatus.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "FeatureLayer.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "FeatureLayer.h"
+#include "ServiceFeatureTable.h"
 #include "MapTypes.h"
 #include "MapViewTypes.h"
-#include "ServiceFeatureTable.h"
+#include "LayerListModel.h"
 #include "SpatialReference.h"
+#include "Envelope.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h
index c27ed46a82..c1c936a6cf 100644
--- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h
+++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDrawingStatus, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISPLAYDRAWINGSTATUS_H
 #define DISPLAYDRAWINGSTATUS_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
   class FeatureLayer;
 }
 
+#include <QQuickItem>
+
 class DisplayDrawingStatus : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro
index 3925cced10..85f0bcd8e5 100644
--- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro
+++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml
index 918b392bf5..e5f20708fa 100644
--- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml
+++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayDrawingStatus, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/DisplayDrawingStatus/main.cpp b/CppSamples/Maps/DisplayDrawingStatus/main.cpp
index 527c156c6f..84c6e53609 100644
--- a/CppSamples/Maps/DisplayDrawingStatus/main.cpp
+++ b/CppSamples/Maps/DisplayDrawingStatus/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DisplayDrawingStatus.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DisplayDrawingStatus.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp
index 9e0cc068ec..16f7b0ce9f 100644
--- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp
+++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayLayerViewDrawState, Category=Maps]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,24 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayLayerViewDrawState.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
 #include "FeatureLayer.h"
-#include "LayerListModel.h"
-#include "LayerViewState.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "PortalItem.h"
+#include "Viewpoint.h"
 #include "Point.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
 #include "Portal.h"
-#include "PortalItem.h"
+#include "LayerViewState.h"
 #include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h
index 95d9200489..c68ca774b2 100644
--- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h
+++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayLayerViewDrawState, Category=Maps]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISPLAYLAYERVIEWDRAWSTATE_H
 #define DISPLAYLAYERVIEWDRAWSTATE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -30,6 +27,8 @@ class Layer;
 class LayerViewState;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayLayerViewDrawState : public QObject
diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro
index 6f0837611d..f26c9553ed 100644
--- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro
+++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayLayerViewDrawState
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml
index f9d4148906..33755bc475 100644
--- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml
+++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayLayerViewDrawState, Category=Maps]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp b/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp
index 36e08c056c..492691503c 100644
--- a/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp
+++ b/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp
@@ -1,37 +1,29 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayLayerViewDrawState.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.cpp b/CppSamples/Maps/DisplayMap/DisplayMap.cpp
index d455647f38..7c927e3ad2 100644
--- a/CppSamples/Maps/DisplayMap/DisplayMap.cpp
+++ b/CppSamples/Maps/DisplayMap/DisplayMap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayMap, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayMap.h"
 
-// ArcGIS Maps SDK headers
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.h b/CppSamples/Maps/DisplayMap/DisplayMap.h
index 4d25445e85..5d8c6a9a01 100644
--- a/CppSamples/Maps/DisplayMap/DisplayMap.h
+++ b/CppSamples/Maps/DisplayMap/DisplayMap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayMap, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef DISPLAYMAP_H
 #define DISPLAYMAP_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class DisplayMap : public QObject
diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.pro b/CppSamples/Maps/DisplayMap/DisplayMap.pro
index 3049579558..ccd9d9af0a 100644
--- a/CppSamples/Maps/DisplayMap/DisplayMap.pro
+++ b/CppSamples/Maps/DisplayMap/DisplayMap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayMap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.qml b/CppSamples/Maps/DisplayMap/DisplayMap.qml
index db53c93123..93c971a8c4 100644
--- a/CppSamples/Maps/DisplayMap/DisplayMap.qml
+++ b/CppSamples/Maps/DisplayMap/DisplayMap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayMap, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/DisplayMap/main.cpp b/CppSamples/Maps/DisplayMap/main.cpp
index f2a1a80c5d..eb6dc942eb 100644
--- a/CppSamples/Maps/DisplayMap/main.cpp
+++ b/CppSamples/Maps/DisplayMap/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayMap.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp
index c976e6367e..192d24a999 100644
--- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp
+++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayOverviewMap, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayOverviewMap.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "FeatureLayer.h"
-#include "GeodatabaseTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "ServiceFeatureTable.h"
 #include "Viewpoint.h"
+#include "MapTypes.h"
+#include "LayerListModel.h"
+#include "GeodatabaseTypes.h"
+#include "Basemap.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h
index 1a4df598ed..bc5c1c5d45 100644
--- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h
+++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayOverviewMap, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef DISPLAYOVERVIEWMAP_H
 #define DISPLAYOVERVIEWMAP_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayOverviewMap : public QObject
diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro
index ab3d3c776a..2cd40bbfc8 100644
--- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro
+++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayOverviewMap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml
index 360b386e9d..074df76995 100644
--- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml
+++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayOverviewMap, Category=Maps]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/DisplayOverviewMap/main.cpp b/CppSamples/Maps/DisplayOverviewMap/main.cpp
index dac0db8983..b5b3c98218 100644
--- a/CppSamples/Maps/DisplayOverviewMap/main.cpp
+++ b/CppSamples/Maps/DisplayOverviewMap/main.cpp
@@ -1,34 +1,26 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayOverviewMap.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp
index fbf6dd2800..20eb61d9b4 100644
--- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp
+++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DownloadPreplannedMap, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,33 +18,30 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DownloadPreplannedMap.h"
 
-// ArcGIS Maps SDK headers
 #include "DownloadPreplannedOfflineMapJob.h"
 #include "DownloadPreplannedOfflineMapResult.h"
-#include "Error.h"
-#include "Geometry.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MobileMapPackage.h"
 #include "OfflineMapTask.h"
-#include "OfflineMapTypes.h"
-#include "PortalItem.h"
 #include "PreplannedMapArea.h"
 #include "PreplannedMapAreaListModel.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "SymbolTypes.h"
+#include "OfflineMapTypes.h"
 #include "TaskTypes.h"
+#include "MobileMapPackage.h"
+#include "GraphicsOverlay.h"
+#include "PortalItem.h"
+#include "Geometry.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h
index 7d72e2323e..1910fcc916 100644
--- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h
+++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DownloadPreplannedMap, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef DOWNLOADPREPLANNEDMAP_H
 #define DOWNLOADPREPLANNEDMAP_H
 
-// ArcGIS Maps SDK headers
-#include "DownloadPreplannedOfflineMapParameters.h"
-
-// Qt headers
-#include <QObject>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -38,9 +31,14 @@ class SimpleLineSymbol;
 class PreplannedMapAreaListModel;
 }
 
+#include <QObject>
+#include <QTemporaryDir>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("PreplannedMapAreaListModel.h")
 
+#include "DownloadPreplannedOfflineMapParameters.h"
+
 class DownloadPreplannedMap : public QObject
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro
index cf8240b7a2..9516437b48 100644
--- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro
+++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DownloadPreplannedMap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml
index e0a49396cd..95105f31ed 100644
--- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml
+++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DownloadPreplannedMap, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/DownloadPreplannedMap/main.cpp b/CppSamples/Maps/DownloadPreplannedMap/main.cpp
index a6492e2308..8f757300d0 100644
--- a/CppSamples/Maps/DownloadPreplannedMap/main.cpp
+++ b/CppSamples/Maps/DownloadPreplannedMap/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DownloadPreplannedMap.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp
index 00d9e1a7b2..bf1718bc3b 100644
--- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp
+++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMap, Category=Maps]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,27 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GenerateOfflineMap.h"
 
-// ArcGIS Maps SDK headers
+#include "Map.h"
+#include "MapQuickView.h"
+#include "Portal.h"
+#include "PortalItem.h"
+#include "OfflineMapTask.h"
+#include "GeometryEngine.h"
 #include "Envelope.h"
+#include "Point.h"
 #include "Error.h"
+#include "TaskTypes.h"
 #include "GenerateOfflineMapJob.h"
 #include "GenerateOfflineMapParameters.h"
 #include "GenerateOfflineMapResult.h"
-#include "GeometryEngine.h"
-#include "Layer.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "OfflineMapTask.h"
-#include "Point.h"
-#include "Portal.h"
-#include "PortalItem.h"
 #include "SpatialReference.h"
-#include "TaskTypes.h"
+#include "Layer.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h
index c1ad8ed665..1719ef875a 100644
--- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h
+++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMap, Category=Maps]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef GENERATEOFFLINEMAP_H
 #define GENERATEOFFLINEMAP_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -28,6 +24,9 @@ class MapQuickView;
 class OfflineMapTask;
 }
 
+#include <QQuickItem>
+#include <QTemporaryDir>
+
 class GenerateOfflineMap : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro
index 34b680f1fa..d7a81ac091 100644
--- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro
+++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = GenerateOfflineMap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml
index a77d29fe9a..d500b330b4 100644
--- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml
+++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMap, Category=Maps]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/GenerateOfflineMap/main.cpp b/CppSamples/Maps/GenerateOfflineMap/main.cpp
index fffc63cd45..e22701b35b 100644
--- a/CppSamples/Maps/GenerateOfflineMap/main.cpp
+++ b/CppSamples/Maps/GenerateOfflineMap/main.cpp
@@ -1,36 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GenerateOfflineMap.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
+#include "ArcGISRuntimeEnvironment.h"
+
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GenerateOfflineMap.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp
index 43d76bfff1..384ceb3104 100644
--- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp
+++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMapLocalBasemap, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,31 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GenerateOfflineMapLocalBasemap.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
-#include "GenerateOfflineMapJob.h"
-#include "GenerateOfflineMapParameters.h"
-#include "GenerateOfflineMapResult.h"
-#include "GeometryEngine.h"
-#include "Layer.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "PortalItem.h"
 #include "OfflineMapTask.h"
+#include "GeometryEngine.h"
+#include "Envelope.h"
 #include "Point.h"
-#include "PortalItem.h"
-#include "SpatialReference.h"
+#include "Error.h"
+#include "GenerateOfflineMapJob.h"
 #include "TaskTypes.h"
+#include "GenerateOfflineMapResult.h"
+#include "Error.h"
+#include "GenerateOfflineMapParameters.h"
+#include "SpatialReference.h"
+#include "Layer.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QTemporaryDir>
-#include <QUuid>
 #include <QtCore/qglobal.h>
+#include <QUuid>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h
index f2ecd4c773..3ba5329c18 100644
--- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h
+++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMapLocalBasemap, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef GENERATEOFFLINEMAPLOCALBASEMAP_H
 #define GENERATEOFFLINEMAPLOCALBASEMAP_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -29,6 +25,9 @@ class PortalItem;
 class OfflineMapTask;
 }
 
+#include <QQuickItem>
+#include <QTemporaryDir>
+
 class GenerateOfflineMapLocalBasemap : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro
index ac3598aaac..5ff0e90fbf 100644
--- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro
+++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = GenerateOfflineMapLocalBasemap
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml
index 6ab6f88d61..0553a808bc 100644
--- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml
+++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMapLocalBasemap, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp
index 4f7161c510..e19e7f69f2 100644
--- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp
+++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp
@@ -1,36 +1,30 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GenerateOfflineMapLocalBasemap.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
+#include "ArcGISRuntimeEnvironment.h"
+
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GenerateOfflineMapLocalBasemap.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp
index ca75dd2eee..6f48775dab 100644
--- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp
+++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMap_Overrides, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,38 +18,36 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GenerateOfflineMap_Overrides.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeatureLayerInfo.h"
-#include "Basemap.h"
 #include "Envelope.h"
-#include "Error.h"
-#include "ExportTileCacheParameters.h"
 #include "FeatureLayer.h"
-#include "GenerateGeodatabaseParameters.h"
-#include "GenerateLayerOption.h"
-#include "GenerateOfflineMapJob.h"
-#include "GenerateOfflineMapParameterOverrides.h"
-#include "GenerateOfflineMapResult.h"
 #include "GeometryEngine.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Portal.h"
+#include "PortalItem.h"
+#include "OfflineMapTask.h"
+#include "Point.h"
+#include "Error.h"
 #include "MapTypes.h"
+#include "LayerListModel.h"
 #include "OfflineMapParametersKey.h"
-#include "OfflineMapTask.h"
 #include "OfflineMapTypes.h"
-#include "Point.h"
+#include "ExportTileCacheParameters.h"
+#include "GenerateOfflineMapParameterOverrides.h"
+#include "ArcGISFeatureLayerInfo.h"
+#include "GenerateLayerOption.h"
+#include "GenerateGeodatabaseParameters.h"
+#include "GenerateLayerOption.h"
+#include "TaskTypes.h"
+#include "GenerateOfflineMapJob.h"
+#include "GenerateOfflineMapResult.h"
+#include "SpatialReference.h"
+#include "Basemap.h"
 #include "Polygon.h"
-#include "Portal.h"
-#include "PortalItem.h"
 #include "ServiceFeatureTable.h"
-#include "SpatialReference.h"
-#include "TaskTypes.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h
index e60355b761..43c3b9e5bc 100644
--- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h
+++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMap_Overrides, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,9 @@
 #ifndef GENERATEOFFLINEMAP_OVERRIDES_H
 #define GENERATEOFFLINEMAP_OVERRIDES_H
 
-// ArcGIS Maps SDK headers
+// C++ API headers
 #include "GenerateOfflineMapParameters.h"
 
-// Qt headers
-#include <QQuickItem>
-#include <QTemporaryDir>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -34,6 +30,9 @@ class OfflineMapTask;
 class PortalItem;
 }
 
+#include <QQuickItem>
+#include <QTemporaryDir>
+
 class GenerateOfflineMap_Overrides: public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro
index 7640fb1602..fba9448c47 100644
--- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro
+++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = GenerateOfflineMap_Overrides
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml
index b76cf1fc91..228067af6e 100644
--- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml
+++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GenerateOfflineMap, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp b/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp
index a4839633a0..bc1bd3b323 100644
--- a/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp
+++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp
@@ -1,36 +1,30 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "GenerateOfflineMap_Overrides.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
+#include "ArcGISRuntimeEnvironment.h"
+
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "GenerateOfflineMap_Overrides.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp
index 28cfdd5cbb..588516c39a 100644
--- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp
+++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=HonorMobileMapPackageExpiration, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "HonorMobileMapPackageExpiration.h"
 
-// ArcGIS Maps SDK headers
-#include "CoreTypes.h"
+#include "MobileMapPackage.h"
+#include "MapQuickView.h"
 #include "Error.h"
 #include "Expiration.h"
-#include "MapQuickView.h"
-#include "MobileMapPackage.h"
+#include "CoreTypes.h"
 
-// Qt headers
+#include <QtGlobal>
 #include <QDateTime>
 #include <QStandardPaths>
-#include <QtGlobal>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h
index 3f9bfa3859..bfd040dec9 100644
--- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h
+++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=HonorMobileMapPackageExpiration, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef HONORMOBILEMAPPACKAGEEXPIRATION_H
 #define HONORMOBILEMAPPACKAGEEXPIRATION_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class MapQuickView;
 class MobileMapPackage;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class HonorMobileMapPackageExpiration : public QObject
diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro
index 5fc5c64ec6..370febf9a0 100644
--- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro
+++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro
@@ -26,7 +26,7 @@ QT += opengl qml quick positioning sensors
 TEMPLATE = app
 TARGET = HonorMobileMapPackageExpiration
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml
index b9d9e0554a..55a354ba15 100644
--- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml
+++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=HonorMobileMapPackageExpiration, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp b/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp
index 15fd74260e..0c2c5b62a5 100644
--- a/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp
+++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "HonorMobileMapPackageExpiration.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp
index 0000a57cf6..d3d5fb782b 100644
--- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp
+++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyLayers, Category=Maps]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,27 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "IdentifyLayers.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "ArcGISSublayer.h"
-#include "ArcGISSublayerListModel.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Basemap.h"
-#include "Error.h"
+#include "ArcGISMapImageLayer.h"
 #include "FeatureLayer.h"
+#include "ServiceFeatureTable.h"
+#include "Viewpoint.h"
+#include "Point.h"
 #include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
+#include "Error.h"
 #include "MapTypes.h"
-#include "Point.h"
-#include "ServiceFeatureTable.h"
+#include "LayerListModel.h"
+#include "ArcGISSublayerListModel.h"
+#include "ArcGISSublayer.h"
 #include "SpatialReference.h"
-#include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
-#include <QQueue>
 #include <QUuid>
+#include <QQueue>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h
index 71ce97fcaf..83e38cc1a2 100644
--- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h
+++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyLayers, Category=Maps]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef IDENTIFYLAYERS_H
 #define IDENTIFYLAYERS_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class IdentifyLayers : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro
index 81117b719b..e3b2ee9242 100644
--- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro
+++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = IdentifyLayers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml
index e2e4428d55..bb7354b20e 100644
--- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml
+++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=IdentifyLayers, Category=Maps]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/IdentifyLayers/main.cpp b/CppSamples/Maps/IdentifyLayers/main.cpp
index 577931e89c..f61c35f09e 100644
--- a/CppSamples/Maps/IdentifyLayers/main.cpp
+++ b/CppSamples/Maps/IdentifyLayers/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "IdentifyLayers.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "IdentifyLayers.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp
index b520b4c01a..d1f87a69bd 100644
--- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp
+++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ManageBookmarks, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ManageBookmarks.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Bookmark.h"
-#include "BookmarkListModel.h"
-#include "Envelope.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "Basemap.h"
 #include "SpatialReference.h"
+#include "Envelope.h"
 #include "Viewpoint.h"
+#include "Bookmark.h"
+#include "MapTypes.h"
+#include "BookmarkListModel.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h
index 3675885214..557effb0ce 100644
--- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h
+++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ManageBookmarks, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef MANAGE_BOOKMARKS_H
 #define MANAGE_BOOKMARKS_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -30,6 +26,9 @@ namespace Esri::ArcGISRuntime
 
 class QString;
 
+#include <QAbstractListModel>
+#include <QQuickItem>
+
 class ManageBookmarks : public QQuickItem
 {
   Q_OBJECT
@@ -63,3 +62,4 @@ class ManageBookmarks : public QQuickItem
 };
 
 #endif // MANAGE_BOOKMARKS_H
+
diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro
index 01732ddbd3..1c716d18d0 100644
--- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro
+++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml
index e19c585c86..7d6efab43c 100644
--- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml
+++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ManageBookmarks, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ManageBookmarks/main.cpp b/CppSamples/Maps/ManageBookmarks/main.cpp
index 6de51206d9..bd4809c2ca 100644
--- a/CppSamples/Maps/ManageBookmarks/main.cpp
+++ b/CppSamples/Maps/ManageBookmarks/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ManageBookmarks.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ManageBookmarks.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.cpp b/CppSamples/Maps/MapLoaded/MapLoaded.cpp
index c9c4a16421..0f4d6dbbd2 100644
--- a/CppSamples/Maps/MapLoaded/MapLoaded.cpp
+++ b/CppSamples/Maps/MapLoaded/MapLoaded.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapLoaded, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,13 +18,11 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "MapLoaded.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Basemap.h"
 #include "MapTypes.h"
 
 using namespace Esri::ArcGISRuntime;
@@ -84,3 +82,4 @@ QString MapLoaded::mapLoadStatus() const
 {
   return m_loadStatus;
 }
+
diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.h b/CppSamples/Maps/MapLoaded/MapLoaded.h
index 38e916e821..9706d682dc 100644
--- a/CppSamples/Maps/MapLoaded/MapLoaded.h
+++ b/CppSamples/Maps/MapLoaded/MapLoaded.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapLoaded, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef MAP_LOADED_H
 #define MAP_LOADED_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
 
 class QString;
 
+#include <QQuickItem>
+
 class MapLoaded : public QQuickItem
 {
   Q_OBJECT
@@ -54,3 +53,4 @@ class MapLoaded : public QQuickItem
 };
 
 #endif // MAP_LOADED_H
+
diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.pro b/CppSamples/Maps/MapLoaded/MapLoaded.pro
index a05f6ccdef..64b3c1a2ba 100644
--- a/CppSamples/Maps/MapLoaded/MapLoaded.pro
+++ b/CppSamples/Maps/MapLoaded/MapLoaded.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.qml b/CppSamples/Maps/MapLoaded/MapLoaded.qml
index 8e2cd5489c..1798a584c4 100644
--- a/CppSamples/Maps/MapLoaded/MapLoaded.qml
+++ b/CppSamples/Maps/MapLoaded/MapLoaded.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapLoaded, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/MapLoaded/main.cpp b/CppSamples/Maps/MapLoaded/main.cpp
index 242a0f2308..0a13942154 100644
--- a/CppSamples/Maps/MapLoaded/main.cpp
+++ b/CppSamples/Maps/MapLoaded/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "MapLoaded.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MapLoaded.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp
index 6c33de2b59..4f21b70c0d 100644
--- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp
+++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapReferenceScale, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "MapReferenceScale.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "FeatureLayer.h"
+#include "Portal.h"
+#include "PortalItem.h"
+#include "Map.h"
 #include "Layer.h"
+#include "FeatureLayer.h"
 #include "LayerListModel.h"
-#include "Map.h"
 #include "MapQuickView.h"
-#include "Portal.h"
-#include "PortalItem.h"
+#include "Error.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
@@ -70,6 +67,7 @@ void MapReferenceScale::init()
   qmlRegisterUncreatableType<QAbstractListModel>("Esri.Samples", 1, 0, "AbstractListModel", "AbstractListModel is uncreateable");
 }
 
+
 double MapReferenceScale::currentMapScale() const
 {
   if (!m_mapView)
diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h
index 9fa1655e0d..2b084020ca 100644
--- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h
+++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapReferenceScale, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef MAPREFERENCESCALE_H
 #define MAPREFERENCESCALE_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -30,6 +26,9 @@ class PortalItem;
 class LayerListModel;
 }
 
+#include <QAbstractListModel>
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class MapReferenceScale : public QObject
diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro
index 08f0a1d7ce..a42d431223 100644
--- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro
+++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = MapReferenceScale
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml
index 2f869f298c..e5cd41313b 100644
--- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml
+++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapReferenceScale, Category=Maps]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/MapReferenceScale/main.cpp b/CppSamples/Maps/MapReferenceScale/main.cpp
index 28803265a5..21c8a19dff 100644
--- a/CppSamples/Maps/MapReferenceScale/main.cpp
+++ b/CppSamples/Maps/MapReferenceScale/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "MapReferenceScale.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/MapRotation/MapRotation.cpp b/CppSamples/Maps/MapRotation/MapRotation.cpp
index f1f8a9c639..4dee3d3d7c 100644
--- a/CppSamples/Maps/MapRotation/MapRotation.cpp
+++ b/CppSamples/Maps/MapRotation/MapRotation.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapRotation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,16 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "MapRotation.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+#include "Basemap.h"
+#include "Viewpoint.h"
 #include "Point.h"
 #include "SpatialReference.h"
-#include "Viewpoint.h"
+#include "MapTypes.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/MapRotation/MapRotation.h b/CppSamples/Maps/MapRotation/MapRotation.h
index 32efcaf764..305ebacde8 100644
--- a/CppSamples/Maps/MapRotation/MapRotation.h
+++ b/CppSamples/Maps/MapRotation/MapRotation.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapRotation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef MAP_ROTATION_H
 #define MAP_ROTATION_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class MapRotation : public QQuickItem
 {
   Q_OBJECT
@@ -44,3 +43,4 @@ class MapRotation : public QQuickItem
 };
 
 #endif // MAP_ROTATION_H
+
diff --git a/CppSamples/Maps/MapRotation/MapRotation.pro b/CppSamples/Maps/MapRotation/MapRotation.pro
index 787bda8124..1525ceffef 100644
--- a/CppSamples/Maps/MapRotation/MapRotation.pro
+++ b/CppSamples/Maps/MapRotation/MapRotation.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/MapRotation/MapRotation.qml b/CppSamples/Maps/MapRotation/MapRotation.qml
index ebe445176c..2b2b2131f1 100644
--- a/CppSamples/Maps/MapRotation/MapRotation.qml
+++ b/CppSamples/Maps/MapRotation/MapRotation.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=MapRotation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/MapRotation/main.cpp b/CppSamples/Maps/MapRotation/main.cpp
index 65e34aed13..accaf89330 100644
--- a/CppSamples/Maps/MapRotation/main.cpp
+++ b/CppSamples/Maps/MapRotation/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "MapRotation.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MapRotation.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp b/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp
index fb9d859ecf..931b2f0344 100644
--- a/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp
+++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=MinMaxScale, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "MinMaxScale.h"
 
-// ArcGIS Maps SDK headers
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
-#include "Point.h"
 #include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.h b/CppSamples/Maps/MinMaxScale/MinMaxScale.h
index fa31857567..78e730d90c 100644
--- a/CppSamples/Maps/MinMaxScale/MinMaxScale.h
+++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=MinMaxScale, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef MINMAXSCALE_H
 #define MINMAXSCALE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
 class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class MinMaxScale : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.pro b/CppSamples/Maps/MinMaxScale/MinMaxScale.pro
index 2e9bff5938..3f8601af23 100644
--- a/CppSamples/Maps/MinMaxScale/MinMaxScale.pro
+++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = MinMaxScale
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.qml b/CppSamples/Maps/MinMaxScale/MinMaxScale.qml
index 1b3e275ecc..f467dd3e42 100644
--- a/CppSamples/Maps/MinMaxScale/MinMaxScale.qml
+++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=MinMaxScale, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/MinMaxScale/main.cpp b/CppSamples/Maps/MinMaxScale/main.cpp
index dcf1aff912..e4bda31a33 100644
--- a/CppSamples/Maps/MinMaxScale/main.cpp
+++ b/CppSamples/Maps/MinMaxScale/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "MinMaxScale.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MinMaxScale.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp
index 9770ae3afd..8aeb75dcc5 100644
--- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp
+++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=MobileMap_SearchAndRoute, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,47 +18,44 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "MobileMap_SearchAndRoute.h"
 
-// ArcGIS Maps SDK headers
-#include "AttributeListModel.h"
-#include "CalloutData.h"
-#include "Error.h"
-#include "GeocodeResult.h"
+#include "Map.h"
+#include "Stop.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyGraphicsOverlayResult.h"
-#include "Item.h"
+#include "RouteTask.h"
+#include "TextSymbol.h"
 #include "LocatorTask.h"
-#include "Map.h"
+#include "RouteResult.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
+#include "GeocodeResult.h"
+#include "GraphicsOverlay.h"
+#include "RouteParameters.h"
 #include "MobileMapPackage.h"
 #include "PictureMarkerSymbol.h"
-#include "Polyline.h"
 #include "ReverseGeocodeParameters.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
+#include "CalloutData.h"
+#include "GraphicsOverlayListModel.h"
+#include "IdentifyGraphicsOverlayResult.h"
+#include "SymbolTypes.h"
+#include "AttributeListModel.h"
+#include "GraphicListModel.h"
 #include "Route.h"
-#include "RouteParameters.h"
-#include "RouteResult.h"
-#include "RouteTask.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
-#include "Stop.h"
-#include "SymbolTypes.h"
-#include "TextSymbol.h"
+#include "SimpleLineSymbol.h"
+#include "Item.h"
+#include "Polyline.h"
 
-// Qt headers
-#include <QDir>
-#include <QFile>
+#include <QUuid>
 #include <QFileInfoList>
+#include <QFile>
 #include <QFuture>
-#include <QStandardPaths>
-#include <QUuid>
 #include <QtCore/qglobal.h>
+#include <QDir>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h
index 00899b2c22..1cd568cfb0 100644
--- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h
+++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=MobileMap_SearchAndRoute, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,17 +17,6 @@
 #ifndef MOBILEMAP_SEARCHANDROUTE_H
 #define MOBILEMAP_SEARCHANDROUTE_H
 
-// ArcGIS Maps SDK headers
-#include "Point.h"
-#include "ReverseGeocodeParameters.h"
-#include "RouteParameters.h"
-#include "Stop.h"
-
-// Qt headers
-#include <QFileInfoList>
-#include <QQuickItem>
-#include <QVariantMap>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -40,6 +29,15 @@ namespace Esri::ArcGISRuntime
   class ReverseGeocodeParameters;
 }
 
+#include "Stop.h"
+#include "Point.h"
+#include "RouteParameters.h"
+#include "ReverseGeocodeParameters.h"
+
+#include <QQuickItem>
+#include <QFileInfoList>
+#include <QVariantMap>
+
 class MobileMap_SearchAndRoute : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro
index 218a1bdb90..c8fd63e80b 100644
--- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro
+++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml
index 865fe7b92a..822464c364 100644
--- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml
+++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=MobileMap_SearchAndRoute, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp b/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp
index 55f1982bf4..3da3a27d53 100644
--- a/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp
+++ b/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp
@@ -1,39 +1,31 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "MobileMap_SearchAndRoute.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MobileMap_SearchAndRoute.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp
index a21b93a903..1e456d5098 100644
--- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp
+++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMapUrl, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,13 +18,11 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OpenMapUrl.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Basemap.h"
 #include "MapTypes.h"
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h
index 99c0236ac9..083296aa20 100644
--- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h
+++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMapUrl, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef OPEN_MAP_URL_H
 #define OPEN_MAP_URL_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class MapQuickView;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
 
 class QString;
 
+#include <QQuickItem>
+
 class OpenMapUrl : public QQuickItem
 {
   Q_OBJECT
@@ -44,3 +43,4 @@ class OpenMapUrl : public QQuickItem
 };
 
 #endif // OPEN_MAP_URL_H
+
diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro
index f649143fe7..eebf195109 100644
--- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro
+++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml
index be4cb4ebca..9d9ea0800f 100644
--- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml
+++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMapUrl, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/OpenMapUrl/main.cpp b/CppSamples/Maps/OpenMapUrl/main.cpp
index f16b229807..732c5c5579 100644
--- a/CppSamples/Maps/OpenMapUrl/main.cpp
+++ b/CppSamples/Maps/OpenMapUrl/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "OpenMapUrl.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "OpenMapUrl.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp
index 2b4282aff6..cd7038ba25 100644
--- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp
+++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMobileMap_MapPackage, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +18,15 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OpenMobileMap_MapPackage.h"
 
-// ArcGIS Maps SDK headers
 #include "Basemap.h"
 #include "Error.h"
 #include "MapQuickView.h"
 #include "MobileMapPackage.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h
index 5bc4cb2a00..144fe56e43 100644
--- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h
+++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMobileMap_MapPackage, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef OPEN_MOBILE_MAP_MAP_PACKAGE_H
 #define OPEN_MOBILE_MAP_MAP_PACKAGE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Error;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class MobileMapPackage;
 }
 
+#include <QQuickItem>
+
 class OpenMobileMap_MapPackage : public QQuickItem
 {
   Q_OBJECT
@@ -47,3 +46,4 @@ class OpenMobileMap_MapPackage : public QQuickItem
 };
 
 #endif // OPEN_MOBILE_MAP_MAP_PACKAGE_H
+
diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro
index e8fd0cb3fa..2079752c1d 100644
--- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro
+++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml
index a7ef26d033..d7af50fac0 100644
--- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml
+++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMobileMap_MapPackage, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp b/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp
index c1b3b27bac..04f933abf3 100644
--- a/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp
+++ b/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "OpenMobileMap_MapPackage.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "OpenMobileMap_MapPackage.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp
index 30432a8908..d1c1c1b6b4 100644
--- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp
+++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReadGeoPackage, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,27 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ReadGeoPackage.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "FeatureLayer.h"
-#include "FeatureTable.h"
-#include "GeoPackage.h"
-#include "GeoPackageFeatureTable.h"
-#include "GeoPackageRaster.h"
-#include "Layer.h"
-#include "LayerListModel.h"
 #include "Map.h"
+#include "Layer.h"
+#include "GeoPackage.h"
+#include "RasterLayer.h"
 #include "MapQuickView.h"
+#include "FeatureTable.h"
+#include "FeatureLayer.h"
+#include "GeoPackageRaster.h"
+#include "GeoPackageFeatureTable.h"
+#include "Error.h"
 #include "MapTypes.h"
-#include "RasterLayer.h"
+#include "LayerListModel.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h
index 013e900ab5..236c6a15be 100644
--- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h
+++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReadGeoPackage, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef READGEOPACKAGE_H
 #define READGEOPACKAGE_H
 
-// Qt headers
-#include <QQuickItem>
-
-// STL headers
-#include <Viewpoint.h>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -30,6 +24,9 @@ namespace Esri::ArcGISRuntime
   class GeoPackage;
 }
 
+#include <QQuickItem>
+#include <Viewpoint.h>
+
 class ReadGeoPackage : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro
index 9a7e3de967..71ea3c7800 100644
--- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro
+++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ReadGeoPackage
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml
index c0c215d2b3..616f1c8a0d 100644
--- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml
+++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReadGeoPackage, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ReadGeoPackage/main.cpp b/CppSamples/Maps/ReadGeoPackage/main.cpp
index efd5c0c2d3..aa97677ebc 100644
--- a/CppSamples/Maps/ReadGeoPackage/main.cpp
+++ b/CppSamples/Maps/ReadGeoPackage/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ReadGeoPackage.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ReadGeoPackage.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp
index ada3a9ae1c..11f594b418 100644
--- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp
+++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetInitialMapArea, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,15 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SetInitialMapArea.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
-#include "Envelope.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Basemap.h"
+#include "Viewpoint.h"
+#include "Envelope.h"
 #include "MapTypes.h"
 #include "SpatialReference.h"
-#include "Viewpoint.h"
 
 using namespace Esri::ArcGISRuntime;
 
@@ -62,3 +60,4 @@ void SetInitialMapArea::componentComplete()
   // set map on the map view
   m_mapView->setMap(m_map);
 }
+
diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h
index b6beb24911..9c4126e5e5 100644
--- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h
+++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetInitialMapArea, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef SET_INITIAL_MAP_AREA_H
 #define SET_INITIAL_MAP_AREA_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class SetInitialMapArea : public QQuickItem
 {
   Q_OBJECT
@@ -43,3 +42,4 @@ class SetInitialMapArea : public QQuickItem
 };
 
 #endif // SET_INITIAL_MAP_AREA_H
+
diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro
index 436e5099ff..c503dfc45f 100644
--- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro
+++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml
index ad4e65a049..0d3e66c743 100644
--- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml
+++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetInitialMapArea, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/SetInitialMapArea/main.cpp b/CppSamples/Maps/SetInitialMapArea/main.cpp
index 6a932ca13e..a94a3c2ddc 100644
--- a/CppSamples/Maps/SetInitialMapArea/main.cpp
+++ b/CppSamples/Maps/SetInitialMapArea/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SetInitialMapArea.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SetInitialMapArea.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp
index 28a92543d1..49b449506f 100644
--- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp
+++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetInitialMapLocation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SetInitialMapLocation.h"
 
-// ArcGIS Maps SDK headers
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
@@ -59,3 +57,4 @@ void SetInitialMapLocation::componentComplete()
   // set map on the map view
   m_mapView->setMap(m_map);
 }
+
diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h
index 24c01f589f..aee3b611b6 100644
--- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h
+++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetInitialMapLocation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef SET_INITIAL_MAP_LOCATION_H
 #define SET_INITIAL_MAP_LOCATION_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class SetInitialMapLocation : public QQuickItem
 {
   Q_OBJECT
@@ -43,3 +42,4 @@ class SetInitialMapLocation : public QQuickItem
 };
 
 #endif // SET_INITIAL_MAP_LOCATION_H
+
diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro
index 535b266a3a..2100335339 100644
--- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro
+++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml
index b27e14e965..a481bd5abe 100644
--- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml
+++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetInitialMapLocation, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/SetInitialMapLocation/main.cpp b/CppSamples/Maps/SetInitialMapLocation/main.cpp
index 7b1cad502f..8c9a018ea8 100644
--- a/CppSamples/Maps/SetInitialMapLocation/main.cpp
+++ b/CppSamples/Maps/SetInitialMapLocation/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SetInitialMapLocation.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SetInitialMapLocation.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp
index ef178d6d3e..7ffbb2f7c9 100644
--- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp
+++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetMapSpatialReference, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SetMapSpatialReference.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapViewTypes.h"
+#include "Basemap.h"
 #include "SpatialReference.h"
-
-// Qt headers
+#include "ArcGISMapImageLayer.h"
+#include "MapViewTypes.h"
 #include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
@@ -72,3 +68,4 @@ void SetMapSpatialReference::componentComplete()
   // set map on the map view
   m_mapView->setMap(m_map);
 }
+
diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h
index 284f5a8dc7..b80adb40ae 100644
--- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h
+++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetMapSpatialReference, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SET_MAP_SPATIAL_REFERENCE_H
 #define SET_MAP_SPATIAL_REFERENCE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -28,6 +25,8 @@ namespace Esri::ArcGISRuntime
   class ArcGISMapImageLayer;
 }
 
+#include <QQuickItem>
+
 class SetMapSpatialReference : public QQuickItem
 {
   Q_OBJECT
@@ -47,3 +46,4 @@ class SetMapSpatialReference : public QQuickItem
 };
 
 #endif // SET_MAP_SPATIAL_REFERENCE_H
+
diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro
index 23099d2a7b..0dcd020273 100644
--- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro
+++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml
index ad8ea997f3..31772fa890 100644
--- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml
+++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetMapSpatialReference, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/SetMapSpatialReference/main.cpp b/CppSamples/Maps/SetMapSpatialReference/main.cpp
index 3280a0a8d9..b77416803a 100644
--- a/CppSamples/Maps/SetMapSpatialReference/main.cpp
+++ b/CppSamples/Maps/SetMapSpatialReference/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SetMapSpatialReference.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SetMapSpatialReference.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp
index fbc86c23b4..615802be0e 100644
--- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp
+++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetMaxExtent, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SetMaxExtent.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
+#include "SpatialReference.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h
index 57cce273ad..8d35fb2994 100644
--- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h
+++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetMaxExtent, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef SETMAXEXTENT_H
 #define SETMAXEXTENT_H
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Envelope;
@@ -33,6 +27,9 @@ class MapQuickView;
 class SimpleLineSymbol;
 }
 
+#include <QObject>
+#include "Envelope.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class SetMaxExtent : public QObject
diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro
index 1d4ec06d57..9b30ffd075 100644
--- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro
+++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SetMaxExtent
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml
index b794a4d587..16805c3d7b 100644
--- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml
+++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetMaxExtent, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/SetMaxExtent/main.cpp b/CppSamples/Maps/SetMaxExtent/main.cpp
index 14bd9cb421..5f0f4db8fd 100644
--- a/CppSamples/Maps/SetMaxExtent/main.cpp
+++ b/CppSamples/Maps/SetMaxExtent/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "SetMaxExtent.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp
index 7070a2cd50..2e9c4df65c 100644
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp
+++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp
@@ -1,30 +1,26 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "IndoorsLocationDataSourceCreator.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISFeatureTable.h"
+#include "IndoorsLocationDataSource.h"
+#include "Map.h"
 #include "Error.h"
+#include "MapTypes.h"
 #include "FeatureLayer.h"
 #include "FeatureTableListModel.h"
-#include "IndoorsLocationDataSource.h"
 #include "LayerListModel.h"
-#include "Map.h"
-#include "MapTypes.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h
index fe6bc95713..7c5023c3a9 100644
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h
+++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h
@@ -1,17 +1,4 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,10 +14,6 @@
 #ifndef INDOORSLOCATIONDATASOURCECREATOR_H
 #define INDOORSLOCATIONDATASOURCECREATOR_H
 
-// Qt headers
-#include <QObject>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISFeatureTable;
@@ -39,6 +22,10 @@ class IndoorsLocationDataSource;
 class Map;
 }
 
+#include <QObject>
+#include <QUuid>
+
+
 class IndoorsLocationDataSourceCreator : public QObject
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp
index 25fa375527..08f92961e7 100644
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp
+++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowDeviceLocationUsingIndoorPositioning, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,32 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "IndoorsLocationDataSourceCreator.h"
 #include "ShowDeviceLocationUsingIndoorPositioning.h"
-
-// ArcGIS Maps SDK headers
-#include "FeatureLayer.h"
 #include "IndoorsLocationDataSource.h"
-#include "LayerListModel.h"
-#include "LocationDisplay.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "MapViewTypes.h"
+#include "LocationDisplay.h"
+#include "LayerListModel.h"
+#include "MapTypes.h"
 #include "PortalItem.h"
-
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID)
-#define PERMISSIONS_PLATFORM
-#include <QPermissions>
-#endif
-
-#ifdef Q_OS_ANDROID
-#include "ArcGISRuntimeEnvironment.h"
-
-#include <QCoreApplication>
-#include <QJniObject>
-#endif
+#include "FeatureLayer.h"
 
 using namespace Esri::ArcGISRuntime;
 
@@ -91,67 +76,14 @@ void ShowDeviceLocationUsingIndoorPositioning::setMapView(MapQuickView* mapView)
   m_mapView = mapView;
   m_mapView->setMap(m_map);
 
-  // Issue expected with Android - https://bugreports.qt.io/browse/QTBUG-130301
-  #ifdef PERMISSIONS_PLATFORM
-    requestBluetoothThenLocationPermissions();
-  #else
-    setupIndoorsLocationDataSource();
-  #endif
+  setupIndoorsLocationDataSource();
 
   emit mapViewChanged();
 }
 
-void ShowDeviceLocationUsingIndoorPositioning::requestBluetoothThenLocationPermissions()
-{
-  #ifdef PERMISSIONS_PLATFORM
-    qApp->requestPermission(QBluetoothPermission{}, [this](const QPermission& permission)
-  {
-    Q_UNUSED(permission);
-    requestLocationPermissionThenSetupILDS();
-  });
-  #endif // PERMISSIONS_PLATFORM
-}
-
-void ShowDeviceLocationUsingIndoorPositioning::requestLocationPermissionThenSetupILDS()
-{
-  #ifdef PERMISSIONS_PLATFORM
-  QLocationPermission locationPermission{};
-  locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise);
-  locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse);
-  qApp->requestPermission(locationPermission, [this](const QPermission& permission)
-  {
-    Q_UNUSED(permission);
-    checkPermissions();
-    setupIndoorsLocationDataSource();
-  });
-  #endif // PERMISSIONS_PLATFORM
-}
-
-void ShowDeviceLocationUsingIndoorPositioning::checkPermissions()
-{
-  #ifdef PERMISSIONS_PLATFORM
-  if (qApp->checkPermission(QBluetoothPermission{}) == Qt::PermissionStatus::Denied)
-  {
-    emit bluetoothPermissionDenied();
-  }
-
-  QLocationPermission locationPermission{};
-  locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise);
-  locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse);
-  if (qApp->checkPermission(locationPermission) == Qt::PermissionStatus::Denied)
-  {
-    emit locationPermissionDenied();
-  }
-  #endif // PERMISSIONS_PLATFORM
-}
-
 // This function uses a helper class `IndoorsLocationDataSourceCreator` to construct the IndoorsLocationDataSource
 void ShowDeviceLocationUsingIndoorPositioning::setupIndoorsLocationDataSource()
 {
-  #ifdef Q_OS_ANDROID
-  ArcGISRuntimeEnvironment::setAndroidApplicationContext(QJniObject{QNativeInterface::QAndroidApplication::context()});
-  #endif
-
   IndoorsLocationDataSourceCreator* indoorsLocationDataSourceCreator = new IndoorsLocationDataSourceCreator(this);
 
   connect(indoorsLocationDataSourceCreator, &IndoorsLocationDataSourceCreator::createIndoorsLocationDataSourceCompleted, this, [this](IndoorsLocationDataSource* indoorsLDS)
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h
index 423a39af61..963f611309 100644
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h
+++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowDeviceLocationUsingIndoorPositioning, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef SHOWDEVICELOCATIONUSINGINDOORPOSITIONING_H
 #define SHOWDEVICELOCATIONUSINGINDOORPOSITIONING_H
 
-// ArcGIS Maps SDK headers
-#include "Location.h"
-
-// Qt headers
-#include <QMap>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISFeatureTable;
@@ -32,6 +25,11 @@ class Map;
 class MapQuickView;
 }
 
+#include "Location.h"
+
+#include <QObject>
+#include <QMap>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class ShowDeviceLocationUsingIndoorPositioning : public QObject
@@ -52,8 +50,6 @@ class ShowDeviceLocationUsingIndoorPositioning : public QObject
 signals:
   void mapViewChanged();
   void locationPropertiesChanged();
-  void locationPermissionDenied();
-  void bluetoothPermissionDenied();
 
 private:
   Esri::ArcGISRuntime::MapQuickView* mapView() const;
@@ -63,9 +59,6 @@ class ShowDeviceLocationUsingIndoorPositioning : public QObject
   void setupIndoorsLocationDataSource();
   void locationChangedHandler(const Esri::ArcGISRuntime::Location& loc);
   void changeFloorDisplay();
-  void requestLocationPermissionThenSetupILDS();
-  void requestBluetoothThenLocationPermissions();
-  void checkPermissions();
 
   Esri::ArcGISRuntime::Map* m_map = nullptr;
   Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr;
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro
index 1ae74540d2..81a5c478b4 100644
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro
+++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro
@@ -23,12 +23,11 @@ CONFIG += c++17
 
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
-android|ios: QT += bluetooth
 
 TEMPLATE = app
 TARGET = ShowDeviceLocationUsingIndoorPositioning
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
@@ -58,11 +57,7 @@ ios {
     OTHER_FILES += \
         $$PWD/Info.plist
 
-    QMAKE_INFO_PLIST = $$PWD/ios/Info.plist
-}
-
-macx {
-    QMAKE_INFO_PLIST = $$PWD/mac/Info.plist
+    QMAKE_INFO_PLIST = $$PWD/Info.plist
 }
 
 android {
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml
index 4c7cfed477..aae678a2e5 100644
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml
+++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowDeviceLocationUsingIndoorPositioning, Category=Maps]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Esri.Samples
-import QtQuick.Dialogs
 
 Item {
 
@@ -81,46 +80,4 @@ Item {
         id: model
         mapView: view
     }
-
-    Connections {
-        target: model
-        function onLocationPermissionDenied() {
-            locationPermissionDeniedDialog.open()
-        }
-    }
-
-    Dialog {
-        id: locationPermissionDeniedDialog
-        title: "Location Permission Denied"
-        modal: true
-        standardButtons: Dialog.Ok
-        x: (parent.width - width) / 2
-        y: (parent.height - height) / 2
-
-        Text {
-            text: "This application requires location permission."
-            color: "white"
-        }
-    }
-
-    Connections {
-        target: model
-        function onBluetoothPermissionDenied() {
-            bluetoothPermissionDeniedDialog.open()
-        }
-    }
-
-    Dialog {
-        id: bluetoothPermissionDeniedDialog
-        title: "Bluetooth Permission Denied"
-        modal: true
-        standardButtons: Dialog.Ok
-        x: (parent.width - width) / 2
-        y: (parent.height - height) / 2
-
-        Text {
-            text: "This application requires bluetooth permission."
-            color: "white"
-        }
-    }
 }
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist
deleted file mode 100644
index dad491cbc3..0000000000
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDisplayName</key>
-        <string>ShowDeviceLocationUsingIndoorPositioning</string>
-        <key>CFBundleExecutable</key>
-        <string>ShowDeviceLocationUsingIndoorPositioning</string>
-        <key>CFBundleGetInfoString</key>
-        <string>ArcGIS</string>
-        <key>CFBundleIcons~ipad</key>
-        <dict/>
-        <key>CFBundleIdentifier</key>
-        <string>com.esri.${PRODUCT_NAME:rfc1034identifier}</string>
-        <key>CFBundleName</key>
-        <string>${PRODUCT_NAME}</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>1.0</string>
-        <key>NOTE</key>
-        <string>This app is cool</string>
-        <key>UIFileSharingEnabled</key>
-        <string>FALSE</string>
-        <key>UIRequiresPersistentWiFi</key>
-        <string>NO</string>
-        <key>LSRequiresIPhoneOS</key>
-        <true/>
-        <key>NSLocationWhenInUseUsageDescription</key>
-        <string>Location required for application</string>
-        <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-        <string>Location required for application</string>
-        <key>NSBluetoothAlwaysUsageDescription</key>
-        <string>Bluetooth access is required for Indoor Positioning</string>
-        <key>UISupportedInterfaceOrientations</key>
-        <array>
-                <string>UIInterfaceOrientationPortrait</string>
-                <string>UIInterfaceOrientationPortraitUpsideDown</string>
-                <string>UIInterfaceOrientationLandscapeLeft</string>
-                <string>UIInterfaceOrientationLandscapeRight</string>
-        </array>
-        <key>UISupportedInterfaceOrientations~ipad</key>
-        <array>
-                <string>UIInterfaceOrientationPortrait</string>
-                <string>UIInterfaceOrientationPortraitUpsideDown</string>
-                <string>UIInterfaceOrientationLandscapeLeft</string>
-                <string>UIInterfaceOrientationLandscapeRight</string>
-        </array>
-        <key>UILaunchStoryboardName</key>
-        <string>LaunchScreen</string>
-</dict>
-</plist>
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist
deleted file mode 100644
index 13b9fcaaa5..0000000000
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleDisplayName</key>
-    <string>ShowDeviceLocationUsingIndoorPositioning</string>
-    <key>CFBundleExecutable</key>
-    <string>ShowDeviceLocationUsingIndoorPositioning</string>
-    <key>CFBundleGetInfoString</key>
-    <string>ArcGIS</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.esri.ShowDeviceLocationUsingIndoorPositioning</string>
-    <key>CFBundleName</key>
-    <string>ShowDeviceLocationUsingIndoorPositioning</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleShortVersionString</key>
-    <string>1.0</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>CFBundleVersion</key>
-    <string>1.0</string>
-    <key>NSLocationUsageDescription</key>
-    <string>Location required for application</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>Location required for application</string>
-    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-    <string>Location required for application</string>
-    <key>NSBluetoothAlwaysUsageDescription</key>
-    <string>Bluetooth access is required for Indoor Positioning</string>
-</dict>
-</plist>
-
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp
index 8e5453887d..0ba79094b4 100644
--- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp
+++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ShowDeviceLocationUsingIndoorPositioning.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp
index 0274bd4d06..be8634b68e 100644
--- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp
+++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowLocationHistory, Category=Maps]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,12 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ShowLocationHistory.h"
 
-// ArcGIS Maps SDK headers
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "Location.h"
-#include "LocationDisplay.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "Polyline.h"
 #include "PolylineBuilder.h"
 #include "SimpleLineSymbol.h"
@@ -39,10 +31,15 @@
 #include "SimpleRenderer.h"
 #include "SimulatedLocationDataSource.h"
 #include "SimulationParameters.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
+#include "GraphicsOverlayListModel.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
+#include "LocationDisplay.h"
+#include "Location.h"
+#include "SpatialReference.h"
 
-// Qt headers
 #include <QDateTime>
 #include <QFuture>
 
diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h
index 2357b8aa8e..c5679bf22f 100644
--- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h
+++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowLocationHistory, Category=Maps]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,8 @@
 #ifndef SHOWLOCATIONHISTORY_H
 #define SHOWLOCATIONHISTORY_H
 
-// ArcGIS Maps SDK headers
 #include "Point.h"
 
-// Qt headers
 #include <QObject>
 
 namespace Esri::ArcGISRuntime
diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro
index fd02b5b314..9c55e3b997 100644
--- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro
+++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ShowLocationHistory
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml
index 44283a349f..0a3e5f0081 100644
--- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml
+++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowLocationHistory, Category=Maps]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ShowLocationHistory/main.cpp b/CppSamples/Maps/ShowLocationHistory/main.cpp
index 5392c2c5c9..2ee18d6958 100644
--- a/CppSamples/Maps/ShowLocationHistory/main.cpp
+++ b/CppSamples/Maps/ShowLocationHistory/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ShowLocationHistory.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp
index 26edb15c3f..e668864f75 100644
--- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp
+++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowMagnifier, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,15 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ShowMagnifier.h"
 
-// ArcGIS Maps SDK headers
-#include "Basemap.h"
 #include "Map.h"
 #include "MapQuickView.h"
+#include "Basemap.h"
+#include "Viewpoint.h"
 #include "MapTypes.h"
-#include "Point.h"
 #include "SpatialReference.h"
-#include "Viewpoint.h"
+#include "Point.h"
 
 using namespace Esri::ArcGISRuntime;
 
@@ -65,3 +63,4 @@ void ShowMagnifier::componentComplete()
   // enable magnifier
   m_mapView->setMagnifierEnabled(true);
 }
+
diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h
index bc541ba48a..3dc6a99dcb 100644
--- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h
+++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowMagnifier, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef SHOW_MAGNIFIER_H
 #define SHOW_MAGNIFIER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
   class MapQuickView;
 }
 
+#include <QQuickItem>
+
 class ShowMagnifier : public QQuickItem
 {
   Q_OBJECT
@@ -43,3 +42,4 @@ class ShowMagnifier : public QQuickItem
 };
 
 #endif // SHOW_MAGNIFIER_H
+
diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro
index 25318f178c..9478d97581 100644
--- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro
+++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml
index 942e82574f..3295941d1d 100644
--- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml
+++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ShowMagnifier, Category=Maps]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/ShowMagnifier/main.cpp b/CppSamples/Maps/ShowMagnifier/main.cpp
index d5c28ea6ca..1c60a0a4e5 100644
--- a/CppSamples/Maps/ShowMagnifier/main.cpp
+++ b/CppSamples/Maps/ShowMagnifier/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ShowMagnifier.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ShowMagnifier.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp b/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp
index 0c7816584b..a7661b85de 100644
--- a/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp
+++ b/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp
@@ -1,22 +1,18 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "MapImageProvider.h"
 
-// Qt headers
 #include <QQuickImageProvider>
 
 MapImageProvider::MapImageProvider() :
diff --git a/CppSamples/Maps/TakeScreenshot/MapImageProvider.h b/CppSamples/Maps/TakeScreenshot/MapImageProvider.h
index e09f9ba891..e6a6cbe917 100644
--- a/CppSamples/Maps/TakeScreenshot/MapImageProvider.h
+++ b/CppSamples/Maps/TakeScreenshot/MapImageProvider.h
@@ -1,17 +1,4 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp
index b856d2def4..cb94163bc0 100644
--- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp
+++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=TakeScreenshot, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,13 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "MapImageProvider.h"
 #include "TakeScreenshot.h"
 
-// ArcGIS Maps SDK headers
 #include "Map.h"
 #include "MapQuickView.h"
+#include "MapImageProvider.h"
 #include "MapTypes.h"
 
-// Qt headers
 #include <QFuture>
 #include <QQmlContext>
 #include <QUuid>
diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h
index 7571c73873..6c4256f1a6 100644
--- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h
+++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=TakeScreenshot, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef TAKESCREENSHOT_H
 #define TAKESCREENSHOT_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -28,6 +25,8 @@ class MapQuickView;
 
 class MapImageProvider;
 
+#include <QQuickItem>
+
 class TakeScreenshot : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro
index 49f2d3ff2b..d0fa1e23b0 100644
--- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro
+++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = TakeScreenshot
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml
index 8121f5457d..ed716810b2 100644
--- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml
+++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=TakeScreenshot, Category=Maps]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Maps/TakeScreenshot/main.cpp b/CppSamples/Maps/TakeScreenshot/main.cpp
index c4be2b290d..183c91db59 100644
--- a/CppSamples/Maps/TakeScreenshot/main.cpp
+++ b/CppSamples/Maps/TakeScreenshot/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "MapImageProvider.h"
-#include "TakeScreenshot.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
-#include <QQmlContext>
 #include <QQmlEngine>
-#include <QQuickView>
+#include <QQmlContext>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "TakeScreenshot.h"
+#include "MapImageProvider.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp b/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp
index 4c68fc1d87..7aff0a46f5 100644
--- a/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp
+++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindClosestFacilityToAnIncidentInteractive, Category=Routing]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,36 +18,33 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ClosestFacility.h"
 
-// ArcGIS Maps SDK headers
 #include "ClosestFacilityParameters.h"
-#include "ClosestFacilityResult.h"
-#include "ClosestFacilityRoute.h"
 #include "ClosestFacilityTask.h"
-#include "Error.h"
 #include "Facility.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "Incident.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "PictureMarkerSymbol.h"
-#include "Point.h"
-#include "Polyline.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "Error.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
+#include "GraphicsOverlayListModel.h"
 #include "SymbolTypes.h"
+#include "GraphicListModel.h"
+#include "ClosestFacilityResult.h"
+#include "ClosestFacilityRoute.h"
+#include "Incident.h"
+#include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
+#include "SimpleLineSymbol.h"
+#include "Polyline.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.h b/CppSamples/Routing/ClosestFacility/ClosestFacility.h
index eb7cabd045..6ec8324a71 100644
--- a/CppSamples/Routing/ClosestFacility/ClosestFacility.h
+++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindClosestFacilityToAnIncidentInteractive, Category=Routing]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,6 @@
 #ifndef CLOSESTFACILITY_H
 #define CLOSESTFACILITY_H
 
-// ArcGIS Maps SDK headers
-#include "ClosestFacilityParameters.h"
-
-// Qt headers
-#include <QList>
-#include <QQuickItem>
-#include <QUrl>
-
 namespace Esri::ArcGISRuntime
 {
   class ClosestFacilityTask;
@@ -36,6 +28,12 @@ namespace Esri::ArcGISRuntime
   class Point;
 }
 
+#include "ClosestFacilityParameters.h"
+
+#include <QList>
+#include <QQuickItem>
+#include <QUrl>
+
 class ClosestFacility : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.pro b/CppSamples/Routing/ClosestFacility/ClosestFacility.pro
index 91779d7c6b..9174dbd727 100644
--- a/CppSamples/Routing/ClosestFacility/ClosestFacility.pro
+++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ClosestFacility
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.qml b/CppSamples/Routing/ClosestFacility/ClosestFacility.qml
index 477f1d708d..35fb0d479d 100644
--- a/CppSamples/Routing/ClosestFacility/ClosestFacility.qml
+++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindClosestFacilityToAnIncidentInteractive, Category=Routing]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/ClosestFacility/main.cpp b/CppSamples/Routing/ClosestFacility/main.cpp
index 63c2aab813..97b19ebb96 100644
--- a/CppSamples/Routing/ClosestFacility/main.cpp
+++ b/CppSamples/Routing/ClosestFacility/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ClosestFacility.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ClosestFacility.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp
index 13afd60557..8dc7d9831d 100644
--- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp
+++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayRouteLayer, Category=Routing]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,33 +18,30 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayRouteLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "AttributeListModel.h"
-#include "Error.h"
-#include "Feature.h"
 #include "FeatureCollection.h"
 #include "FeatureCollectionLayer.h"
-#include "FeatureCollectionTable.h"
-#include "FeatureCollectionTableListModel.h"
-#include "FeatureIterator.h"
-#include "FeatureQueryResult.h"
-#include "FeatureTable.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Portal.h"
 #include "PortalItem.h"
+#include "Error.h"
+#include "MapTypes.h"
 #include "PortalTypes.h"
+#include "LayerListModel.h"
+#include "FeatureCollectionTableListModel.h"
+#include "FeatureTable.h"
+#include "FeatureQueryResult.h"
+#include "FeatureIterator.h"
 #include "QueryParameters.h"
+#include "Feature.h"
+#include "ArcGISFeature.h"
+#include "AttributeListModel.h"
+#include "FeatureCollectionTable.h"
 #include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 #include <QJsonValue>
 
diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h
index d58ec771fe..d936adc920 100644
--- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h
+++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayRouteLayer, Category=Routing]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef DISPLAYROUTELAYER_H
 #define DISPLAYROUTELAYER_H
 
-// Qt headers
-#include <QObject>
-
-// STL headers
 #include <FeatureCollectionTableListModel.h>
 
 namespace Esri
@@ -38,6 +34,8 @@ class PortalItem;
 }
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayRouteLayer : public QObject
diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro
index 6432448ecb..0db96b69b7 100644
--- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro
+++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayRouteLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml
index 6fa656e250..29c3c3e6a9 100644
--- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml
+++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayRouteLayer, Category=Routing]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/DisplayRouteLayer/main.cpp b/CppSamples/Routing/DisplayRouteLayer/main.cpp
index e8efde168c..dc1d7b3c69 100644
--- a/CppSamples/Routing/DisplayRouteLayer/main.cpp
+++ b/CppSamples/Routing/DisplayRouteLayer/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayRouteLayer.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp
index 2cf990a26d..d12c7b66e2 100644
--- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp
+++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindClosestFacilityToMultipleIncidentsService, Category=Routing]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,35 +18,32 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FindClosestFacilityToMultipleIncidentsService.h"
 
-// ArcGIS Maps SDK headers
+#include "Map.h"
+#include "MapQuickView.h"
+#include "PictureMarkerSymbol.h"
+#include "SimpleLineSymbol.h"
+#include "SimpleRenderer.h"
+#include "ServiceFeatureTable.h"
+#include "FeatureLayer.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
+#include "GeometryEngine.h"
+#include "ClosestFacilityTask.h"
 #include "ClosestFacilityParameters.h"
 #include "ClosestFacilityResult.h"
 #include "ClosestFacilityRoute.h"
-#include "ClosestFacilityTask.h"
-#include "Envelope.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
 #include "Error.h"
-#include "FeatureLayer.h"
-#include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
 #include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "LayerListModel.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
-#include "PictureMarkerSymbol.h"
-#include "Polyline.h"
 #include "QueryParameters.h"
-#include "ServiceFeatureTable.h"
-#include "SimpleLineSymbol.h"
-#include "SimpleRenderer.h"
-#include "SymbolTypes.h"
+#include "Polyline.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h
index 49138de8ff..2032a18d0a 100644
--- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h
+++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindClosestFacilityToMultipleIncidentsService, Category=Routing]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef FINDCLOSESTFACILITYTOMULTIPLEINCIDENTSSERVICE_H
 #define FINDCLOSESTFACILITYTOMULTIPLEINCIDENTSSERVICE_H
 
-// ArcGIS Maps SDK headers
-#include "ClosestFacilityParameters.h"
-
-// Qt headers
-#include <QFuture>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Map;
@@ -41,6 +34,11 @@ class QueryParameters;
 class Error;
 }
 
+#include <QObject>
+
+#include "ClosestFacilityParameters.h"
+#include <QFuture>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("Error.h")
 
diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro
index 2e08aad4da..39cd5b0472 100644
--- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro
+++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FindClosestFacilityToMultipleIncidentsService
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml
index 6f64a9686a..46a245257b 100644
--- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml
+++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindClosestFacilityToMultipleIncidentsService, Category=Routing]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp
index a18966bf73..1862463f99 100644
--- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp
+++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "FindClosestFacilityToMultipleIncidentsService.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Routing/FindRoute/FindRoute.cpp b/CppSamples/Routing/FindRoute/FindRoute.cpp
index 80c7cb5b73..7ae218ef36 100644
--- a/CppSamples/Routing/FindRoute/FindRoute.cpp
+++ b/CppSamples/Routing/FindRoute/FindRoute.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindRoute, Category=Routing]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,35 +18,32 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FindRoute.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISVectorTiledLayer.h"
-#include "Basemap.h"
-#include "DirectionManeuverListModel.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "PictureMarkerSymbol.h"
+#include "Basemap.h"
+#include "ArcGISVectorTiledLayer.h"
+#include "GraphicsOverlay.h"
+#include "Viewpoint.h"
 #include "Point.h"
-#include "Polyline.h"
-#include "Route.h"
-#include "RouteParameters.h"
-#include "RouteResult.h"
-#include "RouteTask.h"
-#include "SimpleLineSymbol.h"
-#include "SimpleRenderer.h"
 #include "SpatialReference.h"
+#include "SimpleRenderer.h"
+#include "SimpleLineSymbol.h"
+#include "PictureMarkerSymbol.h"
+#include "RouteTask.h"
+#include "RouteParameters.h"
 #include "Stop.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
-#include "Viewpoint.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "RouteResult.h"
+#include "Route.h"
+#include "DirectionManeuverListModel.h"
+#include "Graphic.h"
+#include "Polyline.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Routing/FindRoute/FindRoute.h b/CppSamples/Routing/FindRoute/FindRoute.h
index 6b2c39f343..90c2456e30 100644
--- a/CppSamples/Routing/FindRoute/FindRoute.h
+++ b/CppSamples/Routing/FindRoute/FindRoute.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindRoute, Category=Routing]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef FIND_ROUTE_H
 #define FIND_ROUTE_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QUrl>
-
-// STL headers
-#include <RouteParameters.h>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -33,6 +26,10 @@ namespace Esri::ArcGISRuntime
   class RouteTask;
 }
 
+#include <RouteParameters.h>
+#include <QQuickItem>
+#include <QUrl>
+
 class QAbstractListModel;
 Q_MOC_INCLUDE("QAbstractListModel")
 
@@ -71,3 +68,4 @@ class FindRoute : public QQuickItem
 };
 
 #endif // FIND_ROUTE_H
+
diff --git a/CppSamples/Routing/FindRoute/FindRoute.pro b/CppSamples/Routing/FindRoute/FindRoute.pro
index 62d46af295..3af5d8b164 100644
--- a/CppSamples/Routing/FindRoute/FindRoute.pro
+++ b/CppSamples/Routing/FindRoute/FindRoute.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Routing/FindRoute/FindRoute.qml b/CppSamples/Routing/FindRoute/FindRoute.qml
index 5b3171a3ae..85e9e0eb0b 100644
--- a/CppSamples/Routing/FindRoute/FindRoute.qml
+++ b/CppSamples/Routing/FindRoute/FindRoute.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindRoute, Category=Routing]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/FindRoute/main.cpp b/CppSamples/Routing/FindRoute/main.cpp
index 10081739e9..1a1175269b 100644
--- a/CppSamples/Routing/FindRoute/main.cpp
+++ b/CppSamples/Routing/FindRoute/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FindRoute.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FindRoute.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp
index 90e0a8e4a1..ff123b5da5 100644
--- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp
+++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindServiceAreasForMultipleFacilities, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,27 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FindServiceAreasForMultipleFacilities.h"
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "Error.h"
-#include "ErrorException.h"
 #include "FeatureLayer.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "NetworkAnalystTypes.h"
 #include "PictureMarkerSymbol.h"
-#include "Polygon.h"
 #include "QueryParameters.h"
-#include "ServiceAreaFacility.h"
 #include "ServiceAreaParameters.h"
 #include "ServiceAreaPolygon.h"
 #include "ServiceAreaResult.h"
@@ -46,11 +33,21 @@
 #include "ServiceFeatureTable.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleRenderer.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "NetworkAnalystTypes.h"
+#include "LayerListModel.h"
+#include "ServiceAreaFacility.h"
+#include "Envelope.h"
+#include "Polygon.h"
+#include "Graphic.h"
+#include "ErrorException.h"
 
-// Qt headers
-#include <QUrl>
 #include <QUuid>
+#include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h
index 4fc331c332..7c27fc73e9 100644
--- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h
+++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindServiceAreasForMultipleFacilities, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,8 @@
 #ifndef FINDSERVICEAREASFORMULTIPLEFACILITIES_H
 #define FINDSERVICEAREASFORMULTIPLEFACILITIES_H
 
-// ArcGIS Maps SDK headers
 #include "ServiceAreaResult.h"
 
-// Qt headers
-#include <QFuture>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -36,6 +31,9 @@ class ServiceFeatureTable;
 class SimpleFillSymbol;
 }
 
+#include <QFuture>
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class FindServiceAreasForMultipleFacilities : public QObject
diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro
index cca32adcef..768c0a32f4 100644
--- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro
+++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FindServiceAreasForMultipleFacilities
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml
index a569dc31db..1de5859d23 100644
--- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml
+++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindServiceAreasForMultipleFacilities, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp
index 191cf51604..b8e0044e92 100644
--- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp
+++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "FindServiceAreasForMultipleFacilities.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp
index 41360872af..61e0c09568 100644
--- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp
+++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=NavigateARouteWithRerouting, Category=Routing]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "NavigateARouteWithRerouting.h"
 
-// ArcGIS Maps SDK headers
 #include "DirectionManeuverListModel.h"
 #include "Error.h"
 #include "ErrorException.h"
@@ -50,26 +48,23 @@
 #include "SimpleMarkerSymbol.h"
 #include "SimulatedLocationDataSource.h"
 #include "SimulationParameters.h"
-#include "SpatialReference.h"
 #include "Stop.h"
-#include "SymbolTypes.h"
 #include "TrackingDistance.h"
 #include "TrackingProgress.h"
 #include "TrackingStatus.h"
+#include "SpatialReference.h"
+#include "SymbolTypes.h"
 #include "VoiceGuidance.h"
 
-// Qt headers
+#include <memory>
 #include <QFileInfo>
 #include <QFuture>
 #include <QList>
 #include <QStandardPaths>
 #include <QTime>
+#include <QtTextToSpeech/QTextToSpeech>
 #include <QUrl>
 #include <QUuid>
-#include <QtTextToSpeech/QTextToSpeech>
-
-// STL headers
-#include <memory>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h
index 81b7fc5e66..ed5cd057b0 100644
--- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h
+++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=NavigateARouteWithRerouting, Category=Routing]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,10 @@
 #ifndef NAVIGATEAROUTEWITHREROUTING_H
 #define NAVIGATEAROUTEWITHREROUTING_H
 
-// ArcGIS Maps SDK headers
-#include "DirectionManeuver.h"
 #include "Route.h"
-#include "RouteParameters.h"
 #include "RouteResult.h"
-
-// Qt headers
-#include <QObject>
+#include "RouteParameters.h"
+#include "DirectionManeuver.h"
 
 class QTextToSpeech;
 
@@ -43,6 +39,8 @@ class SimulatedLocationDataSource;
 }
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class NavigateARouteWithRerouting : public QObject
diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro
index 6fe4289d29..a487fa774a 100644
--- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro
+++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro
@@ -28,7 +28,7 @@ QT += texttospeech
 TEMPLATE = app
 TARGET = NavigateARouteWithRerouting
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml
index f0b8335eb7..a0c46a8a5e 100644
--- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml
+++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=NavigateARouteWithRerouting, Category=Routing]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp b/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp
index e81d3b448c..e4d5d0d0ab 100644
--- a/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp
+++ b/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "NavigateARouteWithRerouting.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp b/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp
index 1f5ed89e81..79bc5f417b 100644
--- a/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp
+++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=NavigateRoute, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,54 +18,50 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "NavigateRoute.h"
 
-// ArcGIS Maps SDK headers
-#include "DirectionManeuver.h"
 #include "DirectionManeuverListModel.h"
-#include "Error.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LinearUnit.h"
 #include "Location.h"
 #include "LocationDisplay.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
 #include "NavigationTypes.h"
 #include "Point.h"
-#include "Polyline.h"
 #include "Route.h"
-#include "RouteParameters.h"
 #include "RouteResult.h"
 #include "RouteTask.h"
 #include "RouteTracker.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
 #include "SimulatedLocationDataSource.h"
 #include "SimulationParameters.h"
-#include "SpatialReference.h"
 #include "Stop.h"
-#include "SymbolTypes.h"
 #include "TrackingDistance.h"
 #include "TrackingProgress.h"
 #include "TrackingStatus.h"
 #include "VoiceGuidance.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
+#include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "RouteTask.h"
+#include "LinearUnit.h"
+#include "RouteParameters.h"
+#include "DirectionManeuver.h"
+#include "SpatialReference.h"
+#include "Polyline.h"
+#include "Graphic.h"
+#include "SimpleLineSymbol.h"
 
-// Qt headers
+#include <memory>
 #include <QFuture>
 #include <QList>
 #include <QTime>
+#include <QtTextToSpeech/QTextToSpeech>
 #include <QUrl>
 #include <QUuid>
-#include <QtTextToSpeech/QTextToSpeech>
-
-// STL headers
-#include <memory>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.h b/CppSamples/Routing/NavigateRoute/NavigateRoute.h
index e5321d6ffe..b55daa20a3 100644
--- a/CppSamples/Routing/NavigateRoute/NavigateRoute.h
+++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=NavigateRoute, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,9 @@
 #ifndef NAVIGATEROUTE_H
 #define NAVIGATEROUTE_H
 
-// ArcGIS Maps SDK headers
 #include "Route.h"
 #include "RouteResult.h"
 
-// Qt headers
-#include <QObject>
-#include <QString>
-
 namespace Esri::ArcGISRuntime
 {
 class Graphic;
@@ -38,6 +33,9 @@ class SimulatedLocationDataSource;
 
 class QTextToSpeech;
 
+#include <QObject>
+#include <QString>
+
 class QAbstractListModel;
 
 Q_MOC_INCLUDE("MapQuickView.h")
diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.pro b/CppSamples/Routing/NavigateRoute/NavigateRoute.pro
index 40af6a23d9..b868742258 100644
--- a/CppSamples/Routing/NavigateRoute/NavigateRoute.pro
+++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.pro
@@ -28,7 +28,7 @@ QT += texttospeech
 TEMPLATE = app
 TARGET = NavigateRoute
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.qml b/CppSamples/Routing/NavigateRoute/NavigateRoute.qml
index 0bc3a5c8b1..260d2b75bc 100644
--- a/CppSamples/Routing/NavigateRoute/NavigateRoute.qml
+++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=NavigateRoute, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/NavigateRoute/main.cpp b/CppSamples/Routing/NavigateRoute/main.cpp
index d3845e4fd0..7bc4a7aa58 100644
--- a/CppSamples/Routing/NavigateRoute/main.cpp
+++ b/CppSamples/Routing/NavigateRoute/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "NavigateRoute.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp b/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp
index 562c99b5ff..1ab88abfb8 100644
--- a/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp
+++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OfflineRouting, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,49 +18,44 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OfflineRouting.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledLayer.h"
-#include "Basemap.h"
 #include "CompositeSymbol.h"
 #include "Envelope.h"
-#include "Error.h"
 #include "GeometryEngine.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyGraphicsOverlayResult.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "PictureMarkerSymbol.h"
-#include "Point.h"
 #include "Polyline.h"
-#include "Route.h"
 #include "RouteParameters.h"
 #include "RouteResult.h"
 #include "RouteTask.h"
-#include "RouteTaskInfo.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
 #include "Stop.h"
-#include "SymbolTypes.h"
 #include "TextSymbol.h"
 #include "TileCache.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "RouteTaskInfo.h"
 #include "TravelMode.h"
+#include "IdentifyGraphicsOverlayResult.h"
+#include "Route.h"
+#include "Basemap.h"
+#include "Point.h"
+#include "SpatialReference.h"
 
-// Qt headers
-#include <QFileInfo>
-#include <QScopedPointer>
-#include <QStandardPaths>
 #include <QUuid>
-
-// STL headers
 #include <memory>
+#include <QScopedPointer>
+#include <QFileInfo>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.h b/CppSamples/Routing/OfflineRouting/OfflineRouting.h
index b989ebcc8d..482900169f 100644
--- a/CppSamples/Routing/OfflineRouting/OfflineRouting.h
+++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OfflineRouting, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,10 @@
 #ifndef OFFLINEROUTING_H
 #define OFFLINEROUTING_H
 
-// ArcGIS Maps SDK headers
 #include "Envelope.h"
 #include "RouteParameters.h"
 #include "RouteResult.h"
 
-// Qt headers
-#include <QFuture>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Graphic;
@@ -36,6 +31,9 @@ class PictureMarkerSymbol;
 class RouteTask;
 }
 
+#include <QFuture>
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class OfflineRouting : public QObject
diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.pro b/CppSamples/Routing/OfflineRouting/OfflineRouting.pro
index 557b4276b4..aa81de9e98 100644
--- a/CppSamples/Routing/OfflineRouting/OfflineRouting.pro
+++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = OfflineRouting
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.qml b/CppSamples/Routing/OfflineRouting/OfflineRouting.qml
index ab5472b099..c993724f1a 100644
--- a/CppSamples/Routing/OfflineRouting/OfflineRouting.qml
+++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OfflineRouting, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/OfflineRouting/main.cpp b/CppSamples/Routing/OfflineRouting/main.cpp
index f33308c672..948de74293 100644
--- a/CppSamples/Routing/OfflineRouting/main.cpp
+++ b/CppSamples/Routing/OfflineRouting/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "OfflineRouting.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp
index 81c9d5f909..c32e640fac 100644
--- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp
+++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RouteAroundBarriers, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RouteAroundBarriers.h"
 
-// ArcGIS Maps SDK headers
 #include "CompositeSymbol.h"
-#include "DirectionManeuverListModel.h"
-#include "Error.h"
 #include "GeometryEngine.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "PictureMarkerSymbol.h"
-#include "Point.h"
 #include "Polygon.h"
 #include "PolygonBarrier.h"
-#include "Polyline.h"
 #include "Route.h"
 #include "RouteResult.h"
 #include "RouteTask.h"
@@ -45,14 +36,20 @@
 #include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
 #include "Stop.h"
-#include "SymbolTypes.h"
 #include "TextSymbol.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "DirectionManeuverListModel.h"
 #include "Viewpoint.h"
+#include "Point.h"
+#include "Polyline.h"
 
-// Qt headers
-#include <QDir>
 #include <QFuture>
 #include <QUuid>
+#include <QDir>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h
index 044c42a092..0017e6b233 100644
--- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h
+++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RouteAroundBarriers, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,10 @@
 #ifndef ROUTEAROUNDBARRIERS_H
 #define ROUTEAROUNDBARRIERS_H
 
-// ArcGIS Maps SDK headers
 #include "PolygonBarrier.h"
 #include "RouteParameters.h"
 #include "Stop.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class GraphicsOverlay;
@@ -35,6 +31,8 @@ class RouteTask;
 class SimpleFillSymbol;
 }
 
+#include <QObject>
+
 class QAbstractListModel;
 
 Q_MOC_INCLUDE("MapQuickView.h")
diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro
index 2d4e77a786..228b39f1ab 100644
--- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro
+++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RouteAroundBarriers
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml
index 05b75bbaad..fcc42cefb4 100644
--- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml
+++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RouteAroundBarriers, Category=Routing]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/RouteAroundBarriers/main.cpp b/CppSamples/Routing/RouteAroundBarriers/main.cpp
index 56e469f793..7ee90f2511 100644
--- a/CppSamples/Routing/RouteAroundBarriers/main.cpp
+++ b/CppSamples/Routing/RouteAroundBarriers/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "RouteAroundBarriers.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.cpp b/CppSamples/Routing/ServiceArea/ServiceArea.cpp
index c8acce1a5c..b6478692a5 100644
--- a/CppSamples/Routing/ServiceArea/ServiceArea.cpp
+++ b/CppSamples/Routing/ServiceArea/ServiceArea.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceArea, Category=Routing]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,38 +18,35 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ServiceArea.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
-#include "NetworkAnalystTypes.h"
 #include "PictureMarkerSymbol.h"
-#include "Point.h"
-#include "Polygon.h"
-#include "Polyline.h"
-#include "PolylineBarrier.h"
 #include "PolylineBuilder.h"
-#include "ServiceAreaFacility.h"
-#include "ServiceAreaPolygon.h"
-#include "ServiceAreaResult.h"
 #include "ServiceAreaTask.h"
 #include "SimpleFillSymbol.h"
 #include "SimpleLineSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
 #include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Graphic.h"
+#include "ServiceAreaFacility.h"
+#include "PolylineBarrier.h"
+#include "NetworkAnalystTypes.h"
+#include "ServiceAreaResult.h"
+#include "ServiceAreaPolygon.h"
+#include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
+#include "GraphicsOverlay.h"
+#include "Polyline.h"
+#include "Polygon.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.h b/CppSamples/Routing/ServiceArea/ServiceArea.h
index c5e90554f9..981c028a37 100644
--- a/CppSamples/Routing/ServiceArea/ServiceArea.h
+++ b/CppSamples/Routing/ServiceArea/ServiceArea.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceArea, Category=Routing]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef SERVICEAREA_H
 #define SERVICEAREA_H
 
-// ArcGIS Maps SDK headers
-#include "ServiceAreaParameters.h"
-
-// Qt headers
-#include <QList>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class GraphicsOverlay;
@@ -34,6 +27,11 @@ namespace Esri::ArcGISRuntime
   class ServiceAreaTask;
 }
 
+#include "ServiceAreaParameters.h"
+
+#include <QList>
+#include <QQuickItem>
+
 class ServiceArea : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.pro b/CppSamples/Routing/ServiceArea/ServiceArea.pro
index ce8552b066..3824936e94 100644
--- a/CppSamples/Routing/ServiceArea/ServiceArea.pro
+++ b/CppSamples/Routing/ServiceArea/ServiceArea.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ServiceArea
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.qml b/CppSamples/Routing/ServiceArea/ServiceArea.qml
index af441093d5..e64c7609c8 100644
--- a/CppSamples/Routing/ServiceArea/ServiceArea.qml
+++ b/CppSamples/Routing/ServiceArea/ServiceArea.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ServiceArea, Category=Routing]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Routing/ServiceArea/main.cpp b/CppSamples/Routing/ServiceArea/main.cpp
index 23665fc27d..9bfb7ef57a 100644
--- a/CppSamples/Routing/ServiceArea/main.cpp
+++ b/CppSamples/Routing/ServiceArea/main.cpp
@@ -1,36 +1,29 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ServiceArea.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ServiceArea.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp
index 4028f6830e..d6e69b38f2 100644
--- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp
+++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Add3DTilesLayer, Category=Scenes]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Add3DTilesLayer.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
 #include "Basemap.h"
 #include "Camera.h"
diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h
index 2b5b6a3176..b7a1cd0bf2 100644
--- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h
+++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Add3DTilesLayer, Category=Scenes]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ADD3DTILESLAYER_H
 #define ADD3DTILESLAYER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -27,6 +24,8 @@ class SceneQuickView;
 class Ogc3dTilesLayer;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h");
 
 class Add3DTilesLayer : public QObject
diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro
index d3101c63d4..d12b6bbe6c 100644
--- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro
+++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro
@@ -28,7 +28,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = Add3DTilesLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml
index b09a33b10d..349bce7e61 100644
--- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml
+++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Add3DTilesLayer, Category=Scenes]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/Add3DTilesLayer/main.cpp b/CppSamples/Scenes/Add3DTilesLayer/main.cpp
index fd93b87f3e..c020149a95 100644
--- a/CppSamples/Scenes/Add3DTilesLayer/main.cpp
+++ b/CppSamples/Scenes/Add3DTilesLayer/main.cpp
@@ -1,32 +1,26 @@
-// [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "Add3DTilesLayer.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp
index 5c841d0076..44b2848747 100644
--- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp
+++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddAPointSceneLayer, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AddAPointSceneLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
-#include "ElevationSourceListModel.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "ArcGISSceneLayer.h"
+#include "MapTypes.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerListModel.h"
+#include "MapTypes.h"
 
-// Qt headers
 #include <QUuid>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h
index 92d8a9200a..06f06bd383 100644
--- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h
+++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddAPointSceneLayer, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef ADDAPOINTSCENELAYER_H
 #define ADDAPOINTSCENELAYER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class AddAPointSceneLayer : public QObject
diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro
index 3ebed4663a..41c96e1d0d 100644
--- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro
+++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AddAPointSceneLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml
index 245c2589e6..b6f71c8e06 100644
--- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml
+++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddAPointSceneLayer, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/AddAPointSceneLayer/main.cpp b/CppSamples/Scenes/AddAPointSceneLayer/main.cpp
index f89137f4a7..66b4a7bd5f 100644
--- a/CppSamples/Scenes/AddAPointSceneLayer/main.cpp
+++ b/CppSamples/Scenes/AddAPointSceneLayer/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AddAPointSceneLayer.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp
index 16f2cc6e7f..4ba4308e00 100644
--- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp
+++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddIntegratedMeshLayer, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AddIntegratedMeshLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "Camera.h"
-#include "Error.h"
-#include "IntegratedMeshLayer.h"
-#include "LayerListModel.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "IntegratedMeshLayer.h"
+#include "Error.h"
+#include "LayerListModel.h"
+#include "Camera.h"
 #include "SpatialReference.h"
+#include "Point.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QUuid>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h
index 6c794139de..ec220bda52 100644
--- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h
+++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddIntegratedMeshLayer, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef ADDINTEGRATEDMESHLAYER_H
 #define ADDINTEGRATEDMESHLAYER_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Error;
@@ -28,6 +25,8 @@ class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class AddIntegratedMeshLayer : public QObject
diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro
index 3e13e02a41..d915b8e6ef 100644
--- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro
+++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AddIntegratedMeshLayer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml
index 897a49880c..f898554c1a 100644
--- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml
+++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AddIntegratedMeshLayer, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp b/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp
index 6dfc1e0372..b2a8f8e33a 100644
--- a/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp
+++ b/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AddIntegratedMeshLayer.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp
index 878bb7310a..8684bda852 100644
--- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp
+++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Animate3DSymbols, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,49 +18,46 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Animate3DSymbols.h"
-#include "MissionData.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "AttributeListModel.h"
 #include "Camera.h"
 #include "DistanceCompositeSceneSymbol.h"
-#include "ElevationSourceListModel.h"
 #include "GlobeCameraController.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerSceneProperties.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "ModelSceneSymbol.h"
 #include "OrbitGeoElementCameraController.h"
 #include "PointCollection.h"
 #include "Polyline.h"
 #include "PolylineBuilder.h"
-#include "RendererSceneProperties.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
 #include "SceneViewTypes.h"
-#include "SimpleLineSymbol.h"
-#include "SimpleMarkerSceneSymbol.h"
 #include "SimpleMarkerSymbol.h"
+#include "SimpleMarkerSceneSymbol.h"
 #include "SimpleRenderer.h"
 #include "SpatialReference.h"
-#include "Surface.h"
+#include "MissionData.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerSceneProperties.h"
+#include "RendererSceneProperties.h"
+#include "AttributeListModel.h"
+#include "Graphic.h"
 #include "Viewpoint.h"
+#include "SimpleLineSymbol.h"
 
-// Qt headers
 #include <QFileInfo>
 #include <QFuture>
-#include <QStandardPaths>
 #include <QStringListModel>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
@@ -391,3 +388,4 @@ double Animate3DSymbols::minZoom() const
 {
   return m_followingController ? m_followingController->minCameraDistance() : 0;
 }
+
diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h
index e1515cd622..f472e849d0 100644
--- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h
+++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Animate3DSymbols, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef ANIMATE3DSYMBOLS_H
 #define ANIMATE3DSYMBOLS_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QString>
-
-// STL headers
-#include <memory>
-
 class MissionData;
 
 namespace Esri::ArcGISRuntime
@@ -41,6 +34,10 @@ namespace Esri::ArcGISRuntime
 class QAbstractListModel;
 class MissionData;
 
+#include <QQuickItem>
+#include <QString>
+#include <memory>
+
 Q_MOC_INCLUDE("QAbstractListModel")
 
 class Animate3DSymbols : public QQuickItem
diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro
index eb0e30dc9b..1ccab082b4 100644
--- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro
+++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml
index 3b5098d5ca..12db043a34 100644
--- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml
+++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Animate3DSymbols, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp b/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp
index fda0b2b7fb..a16e28e9b3 100644
--- a/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp
+++ b/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Animate3DSymbols, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "MissionData.h"
 
-// Qt headers
 #include <QFile>
 
 // MissionData
diff --git a/CppSamples/Scenes/Animate3DSymbols/MissionData.h b/CppSamples/Scenes/Animate3DSymbols/MissionData.h
index d5b50464bc..4333dd4b86 100644
--- a/CppSamples/Scenes/Animate3DSymbols/MissionData.h
+++ b/CppSamples/Scenes/Animate3DSymbols/MissionData.h
@@ -1,23 +1,22 @@
 // [WriteFile Name=Animate3DSymbols, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // [Legal]
-
 #ifndef MISSIONDATA_H
 #define MISSIONDATA_H
 
-// ArcGIS Maps SDK headers
+// C++ API headers
 #include "Point.h"
 #include "SpatialReference.h"
 
diff --git a/CppSamples/Scenes/Animate3DSymbols/main.cpp b/CppSamples/Scenes/Animate3DSymbols/main.cpp
index d9f979252a..042839d55d 100644
--- a/CppSamples/Scenes/Animate3DSymbols/main.cpp
+++ b/CppSamples/Scenes/Animate3DSymbols/main.cpp
@@ -1,40 +1,34 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Animate3DSymbols.h"
-
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-#include "MapQuickView.h"
-#include "SceneQuickView.h"
 
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
 #include <QQmlEngine>
-#include <QQuickView>
+#include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "MapQuickView.h"
+#include "SceneQuickView.h"
+#include "ArcGISRuntimeEnvironment.h"
+
+#include "Animate3DSymbols.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp
index cbe83514b4..fecf5cd449 100644
--- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp
+++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnimateImagesWithImageOverlay, Category=Scenes]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,38 +18,35 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AnimateImagesWithImageOverlay.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
 #include "ArcGISTiledLayer.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Envelope.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
 #include "ImageFrame.h"
 #include "ImageOverlay.h"
 #include "ImageOverlayListModel.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
 #include "SceneView.h"
-#include "SpatialReference.h"
-#include "Surface.h"
+#include "Envelope.h"
+#include "Point.h"
+#include "Camera.h"
 #include "Viewpoint.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerListModel.h"
+#include "SpatialReference.h"
+#include "MapTypes.h"
 
 // Qt headers
+#include <QtCore/qglobal.h>
 #include <QDir>
 #include <QFile>
 #include <QImage>
 #include <QStandardPaths>
 #include <QString>
 #include <QTimer>
-#include <QtCore/qglobal.h>
 
-// STL headers
 #include <memory>
 
 using namespace Esri::ArcGISRuntime;
@@ -86,6 +83,7 @@ AnimateImagesWithImageOverlay::AnimateImagesWithImageOverlay(QObject* parent /*
   ArcGISTiledElevationSource* elevationSource = new ArcGISTiledElevationSource(
         QUrl("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer"), this);
 
+
   // add the elevation source to the scene to display elevation
   m_scene->baseSurface()->elevationSources()->append(elevationSource);
 
diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h
index 55842701b3..a8591b2716 100644
--- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h
+++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnimateImagesWithImageOverlay, Category=Scenes]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef ANIMATEIMAGESWITHIMAGEOVERLAY_H
 #define ANIMATEIMAGESWITHIMAGEOVERLAY_H
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-
-// Qt headers
-#include <QDir>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -34,6 +27,11 @@ class ImageOverlay;
 
 class QTimer;
 
+#include <QDir>
+#include <QObject>
+
+#include "Envelope.h"
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class AnimateImagesWithImageOverlay : public QObject
diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro
index 3222b44123..205f0d47c0 100644
--- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro
+++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = AnimateImagesWithImageOverlay
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml
index 8206c0b69c..58d2f6e6a4 100644
--- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml
+++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=AnimateImagesWithImageOverlay, Category=Scenes]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp b/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp
index 1d77146821..c99ff8d54d 100644
--- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp
+++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "AnimateImagesWithImageOverlay.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp b/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp
index 3e9cd713b5..606e3491b8 100644
--- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp
+++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=BasicSceneView, Category=Scenes]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "BasicSceneView.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
 #include "Camera.h"
 #include "ElevationSourceListModel.h"
@@ -86,3 +84,4 @@ void BasicSceneView::setSceneView(SceneQuickView* sceneView)
 
   emit sceneViewChanged();
 }
+
diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.h b/CppSamples/Scenes/BasicSceneView/BasicSceneView.h
index e8830102ec..164340b6ea 100644
--- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.h
+++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=BasicSceneView, Category=Scenes]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef BASICSCENEVIEW_H
 #define BASICSCENEVIEW_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h");
 
 class BasicSceneView : public QObject
diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro b/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro
index 2baff1293e..bc01a85304 100644
--- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro
+++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = BasicSceneView
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml b/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml
index 3efd122438..dfa61fefa3 100644
--- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml
+++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=BasicSceneView, Category=Scenes]
 // [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/BasicSceneView/main.cpp b/CppSamples/Scenes/BasicSceneView/main.cpp
index 41880b0c01..7e7fe68f2e 100644
--- a/CppSamples/Scenes/BasicSceneView/main.cpp
+++ b/CppSamples/Scenes/BasicSceneView/main.cpp
@@ -1,32 +1,26 @@
-// [Legal]
 // Copyright 2022 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "BasicSceneView.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp
index 2dfb86d3e0..e232b1c332 100644
--- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp
+++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeAtmosphereEffect, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,16 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ChangeAtmosphereEffect.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "MapTypes.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "MapTypes.h"
 #include "Surface.h"
+#include "Camera.h"
+#include "ElevationSourceListModel.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
@@ -93,3 +90,5 @@ ChangeAtmosphereEffect::AtmosphereEnum ChangeAtmosphereEffect::atmosphereEffect(
     return static_cast<AtmosphereEnum>(m_sceneView->atmosphereEffect());
   return static_cast<AtmosphereEnum>(AtmosphereEffect::None);
 }
+
+
diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h
index d2b3e673d8..d555c609bc 100644
--- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h
+++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeAtmosphereEffect, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,18 +17,16 @@
 #ifndef CHANGEATMOSPHEREEFFECT_H
 #define CHANGEATMOSPHEREEFFECT_H
 
-// ArcGIS Maps SDK headers
 #include "SceneViewTypes.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class ChangeAtmosphereEffect : public QObject
diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro
index cae38b0e68..e76935c561 100644
--- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro
+++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ChangeAtmosphereEffect
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml
index 39d53e8f38..25dea718f8 100644
--- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml
+++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChangeAtmosphereEffect, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp b/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp
index 8748a490fb..7518fbd287 100644
--- a/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp
+++ b/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ChangeAtmosphereEffect.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp
index b4ab4b8086..d7f3575d7b 100644
--- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp
+++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChooseCameraController, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,34 +18,31 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ChooseCameraController.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
 #include "GlobeCameraController.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerSceneProperties.h"
-#include "MapTypes.h"
 #include "ModelSceneSymbol.h"
-#include "OrbitGeoElementCameraController.h"
 #include "OrbitLocationCameraController.h"
-#include "Point.h"
+#include "OrbitGeoElementCameraController.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Camera.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
 #include "SceneViewTypes.h"
+#include "LayerSceneProperties.h"
 #include "SpatialReference.h"
-#include "Surface.h"
+#include "GraphicsOverlay.h"
+#include "Point.h"
+#include "Graphic.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 namespace
 {
@@ -150,3 +147,4 @@ void ChooseCameraController::setSceneView(SceneQuickView* sceneView)
 
   emit sceneViewChanged();
 }
+
diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h
index 6d48e9290b..496c308e05 100644
--- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h
+++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChooseCameraController, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,6 +30,8 @@ class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class ChooseCameraController : public QObject
diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro
index 7e782584df..5b0bdf7b33 100644
--- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro
+++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ChooseCameraController
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml
index 01ba7659a0..a668003c54 100644
--- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml
+++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ChooseCameraController, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/ChooseCameraController/main.cpp b/CppSamples/Scenes/ChooseCameraController/main.cpp
index 41953cb9fb..ec7758c1ef 100644
--- a/CppSamples/Scenes/ChooseCameraController/main.cpp
+++ b/CppSamples/Scenes/ChooseCameraController/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ChooseCameraController.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp
index 3e9428efa4..0ee73c7ade 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateTerrainSurfaceFromLocalRaster, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateTerrainSurfaceFromLocalRaster.h"
 
-// ArcGIS Maps SDK headers
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Error.h"
-#include "MapTypes.h"
 #include "RasterElevationSource.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "MapTypes.h"
+#include "Error.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "Camera.h"
 
-// Qt headers
+#include <QUrl>
 #include <QFileInfo>
 #include <QStandardPaths>
-#include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h
index de6587f7e8..e45068ce44 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateTerrainSurfaceFromLocalRaster, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,18 +17,16 @@
 #ifndef CREATETERRAINSURFACEFROMLOCALRASTER_H
 #define CREATETERRAINSURFACEFROMLOCALRASTER_H
 
-// ArcGIS Maps SDK headers
 #include "Error.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
   class Scene;
   class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class CreateTerrainSurfaceFromLocalRaster : public QObject
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro
index 653f778691..d6d86fbbf9 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateTerrainSurfaceFromLocalRaster
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml
index f6d90a1e19..ecf765172f 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateTerrainSurfaceFromLocalRaster, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp
index d1bb6ea488..58603c07bd 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateTerrainSurfaceFromLocalRaster.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp
index c265755f10..aae83c93a1 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateTerrainSurfaceFromLocalTilePackage, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,20 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateTerrainSurfaceFromLocalTilePackage.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Error.h"
-#include "MapTypes.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "MapTypes.h"
+#include "Error.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "Camera.h"
 
-// Qt headers
+#include <QUrl>
 #include <QFileInfo>
 #include <QStandardPaths>
-#include <QUrl>
 
 using namespace Esri::ArcGISRuntime;
 
@@ -138,3 +135,4 @@ void CreateTerrainSurfaceFromLocalTilePackage::setSceneView(SceneQuickView* scen
 
   emit sceneViewChanged();
 }
+
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h
index 6740187533..bafbfeada7 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateTerrainSurfaceFromLocalTilePackage, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,18 +17,16 @@
 #ifndef CreateTerrainSurfaceFromLocalTilePackage_H
 #define CreateTerrainSurfaceFromLocalTilePackage_H
 
-// ArcGIS Maps SDK headers
 #include "Error.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
   class Scene;
   class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class CreateTerrainSurfaceFromLocalTilePackage : public QObject
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro
index a5d6d58dbb..02a0bcd878 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateTerrainSurfaceFromLocalTilePackage
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml
index 6c85089fcc..d46c76f447 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateTerrainSurfaceFromLocalTilePackage, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp
index 15f2966fd9..fec16de280 100644
--- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp
+++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateTerrainSurfaceFromLocalTilePackage.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp
index f360e4ae31..e2a5b57339 100644
--- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp
+++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Display3DLabelsInScene, Category=Scenes]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,19 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Display3DLabelsInScene.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcadeLabelExpression.h"
-#include "Error.h"
 #include "FeatureLayer.h"
-#include "GroupLayer.h"
 #include "LabelDefinition.h"
-#include "LabelDefinitionListModel.h"
-#include "LayerListModel.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "ServiceTypes.h"
 #include "TextSymbol.h"
+#include "Error.h"
+#include "LayerListModel.h"
+#include "GroupLayer.h"
+#include "ServiceTypes.h"
+#include "LabelDefinitionListModel.h"
 
 using namespace Esri::ArcGISRuntime;
 
@@ -105,3 +103,4 @@ void Display3DLabelsInScene::setSceneView(SceneQuickView* sceneView)
 
   emit sceneViewChanged();
 }
+
diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h
index 5469d5bc60..21719b1fea 100644
--- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h
+++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Display3DLabelsInScene, Category=Scenes]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISPLAY3DLABELSINSCENE_H
 #define DISPLAY3DLABELSINSCENE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -27,6 +24,8 @@ class SceneQuickView;
 class FeatureLayer;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class Display3DLabelsInScene : public QObject
diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro
index f9b58411d7..f3a1cb5e57 100644
--- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro
+++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = Display3DLabelsInScene
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml
index 000a54b6dc..7e84b90c6a 100644
--- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml
+++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Display3DLabelsInScene, Category=Scenes]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/Display3DLabelsInScene/main.cpp b/CppSamples/Scenes/Display3DLabelsInScene/main.cpp
index 3abf0c15c2..aba15c22a4 100644
--- a/CppSamples/Scenes/Display3DLabelsInScene/main.cpp
+++ b/CppSamples/Scenes/Display3DLabelsInScene/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "Display3DLabelsInScene.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp
index 27b0587a3a..c50e139875 100644
--- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp
+++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplaySceneLayer, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,21 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplaySceneLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISSceneLayer.h"
-#include "ArcGISTiledElevationSource.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
 #include "Basemap.h"
+#include "ArcGISTiledElevationSource.h"
+#include "ArcGISSceneLayer.h"
+#include "Point.h"
+#include "Viewpoint.h"
 #include "Camera.h"
+#include "MapTypes.h"
+#include "Surface.h"
 #include "ElevationSourceListModel.h"
 #include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
 #include "SpatialReference.h"
-#include "Surface.h"
-#include "Viewpoint.h"
 
 using namespace Esri::ArcGISRuntime;
 
@@ -80,3 +78,4 @@ void DisplaySceneLayer::componentComplete()
   // set scene on the scene view
   m_sceneView->setArcGISScene(m_scene);
 }
+
diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h
index e0285b6d45..2b1d4765fe 100644
--- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h
+++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplaySceneLayer, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef DISPLAYSCENELAYER_H
 #define DISPLAYSCENELAYER_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Scene;
@@ -27,6 +24,8 @@ namespace Esri::ArcGISRuntime
   class ArcGISSceneLayer;
 }
 
+#include <QQuickItem>
+
 class DisplaySceneLayer : public QQuickItem
 {
   Q_OBJECT
@@ -45,3 +44,4 @@ class DisplaySceneLayer : public QQuickItem
 };
 
 #endif // DISPLAYSCENELAYER_H
+
diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro
index ebf6a3c27d..8c3f46ff4d 100644
--- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro
+++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml
index 2320c9713e..030eaba947 100644
--- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml
+++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplaySceneLayer, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/DisplaySceneLayer/main.cpp b/CppSamples/Scenes/DisplaySceneLayer/main.cpp
index 332c2371a8..4830dbe8a3 100644
--- a/CppSamples/Scenes/DisplaySceneLayer/main.cpp
+++ b/CppSamples/Scenes/DisplaySceneLayer/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DisplaySceneLayer.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DisplaySceneLayer.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp
index df1f5cf35f..f07d3f87b2 100644
--- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp
+++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DistanceCompositeSymbol, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,35 +18,32 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DistanceCompositeSymbol.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledElevationSource.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
 #include "Basemap.h"
+#include "ArcGISTiledElevationSource.h"
 #include "DistanceCompositeSceneSymbol.h"
-#include "ElevationSourceListModel.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerSceneProperties.h"
-#include "MapTypes.h"
+#include "SimpleMarkerSymbol.h"
+#include "SimpleMarkerSceneSymbol.h"
 #include "ModelSceneSymbol.h"
 #include "OrbitGeoElementCameraController.h"
-#include "Point.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
 #include "SceneViewTypes.h"
-#include "SimpleMarkerSceneSymbol.h"
-#include "SimpleMarkerSymbol.h"
+#include "LayerSceneProperties.h"
 #include "SpatialReference.h"
-#include "Surface.h"
-#include "SymbolTypes.h"
+#include "GraphicsOverlay.h"
+#include "Point.h"
+#include "Graphic.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h
index 2ffc2d428c..6f546b1eb8 100644
--- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h
+++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DistanceCompositeSymbol, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef DISTANCE_COMPOSITE_SYMBOL_H
 #define DISTANCE_COMPOSITE_SYMBOL_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Scene;
   class SceneQuickView;
 }
 
+#include <QQuickItem>
+
 class DistanceCompositeSymbol : public QQuickItem
 {
   Q_OBJECT
@@ -43,3 +42,4 @@ class DistanceCompositeSymbol : public QQuickItem
 };
 
 #endif // DISTANCE_COMPOSITE_SYMBOL_H
+
diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro
index b05c890782..04892c0475 100644
--- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro
+++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml
index 8cadab7ea3..199da1be45 100644
--- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml
+++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DistanceCompositeSymbol, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp b/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp
index 384f780b97..076d4bc7b2 100644
--- a/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp
+++ b/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DistanceCompositeSymbol.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "DistanceCompositeSymbol.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp
index e5ac94edec..593194c5a8 100644
--- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp
+++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExtrudeGraphics, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,34 +18,31 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ExtrudeGraphics.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledElevationSource.h"
-#include "AttributeListModel.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
 #include "Basemap.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "MapTypes.h"
+#include "ArcGISTiledElevationSource.h"
+#include "SimpleRenderer.h"
 #include "Point.h"
-#include "Polygon.h"
 #include "PolygonBuilder.h"
+#include "Polygon.h"
+#include "SimpleFillSymbol.h"
+#include "Camera.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
 #include "RendererSceneProperties.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
 #include "SceneViewTypes.h"
-#include "SimpleFillSymbol.h"
-#include "SimpleRenderer.h"
+#include "GraphicsOverlay.h"
 #include "SpatialReference.h"
-#include "Surface.h"
-#include "SymbolTypes.h"
+#include "Graphic.h"
+#include "AttributeListModel.h"
 
-// STL headers
 #include <cmath>
 #include <ctime>
 
diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h
index 76f5da2c5e..76e86c9073 100644
--- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h
+++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExtrudeGraphics, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef EXTRUDE_GRAPHICS_H
 #define EXTRUDE_GRAPHICS_H
 
-// Qt headers
-#include <QQuickItem>
-#include <QUrl>
-
 namespace Esri::ArcGISRuntime
 {
   class Scene;
@@ -29,6 +25,9 @@ namespace Esri::ArcGISRuntime
   class Polygon;
 }
 
+#include <QQuickItem>
+#include <QUrl>
+
 class ExtrudeGraphics : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro
index a52557dcb8..64a8ecef20 100644
--- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro
+++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml
index 0f65181ba0..955c0000fd 100644
--- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml
+++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ExtrudeGraphics, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/ExtrudeGraphics/main.cpp b/CppSamples/Scenes/ExtrudeGraphics/main.cpp
index 71d0550ac3..8047cf1817 100644
--- a/CppSamples/Scenes/ExtrudeGraphics/main.cpp
+++ b/CppSamples/Scenes/ExtrudeGraphics/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "ExtrudeGraphics.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "ExtrudeGraphics.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp
index c9f1faadf2..730c1de207 100644
--- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp
+++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerExtrusion, Category=Scenes]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,27 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FeatureLayerExtrusion.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
 #include "FeatureLayer.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "RendererSceneProperties.h"
+#include "ServiceFeatureTable.h"
+#include "ArcGISTiledElevationSource.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SceneViewTypes.h"
-#include "ServiceFeatureTable.h"
-#include "SimpleFillSymbol.h"
+#include "Point.h"
 #include "SimpleLineSymbol.h"
+#include "SimpleFillSymbol.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
-#include "Surface.h"
+#include "RendererSceneProperties.h"
+#include "Camera.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "RendererSceneProperties.h"
+#include "LayerListModel.h"
+#include "SceneViewTypes.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
 
 using namespace Esri::ArcGISRuntime;
@@ -120,3 +119,6 @@ void FeatureLayerExtrusion::totalPopulation()
   props.setExtrusionExpression("[POP2007] / 10");
   m_renderer->setSceneProperties(props);
 }
+
+
+
diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h
index 9986e49b37..58994b742a 100644
--- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h
+++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerExtrusion, Category=Scenes]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef FEATURELAYEREXTRUSION_H
 #define FEATURELAYEREXTRUSION_H
 
-// ArcGIS Maps SDK headers
-#include "Camera.h"
-#include "Point.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class FeatureLayer;
@@ -36,6 +29,10 @@ class SimpleRenderer;
 enum class FeatureRenderingMode;
 }
 
+#include <QQuickItem>
+#include "Point.h"
+#include "Camera.h"
+
 class FeatureLayerExtrusion : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro
index feb425c1f7..919148ddcd 100644
--- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro
+++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FeatureLayerExtrusion
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml
index 3cf6e975c7..60ea2031a8 100644
--- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml
+++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FeatureLayerExtrusion, Category=Scenes]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp b/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp
index 0f5b6271a3..6312810bee 100644
--- a/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp
+++ b/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FeatureLayerExtrusion.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FeatureLayerExtrusion.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp
index 1929070aee..7a09dafc04 100644
--- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp
+++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FilterFeaturesInScene, Category=Scenes]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FilterFeaturesInScene.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
 #include "ArcGISVectorTiledLayer.h"
@@ -49,7 +47,6 @@
 #include "Surface.h"
 #include "SymbolTypes.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h
index 30ce659352..9edfc2706b 100644
--- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h
+++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FilterFeaturesInScene, Category=Scenes]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef FILTERFEATURESINSCENE_H
 #define FILTERFEATURESINSCENE_H
 
-// ArcGIS Maps SDK headers
-#include "Polygon.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISSceneLayer;
@@ -32,6 +26,10 @@ class SceneLayerPolygonFilter;
 class SceneQuickView;
 }
 
+#include "Polygon.h"
+
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h");
 
 class FilterFeaturesInScene : public QObject
diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro
index ca5c1b633a..963c85fb1b 100644
--- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro
+++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FilterFeaturesInScene
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml
index 0aeefd513a..3db231a77e 100644
--- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml
+++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FilterFeaturesInScene, Category=Scenes]
 // [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/FilterFeaturesInScene/main.cpp b/CppSamples/Scenes/FilterFeaturesInScene/main.cpp
index 944e143ceb..c2ed3ce7f1 100644
--- a/CppSamples/Scenes/FilterFeaturesInScene/main.cpp
+++ b/CppSamples/Scenes/FilterFeaturesInScene/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2023 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "FilterFeaturesInScene.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp
index 4ccadad43c..acd10ce880 100644
--- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp
+++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=GetElevationAtPoint, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,24 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "GetElevationAtPoint.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
 #include "SimpleMarkerSymbol.h"
 #include "Surface.h"
+#include "Camera.h"
+#include "MapTypes.h"
 #include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "Graphic.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h
index 401bbbe85a..8d28d7e238 100644
--- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h
+++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=GetElevationAtPoint, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro
index a58a41ed43..f94f16c275 100644
--- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro
+++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = GetElevationAtPoint
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml
index 3f9a1ee20c..beabdbc15c 100644
--- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml
+++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=GetElevationAtPoint, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/GetElevationAtPoint/main.cpp b/CppSamples/Scenes/GetElevationAtPoint/main.cpp
index 9686470450..8f453cfd4c 100644
--- a/CppSamples/Scenes/GetElevationAtPoint/main.cpp
+++ b/CppSamples/Scenes/GetElevationAtPoint/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "GetElevationAtPoint.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp
index bc95aadead..a06998ce74 100644
--- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp
+++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMobileScenePackage, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +18,15 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OpenMobileScenePackage.h"
 
-// ArcGIS Maps SDK headers
 #include "Error.h"
 #include "MobileScenePackage.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h
index 28b31c8b91..0b87ece07b 100644
--- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h
+++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMobileScenePackage, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef OPENMOBILESCENEPACKAGE_H
 #define OPENMOBILESCENEPACKAGE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Error;
@@ -28,6 +25,8 @@ class SceneQuickView;
 class MobileScenePackage;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class OpenMobileScenePackage : public QObject
diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro
index f3b5a5d28b..1768499a74 100644
--- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro
+++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = OpenMobileScenePackage
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml
index 6864a46623..2d5cccb0ac 100644
--- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml
+++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenMobileScenePackage, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/OpenMobileScenePackage/main.cpp b/CppSamples/Scenes/OpenMobileScenePackage/main.cpp
index 00642f832b..5f290cfa76 100644
--- a/CppSamples/Scenes/OpenMobileScenePackage/main.cpp
+++ b/CppSamples/Scenes/OpenMobileScenePackage/main.cpp
@@ -1,32 +1,25 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "OpenMobileScenePackage.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 #include <QtCore/qglobal.h>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/OpenScene/OpenScene.cpp b/CppSamples/Scenes/OpenScene/OpenScene.cpp
index 4720bef4d6..9e8df9c68a 100644
--- a/CppSamples/Scenes/OpenScene/OpenScene.cpp
+++ b/CppSamples/Scenes/OpenScene/OpenScene.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenScene, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,13 +18,11 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OpenScene.h"
 
-// ArcGIS Maps SDK headers
-#include "PortalItem.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "PortalItem.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/OpenScene/OpenScene.h b/CppSamples/Scenes/OpenScene/OpenScene.h
index ca5042dc73..0eba25745a 100644
--- a/CppSamples/Scenes/OpenScene/OpenScene.h
+++ b/CppSamples/Scenes/OpenScene/OpenScene.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenScene, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,13 @@
 #ifndef OPENSCENE_H
 #define OPENSCENE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
 }
 
+#include <QQuickItem>
+
 class OpenScene : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Scenes/OpenScene/OpenScene.pro b/CppSamples/Scenes/OpenScene/OpenScene.pro
index 4d493c61c1..24e47c7b8e 100644
--- a/CppSamples/Scenes/OpenScene/OpenScene.pro
+++ b/CppSamples/Scenes/OpenScene/OpenScene.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = OpenScene
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/OpenScene/OpenScene.qml b/CppSamples/Scenes/OpenScene/OpenScene.qml
index b496f80e72..d55875cc71 100644
--- a/CppSamples/Scenes/OpenScene/OpenScene.qml
+++ b/CppSamples/Scenes/OpenScene/OpenScene.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OpenScene, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/OpenScene/main.cpp b/CppSamples/Scenes/OpenScene/main.cpp
index b3a4da7cc9..e13de3762a 100644
--- a/CppSamples/Scenes/OpenScene/main.cpp
+++ b/CppSamples/Scenes/OpenScene/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "OpenScene.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "OpenScene.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp
index b5cc280962..10a7fb1123 100644
--- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp
+++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OrbitCameraAroundObject, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,34 +18,31 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OrbitCameraAroundObject.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "AttributeListModel.h"
-#include "ElevationSourceListModel.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerSceneProperties.h"
-#include "MapTypes.h"
 #include "ModelSceneSymbol.h"
 #include "OrbitGeoElementCameraController.h"
-#include "Point.h"
-#include "RendererSceneProperties.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SceneViewTypes.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerSceneProperties.h"
+#include "RendererSceneProperties.h"
+#include "AttributeListModel.h"
+#include "SceneViewTypes.h"
+#include "GraphicsOverlay.h"
+#include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QUuid>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h
index f0a06dd4cf..0dab851523 100644
--- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h
+++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OrbitCameraAroundObject, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,6 @@
 #ifndef ORBITCAMERAAROUNDOBJECT_H
 #define ORBITCAMERAAROUNDOBJECT_H
 
-// Qt headers
-#include <QObject>
-#include <QPointF>
-
 namespace Esri::ArcGISRuntime
 {
   class Graphic;
@@ -30,6 +26,9 @@ namespace Esri::ArcGISRuntime
   class SceneQuickView;
 }
 
+#include <QObject>
+#include <QPointF>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class OrbitCameraAroundObject : public QObject
diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro
index cd26dea2c9..cfe9f9d04d 100644
--- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro
+++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = OrbitCameraAroundObject
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml
index 700b0ad786..844612609e 100644
--- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml
+++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OrbitCameraAroundObject, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp b/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp
index 3070acca39..a778edf716 100644
--- a/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp
+++ b/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "OrbitCameraAroundObject.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp
index cfb567ae00..de964b9e83 100644
--- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp
+++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=RealisticLightingAndShadows, Category=Scenes]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "RealisticLightingAndShadows.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
+#include "ArcGISSceneLayer.h"
 #include "Camera.h"
+#include "MapTypes.h"
+#include "Surface.h"
 #include "ElevationSourceListModel.h"
 #include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
 #include "SceneViewTypes.h"
-#include "Surface.h"
 
-// Qt headers
-#include <QDate>
 #include <QDateTime>
+#include <QDate>
 #include <QFuture>
 #include <QTime>
 #include <QTimeZone>
 #include <QUrl>
 
-// STL headers
 #include <cmath>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h
index 0c33e3d859..7ffc1d1eec 100644
--- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h
+++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=RealisticLightingAndShadows, Category=Scenes]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef REALISTICLIGHTINGANDSHADOWS_H
 #define REALISTICLIGHTINGANDSHADOWS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class RealisticLightingAndShadows : public QObject
diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro
index b669c8e8fd..159ea66fa8 100644
--- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro
+++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = RealisticLightingAndShadows
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml
index efa967e323..aeba5506d8 100644
--- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml
+++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=RealisticLightingAndShadows, Category=Scenes]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp b/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp
index 4b8e8197a0..da2a868673 100644
--- a/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp
+++ b/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "RealisticLightingAndShadows.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp
index b9d11332c1..3aec633496 100644
--- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp
+++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SceneLayerSelection, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,27 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SceneLayerSelection.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
-#include "Basemap.h"
-#include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Feature.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SpatialReference.h"
 #include "Surface.h"
+#include "Basemap.h"
+#include "ArcGISSceneLayer.h"
+#include "Point.h"
+#include "Camera.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "Camera.h"
+#include "MapTypes.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerListModel.h"
+#include "IdentifyLayerResult.h"
+#include "Feature.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h
index f1c86b761b..296d3a89ee 100644
--- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h
+++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SceneLayerSelection, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef SCENELAYERSELECTION_H
 #define SCENELAYERSELECTION_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
 class ArcGISSceneLayer;
 }
 
+#include <QQuickItem>
+
 class SceneLayerSelection : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro
index ef01febb89..23a42c350e 100644
--- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro
+++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SceneLayerSelection
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml
index ffb43fc936..5d99973ba3 100644
--- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml
+++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SceneLayerSelection, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/SceneLayerSelection/main.cpp b/CppSamples/Scenes/SceneLayerSelection/main.cpp
index 84524b0e4f..18bb54ec90 100644
--- a/CppSamples/Scenes/SceneLayerSelection/main.cpp
+++ b/CppSamples/Scenes/SceneLayerSelection/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SceneLayerSelection.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SceneLayerSelection.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp
index d5620496cb..c2300420a4 100644
--- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp
+++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ScenePropertiesExpressions, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,31 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ScenePropertiesExpressions.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "AttributeListModel.h"
 #include "Basemap.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
+#include "SimpleMarkerSceneSymbol.h"
+#include "SimpleRenderer.h"
 #include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
 #include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Graphic.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
 #include "LayerSceneProperties.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "RendererSceneProperties.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
+#include "AttributeListModel.h"
 #include "SceneViewTypes.h"
-#include "SimpleMarkerSceneSymbol.h"
-#include "SimpleRenderer.h"
+#include "GraphicsOverlay.h"
 #include "SpatialReference.h"
-#include "Surface.h"
-#include "SymbolTypes.h"
+#include "Point.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h
index d7a1cb3512..514993189e 100644
--- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h
+++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ScenePropertiesExpressions, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SCENEPROPERTIESEXPRESSIONS_H
 #define SCENEPROPERTIESEXPRESSIONS_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Graphic;
@@ -28,6 +25,8 @@ class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class ScenePropertiesExpressions : public QObject
diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro
index 17ff3bf599..260972cfff 100644
--- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro
+++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ScenePropertiesExpressions
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml
index 736ebd818a..8b87ac3383 100644
--- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml
+++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ScenePropertiesExpressions, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp b/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp
index f9bb648319..deea91fc06 100644
--- a/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp
+++ b/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ScenePropertiesExpressions.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp
index 8461c73910..452c801b56 100644
--- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp
+++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetSurfacePlacementMode, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,31 +18,29 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SetSurfacePlacementMode.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISSceneLayer.h"
 #include "ArcGISTiledElevationSource.h"
 #include "Camera.h"
-#include "ElevationSourceListModel.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
-#include "LayerSceneProperties.h"
-#include "MapTypes.h"
 #include "Point.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SceneViewTypes.h"
 #include "SimpleMarkerSymbol.h"
 #include "SpatialReference.h"
-#include "Surface.h"
-#include "SymbolTypes.h"
 #include "TextSymbol.h"
 #include "Viewpoint.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerSceneProperties.h"
+#include "LayerListModel.h"
+#include "SceneViewTypes.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h
index bb2d35ade6..fa9760a16d 100644
--- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h
+++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetSurfacePlacementMode, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef SETSURFACEPLACEMENTMODE_H
 #define SETSURFACEPLACEMENTMODE_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class SceneQuickView;
   class GraphicsOverlay;
 }
 
+#include <QQuickItem>
+
 class SetSurfacePlacementMode : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro
index 4cbc5dd7a4..94bb14ce49 100644
--- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro
+++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml
index eeb3ac0479..e0c8749e0d 100644
--- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml
+++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SetSurfacePlacementMode, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp b/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp
index 41e8f7d255..a7c67b4854 100644
--- a/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp
+++ b/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SetSurfacePlacementMode.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SetSurfacePlacementMode.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/Symbols/Symbols.cpp b/CppSamples/Scenes/Symbols/Symbols.cpp
index 08e7584dc6..262d04cf21 100644
--- a/CppSamples/Scenes/Symbols/Symbols.cpp
+++ b/CppSamples/Scenes/Symbols/Symbols.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=Symbols, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,28 +18,26 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "Symbols.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledElevationSource.h"
+#include "Scene.h"
+#include "SceneQuickView.h"
 #include "Basemap.h"
+#include "ArcGISTiledElevationSource.h"
+#include "SimpleMarkerSceneSymbol.h"
 #include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerSceneProperties.h"
 #include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicsOverlay.h"
+#include "GraphicListModel.h"
+#include "Graphic.h"
 #include "Point.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
+#include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerSceneProperties.h"
 #include "SceneViewTypes.h"
-#include "SimpleMarkerSceneSymbol.h"
 #include "SpatialReference.h"
-#include "Surface.h"
-#include "SymbolTypes.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/Symbols/Symbols.h b/CppSamples/Scenes/Symbols/Symbols.h
index cbfd08f4be..e3a1c2c06b 100644
--- a/CppSamples/Scenes/Symbols/Symbols.h
+++ b/CppSamples/Scenes/Symbols/Symbols.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=Symbols, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef SYMBOLS_H
 #define SYMBOLS_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Scene;
   class SceneQuickView;
 }
 
+#include <QQuickItem>
+
 class Symbols : public QQuickItem
 {
   Q_OBJECT
@@ -43,3 +42,4 @@ class Symbols : public QQuickItem
 };
 
 #endif // SYMBOLS_H
+
diff --git a/CppSamples/Scenes/Symbols/Symbols.pro b/CppSamples/Scenes/Symbols/Symbols.pro
index d3399e5de2..9899253424 100644
--- a/CppSamples/Scenes/Symbols/Symbols.pro
+++ b/CppSamples/Scenes/Symbols/Symbols.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Scenes/Symbols/Symbols.qml b/CppSamples/Scenes/Symbols/Symbols.qml
index f8a2b599e1..c5621e816b 100644
--- a/CppSamples/Scenes/Symbols/Symbols.qml
+++ b/CppSamples/Scenes/Symbols/Symbols.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=Symbols, Category=Scenes]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/Symbols/main.cpp b/CppSamples/Scenes/Symbols/main.cpp
index 211a8899e0..a5ac1e03ce 100644
--- a/CppSamples/Scenes/Symbols/main.cpp
+++ b/CppSamples/Scenes/Symbols/main.cpp
@@ -1,38 +1,31 @@
-// [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "Symbols.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Symbols.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp
index 0f57216dad..ce6cbd8d7d 100644
--- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp
+++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SyncMapViewSceneView, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +18,15 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SyncMapViewSceneView.h"
 
-// ArcGIS Maps SDK headers
+#include "Scene.h"
+#include "SceneQuickView.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
-#include "Scene.h"
-#include "SceneQuickView.h"
 #include "Viewpoint.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h
index 92386e73a3..1a54cffbdd 100644
--- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h
+++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SyncMapViewSceneView, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef SYNCMAPVIEWSCENEVIEW_H
 #define SYNCMAPVIEWSCENEVIEW_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
@@ -29,6 +26,8 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("SceneQuickView.h")
 
diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro
index f79baff846..5b1da19652 100644
--- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro
+++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = SyncMapViewSceneView
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml
index abf18abdfc..15520a7a66 100644
--- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml
+++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SyncMapViewSceneView, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/SyncMapViewSceneView/main.cpp b/CppSamples/Scenes/SyncMapViewSceneView/main.cpp
index efc8e89152..d0f214cf16 100644
--- a/CppSamples/Scenes/SyncMapViewSceneView/main.cpp
+++ b/CppSamples/Scenes/SyncMapViewSceneView/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "SyncMapViewSceneView.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp
index 61b4f2953e..542c93f78f 100644
--- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp
+++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=TerrainExaggeration, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,21 +18,18 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "TerrainExaggeration.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
+#include "Scene.h"
 #include "Camera.h"
-#include "ElevationSourceListModel.h"
-#include "MapTypes.h"
 #include "Point.h"
-#include "Scene.h"
 #include "SceneQuickView.h"
-#include "SpatialReference.h"
+#include "MapTypes.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "SpatialReference.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h
index c90c7b7157..b1532d9981 100644
--- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h
+++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=TerrainExaggeration, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef TERRAINEXAGGERATION_H
 #define TERRAINEXAGGERATION_H
 
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
 class SceneQuickView;
 class Surface;
 }
 
+#include <QQuickItem>
+
 class TerrainExaggeration : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro
index ba962ae6ad..883a24d9cd 100644
--- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro
+++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = TerrainExaggeration
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml
index f7d9300284..82adaccfe8 100644
--- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml
+++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=TerrainExaggeration, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/TerrainExaggeration/main.cpp b/CppSamples/Scenes/TerrainExaggeration/main.cpp
index c9ac344e64..5cd98871b4 100644
--- a/CppSamples/Scenes/TerrainExaggeration/main.cpp
+++ b/CppSamples/Scenes/TerrainExaggeration/main.cpp
@@ -1,37 +1,30 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "TerrainExaggeration.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "TerrainExaggeration.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp
index 6a86d77785..085a34192c 100644
--- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp
+++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewContentBeneathTerrainSurface, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,15 +18,13 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ViewContentBeneathTerrainSurface.h"
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
-#include "SceneViewTypes.h"
+#include "Error.h"
 #include "Surface.h"
+#include "SceneViewTypes.h"
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h
index 2ec3540712..f163a05772 100644
--- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h
+++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewContentBeneathTerrainSurface, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef VIEWCONTENTBENEATHTERRAINSURFACE_H
 #define VIEWCONTENTBENEATHTERRAINSURFACE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class ViewContentBeneathTerrainSurface : public QObject
diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro
index 4db2314430..33901cbb7b 100644
--- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro
+++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewContentBeneathTerrainSurface
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml
index ec6d7d7cde..3eb44714e2 100644
--- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml
+++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewContentBeneathTerrainSurface, Category=Scenes]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp
index 1a1a7b16ac..3318be915c 100644
--- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp
+++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp
@@ -1,31 +1,24 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ViewContentBeneathTerrainSurface.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp
index 24077a1fe5..7e05440611 100644
--- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp
+++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewPointCloudDataOffline, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,26 +18,23 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ViewPointCloudDataOffline.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
-#include "ElevationSourceListModel.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "LayerListModel.h"
-#include "MapTypes.h"
-#include "PointCloudLayer.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
+#include "PointCloudLayer.h"
+#include "MapTypes.h"
+#include "Error.h"
 #include "Surface.h"
+#include "ElevationSourceListModel.h"
+#include "LayerListModel.h"
 #include "Viewpoint.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
@@ -112,3 +109,5 @@ void ViewPointCloudDataOffline::setSceneView(SceneQuickView* sceneView)
 
   emit sceneViewChanged();
 }
+
+
diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h
index 36dbe9529f..2af180ac94 100644
--- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h
+++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewPointCloudDataOffline, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,14 @@
 #ifndef VIEWPOINTCLOUDDATAOFFLINE_H
 #define VIEWPOINTCLOUDDATAOFFLINE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("SceneQuickView.h")
 
 class ViewPointCloudDataOffline : public QObject
diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro
index 23a1cb45af..06db86d6a3 100644
--- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro
+++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewPointCloudDataOffline
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml
index 56d276013a..33259faf9f 100644
--- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml
+++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ViewPointCloudDataOffline, Category=Scenes]
 // [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp b/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp
index dc7b3a47ec..6fd34e81ce 100644
--- a/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp
+++ b/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp
@@ -1,32 +1,25 @@
-// [Legal]
 // Copyright 2018 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ViewPointCloudDataOffline.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QSurfaceFormat>
 #include <QtCore/qglobal.h>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/Search/FindAddress/FindAddress.cpp b/CppSamples/Search/FindAddress/FindAddress.cpp
index 13a6a9bb9d..309eba4fdc 100644
--- a/CppSamples/Search/FindAddress/FindAddress.cpp
+++ b/CppSamples/Search/FindAddress/FindAddress.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindAddress, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,36 +18,31 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FindAddress.h"
 
-// ArcGIS Maps SDK headers
-#include "AttributeListModel.h"
+#include "Map.h"
+#include "MapQuickView.h"
 #include "Basemap.h"
-#include "CalloutData.h"
-#include "Envelope.h"
+#include "GraphicsOverlay.h"
+#include "PictureMarkerSymbol.h"
+#include "SimpleRenderer.h"
+#include "LocatorTask.h"
 #include "GeocodeParameters.h"
-#include "GeocodeResult.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
+#include "MapTypes.h"
 #include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "AttributeListModel.h"
+#include "GeocodeResult.h"
+#include "CalloutData.h"
 #include "IdentifyGraphicsOverlayResult.h"
-#include "LocatorTask.h"
-#include "Map.h"
-#include "MapQuickView.h"
-#include "MapTypes.h"
-#include "PictureMarkerSymbol.h"
 #include "Point.h"
-#include "SimpleRenderer.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUrl>
-#include <QUuid>
-
-// STL headers
 #include <memory>
+#include <QUuid>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Search/FindAddress/FindAddress.h b/CppSamples/Search/FindAddress/FindAddress.h
index 30555cac06..aec33ffaf7 100644
--- a/CppSamples/Search/FindAddress/FindAddress.h
+++ b/CppSamples/Search/FindAddress/FindAddress.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindAddress, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef FIND_ADDRESS_H
 #define FIND_ADDRESS_H
 
-// ArcGIS Maps SDK headers
-#include "GeocodeParameters.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class Map;
@@ -32,6 +26,9 @@ namespace Esri::ArcGISRuntime
   class LocatorTask;
 }
 
+#include "GeocodeParameters.h"
+#include <QQuickItem>
+
 class FindAddress : public QQuickItem
 {
   Q_OBJECT
@@ -62,3 +59,4 @@ class FindAddress : public QQuickItem
 };
 
 #endif // FIND_ADDRESS_H
+
diff --git a/CppSamples/Search/FindAddress/FindAddress.pro b/CppSamples/Search/FindAddress/FindAddress.pro
index 362a76088e..3d508dd371 100644
--- a/CppSamples/Search/FindAddress/FindAddress.pro
+++ b/CppSamples/Search/FindAddress/FindAddress.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Search/FindAddress/FindAddress.qml b/CppSamples/Search/FindAddress/FindAddress.qml
index 913738e4a8..e0b54125f3 100644
--- a/CppSamples/Search/FindAddress/FindAddress.qml
+++ b/CppSamples/Search/FindAddress/FindAddress.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindAddress, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Search/FindAddress/main.cpp b/CppSamples/Search/FindAddress/main.cpp
index 636dc2fb0f..458be35c56 100644
--- a/CppSamples/Search/FindAddress/main.cpp
+++ b/CppSamples/Search/FindAddress/main.cpp
@@ -1,40 +1,32 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FindAddress.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FindAddress.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Search/FindPlace/FindPlace.cpp b/CppSamples/Search/FindPlace/FindPlace.cpp
index e015be46ac..8d18d4b449 100644
--- a/CppSamples/Search/FindPlace/FindPlace.cpp
+++ b/CppSamples/Search/FindPlace/FindPlace.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindPlace, Category=Search]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,45 +18,38 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "FindPlace.h"
 
-// ArcGIS Maps SDK headers
-#include "AttributeListModel.h"
 #include "CalloutData.h"
-#include "GeoElement.h"
-#include "GeocodeResult.h"
-#include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyGraphicsOverlayResult.h"
-#include "Location.h"
-#include "LocationDisplay.h"
-#include "LocatorTask.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "MapViewTypes.h"
+#include "GraphicsOverlay.h"
+#include "GeocodeResult.h"
+#include "GeoElement.h"
+#include "GeometryEngine.h"
 #include "PictureMarkerSymbol.h"
+#include "IdentifyGraphicsOverlayResult.h"
 #include "Point.h"
 #include "SimpleRenderer.h"
-#include "SpatialReference.h"
+#include "LocatorTask.h"
+#include "LocationDisplay.h"
 #include "SuggestListModel.h"
+#include "MapTypes.h"
+#include "MapViewTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "AttributeListModel.h"
 #include "SuggestParameters.h"
+#include "Location.h"
+#include "Graphic.h"
 #include "Viewpoint.h"
+#include "SpatialReference.h"
+#include "GeocodeResult.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUrl>
 #include <QUuid>
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID)
-#define PERMISSIONS_PLATFORM
-#include <QPermissions>
-#endif
-
 using namespace Esri::ArcGISRuntime;
 
 FindPlace::FindPlace(QQuickItem* parent /* = nullptr */):
@@ -101,13 +94,22 @@ void FindPlace::componentComplete()
   m_mapView->calloutData()->setVisible(false);
   m_calloutData = m_mapView->calloutData();
 
+  // connect mapview signals
   connectSignals();
-
-  initiateLocation();
 }
 
 void FindPlace::connectSignals()
 {
+  connect(m_mapView, &MapQuickView::drawStatusChanged, this, [this](DrawStatus drawStatus)
+  {
+    if (drawStatus != DrawStatus::Completed || m_mapView->locationDisplay()->isStarted())
+      return;
+
+    // turn on the location display
+    m_mapView->locationDisplay()->setAutoPanMode(LocationDisplayAutoPanMode::Recenter);
+    m_mapView->locationDisplay()->start();
+  });
+
   connect(m_mapView, &MapQuickView::mousePressed, this, [this](QMouseEvent& /*event*/)
   {
     emit hideSuggestionView();
@@ -139,32 +141,6 @@ void FindPlace::connectSignals()
   });
 }
 
-void FindPlace::initiateLocation()
-{
-#ifdef PERMISSIONS_PLATFORM
-  QLocationPermission locationPermission{};
-  locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise);
-  locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse);
-
-  switch (qApp->checkPermission(locationPermission))
-  {
-    case Qt::PermissionStatus::Undetermined:
-      qApp->requestPermission(locationPermission, this, &FindPlace::initiateLocation);
-      return;
-    case Qt::PermissionStatus::Denied:
-      emit locationPermissionDenied();
-      return;
-    case Qt::PermissionStatus::Granted:
-      m_mapView->locationDisplay()->setAutoPanMode(LocationDisplayAutoPanMode::Recenter);
-      m_mapView->locationDisplay()->start();
-      return;
-  }
-#else
-  m_mapView->locationDisplay()->setAutoPanMode(LocationDisplayAutoPanMode::Recenter);
-  m_mapView->locationDisplay()->start();
-#endif
-}
-
 void FindPlace::addGraphicsOverlay()
 {
   // add a graphics overlay to the mapview
diff --git a/CppSamples/Search/FindPlace/FindPlace.h b/CppSamples/Search/FindPlace/FindPlace.h
index 9cafa1c662..1602a27a59 100644
--- a/CppSamples/Search/FindPlace/FindPlace.h
+++ b/CppSamples/Search/FindPlace/FindPlace.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindPlace, Category=Search]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,6 @@
 #ifndef FINDPLACE_H
 #define FINDPLACE_H
 
-// ArcGIS Maps SDK headers
-#include "Envelope.h"
-#include "GeocodeParameters.h"
-#include "Point.h"
-
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
     class CalloutData;
@@ -36,6 +27,13 @@ namespace Esri::ArcGISRuntime
     class GeocodeResult;
 }
 
+#include "Point.h"
+#include "Envelope.h"
+#include "GeocodeParameters.h"
+
+#include <QAbstractListModel>
+#include <QQuickItem>
+
 class FindPlace : public QQuickItem
 {
   Q_OBJECT
@@ -69,7 +67,6 @@ class FindPlace : public QQuickItem
   void hideCallout();
   void showCallout();
   void showExtentButton();
-  void locationPermissionDenied();
 
 private:
   void addGraphicsOverlay();
@@ -79,7 +76,6 @@ class FindPlace : public QQuickItem
   void setPoiTextHasFocus(bool hasFocus);
   Esri::ArcGISRuntime::GeocodeParameters createParameters();
   void onGeocodingCompleted_(const QList<Esri::ArcGISRuntime::GeocodeResult>& results);
-  void initiateLocation();
 
 private:
   Esri::ArcGISRuntime::Map* m_map = nullptr;
diff --git a/CppSamples/Search/FindPlace/FindPlace.pro b/CppSamples/Search/FindPlace/FindPlace.pro
index f223da44d5..fd9349a73c 100644
--- a/CppSamples/Search/FindPlace/FindPlace.pro
+++ b/CppSamples/Search/FindPlace/FindPlace.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = FindPlace
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
@@ -64,11 +64,7 @@ ios {
     OTHER_FILES += \
         $$PWD/Info.plist
 
-    QMAKE_INFO_PLIST = $$PWD/ios/Info.plist
-}
-
-macx {
-    QMAKE_INFO_PLIST = $$PWD/mac/Info.plist
+    QMAKE_INFO_PLIST = $$PWD/Info.plist
 }
 
 android {
diff --git a/CppSamples/Search/FindPlace/FindPlace.qml b/CppSamples/Search/FindPlace/FindPlace.qml
index 41de14df84..cf483e7b3a 100644
--- a/CppSamples/Search/FindPlace/FindPlace.qml
+++ b/CppSamples/Search/FindPlace/FindPlace.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindPlace, Category=Search]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@ import QtQuick.Controls
 import QtPositioning
 import Esri.ArcGISRuntime.Toolkit
 import Esri.Samples
-import QtQuick.Dialogs
 
 FindPlaceSample {
     id: findPlaceSample
@@ -152,25 +151,4 @@ FindPlaceSample {
             callout.dismiss();
         }
     }
-
-    Connections {
-        target: findPlaceSample
-        function onLocationPermissionDenied() {
-            permissionDeniedDialog.open()
-        }
-    }
-
-    Dialog {
-        id: permissionDeniedDialog
-        title: "Location Permission Denied"
-        modal: true
-        standardButtons: Dialog.Ok
-        x: (parent.width - width) / 2
-        y: (parent.height - height) / 2
-
-        Text {
-            text: "This application requires location permissions."
-            color: "white"
-        }
-    }
 }
diff --git a/CppSamples/Search/FindPlace/SearchBox.qml b/CppSamples/Search/FindPlace/SearchBox.qml
index bed87ab34c..75beb39266 100644
--- a/CppSamples/Search/FindPlace/SearchBox.qml
+++ b/CppSamples/Search/FindPlace/SearchBox.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindPlace, Category=Search]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Search/FindPlace/SearchButton.qml b/CppSamples/Search/FindPlace/SearchButton.qml
index abffa961fd..d895ff1330 100644
--- a/CppSamples/Search/FindPlace/SearchButton.qml
+++ b/CppSamples/Search/FindPlace/SearchButton.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindPlace, Category=Search]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Search/FindPlace/SuggestionView.qml b/CppSamples/Search/FindPlace/SuggestionView.qml
index c890932d9a..c97cb6994c 100644
--- a/CppSamples/Search/FindPlace/SuggestionView.qml
+++ b/CppSamples/Search/FindPlace/SuggestionView.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=FindPlace, Category=Search]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Search/FindPlace/ios/Info.plist b/CppSamples/Search/FindPlace/ios/Info.plist
deleted file mode 100644
index 15cffaed6e..0000000000
--- a/CppSamples/Search/FindPlace/ios/Info.plist
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDisplayName</key>
-	<string>FindPlace</string>
-	<key>CFBundleExecutable</key>
-	<string>FindPlace</string>
-	<key>CFBundleGetInfoString</key>
-	<string>ArcGIS</string>
-	<key>CFBundleIcons~ipad</key>
-	<dict/>
-	<key>CFBundleIdentifier</key>
-	<string>com.esri.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>NOTE</key>
-	<string>This app is cool</string>
-	<key>UIFileSharingEnabled</key>
-    	<string>FALSE</string>
-	<key>UIRequiresPersistentWiFi</key>
-	<string>NO</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSLocationWhenInUseUsageDescription</key>
-    	<string>Location required for application</string>
-    	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-    	<string>Location required for application</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-        <key>UILaunchStoryboardName</key>
-        <string>LaunchScreen</string>
-</dict>
-</plist>
-
diff --git a/CppSamples/Search/FindPlace/mac/Info.plist b/CppSamples/Search/FindPlace/mac/Info.plist
deleted file mode 100644
index d3fa3cacd9..0000000000
--- a/CppSamples/Search/FindPlace/mac/Info.plist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleDisplayName</key>
-    <string>FindPlace</string>
-    <key>CFBundleExecutable</key>
-    <string>FindPlace</string>
-    <key>CFBundleGetInfoString</key>
-    <string>ArcGIS</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.esri.FindPlace</string>
-    <key>CFBundleName</key>
-    <string>FindPlace</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleShortVersionString</key>
-    <string>1.0</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>CFBundleVersion</key>
-    <string>1.0</string>
-    <key>NSLocationUsageDescription</key>
-    <string>Location required for application</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>Location required for application</string>
-    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-    <string>Location required for application</string>
-</dict>
-</plist>
-
diff --git a/CppSamples/Search/FindPlace/main.cpp b/CppSamples/Search/FindPlace/main.cpp
index a948fad94b..c49cbe9d37 100644
--- a/CppSamples/Search/FindPlace/main.cpp
+++ b/CppSamples/Search/FindPlace/main.cpp
@@ -1,39 +1,31 @@
-// [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "FindPlace.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "FindPlace.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp b/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp
index f91588ad06..e65fc698d1 100644
--- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp
+++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=OfflineGeocode, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,43 +18,38 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "OfflineGeocode.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISTiledLayer.h"
-#include "Basemap.h"
+#include "Map.h"
+#include "Point.h"
+#include "Graphic.h"
 #include "CalloutData.h"
-#include "Error.h"
-#include "ErrorException.h"
-#include "GeocodeParameters.h"
+#include "LocatorTask.h"
+#include "MapQuickView.h"
 #include "GeocodeResult.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
+#include "SuggestListModel.h"
+#include "ArcGISTiledLayer.h"
+#include "GeocodeParameters.h"
+#include "PictureMarkerSymbol.h"
 #include "IdentifyGraphicsOverlayResult.h"
-#include "LayerListModel.h"
-#include "LocatorTask.h"
-#include "Map.h"
-#include "MapQuickView.h"
 #include "MapViewTypes.h"
-#include "PictureMarkerSymbol.h"
-#include "Point.h"
-#include "SpatialReference.h"
-#include "SuggestListModel.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "LayerListModel.h"
 #include "TileCache.h"
+#include "Basemap.h"
+#include "SpatialReference.h"
 #include "Viewpoint.h"
+#include "ErrorException.h"
 
-// Qt headers
 #include <QFuture>
 #include <QScopedPointer>
-#include <QStandardPaths>
-#include <QUuid>
 #include <QtCore/qglobal.h>
-
-// STL headers
 #include <memory>
+#include <QUuid>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.h b/CppSamples/Search/OfflineGeocode/OfflineGeocode.h
index fce9b7c9ec..3dcfc392df 100644
--- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.h
+++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=OfflineGeocode, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,16 +17,6 @@
 #ifndef OFFLINEGEOCODE_H
 #define OFFLINEGEOCODE_H
 
-// ArcGIS Maps SDK headers
-#include "Error.h"
-#include "GeocodeParameters.h"
-#include "Point.h"
-#include "ReverseGeocodeParameters.h"
-#include "SuggestResult.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
   class ErrorException;
@@ -41,6 +31,14 @@ namespace Esri::ArcGISRuntime
   class SuggestListModel;
 }
 
+#include "Point.h"
+#include "Error.h"
+#include "SuggestResult.h"
+#include "GeocodeParameters.h"
+#include "ReverseGeocodeParameters.h"
+
+#include <QQuickItem>
+
 Q_MOC_INCLUDE("SuggestListModel.h")
 
 class OfflineGeocode : public QQuickItem
diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro b/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro
index 281c74e07f..4dce6f382f 100644
--- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro
+++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml b/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml
index c6f5419deb..5b7d24ae11 100644
--- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml
+++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=OfflineGeocode, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Search/OfflineGeocode/main.cpp b/CppSamples/Search/OfflineGeocode/main.cpp
index 46e503a212..b283d1dc48 100644
--- a/CppSamples/Search/OfflineGeocode/main.cpp
+++ b/CppSamples/Search/OfflineGeocode/main.cpp
@@ -1,39 +1,31 @@
-// [Legal]
 // Copyright 2015 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "OfflineGeocode.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
-
-// Qt headers
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
 
-// Other headers
 #include "Esri/ArcGISRuntime/Toolkit/register.h"
+#include "ArcGISRuntimeEnvironment.h"
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "OfflineGeocode.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp
index 80ee6d3eb9..bfd55fed6a 100644
--- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp
+++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReverseGeocodeOnline, Category=Search]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,31 +18,28 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ReverseGeocodeOnline.h"
 
-// ArcGIS Maps SDK headers
-#include "AttributeListModel.h"
 #include "CalloutData.h"
-#include "Envelope.h"
-#include "GeocodeResult.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
 #include "LocatorTask.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "PictureMarkerSymbol.h"
-#include "Point.h"
-#include "ReverseGeocodeParameters.h"
 #include "SimpleRenderer.h"
+#include "MapTypes.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "AttributeListModel.h"
+#include "ReverseGeocodeParameters.h"
+#include "GeocodeResult.h"
+#include "Point.h"
 #include "SpatialReference.h"
+#include "Envelope.h"
 
-// Qt headers
-#include <QDir>
 #include <QFuture>
+#include <QDir>
 #include <QUrl>
 #include <QUuid>
 
diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h
index 49ae6591e8..af2bf24ec5 100644
--- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h
+++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReverseGeocodeOnline, Category=Search]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 #ifndef REVERSEGEOCODEONLINE_H
 #define REVERSEGEOCODEONLINE_H
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class CalloutData;
@@ -30,6 +27,8 @@ class Map;
 class MapQuickView;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("CalloutData.h")
 
diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro
index b45b9df301..ca1223f193 100644
--- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro
+++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ReverseGeocodeOnline
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample
diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml
index 719b7a0534..fef26c10bc 100644
--- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml
+++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ReverseGeocodeOnline, Category=Search]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Search/ReverseGeocodeOnline/main.cpp b/CppSamples/Search/ReverseGeocodeOnline/main.cpp
index 1a5d60bdda..999c33ce96 100644
--- a/CppSamples/Search/ReverseGeocodeOnline/main.cpp
+++ b/CppSamples/Search/ReverseGeocodeOnline/main.cpp
@@ -1,37 +1,29 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ReverseGeocodeOnline.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Other headers
-#include "Esri/ArcGISRuntime/Toolkit/register.h"
-
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "Esri/ArcGISRuntime/Toolkit/register.h"
+
 int main(int argc, char *argv[])
 {
   QGuiApplication app(argc, argv);
diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp
index 7769261a74..b75089bc33 100644
--- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp
+++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=SearchDictionarySymbolStyle, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +18,14 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "SearchDictionarySymbolStyle.h"
-
-// ArcGIS Maps SDK headers
 #include "DictionarySymbolStyle.h"
-#include "SymbolStyleSearchParameters.h"
 #include "SymbolStyleSearchResultListModel.h"
+#include "SymbolStyleSearchParameters.h"
 
-// Qt headers
 #include <QFuture>
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 
diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h
index cd1018a5ef..8a8deb1e81 100644
--- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h
+++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=SearchDictionarySymbolStyle, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,16 +17,15 @@
 #ifndef SEARCHDICTIONARYSYMBOLSTYLE_H
 #define SEARCHDICTIONARYSYMBOLSTYLE_H
 
-// Qt headers
-#include <QAbstractListModel>
-#include <QQuickItem>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
     class DictionarySymbolStyle;
 }
 
+#include <QQuickItem>
+#include <QUuid>
+#include <QAbstractListModel>
+
 class SearchDictionarySymbolStyle : public QQuickItem
 {
   Q_OBJECT
diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro
index 3bcfd13e7b..b9efa3b38d 100644
--- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro
+++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml
index c04051bdaa..ca5a07a1af 100644
--- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml
+++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=SearchDictionarySymbolStyle, Category=Search]
 // [Legal]
 // Copyright 2016 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp b/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp
index e654cc5673..b11f7ec0ea 100644
--- a/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp
+++ b/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp
@@ -1,37 +1,29 @@
-// [Legal]
-// Copyright 2016 Esri.
+// Copyright 2016 ESRI
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
+//
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-// sample headers
-#include "SearchDictionarySymbolStyle.h"
-
-// ArcGIS Maps SDK headers
-#include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
+#include <QSettings>
+#include <QGuiApplication>
+#include <QQuickView>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QGuiApplication>
 #include <QQmlEngine>
-#include <QQuickView>
-#include <QSettings>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
 
+#include "SearchDictionarySymbolStyle.h"
+#include "ArcGISRuntimeEnvironment.h"
+
 #define STRINGIZE(x) #x
 #define QUOTE(x) STRINGIZE(x)
 
diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp
index fff2a9e0af..2a29cf5591 100644
--- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp
+++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureSubnetworkTrace, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,13 +18,9 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ConfigureSubnetworkTrace.h"
 
-// ArcGIS Maps SDK headers
 #include "CodedValueDomain.h"
-#include "Credential.h"
-#include "Error.h"
 #include "UtilityAssetGroup.h"
 #include "UtilityAssetType.h"
 #include "UtilityCategory.h"
@@ -45,12 +41,11 @@
 #include "UtilityTraceParameters.h"
 #include "UtilityTraceResultListModel.h"
 #include "UtilityTraversability.h"
+#include "Error.h"
+#include "Credential.h"
 
-// Qt headers
 #include <QFuture>
 #include <QQmlEngine>
-
-// STL headers
 #include <algorithm>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h
index 7337ca8cac..709ff21667 100644
--- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h
+++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureSubnetworkTrace, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,6 @@
 #ifndef CONFIGURESUBNETWORKTRACE_H
 #define CONFIGURESUBNETWORKTRACE_H
 
-// ArcGIS Maps SDK headers
-#include "UtilityNetworkAttribute.h"
-#include "UtilityNetworkAttributeComparison.h"
-
-// Qt headers
-#include <QObject>
-#include <QUrl>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
 class Credential;
@@ -41,6 +32,13 @@ class UtilityTraceConfiguration;
 class UtilityTraceParameters;
 }
 
+#include <QObject>
+#include <QUrl>
+#include <QUuid>
+
+#include "UtilityNetworkAttributeComparison.h"
+#include "UtilityNetworkAttribute.h"
+
 class ConfigureSubnetworkTrace : public QObject
 {
   Q_OBJECT
diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro
index 401023baf3..6cdf4aaf7d 100644
--- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro
+++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ConfigureSubnetworkTrace
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml
index 56413b9c16..5e4b511971 100644
--- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml
+++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ConfigureSubnetworkTrace, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp
index 88d2e3a590..d4a5fd8123 100644
--- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp
+++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ConfigureSubnetworkTrace.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp
index 35357f587b..72bbb71792 100644
--- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp
+++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateLoadReport, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,14 +18,11 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "CreateLoadReport.h"
 
-// ArcGIS Maps SDK headers
-#include "CodedValueDomain.h"
-#include "Credential.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
+
+#include "CodedValueDomain.h"
 #include "UtilityAssetGroup.h"
 #include "UtilityAssetType.h"
 #include "UtilityCategory.h"
@@ -43,15 +40,16 @@
 #include "UtilityTerminalConfiguration.h"
 #include "UtilityTier.h"
 #include "UtilityTraceConfiguration.h"
-#include "UtilityTraceFunction.h"
 #include "UtilityTraceFunctionListModel.h"
 #include "UtilityTraceFunctionOutput.h"
 #include "UtilityTraceOrCondition.h"
 #include "UtilityTraceParameters.h"
 #include "UtilityTraceResultListModel.h"
 #include "UtilityTraversability.h"
+#include "Credential.h"
+#include "MapTypes.h"
+#include "UtilityTraceFunction.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h
index db2d9a466d..8363134353 100644
--- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h
+++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateLoadReport, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,11 +17,6 @@
 #ifndef CREATELOADREPORT_H
 #define CREATELOADREPORT_H
 
-// Qt headers
-#include <QObject>
-#include <QUuid>
-#include <QVariantMap>
-
 namespace Esri::ArcGISRuntime
 {
 class Credential;
@@ -37,6 +32,10 @@ class UtilityTraceConfiguration;
 class UtilityTraceParameters;
 }
 
+#include <QObject>
+#include <QVariantMap>
+#include <QUuid>
+
 class CreateLoadReport : public QObject
 {
   Q_OBJECT
diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro
index 1cf6f82761..ae0f95f6dc 100644
--- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro
+++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = CreateLoadReport
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml
index 51fcf2457c..597d63d953 100644
--- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml
+++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=CreateLoadReport, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp b/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp
index 85a8801f3d..0f6df1c286 100644
--- a/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp
+++ b/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "CreateLoadReport.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp
index 5538920110..f91e889138 100644
--- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp
+++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayContentOfUtilityNetworkContainer, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,47 +18,46 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayContentOfUtilityNetworkContainer.h"
 #include "SymbolImageProvider.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "ArcGISFeatureLayerInfo.h"
 #include "ArcGISFeatureListModel.h"
 #include "ArcGISFeatureTable.h"
-#include "AuthenticationChallenge.h"
 #include "AuthenticationManager.h"
-#include "Credential.h"
-#include "DrawingInfo.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "ErrorException.h"
 #include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
-#include "Polygon.h"
-#include "Renderer.h"
-#include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
 #include "SubtypeFeatureLayer.h"
-#include "Symbol.h"
-#include "SymbolTypes.h"
 #include "UtilityAssetType.h"
 #include "UtilityAssociation.h"
 #include "UtilityElement.h"
 #include "UtilityNetwork.h"
 #include "UtilityNetworkTypes.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "LayerListModel.h"
+#include "Credential.h"
+#include "AuthenticationChallenge.h"
+#include "IdentifyLayerResult.h"
+#include "ArcGISFeature.h"
+#include "ArcGISFeatureTable.h"
+#include "ArcGISFeatureLayerInfo.h"
+#include "DrawingInfo.h"
+#include "GraphicsOverlay.h"
+#include "Graphic.h"
+#include "ErrorException.h"
+#include "Envelope.h"
+#include "ArcGISFeatureTable.h"
+#include "SpatialReference.h"
+#include "Renderer.h"
+#include "Point.h"
+#include "Polygon.h"
+#include "Symbol.h"
+#include "SimpleLineSymbol.h"
 
-// Qt headers
 #include <QImage>
 #include <QQmlContext>
 #include <QUuid>
diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h
index 70bc2a7a61..1edff06011 100644
--- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h
+++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayContentOfUtilityNetworkContainer, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,6 @@
 #ifndef DISPLAYCONTENTOFUTILITYNETWORKCONTAINER_H
 #define DISPLAYCONTENTOFUTILITYNETWORKCONTAINER_H
 
-// ArcGIS Maps SDK headers
-#include "Geometry.h"
-#include "Viewpoint.h"
-
-// Qt headers
-#include <QFuture>
-#include <QMouseEvent>
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
   class ArcGISFeature;
@@ -44,6 +35,13 @@ namespace Esri::ArcGISRuntime
 
 class SymbolImageProvider;
 
+#include <QFuture>
+#include <QObject>
+#include <QMouseEvent>
+
+#include "Viewpoint.h"
+#include "Geometry.h"
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayContentOfUtilityNetworkContainer : public QObject
diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro
index 0bdf0d4837..517b0c267a 100644
--- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro
+++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayContentOfUtilityNetworkContainer
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml
index 5ab7ba0313..2f960bfdf6 100644
--- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml
+++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayContentOfUtilityNetworkContainer, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp
index cb45ee97e4..8c822a0774 100644
--- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp
+++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp
@@ -1,22 +1,18 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "SymbolImageProvider.h"
 
-// Qt headers
 #include <QQuickImageProvider>
 
 SymbolImageProvider::SymbolImageProvider() :
diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h
index b0db357700..894d1da7d8 100644
--- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h
+++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h
@@ -1,17 +1,4 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp
index e964830dff..3d8df37f25 100644
--- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp
+++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp
@@ -1,31 +1,25 @@
-// [Legal]
 // Copyright 2021 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayContentOfUtilityNetworkContainer.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QCommandLineParser>
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp
index 3857a8e7be..75a4da306c 100644
--- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp
+++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayUtilityAssociations, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,30 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayUtilityAssociations.h"
 #include "SymbolImageProvider.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISFeatureTable.h"
 #include "AttributeListModel.h"
-#include "Credential.h"
-#include "Envelope.h"
-#include "Error.h"
 #include "FeatureLayer.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "LayerListModel.h"
+#include "Graphic.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Point.h"
 #include "SimpleLineSymbol.h"
-#include "SpatialReference.h"
-#include "SymbolTypes.h"
-#include "UniqueValue.h"
 #include "UniqueValueRenderer.h"
 #include "UtilityAssociation.h"
 #include "UtilityNetwork.h"
@@ -49,12 +36,23 @@
 #include "UtilityNetworkListModel.h"
 #include "UtilityNetworkSource.h"
 #include "UtilityNetworkTypes.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "AttributeListModel.h"
+#include "LayerListModel.h"
+#include "Credential.h"
+#include "UniqueValue.h"
 #include "Viewpoint.h"
+#include "Envelope.h"
+#include "SpatialReference.h"
+#include "Point.h"
 
-// Qt headers
 #include <QFuture>
-#include <QImage>
 #include <QList>
+#include <QImage>
 #include <QQmlContext>
 #include <QUuid>
 
diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h
index a6ca84c318..9f115c620b 100644
--- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h
+++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayUtilityAssociations, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,7 @@
 #ifndef DISPLAYUTILITYASSOCIATIONS_H
 #define DISPLAYUTILITYASSOCIATIONS_H
 
-// ArcGIS Maps SDK headers
 #include "UtilityNetworkTypes.h"
-
-// Qt headers
 #include <QObject>
 
 namespace Esri::ArcGISRuntime
@@ -35,6 +32,8 @@ class UtilityNetwork;
 
 class SymbolImageProvider;
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 
 class DisplayUtilityAssociations : public QObject
diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro
index 8090f4860c..3c6688f469 100644
--- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro
+++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayUtilityAssociations
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml
index f08d937c79..59b0ff2b2e 100644
--- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml
+++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayUtilityAssociations, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp
index 883558464e..4f2713b399 100644
--- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp
+++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp
@@ -1,22 +1,18 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "SymbolImageProvider.h"
 
-// Qt headers
 #include <QQuickImageProvider>
 
 SymbolImageProvider::SymbolImageProvider() :
diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h
index 0c92d0b464..621d4d557f 100644
--- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h
+++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h
@@ -1,17 +1,4 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp
index b7aedc5f51..46fd069241 100644
--- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp
+++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "DisplayUtilityAssociations.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp
index 0a3b47fbb2..e3d704f4bd 100644
--- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp
+++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=PerformValveIsolationTrace, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,33 +18,21 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "PerformValveIsolationTrace.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
 #include "ArcGISFeatureListModel.h"
-#include "Credential.h"
-#include "Error.h"
 #include "FeatureLayer.h"
-#include "GeometryEngine.h"
 #include "Graphic.h"
-#include "GraphicListModel.h"
 #include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
 #include "Point.h"
-#include "Polyline.h"
 #include "QueryParameters.h"
 #include "ServiceFeatureTable.h"
 #include "ServiceGeodatabase.h"
 #include "SimpleMarkerSymbol.h"
 #include "SimpleRenderer.h"
-#include "SymbolTypes.h"
+#include "UtilityTraceResultListModel.h"
 #include "UtilityAssetGroup.h"
 #include "UtilityAssetType.h"
 #include "UtilityCategory.h"
@@ -63,15 +51,21 @@
 #include "UtilityTraceConfiguration.h"
 #include "UtilityTraceFilter.h"
 #include "UtilityTraceParameters.h"
-#include "UtilityTraceResultListModel.h"
+#include "GeometryEngine.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicListModel.h"
+#include "LayerListModel.h"
+#include "Credential.h"
+#include "IdentifyLayerResult.h"
+#include "ArcGISFeature.h"
+#include "Polyline.h"
 
-// Qt headers
 #include <QFuture>
 #include <QUuid>
 
-// Other headers
-#include "TaskCanceler.h"
-
 using namespace Esri::ArcGISRuntime;
 
 namespace
@@ -106,8 +100,7 @@ PerformValveIsolationTrace::PerformValveIsolationTrace(QObject* parent /* = null
   m_startingLocationOverlay(new GraphicsOverlay(this)),
   m_filterBarriersOverlay(new GraphicsOverlay(this)),
   m_serviceGeodatabase(new ServiceGeodatabase(featureServiceUrl, m_cred, this)),
-  m_graphicParent(new QObject()),
-  m_taskCanceler(std::make_unique<TaskCanceler>())
+  m_graphicParent(new QObject())
 {
   // disable UI while loading service geodatabase and utility network
   m_tasksRunning = true;
@@ -178,11 +171,11 @@ void PerformValveIsolationTrace::setMapView(MapQuickView* mapView)
     constexpr double tolerance = 10.0;
     constexpr bool returnPopups = false;
     m_clickPoint = m_mapView->screenToLocation(mouseEvent.position().x(), mouseEvent.position().y());
-    m_taskCanceler->addTask(m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList<IdentifyLayerResult*>& results)
+    m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList<IdentifyLayerResult*>& results)
     {
       // handle the identify results
       onIdentifyLayersCompleted_(results);
-    }));
+    });
   });
 
   // apply renderers
@@ -256,11 +249,10 @@ void PerformValveIsolationTrace::performTrace()
       UtilityCategoryComparison* categoryComparison = new UtilityCategoryComparison(selectedCategory, UtilityCategoryComparisonOperator::Exists, this);
       traceParameters->traceConfiguration()->filter()->setBarriers(categoryComparison);
     }
-
-    m_taskCanceler->addTask(m_utilityNetwork->traceAsync(traceParameters).then(this, [this](QList<UtilityTraceResult*>)
+    m_utilityNetwork->traceAsync(traceParameters).then(this, [this](QList<UtilityTraceResult*>)
     {
       onTraceCompleted_();
-    }));
+    });
   }
 }
 
@@ -317,7 +309,8 @@ void PerformValveIsolationTrace::onTraceCompleted_()
             objectIds.append(utilityElement->objectId());
         }
         queryParameters.setObjectIds(objectIds);
-        m_taskCanceler->addTask(featureLayer->selectFeaturesAsync(queryParameters, SelectionMode::New));
+        auto future = featureLayer->selectFeaturesAsync(queryParameters, SelectionMode::New);
+        Q_UNUSED(future)
       }
     }
   }
@@ -392,7 +385,7 @@ void PerformValveIsolationTrace::connectSignals()
       return;
 
     // display starting location
-    m_taskCanceler->addTask(m_utilityNetwork->featuresForElementsAsync(QList<UtilityElement*> {m_startingLocation}).then(this, [this](QList<ArcGISFeature*>)
+    m_utilityNetwork->featuresForElementsAsync(QList<UtilityElement*> {m_startingLocation}).then(this, [this](QList<ArcGISFeature*>)
     {
       // display starting location
       ArcGISFeatureListModel* elementFeaturesList = m_utilityNetwork->featuresForElementsResult();
@@ -401,10 +394,10 @@ void PerformValveIsolationTrace::connectSignals()
       m_startingLocationOverlay->graphics()->append(graphic);
 
       constexpr double scale = 3000.0;
-      m_taskCanceler->addTask(m_mapView->setViewpointCenterAsync(startingLocationGeometry, scale));
+      m_mapView->setViewpointCenterAsync(startingLocationGeometry, scale);
       m_tasksRunning = false;
       emit tasksRunningChanged();
-    }));
+    });
 
     // populate the combo box choices
     m_categoriesList = categoriesList();
diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h
index a0cb31e5d8..4ccc6e0234 100644
--- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h
+++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=PerformValveIsolationTrace, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,6 @@
 #ifndef PERFORMVALVEISOLATIONTRACE_H
 #define PERFORMVALVEISOLATIONTRACE_H
 
-// Qt headers
-#include <QObject>
-#include <QUuid>
-
-// STL headers
-#include <Point.h>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISFeature;
@@ -41,11 +34,13 @@ class IdentifyLayerResult;
 class ServiceGeodatabase;
 }
 
+#include <QObject>
+#include <QUuid>
+#include <Point.h>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("IdentifyLayerResult.h")
 
-class TaskCanceler;
-
 class PerformValveIsolationTrace : public QObject
 {
   Q_OBJECT
@@ -101,7 +96,6 @@ class PerformValveIsolationTrace : public QObject
   QStringList m_terminals;
   QScopedPointer<QObject> m_graphicParent;
   QStringList m_categoriesList;
-  std::unique_ptr<TaskCanceler> m_taskCanceler;
   int m_selectedIndex = -1;
   bool m_isolateFeatures = false;
   bool m_tasksRunning = false;
diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro
index 0452b9a168..7231afa838 100644
--- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro
+++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro
@@ -27,16 +27,13 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = PerformValveIsolationTrace
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
 
-INCLUDEPATH += $${PWD}/../../../SampleViewer
-
 HEADERS += \
-    PerformValveIsolationTrace.h \
-    $${PWD}/../../../SampleViewer/TaskCanceler.h
+    PerformValveIsolationTrace.h
 
 SOURCES += \
     main.cpp \
diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml
index 732ac48b90..56b60dfb3a 100644
--- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml
+++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=PerformValveIsolationTrace, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp
index 064257cb82..c602c90371 100644
--- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp
+++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "PerformValveIsolationTrace.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
@@ -72,6 +65,7 @@ int main(int argc, char *argv[])
   engine.addImportPath(ARCGIS_RUNTIME_IMPORT_PATH_2);
 #endif
 
+
   // Set the source
   engine.load(QUrl("qrc:/Samples/UtilityNetwork/PerformValveIsolationTrace/main.qml"));
 
diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp
index 95b9426846..52013b8262 100644
--- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp
+++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=TraceUtilityNetwork, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,38 +18,16 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "TraceUtilityNetwork.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISFeature.h"
-#include "AttributeListModel.h"
-#include "Credential.h"
-#include "Envelope.h"
-#include "Error.h"
 #include "ErrorException.h"
 #include "FeatureLayer.h"
-#include "FeatureQueryResult.h"
 #include "GeometryEngine.h"
-#include "Graphic.h"
-#include "GraphicListModel.h"
-#include "GraphicsOverlay.h"
-#include "GraphicsOverlayListModel.h"
-#include "IdentifyLayerResult.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
-#include "MapTypes.h"
-#include "Polyline.h"
-#include "QueryParameters.h"
 #include "ServiceFeatureTable.h"
 #include "ServiceGeodatabase.h"
-#include "SimpleLineSymbol.h"
 #include "SimpleMarkerSymbol.h"
-#include "SpatialReference.h"
-#include "SymbolTypes.h"
-#include "UniqueValue.h"
-#include "UniqueValueListModel.h"
 #include "UniqueValueRenderer.h"
 #include "UtilityAssetGroup.h"
 #include "UtilityAssetType.h"
@@ -65,14 +43,31 @@
 #include "UtilityTier.h"
 #include "UtilityTraceParameters.h"
 #include "UtilityTraceResultListModel.h"
+#include "MapTypes.h"
+#include "SymbolTypes.h"
+#include "Error.h"
+#include "GraphicsOverlayListModel.h"
+#include "GraphicsOverlay.h"
+#include "GraphicListModel.h"
+#include "Graphic.h"
+#include "AttributeListModel.h"
+#include "LayerListModel.h"
+#include "Credential.h"
+#include "UniqueValueListModel.h"
+#include "IdentifyLayerResult.h"
+#include "ArcGISFeature.h"
+#include "QueryParameters.h"
+#include "UniqueValue.h"
+#include "FeatureQueryResult.h"
+#include "SimpleLineSymbol.h"
+#include "SpatialReference.h"
+#include "Envelope.h"
 #include "Viewpoint.h"
+#include "Polyline.h"
+#include "ErrorException.h"
 
-// Qt headers
 #include <QFuture>
 
-// Other headers
-#include "TaskCanceler.h"
-
 using namespace Esri::ArcGISRuntime;
 
 TraceUtilityNetwork::TraceUtilityNetwork(QObject* parent /* = nullptr */):
@@ -84,8 +79,7 @@ TraceUtilityNetwork::TraceUtilityNetwork(QObject* parent /* = nullptr */):
   m_mediumVoltageSymbol(new SimpleLineSymbol(SimpleLineSymbolStyle::Solid, QColor(Qt::darkCyan), 3, this)),
   m_lowVoltageSymbol(new SimpleLineSymbol(SimpleLineSymbolStyle::Dash, QColor(Qt::darkCyan), 3, this)),
   m_serviceGeodatabase(new ServiceGeodatabase(m_serviceUrl, m_cred, this)),
-  m_graphicParent(new QObject()),
-  m_taskCanceler(std::make_unique<TaskCanceler>())
+  m_graphicParent(new QObject())
 {
   m_map->setInitialViewpoint(Viewpoint(Envelope(-9813547.35557238, 5129980.36635111, -9813185.0602376, 5130215.41254146, SpatialReference::webMercator())));
 
@@ -190,10 +184,10 @@ void TraceUtilityNetwork::connectSignals()
     constexpr double tolerance = 10.0;
     constexpr bool returnPopups = false;
     m_clickPoint = m_mapView->screenToLocation(mouseEvent.position().x(), mouseEvent.position().y());
-    m_taskCanceler->addTask(m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList<IdentifyLayerResult*>& results)
+    m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList<IdentifyLayerResult*>& results)
     {
       onIdentifyLayersCompleted_(results);
-    }));
+    });
   });
 }
 
@@ -281,13 +275,13 @@ void TraceUtilityNetwork::trace(int index)
   m_traceParams->setStartingLocations(m_startingLocations);
   m_traceParams->setBarriers(m_barriers);
   // Perform a connected trace on the utility network
-  m_taskCanceler->addTask(m_utilityNetwork->traceAsync(m_traceParams).then(this, [this](QList<UtilityTraceResult*>)
+  m_utilityNetwork->traceAsync(m_traceParams).then(this, [this](QList<UtilityTraceResult*>)
   {
     onTraceCompleted_();
   }).onFailed([this](const ErrorException& exception)
   {
     onTaskFailed_(exception);
-  }));
+  });
 }
 
 void TraceUtilityNetwork::reset()
@@ -402,9 +396,7 @@ void TraceUtilityNetwork::onIdentifyLayersCompleted_(const QList<IdentifyLayerRe
     }
   }
   else
-  {
     return;
-  }
 
   updateTraceParams(element);
 }
@@ -443,15 +435,15 @@ void TraceUtilityNetwork::onTraceCompleted_()
   deviceParams.setObjectIds(deviceObjIds);
   lineParams.setObjectIds(lineObjIds);
 
-  m_taskCanceler->addTask(m_deviceLayer->selectFeaturesAsync(deviceParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*)
+  m_deviceLayer->selectFeaturesAsync(deviceParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*)
   {
     setBusyIndicator(false);
-  }));
+  });
 
-  m_taskCanceler->addTask(m_lineLayer->selectFeaturesAsync(lineParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*)
+  m_lineLayer->selectFeaturesAsync(lineParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*)
   {
     setBusyIndicator(false);
-  }));
+  });
 }
 
 UniqueValue* TraceUtilityNetwork::createUniqueValue(const QString& label, Esri::ArcGISRuntime::Symbol* fillSymbol, int value)
diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h
index 7473ca3e21..a8a7f817fd 100644
--- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h
+++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=TraceUtilityNetwork, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,8 @@
 #ifndef TraceUtilityNetwork_H
 #define TraceUtilityNetwork_H
 
-// ArcGIS Maps SDK headers
 #include "Point.h"
 
-// Qt headers
-#include <QObject>
-#include <QUrl>
-#include <QUuid>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISFeature;
@@ -51,11 +45,13 @@ class UtilityTier;
 class UtilityTraceParameters;
 }
 
+#include <QObject>
+#include <QUrl>
+#include <QUuid>
+
 Q_MOC_INCLUDE("MapQuickView.h")
 Q_MOC_INCLUDE("IdentifyLayerResult.h")
 
-class TaskCanceler;
-
 class TraceUtilityNetwork : public QObject
 {
   Q_OBJECT
@@ -137,7 +133,7 @@ class TraceUtilityNetwork : public QObject
   QList<Esri::ArcGISRuntime::UtilityElement*> m_barriers;
   QList<Esri::ArcGISRuntime::UtilityTerminal*> m_terminals;
   QScopedPointer<QObject> m_graphicParent;
-  std::unique_ptr<TaskCanceler> m_taskCanceler;
+
 };
 
 #endif // TraceUtilityNetwork_H
diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro
index fb44f879c7..cc5c452cec 100644
--- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro
+++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro
@@ -27,16 +27,13 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = TraceUtilityNetwork
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
 
-INCLUDEPATH += $${PWD}/../../../SampleViewer
-
 HEADERS += \
-    TraceUtilityNetwork.h \
-    $${PWD}/../../../SampleViewer/TaskCanceler.h
+    TraceUtilityNetwork.h
 
 SOURCES += \
     main.cpp \
diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml
index 959bf8a378..e3b759373d 100644
--- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml
+++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=TraceUtilityNetwork, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp b/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp
index 6e9f370402..9a117e4f33 100644
--- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp
+++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp
@@ -1,30 +1,23 @@
-// [Legal]
 // Copyright 2019 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "TraceUtilityNetwork.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp
index bdb3e65605..3ed3fab9a5 100644
--- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp
+++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp
@@ -1,12 +1,12 @@
 // [WriteFile Name=ValidateUtilityNetworkTopology, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,6 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
-#include "ValidateUtilityNetworkTopology.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISFeature.h"
 #include "ArcGISFeatureListModel.h"
 #include "AttributeListModel.h"
@@ -30,8 +26,8 @@
 #include "Error.h"
 #include "FeatureEditResult.h"
 #include "FeatureLayer.h"
-#include "FeatureQueryResult.h"
 #include "FeatureTableEditResult.h"
+#include "FeatureQueryResult.h"
 #include "Field.h"
 #include "Graphic.h"
 #include "GraphicListModel.h"
@@ -77,14 +73,15 @@
 #include "UtilityTraceParameters.h"
 #include "UtilityTraceResultListModel.h"
 #include "UtilityValidationResult.h"
+#include "ValidateUtilityNetworkTopology.h"
 #include "Viewpoint.h"
 
-// Qt headers
-#include <QFuture>
 #include <QUuid>
+#include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
 
+
 ValidateUtilityNetworkTopology::ValidateUtilityNetworkTopology(QObject* parent /* = nullptr */) :
   QObject(parent)
 {
diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h
index 808dc6da41..50bf9ba40d 100644
--- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h
+++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h
@@ -1,12 +1,12 @@
 // [WriteFile Name=ValidateUtilityNetworkTopology, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,9 @@
 #ifndef VALIDATEUTILITYNETWORKTOPOLOGY_H
 #define VALIDATEUTILITYNETWORKTOPOLOGY_H
 
-// ArcGIS Maps SDK headers
 #include "CodedValueDomain.h"
 #include "IdentifyLayerResult.h"
 
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime {
   class ArcGISFeature;
   class FeatureLayer;
@@ -39,6 +35,8 @@ namespace Esri::ArcGISRuntime {
   class UtilityTraceParameters;
 }
 
+#include <QObject>
+
 Q_MOC_INCLUDE("MapQuickView.h");
 
 class ValidateUtilityNetworkTopology : public QObject
diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro
index 51ae289752..f37df3e928 100644
--- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro
+++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ValidateUtilityNetworkTopology
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml
index 84239b3c55..6a7fe9afd3 100644
--- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml
+++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml
@@ -1,12 +1,12 @@
 // [WriteFile Name=ValidateUtilityNetworkTopology, Category=UtilityNetwork]
 // [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp
index 6ed71a10d0..c8dc675e8c 100644
--- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp
+++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp
@@ -1,27 +1,22 @@
-// [Legal]
 // Copyright 2024 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ValidateUtilityNetworkTopology.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif
diff --git a/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro b/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro
index 6272bb3159..76bd3de6e1 100644
--- a/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro
+++ b/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro
@@ -27,7 +27,7 @@ QT += opengl widgets
 TEMPLATE = app
 TARGET = BuildLegend
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro b/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro
index 81a5585e5c..8da83aa70b 100644
--- a/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro
+++ b/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro b/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro
index 698dd6c43c..a5bd09bd53 100644
--- a/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro
+++ b/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro b/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro
index 6b457da5a1..bddcb4f85a 100644
--- a/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro
+++ b/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro b/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro
index 994a90ebdf..c03b05428f 100644
--- a/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro
+++ b/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro b/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro
index 325283993d..26e479a908 100644
--- a/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro
+++ b/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro b/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro
index 5f6eba8dc9..ad16768c43 100644
--- a/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro
+++ b/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro b/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro
index c43b5e6f25..8de7328e95 100644
--- a/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro
+++ b/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro b/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro
index 2edbecfc48..bf109fff1e 100644
--- a/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro
+++ b/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro b/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro
index 57ab9a2e77..80e9297729 100644
--- a/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro
+++ b/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro b/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro
index b33d583d1d..dcca7b1cf6 100644
--- a/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro
+++ b/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro b/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro
index c92447cc7b..5dde41ac5c 100644
--- a/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro
+++ b/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro b/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro
index 218f2eff4b..d78a1d91fc 100644
--- a/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro
+++ b/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro b/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro
index 70a5abf82c..c0f4360fa8 100644
--- a/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro
+++ b/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro b/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro
index 6595b7e052..72f05319be 100644
--- a/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro
+++ b/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro
@@ -22,7 +22,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl widgets
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \
diff --git a/SampleViewer/SampleViewer.pro b/SampleViewer/SampleViewer.pro
index fb8079d8a7..4e6713242a 100644
--- a/SampleViewer/SampleViewer.pro
+++ b/SampleViewer/SampleViewer.pro
@@ -20,13 +20,12 @@
 TEMPLATE = app
 QT += core gui xml network qml quick positioning sensors multimedia
 QT += widgets quickcontrols2 opengl webview core5compat websockets texttospeech
-android|ios: QT += bluetooth
 TARGET = ArcGISQt_Samples
 DEFINES += Qt_Version=\"$$QT_VERSION\"
 SAMPLEPATHCPP = $$PWD/../CppSamples
 COMMONVIEWER = $$PWD
 PCH_HEADER = $$COMMONVIEWER/pch.hpp
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 DEFINES += ArcGIS_Runtime_Version=$$ARCGIS_RUNTIME_VERSION
 
 # This block determines whether to build against the installed SDK or the local dev build area
@@ -150,8 +149,8 @@ android {
 
 HEADERS += \
     $$PCH_HEADER \
-    $$COMMONVIEWER/SyntaxHighlighter/SyntaxHighlighter.h \
-    $$COMMONVIEWER/SyntaxHighlighter/QmlHighlighter.h \
+    $$COMMONVIEWER/SyntaxHighlighter/syntax_highlighter.h \
+    $$COMMONVIEWER/SyntaxHighlighter/QMLHighlighter.h \
     $$COMMONVIEWER/CategoryListModel.h \
     $$COMMONVIEWER/DataItem.h \
     $$COMMONVIEWER/DataItemListModel.h \
@@ -165,12 +164,11 @@ HEADERS += \
     $$COMMONVIEWER/SearchFilterSimpleKeywordCriteria.h \
     $$COMMONVIEWER/SourceCode.h \
     $$COMMONVIEWER/SourceCodeListModel.h \
-    $$COMMONVIEWER/ZipHelper.h \
-    $$COMMONVIEWER/TaskCanceler.h
+    $$COMMONVIEWER/ZipHelper.h
 
 SOURCES += \
-    $$COMMONVIEWER/SyntaxHighlighter/SyntaxHighlighter.cpp \
-    $$COMMONVIEWER/SyntaxHighlighter/QmlHighlighter.cpp \
+    $$COMMONVIEWER/SyntaxHighlighter/syntax_highlighter.cpp \
+    $$COMMONVIEWER/SyntaxHighlighter/QMLHighlighter.cpp \
     $$COMMONVIEWER/CategoryListModel.cpp \
     $$COMMONVIEWER/DataItem.cpp \
     $$COMMONVIEWER/DataItemListModel.cpp \
diff --git a/SampleViewer/SyntaxHighlighter/QmlHighlighter.cpp b/SampleViewer/SyntaxHighlighter/QMLHighlighter.cpp
similarity index 69%
rename from SampleViewer/SyntaxHighlighter/QmlHighlighter.cpp
rename to SampleViewer/SyntaxHighlighter/QMLHighlighter.cpp
index d76204ea79..d542daf36f 100644
--- a/SampleViewer/SyntaxHighlighter/QmlHighlighter.cpp
+++ b/SampleViewer/SyntaxHighlighter/QMLHighlighter.cpp
@@ -16,11 +16,11 @@
 #include "pch.hpp"
 
 #include <QStringList>
-#include <QRegularExpression>
+#include <QRegExp>
 
-#include "QmlHighlighter.h"
+#include "QMLHighlighter.h"
 
-QmlHighlighter::QmlHighlighter(QTextDocument* parent) :
+QMLHighlighter::QMLHighlighter(QTextDocument* parent) :
   QSyntaxHighlighter(parent)
 {
     HighlightingRule rule;
@@ -35,43 +35,43 @@ QmlHighlighter::QmlHighlighter(QTextDocument* parent) :
                     << "\\bendif\\b" << "\\bQ_DECL_OVERRIDE\\b";
     foreach (const QString& pattern, keywordPatterns)
     {
-        rule.pattern = QRegularExpression(pattern);
+        rule.pattern = QRegExp(pattern);
         rule.format = m_keywordFormat;
         m_highlightingRules.append(rule);
     }
 
     m_classFormat.setForeground(Qt::darkMagenta);
-    rule.pattern = QRegularExpression(QStringLiteral("\\b[A-Z][A-Za-z]+\\b"));
+    rule.pattern = QRegExp("\\b[A-Z][A-Za-z]+\\b");
     rule.format = m_classFormat;
     m_highlightingRules.append(rule);
 
     m_classFormat_2.setForeground(Qt::darkMagenta);
-    rule.pattern = QRegularExpression(QStringLiteral("\\bQ_PROPERTY\\b"));
+    rule.pattern = QRegExp("\\bQ_PROPERTY\\b");
     rule.format = m_classFormat_2;
     m_highlightingRules.append(rule);
 
     m_classFormat_3.setForeground(Qt::darkMagenta);
-    rule.pattern = QRegularExpression(QStringLiteral("\\bQ_INVOKABLE\\b"));
+    rule.pattern = QRegExp("\\bQ_INVOKABLE\\b");
     rule.format = m_classFormat_3;
     m_highlightingRules.append(rule);
 
     m_memberVarName_1.setForeground(Qt::darkRed);
-    rule.pattern = QRegularExpression(QStringLiteral("\\b[a-z][A-Za-z]+(?=:)\\b"));
+    rule.pattern = QRegExp("\\b[a-z][A-Za-z]+(?=:)\\b");
     rule.format = m_memberVarName_1;
     m_highlightingRules.append(rule);
 
     m_memberVarName_2.setForeground(Qt::darkRed);
-    rule.pattern = QRegularExpression(QStringLiteral("\\b[a-z]+(?=:)\\b"));
+    rule.pattern = QRegExp("\\b[a-z]+(?=:)\\b");
     rule.format = m_memberVarName_2;
     m_highlightingRules.append(rule);
 
     m_memberVarName_3.setForeground(Qt::darkRed);
-    rule.pattern = QRegularExpression(QStringLiteral("\\banchors.\\b"));
+    rule.pattern = QRegExp("\\banchors.\\b");
     rule.format = m_memberVarName_3;
     m_highlightingRules.append(rule);
 
     m_memberVarName_4.setForeground(Qt::darkRed);
-    rule.pattern = QRegularExpression(QStringLiteral("\\banchors\\b"));
+    rule.pattern = QRegExp("\\banchors\\b");
     rule.format = m_memberVarName_4;
     m_highlightingRules.append(rule);
 
@@ -91,50 +91,49 @@ QmlHighlighter::QmlHighlighter(QTextDocument* parent) :
 
     foreach (const QString& pattern, keywordPatternsOther)
     {
-        rule.pattern = QRegularExpression(pattern);
+        rule.pattern = QRegExp(pattern);
         rule.format = m_keywordOtherFormat;
         m_highlightingRules.append(rule);
     }
 
     m_singleLineCommentFormat.setForeground(Qt::darkGreen);
-    rule.pattern = QRegularExpression(QStringLiteral("^(?!\"([^\"']*)\")\\s*//[^\n]*"));
+    rule.pattern = QRegExp("^(?!\"([^\"']*)\")\\s*//[^\n]*");
     rule.format = m_singleLineCommentFormat;
     m_highlightingRules.append(rule);
 
     m_multiLineCommentFormat.setForeground(Qt::darkGreen);
 
     m_quotationFormat.setForeground(Qt::darkGreen);
-    rule.pattern = QRegularExpression(QStringLiteral("(\"[^\"]+\"|'[^\']+')"));
+    rule.pattern = QRegExp("(\"[^\"]+\"|'[^\']+')");
     rule.format = m_quotationFormat;
     m_highlightingRules.append(rule);
 
-    m_commentStartExpression = QRegularExpression(QStringLiteral("/\\*"));
-    m_commentEndExpression = QRegularExpression(QStringLiteral("\\*/"));
+    m_commentStartExpression = QRegExp("/\\*");
+    m_commentEndExpression = QRegExp("\\*/");
 }
 
-void QmlHighlighter::highlightBlock(const QString& text)
+void QMLHighlighter::highlightBlock(const QString& text)
 {
     foreach (const HighlightingRule& rule, m_highlightingRules)
     {
-        QRegularExpression expression(rule.pattern);
-        QRegularExpressionMatchIterator matchIterator = expression.globalMatch(text);
-        while (matchIterator.hasNext())
+        QRegExp expression(rule.pattern);
+        int index = expression.indexIn(text);
+        while (index >= 0)
         {
-            QRegularExpressionMatch match = matchIterator.next();
-            int index = match.capturedStart();
-            int length = match.capturedLength();
+            int length = expression.matchedLength();
             setFormat(index, length, rule.format);
+            index = expression.indexIn(text, index + length);
         }
     }
     setCurrentBlockState(0);
 
     int startIndex = 0;
     if (previousBlockState() != 1)
-        startIndex = m_commentStartExpression.match(text).capturedStart();
+        startIndex = m_commentStartExpression.indexIn(text);
 
     while (startIndex >= 0)
     {
-        int endIndex = m_commentEndExpression.match(text, startIndex).capturedStart();
+        int endIndex = m_commentEndExpression.indexIn(text, startIndex);
         int commentLength;
         if (endIndex == -1)
         {
@@ -143,10 +142,10 @@ void QmlHighlighter::highlightBlock(const QString& text)
         }
         else
         {
-            commentLength = endIndex - startIndex + m_commentEndExpression.match(text, startIndex).capturedLength();
+            commentLength = endIndex - startIndex + m_commentEndExpression.matchedLength();
         }
         setFormat(startIndex, commentLength, m_multiLineCommentFormat);
-        startIndex = m_commentStartExpression.match(text, startIndex + commentLength).capturedStart();
+        startIndex = m_commentStartExpression.indexIn(text, startIndex + commentLength);
     }
 }
 
diff --git a/SampleViewer/SyntaxHighlighter/QmlHighlighter.h b/SampleViewer/SyntaxHighlighter/QMLHighlighter.h
similarity index 84%
rename from SampleViewer/SyntaxHighlighter/QmlHighlighter.h
rename to SampleViewer/SyntaxHighlighter/QMLHighlighter.h
index 1174ce4a09..16cf3680b1 100644
--- a/SampleViewer/SyntaxHighlighter/QmlHighlighter.h
+++ b/SampleViewer/SyntaxHighlighter/QMLHighlighter.h
@@ -20,12 +20,12 @@
 #include <QSyntaxHighlighter>
 #include <QTextDocument>
 #include <QList>
-#include <QRegularExpression>
+#include <QRegExp>
 
-class QmlHighlighter : public QSyntaxHighlighter {
+class QMLHighlighter : public QSyntaxHighlighter {
 
 public:
-    explicit QmlHighlighter(QTextDocument* parent = nullptr);
+    explicit QMLHighlighter(QTextDocument* parent = nullptr);
 
 protected:
     void highlightBlock(const QString& text);
@@ -33,14 +33,14 @@ class QmlHighlighter : public QSyntaxHighlighter {
 private:
     struct HighlightingRule
     {
-        QRegularExpression pattern;
+        QRegExp pattern;
         QTextCharFormat format;
     };
 
     QList<HighlightingRule> m_highlightingRules;
 
-    QRegularExpression m_commentStartExpression;
-    QRegularExpression m_commentEndExpression;
+    QRegExp m_commentStartExpression;
+    QRegExp m_commentEndExpression;
 
     QTextCharFormat m_keywordFormat;
     QTextCharFormat m_keywordOtherFormat;
diff --git a/SampleViewer/SyntaxHighlighter/SyntaxHighlighter.cpp b/SampleViewer/SyntaxHighlighter/syntax_highlighter.cpp
similarity index 89%
rename from SampleViewer/SyntaxHighlighter/SyntaxHighlighter.cpp
rename to SampleViewer/SyntaxHighlighter/syntax_highlighter.cpp
index 753d43af77..0ea9537398 100644
--- a/SampleViewer/SyntaxHighlighter/SyntaxHighlighter.cpp
+++ b/SampleViewer/SyntaxHighlighter/syntax_highlighter.cpp
@@ -18,9 +18,9 @@
 #include <QTextDocument>
 #include <QQuickTextDocument>
 
-#include "QmlHighlighter.h"
+#include "QMLHighlighter.h"
 
-#include "SyntaxHighlighter.h"
+#include "syntax_highlighter.h"
 
 SyntaxHighlighter::SyntaxHighlighter(QObject* parent) :
   QObject(parent)
@@ -30,6 +30,6 @@ SyntaxHighlighter::SyntaxHighlighter(QObject* parent) :
 void SyntaxHighlighter::setHighlighter(QObject* textArea) {
     QQuickTextDocument* quickTextDocument = qvariant_cast<QQuickTextDocument*>(textArea->property("textDocument"));
     QTextDocument* document = quickTextDocument->textDocument();
-    QmlHighlighter* highlighter = new QmlHighlighter(document);
+    QMLHighlighter* highlighter = new QMLHighlighter(document);
     highlighter->rehighlight();
 }
diff --git a/SampleViewer/SyntaxHighlighter/SyntaxHighlighter.h b/SampleViewer/SyntaxHighlighter/syntax_highlighter.h
similarity index 100%
rename from SampleViewer/SyntaxHighlighter/SyntaxHighlighter.h
rename to SampleViewer/SyntaxHighlighter/syntax_highlighter.h
diff --git a/SampleViewer/TaskCanceler.h b/SampleViewer/TaskCanceler.h
deleted file mode 100644
index 1d9cb12cf2..0000000000
--- a/SampleViewer/TaskCanceler.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// [Legal]
-// Copyright 2024 Esri.
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-#ifndef TaskCanceler_H
-#define TaskCanceler_H
-
-// Qt headers
-#include <QFutureWatcher>
-
-#include <memory>
-#include <mutex>
-#include <unordered_set>
-
-// This class is a helper to ensure any QFuture-based async tasks are
-// canceled upon destruction. This is useful to ensure QFuture
-// continuations aren't being executed at the same time as samples are being
-// destructed
-
-class TaskCanceler
-{
-public:
-  TaskCanceler() = default;
-  ~TaskCanceler()
-  {
-    cancelAllTasks_();
-  }
-
-  template <typename T>
-  void addTask(const QFuture<T>& future)
-  {
-    auto watcher = std::make_shared<QFutureWatcher<T>>();
-
-    QObject::connect(watcher.get(), &QFutureWatcher<T>::finished, &m_connectionContext, [this, watcher]()
-    {
-      std::lock_guard<std::mutex> lock(m_mutex);
-      m_watchers.erase(watcher);
-    });
-    watcher->setFuture(future);
-
-    std::lock_guard<std::mutex> lock(m_mutex);
-    m_watchers.insert(watcher);
-  }
-
-private:
-  void cancelAllTasks_()
-  {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    for (auto& watcher : m_watchers)
-    {
-      if (watcher->isRunning())
-      {
-        watcher->cancel();
-      }
-    }
-  }
-
-  std::unordered_set<std::shared_ptr<QFutureWatcherBase>> m_watchers;
-  std::mutex m_mutex;
-  QObject m_connectionContext;
-};
-
-#endif // TaskCanceler_H
diff --git a/SampleViewer/mainSample.cpp b/SampleViewer/mainSample.cpp
index 12d33131d3..0b19979d29 100644
--- a/SampleViewer/mainSample.cpp
+++ b/SampleViewer/mainSample.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 // [Legal]
 
-#include "pch.hpp" // IWYU pragma: keep
+#include "pch.hpp"
 
 // Qt headers
 #include <QApplication>
@@ -30,9 +30,8 @@
 #  include <QtWebEngineQuick>
 #endif // QT_WEBVIEW_WEBENGINE_BACKEND
 
-#include "ArcGISQt_global.h" // IWYU pragma: keep - for LOCALSERVER_SUPPORTED
-
 #include "SampleManager.h"
+#include "ArcGISRuntimeEnvironment.h"
 
 #include "CategoryListModel.h"
 #include "DataItem.h"
@@ -45,245 +44,253 @@
 #include "SearchFilterCriteria.h"
 #include "SourceCode.h"
 #include "SourceCodeListModel.h"
-#include "SyntaxHighlighter/SyntaxHighlighter.h"
-#include "../CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h"
+#include "SyntaxHighlighter/syntax_highlighter.h"
+#include "DrawOrderLayerListModel.h"
 
 #ifdef ESRI_BUILD
 #include "buildnum.h"
 #endif
 
 // All Samples
-#include "../CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h"
-#include "../CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h"
-#include "../CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h"
-#include "../CppSamples/Analysis/Geotriggers/Geotriggers.h"
-#include "../CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h"
-#include "../CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h"
-#include "../CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h"
-#include "../CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h"
-#include "../CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h"
-#include "../CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h"
-#include "../CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h"
-#include "../CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h"
-#include "../CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h"
-#include "../CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h"
-#include "../CppSamples/DisplayInformation/BuildLegend/BuildLegend.h"
-#include "../CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h"
-#include "../CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h"
-#include "../CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h"
-#include "../CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h"
-#include "../CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h"
-#include "../CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h"
-#include "../CppSamples/DisplayInformation/GOSymbols/GOSymbols.h"
-#include "../CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h"
-#include "../CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h"
-#include "../CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h"
-#include "../CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h"
-#include "../CppSamples/DisplayInformation/ShowCallout/ShowCallout.h"
-#include "../CppSamples/DisplayInformation/ShowGrid/ShowGrid.h"
-#include "../CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h"
-#include "../CppSamples/DisplayInformation/ShowPopup/ShowPopup.h"
-#include "../CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h"
-#include "../CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h"
-#include "../CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h"
-#include "../CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h"
-#include "../CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h"
-#include "../CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h"
-#include "../CppSamples/EditData/ContingentValues/ContingentValues.h"
-#include "../CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h"
-#include "../CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h"
-#include "../CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h"
-#include "../CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h"
-#include "../CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h"
-#include "../CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h"
-#include "../CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h"
-#include "../CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h"
-#include "../CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h"
-#include "../CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h"
-#include "../CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h"
-#include "../CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h"
-#include "../CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h"
-#include "../CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h"
-#include "../CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h"
-#include "../CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h"
-#include "../CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h"
-#include "../CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h"
-#include "../CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h"
-#include "../CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h"
-#include "../CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h"
-#include "../CppSamples/Geometry/Buffer/Buffer.h"
-#include "../CppSamples/Geometry/ClipGeometry/ClipGeometry.h"
-#include "../CppSamples/Geometry/ConvexHull/ConvexHull.h"
-#include "../CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h"
-#include "../CppSamples/Geometry/CreateGeometries/CreateGeometries.h"
-#include "../CppSamples/Geometry/CutGeometry/CutGeometry.h"
-#include "../CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h"
-#include "../CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h"
-#include "../CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h"
-#include "../CppSamples/Geometry/ListTransformations/ListTransformations.h"
-#include "../CppSamples/Geometry/NearestVertex/NearestVertex.h"
-#include "../CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h"
-#include "../CppSamples/Geometry/SpatialOperations/SpatialOperations.h"
-#include "../CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h"
-#include "../CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h"
-#include "../CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h"
-#include "../CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h"
-#include "../CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h"
-#include "../CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h"
-#include "../CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h"
-#include "../CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h"
-#include "../CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h"
-#include "../CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h"
-#include "../CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h"
-#include "../CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h"
-#include "../CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h"
-#include "../CppSamples/Layers/ConfigureClusters/ConfigureClusters.h"
-#include "../CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h"
-#include "../CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h"
-#include "../CppSamples/Layers/DisplayDimensions/DisplayDimensions.h"
-#include "../CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h"
-#include "../CppSamples/Layers/DisplayKml/DisplayKml.h"
-#include "../CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h"
-#include "../CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h"
-#include "../CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h"
-#include "../CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h"
-#include "../CppSamples/Layers/ExportTiles/ExportTiles.h"
-#include "../CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h"
-#include "../CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h"
-#include "../CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h"
-#include "../CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h"
-#include "../CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h"
-#include "../CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h"
-#include "../CppSamples/Layers/GroupLayers/GroupLayers.h"
-#include "../CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h"
-#include "../CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h"
-#include "../CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h"
-#include "../CppSamples/Layers/ListKmlContents/ListKmlContents.h"
-#include "../CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h"
-#include "../CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h"
-#include "../CppSamples/Layers/OSM_Layer/OSM_Layer.h"
-#include "../CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h"
-#include "../CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h"
-#include "../CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h"
-#include "../CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h"
-#include "../CppSamples/Layers/RasterFunctionService/RasterFunctionService.h"
-#include "../CppSamples/Layers/RasterLayerFile/RasterLayerFile.h"
-#include "../CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h"
-#include "../CppSamples/Layers/RasterLayerService/RasterLayerService.h"
-#include "../CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h"
-#include "../CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h"
-#include "../CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h"
-#include "../CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h"
-#include "../CppSamples/Layers/TileCacheLayer/TileCacheLayer.h"
-#include "../CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h"
-#include "../CppSamples/Layers/WMTS_Layer/WMTS_Layer.h"
-#include "../CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h"
-#include "../CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h"
-#include "../CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h"
-#include "../CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h"
-#include "../CppSamples/Maps/ChangeBasemap/ChangeBasemap.h"
-#include "../CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h"
-#include "../CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h"
-#include "../CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h"
-#include "../CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h"
-#include "../CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h"
-#include "../CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h"
-#include "../CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h"
-#include "../CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h"
-#include "../CppSamples/Maps/DisplayMap/DisplayMap.h"
-#include "../CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h"
-#include "../CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h"
-#include "../CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h"
-#include "../CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h"
-#include "../CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h"
-#include "../CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h"
-#include "../CppSamples/Maps/IdentifyLayers/IdentifyLayers.h"
-#include "../CppSamples/Maps/ManageBookmarks/ManageBookmarks.h"
-#include "../CppSamples/Maps/MapLoaded/MapLoaded.h"
-#include "../CppSamples/Maps/MapReferenceScale/MapReferenceScale.h"
-#include "../CppSamples/Maps/MapRotation/MapRotation.h"
-#include "../CppSamples/Maps/MinMaxScale/MinMaxScale.h"
-#include "../CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h"
-#include "../CppSamples/Maps/OpenMapUrl/OpenMapUrl.h"
-#include "../CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h"
-#include "../CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h"
-#include "../CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h"
-#include "../CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h"
-#include "../CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h"
-#include "../CppSamples/Maps/SetMaxExtent/SetMaxExtent.h"
-#include "../CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h"
-#include "../CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h"
-#include "../CppSamples/Maps/ShowMagnifier/ShowMagnifier.h"
-#include "../CppSamples/Maps/TakeScreenshot/MapImageProvider.h"
-#include "../CppSamples/Maps/TakeScreenshot/TakeScreenshot.h"
-#include "../CppSamples/Routing/ClosestFacility/ClosestFacility.h"
-#include "../CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h"
-#include "../CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h"
-#include "../CppSamples/Routing/FindRoute/FindRoute.h"
-#include "../CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h"
-#include "../CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h"
-#include "../CppSamples/Routing/NavigateRoute/NavigateRoute.h"
-#include "../CppSamples/Routing/OfflineRouting/OfflineRouting.h"
-#include "../CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h"
-#include "../CppSamples/Routing/ServiceArea/ServiceArea.h"
-#include "../CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h"
-#include "../CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h"
-#include "../CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h"
-#include "../CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h"
-#include "../CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h"
-#include "../CppSamples/Scenes/BasicSceneView/BasicSceneView.h"
-#include "../CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h"
-#include "../CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h"
-#include "../CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h"
-#include "../CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h"
-#include "../CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h"
-#include "../CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h"
-#include "../CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h"
-#include "../CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h"
-#include "../CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h"
-#include "../CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h"
-#include "../CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h"
-#include "../CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h"
-#include "../CppSamples/Scenes/OpenScene/OpenScene.h"
-#include "../CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h"
-#include "../CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h"
-#include "../CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h"
-#include "../CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h"
-#include "../CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h"
-#include "../CppSamples/Scenes/Symbols/Symbols.h"
-#include "../CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h"
-#include "../CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h"
-#include "../CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h"
-#include "../CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h"
-#include "../CppSamples/Search/FindAddress/FindAddress.h"
-#include "../CppSamples/Search/FindPlace/FindPlace.h"
-#include "../CppSamples/Search/OfflineGeocode/OfflineGeocode.h"
-#include "../CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h"
-#include "../CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h"
-#include "../CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h"
-#include "../CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h"
-#include "../CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h"
-#include "../CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h"
-#include "../CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h"
-#include "../CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h"
-#include "../CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h"
+#include "Add3DTilesLayer.h"
+#include "AddAPointSceneLayer.h"
+#include "AddCustomDynamicEntityDataSource.h"
+#include "AddDynamicEntityLayer.h"
+#include "AddEncExchangeSet.h"
+#include "AddFeaturesFeatureService.h"
+#include "AddGraphicsWithRenderer.h"
+#include "AddIntegratedMeshLayer.h"
+#include "AddItemsToPortal.h"
+#include "AnalyzeHotspots.h"
+#include "AnalyzeViewshed.h"
+#include "Animate3DSymbols.h"
+#include "AnimateImagesWithImageOverlay.h"
+#include "ApplyMosaicRuleToRasters.h"
+#include "ApplyScheduledMapUpdates.h"
+#include "ApplyUniqueValuesWithAlternateSymbols.h"
+#include "ArcGISMapImageLayerUrl.h"
+#include "ArcGISQt_global.h" // for LOCALSERVER_SUPPORTED
+#include "ArcGISTiledLayerUrl.h"
+#include "BasicSceneView.h"
+#include "BlendRasterLayer.h"
+#include "BookmarkListModel.h"
+#include "BrowseBuildingFloors.h"
+#include "BrowseOGCAPIFeatureService.h"
+#include "BrowseWfsLayers.h"
+#include "Buffer.h"
+#include "BuildLegend.h"
+#include "ChangeAtmosphereEffect.h"
+#include "ChangeBasemap.h"
+#include "ChangeSublayerRenderer.h"
+#include "ChangeSublayerVisibility.h"
+#include "ChangeViewpoint.h"
+#include "ChooseCameraController.h"
+#include "ClipGeometry.h"
+#include "ClosestFacility.h"
+#include "ConfigureBasemapStyleLanguage.h"
+#include "ConfigureClusters.h"
+#include "ConfigureSubnetworkTrace.h"
+#include "ContingentValues.h"
+#include "ControlAnnotationSublayerVisibility.h"
+#include "ControlTimeExtentTimeSlider.h"
+#include "ConvexHull.h"
+#include "CreateAndSaveKmlFile.h"
+#include "CreateAndSaveMap.h"
+#include "CreateAndEditGeometries.h"
+#include "CreateDynamicBasemapGallery.h"
+#include "CreateGeometries.h"
+#include "CreateLoadReport.h"
+#include "CreateMobileGeodatabase.h"
+#include "CreateSymbolStylesFromWebStyles.h"
+#include "CreateTerrainSurfaceFromLocalRaster.h"
+#include "CreateTerrainSurfaceFromLocalTilePackage.h"
+#include "Credential.h"
+#include "CustomDictionaryStyle.h"
+#include "CutGeometry.h"
+#include "DeleteFeaturesFeatureService.h"
+#include "DensifyAndGeneralize.h"
+#include "Display3DLabelsInScene.h"
+#include "DisplayAnnotation.h"
+#include "DisplayContentOfUtilityNetworkContainer.h"
+#include "DisplayDimensions.h"
+#include "DisplayDeviceLocation.h"
+#include "DisplayDeviceLocationWithNmeaDataSources.h"
+#include "DisplayDrawingStatus.h"
+#include "DisplayFeatureLayers.h"
+#include "DisplayGrid.h"
+#include "DisplayKml.h"
+#include "DisplayKmlNetworkLinks.h"
+#include "DisplayLayerViewDrawState.h"
+#include "DisplayMap.h"
+#include "DisplayOgcApiFeatureCollection.h"
+#include "DisplayOverviewMap.h"
+#include "DisplayClusters.h"
+#include "DisplayRouteLayer.h"
+#include "DisplaySceneLayer.h"
+#include "DisplaySubtypeFeatureLayer.h"
+#include "DisplayUtilityAssociations.h"
+#include "DisplayWfsLayer.h"
+#include "DistanceCompositeSymbol.h"
+#include "DistanceMeasurementAnalysis.h"
+#include "DownloadPreplannedMap.h"
+#include "EditAndSyncFeatures.h"
+#include "EditFeatureAttachments.h"
+#include "EditFeaturesWithFeatureLinkedAnnotation.h"
+#include "EditKmlGroundOverlay.h"
+#include "EditWithBranchVersioning.h"
+#include "ExportTiles.h"
+#include "ExportVectorTiles.h"
+#include "ExtrudeGraphics.h"
+#include "Feature_Collection_Layer.h"
+#include "FeatureCollectionLayerFromPortal.h"
+#include "FeatureCollectionLayerQuery.h"
+#include "FeatureLayerChangeRenderer.h"
+#include "FeatureLayerDictionaryRenderer.h"
+#include "FeatureLayerExtrusion.h"
+#include "FilterFeaturesInScene.h"
+#include "FeatureLayerQuery.h"
+#include "FeatureLayerRenderingModeMap.h"
+#include "FeatureLayerRenderingModeScene.h"
+#include "FeatureLayerSelection.h"
+#include "FilterByDefinitionExpressionOrDisplayFilter.h"
+#include "FindAddress.h"
+#include "FindClosestFacilityToMultipleIncidentsService.h"
+#include "FindPlace.h"
+#include "FindRoute.h"
+#include "FindServiceAreasForMultipleFacilities.h"
+#include "FormatCoordinates.h"
+#include "GenerateGeodatabaseReplicaFromFeatureService.h"
+#include "GenerateOfflineMap_Overrides.h"
+#include "GenerateOfflineMap.h"
+#include "GenerateOfflineMapLocalBasemap.h"
+#include "GeodesicOperations.h"
+#include "Geotriggers.h"
+#include "GetElevationAtPoint.h"
+#include "GODictionaryRenderer_3D.h"
+#include "GODictionaryRenderer.h"
+#include "GOSymbols.h"
+#include "GroupLayers.h"
+#include "Hillshade_Renderer.h"
+#include "HonorMobileMapPackageExpiration.h"
+#include "IdentifyGraphics.h"
+#include "IdentifyKmlFeatures.h"
+#include "IdentifyLayers.h"
+#include "IdentifyRasterCell.h"
+#include "IntegratedWindowsAuthentication.h"
+#include "LineOfSightGeoElement.h"
+#include "LineOfSightLocation.h"
+#include "ListKmlContents.h"
+#include "ListRelatedFeatures.h"
+#include "ListTransformations.h"
+#include "LoadWfsXmlQuery.h"
+#include "ManageBookmarks.h"
+#include "ManageOperationalLayers.h"
+#include "MapImageProvider.h"
+#include "MapLoaded.h"
+#include "MapReferenceScale.h"
+#include "MapRotation.h"
+#include "MinMaxScale.h"
+#include "MobileMap_SearchAndRoute.h"
+#include "NavigateRoute.h"
+#include "NavigateARouteWithRerouting.h"
+#include "NearestVertex.h"
+#include "OfflineGeocode.h"
+#include "OfflineRouting.h"
+#include "OpenMapUrl.h"
+#include "OpenMobileMap_MapPackage.h"
+#include "OpenMobileScenePackage.h"
+#include "OpenScene.h"
+#include "OrbitCameraAroundObject.h"
+#include "OSM_Layer.h"
+#include "PerformValveIsolationTrace.h"
+#include "Picture_Marker_Symbol.h"
+#include "PlayAKmlTour.h"
+#include "PortalUserInfo.h"
+#include "ProjectGeometry.h"
+#include "QueryFeaturesWithArcadeExpression.h"
+#include "QueryMapImageSublayer.h"
+#include "QueryOGCAPICQLFilters.h"
+#include "RasterColormapRenderer.h"
+#include "RasterFunctionService.h"
+#include "RasterLayerFile.h"
+#include "RasterLayerGeoPackage.h"
+#include "RasterLayerService.h"
+#include "RasterRenderingRule.h"
+#include "RasterRgbRenderer.h"
+#include "RasterStretchRenderer.h"
+#include "ReadGeoPackage.h"
+#include "ReadSymbolsFromMobileStyle.h"
+#include "RealisticLightingAndShadows.h"
+#include "ReverseGeocodeOnline.h"
+#include "RouteAroundBarriers.h"
+#include "SceneLayerSelection.h"
+#include "ScenePropertiesExpressions.h"
+#include "SearchDictionarySymbolStyle.h"
+#include "SearchForWebmap.h"
+#include "ServiceArea.h"
+#include "ServiceFeatureTableCache.h"
+#include "ServiceFeatureTableManualCache.h"
+#include "ServiceFeatureTableNoCache.h"
+#include "SetInitialMapArea.h"
+#include "SetInitialMapLocation.h"
+#include "SetMapSpatialReference.h"
+#include "SetMaxExtent.h"
+#include "ShowCallout.h"
+#include "ShowDeviceLocationUsingIndoorPositioning.h"
+#include "ShowLabelsOnLayers.h"
+#include "ShowLocationHistory.h"
+#include "ShowMagnifier.h"
+#include "ShowOrgBasemaps.h"
+#include "ShowPopup.h"
+#include "Simple_Marker_Symbol.h"
+#include "Simple_Renderer.h"
+#include "SketchOnMap.h"
+#include "SnapGeometryEdits.h"
+#include "SpatialOperations.h"
+#include "SpatialRelationships.h"
+#include "StatisticalQuery.h"
+#include "StatisticalQueryGroupSort.h"
+#include "StyleWmsLayer.h"
+#include "SuggestListModel.h"
+#include "SetSurfacePlacementMode.h"
+#include "SymbolizeShapefile.h"
+#include "Symbols.h"
+#include "SyncMapViewSceneView.h"
+#include "TakeScreenshot.h"
+#include "TerrainExaggeration.h"
+#include "TileCacheLayer.h"
+#include "TokenAuthentication.h"
+#include "TraceUtilityNetwork.h"
+#include "Unique_Value_Renderer.h"
+#include "UpdateAttributesFeatureService.h"
+#include "UpdateGeometryFeatureService.h"
+#include "ValidateUtilityNetworkTopology.h"
+#include "VectorTiledLayerUrl.h"
+#include "ViewContentBeneathTerrainSurface.h"
+#include "ViewPointCloudDataOffline.h"
+#include "ViewshedCamera.h"
+#include "ViewshedGeoElement.h"
+#include "ViewshedLocation.h"
+#include "Web_Tiled_Layer.h"
+#include "WmsLayerUrl.h"
+#include "WMTS_Layer.h"
 
 #ifdef LOCALSERVER_SUPPORTED
-#include "../CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h"
-#include "../CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h"
-#include "../CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h"
-#include "../CppSamples/LocalServer/LocalServerServices/LocalServerServices.h"
+#include "LocalServerFeatureLayer.h"
+#include "LocalServerGeoprocessing.h"
+#include "LocalServerMapImageLayer.h"
+#include "LocalServerServices.h"
 #endif // LOCALSERVER_SUPPORTED
 
 #ifdef SHOW_PORTAL_SAMPLES
-#include "../CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h"
-#include "../CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h"
-#include "../CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h"
-#include "../CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h"
+#include "AddItemsToPortal.h"
+#include "PortalUserInfo.h"
+#include "SearchForWebmap.h"
+#include "ShowOrgBasemaps.h"
 #endif // HIDE_PORTAL_SAMPLES
 
 #ifdef SHOW_RASTER_FUNCTION_SAMPLE
-#include "../CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h"
+#include "RasterFunctionFile.h"
 #endif // SHOW_RASTER_FUNCTION_SAMPLE
 
 
@@ -396,9 +403,9 @@ void registerCppSampleClasses()
   ControlAnnotationSublayerVisibility::init();
   ControlTimeExtentTimeSlider::init();
   ConvexHull::init();
-  CreateAndEditGeometries::init();
   CreateAndSaveKmlFile::init();
   CreateAndSaveMap::init();
+  CreateAndEditGeometries::init();
   CreateDynamicBasemapGallery::init();
   CreateGeometries::init();
   CreateLoadReport::init();
@@ -412,19 +419,20 @@ void registerCppSampleClasses()
   DensifyAndGeneralize::init();
   Display3DLabelsInScene::init();
   DisplayAnnotation::init();
-  DisplayClusters::init();
+  DisplayDimensions::init();
   DisplayContentOfUtilityNetworkContainer::init();
   DisplayDeviceLocation::init();
   DisplayDeviceLocationWithNmeaDataSources::init();
-  DisplayDimensions::init();
   DisplayDrawingStatus::init();
   DisplayFeatureLayers::init();
+  DisplayGrid::init();
   DisplayKml::init();
   DisplayKmlNetworkLinks::init();
   DisplayLayerViewDrawState::init();
   DisplayMap::init();
   DisplayOgcApiFeatureCollection::init();
   DisplayOverviewMap::init();
+  DisplayClusters::init();
   DisplayRouteLayer::init();
   DisplaySceneLayer::init();
   DisplaySubtypeFeatureLayer::init();
@@ -441,34 +449,34 @@ void registerCppSampleClasses()
   ExportTiles::init();
   ExportVectorTiles::init();
   ExtrudeGraphics::init();
+  Feature_Collection_Layer::init();
   FeatureCollectionLayerFromPortal::init();
   FeatureCollectionLayerQuery::init();
   FeatureLayerChangeRenderer::init();
   FeatureLayerDictionaryRenderer::init();
   FeatureLayerExtrusion::init();
+  FilterFeaturesInScene::init();
   FeatureLayerQuery::init();
   FeatureLayerRenderingModeMap::init();
   FeatureLayerRenderingModeScene::init();
   FeatureLayerSelection::init();
-  Feature_Collection_Layer::init();
   FilterByDefinitionExpressionOrDisplayFilter::init();
-  FilterFeaturesInScene::init();
   FindAddress::init();
   FindClosestFacilityToMultipleIncidentsService::init();
   FindPlace::init();
   FindRoute::init();
   FindServiceAreasForMultipleFacilities::init();
   FormatCoordinates::init();
-  GODictionaryRenderer::init();
-  GODictionaryRenderer_3D::init();
-  GOSymbols::init();
   GenerateGeodatabaseReplicaFromFeatureService::init();
+  GenerateOfflineMap_Overrides::init();
   GenerateOfflineMap::init();
   GenerateOfflineMapLocalBasemap::init();
-  GenerateOfflineMap_Overrides::init();
   GeodesicOperations::init();
   Geotriggers::init();
   GetElevationAtPoint::init();
+  GODictionaryRenderer_3D::init();
+  GODictionaryRenderer::init();
+  GOSymbols::init();
   GroupLayers::init();
   Hillshade_Renderer::init();
   HonorMobileMapPackageExpiration::init();
@@ -490,10 +498,9 @@ void registerCppSampleClasses()
   MapRotation::init();
   MinMaxScale::init();
   MobileMap_SearchAndRoute::init();
-  NavigateARouteWithRerouting::init();
   NavigateRoute::init();
+  NavigateARouteWithRerouting::init();
   NearestVertex::init();
-  OSM_Layer::init();
   OfflineGeocode::init();
   OfflineRouting::init();
   OpenMapUrl::init();
@@ -501,6 +508,7 @@ void registerCppSampleClasses()
   OpenMobileScenePackage::init();
   OpenScene::init();
   OrbitCameraAroundObject::init();
+  OSM_Layer::init();
   PerformValveIsolationTrace::init();
   Picture_Marker_Symbol::init();
   PlayAKmlTour::init();
@@ -532,10 +540,8 @@ void registerCppSampleClasses()
   SetInitialMapLocation::init();
   SetMapSpatialReference::init();
   SetMaxExtent::init();
-  SetSurfacePlacementMode::init();
   ShowCallout::init();
   ShowDeviceLocationUsingIndoorPositioning::init();
-  ShowGrid::init();
   ShowLabelsOnLayers::init();
   ShowLocationHistory::init();
   ShowMagnifier::init();
@@ -543,12 +549,13 @@ void registerCppSampleClasses()
   Simple_Marker_Symbol::init();
   Simple_Renderer::init();
   SketchOnMap::init();
-  SnapGeometryEdits::init();
   SpatialOperations::init();
   SpatialRelationships::init();
+  SnapGeometryEdits::init();
   StatisticalQuery::init();
   StatisticalQueryGroupSort::init();
   StyleWmsLayer::init();
+  SetSurfacePlacementMode::init();
   SymbolizeShapefile::init();
   Symbols::init();
   SyncMapViewSceneView::init();
@@ -567,9 +574,9 @@ void registerCppSampleClasses()
   ViewshedCamera::init();
   ViewshedGeoElement::init();
   ViewshedLocation::init();
-  WMTS_Layer::init();
   Web_Tiled_Layer::init();
   WmsLayerUrl::init();
+  WMTS_Layer::init();
 
 #ifdef SHOW_PORTAL_SAMPLES
   PortalUserInfo::init();
diff --git a/SampleViewer/samples.pri b/SampleViewer/samples.pri
index da2ac83060..a0ff9c712d 100644
--- a/SampleViewer/samples.pri
+++ b/SampleViewer/samples.pri
@@ -17,6 +17,225 @@
 
 #-------------------------------------------------
 
+INCLUDEPATH += \
+    "$$SAMPLEPATHCPP/Analysis/AnalyzeHotspots" \
+    "$$SAMPLEPATHCPP/Analysis/AnalyzeViewshed" \
+    "$$SAMPLEPATHCPP/Analysis/DistanceMeasurementAnalysis" \
+    "$$SAMPLEPATHCPP/Analysis/Geotriggers" \
+    "$$SAMPLEPATHCPP/Analysis/LineOfSightGeoElement" \
+    "$$SAMPLEPATHCPP/Analysis/LineOfSightLocation" \
+    "$$SAMPLEPATHCPP/Analysis/StatisticalQuery" \
+    "$$SAMPLEPATHCPP/Analysis/StatisticalQueryGroupSort" \
+    "$$SAMPLEPATHCPP/Analysis/ViewshedCamera" \
+    "$$SAMPLEPATHCPP/Analysis/ViewshedGeoElement" \
+    "$$SAMPLEPATHCPP/Analysis/ViewshedLocation" \
+    "$$SAMPLEPATHCPP/CloudAndPortal/AddItemsToPortal" \
+    "$$SAMPLEPATHCPP/CloudAndPortal/IntegratedWindowsAuthentication" \
+    "$$SAMPLEPATHCPP/CloudAndPortal/PortalUserInfo" \
+    "$$SAMPLEPATHCPP/CloudAndPortal/SearchForWebmap" \
+    "$$SAMPLEPATHCPP/CloudAndPortal/ShowOrgBasemaps" \
+    "$$SAMPLEPATHCPP/CloudAndPortal/TokenAuthentication" \
+    "$$SAMPLEPATHCPP/DisplayInformation/AddGraphicsWithRenderer" \
+    "$$SAMPLEPATHCPP/DisplayInformation/BuildLegend" \
+    "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility" \
+    "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles" \
+    "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle" \
+    "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid" \
+    "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters" \
+    "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D" \
+    "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer" \
+    "$$SAMPLEPATHCPP/DisplayInformation/GOSymbols" \
+    "$$SAMPLEPATHCPP/DisplayInformation/IdentifyGraphics" \
+    "$$SAMPLEPATHCPP/DisplayInformation/Picture_Marker_Symbol" \
+    "$$SAMPLEPATHCPP/DisplayInformation/QueryFeaturesWithArcadeExpression" \
+    "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle" \
+    "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout" \
+    "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers" \
+    "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup" \
+    "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol" \
+    "$$SAMPLEPATHCPP/DisplayInformation/Simple_Renderer" \
+    "$$SAMPLEPATHCPP/DisplayInformation/SketchOnMap" \
+    "$$SAMPLEPATHCPP/DisplayInformation/SymbolizeShapefile" \
+    "$$SAMPLEPATHCPP/DisplayInformation/Unique_Value_Renderer" \
+    "$$SAMPLEPATHCPP/EditData/AddFeaturesFeatureService" \
+    "$$SAMPLEPATHCPP/EditData/ContingentValues" \
+    "$$SAMPLEPATHCPP/EditData/DeleteFeaturesFeatureService" \
+    "$$SAMPLEPATHCPP/EditData/EditAndSyncFeatures" \
+    "$$SAMPLEPATHCPP/EditData/EditFeatureAttachments" \
+    "$$SAMPLEPATHCPP/EditData/EditFeaturesWithFeatureLinkedAnnotation" \
+    "$$SAMPLEPATHCPP/EditData/EditKmlGroundOverlay" \
+    "$$SAMPLEPATHCPP/EditData/EditWithBranchVersioning" \
+    "$$SAMPLEPATHCPP/EditData/SnapGeometryEdits" \
+    "$$SAMPLEPATHCPP/EditData/UpdateAttributesFeatureService" \
+    "$$SAMPLEPATHCPP/EditData/UpdateGeometryFeatureService" \
+    "$$SAMPLEPATHCPP/Features/ControlTimeExtentTimeSlider" \
+    "$$SAMPLEPATHCPP/Features/CreateMobileGeodatabase" \
+    "$$SAMPLEPATHCPP/Features/FeatureLayerChangeRenderer" \
+    "$$SAMPLEPATHCPP/Features/FeatureLayerDictionaryRenderer" \
+    "$$SAMPLEPATHCPP/Features/FeatureLayerQuery" \
+    "$$SAMPLEPATHCPP/Features/FeatureLayerSelection" \
+    "$$SAMPLEPATHCPP/Features/FilterByDefinitionExpressionOrDisplayFilter" \
+    "$$SAMPLEPATHCPP/Features/GenerateGeodatabaseReplicaFromFeatureService" \
+    "$$SAMPLEPATHCPP/Features/ListRelatedFeatures" \
+    "$$SAMPLEPATHCPP/Features/ServiceFeatureTableCache" \
+    "$$SAMPLEPATHCPP/Features/ServiceFeatureTableManualCache" \
+    "$$SAMPLEPATHCPP/Features/ServiceFeatureTableNoCache" \
+    "$$SAMPLEPATHCPP/Geometry/Buffer" \
+    "$$SAMPLEPATHCPP/Geometry/ClipGeometry" \
+    "$$SAMPLEPATHCPP/Geometry/ConvexHull" \
+    "$$SAMPLEPATHCPP/Geometry/CreateAndEditGeometries" \
+    "$$SAMPLEPATHCPP/Geometry/CreateGeometries" \
+    "$$SAMPLEPATHCPP/Geometry/CutGeometry" \
+    "$$SAMPLEPATHCPP/Geometry/DensifyAndGeneralize" \
+    "$$SAMPLEPATHCPP/Geometry/FormatCoordinates" \
+    "$$SAMPLEPATHCPP/Geometry/GeodesicOperations" \
+    "$$SAMPLEPATHCPP/Geometry/ListTransformations" \
+    "$$SAMPLEPATHCPP/Geometry/NearestVertex" \
+    "$$SAMPLEPATHCPP/Geometry/ProjectGeometry" \
+    "$$SAMPLEPATHCPP/Geometry/SpatialOperations" \
+    "$$SAMPLEPATHCPP/Geometry/SpatialRelationships" \
+    "$$SAMPLEPATHCPP/Layers/ConfigureClusters" \
+    "$$SAMPLEPATHCPP/Layers/AddCustomDynamicEntityDataSource" \
+    "$$SAMPLEPATHCPP/Layers/AddDynamicEntityLayer" \
+    "$$SAMPLEPATHCPP/Layers/AddEncExchangeSet" \
+    "$$SAMPLEPATHCPP/Layers/ApplyMosaicRuleToRasters" \
+    "$$SAMPLEPATHCPP/Layers/ApplyUniqueValuesWithAlternateSymbols" \
+    "$$SAMPLEPATHCPP/Layers/ArcGISMapImageLayerUrl" \
+    "$$SAMPLEPATHCPP/Layers/ArcGISTiledLayerUrl" \
+    "$$SAMPLEPATHCPP/Layers/BlendRasterLayer" \
+    "$$SAMPLEPATHCPP/Layers/BrowseOGCAPIFeatureService" \
+    "$$SAMPLEPATHCPP/Layers/BrowseWfsLayers" \
+    "$$SAMPLEPATHCPP/Layers/ChangeSublayerRenderer" \
+    "$$SAMPLEPATHCPP/Layers/ChangeSublayerVisibility" \
+    "$$SAMPLEPATHCPP/Layers/CreateAndSaveKmlFile" \
+    "$$SAMPLEPATHCPP/Layers/DisplayAnnotation" \
+    "$$SAMPLEPATHCPP/Layers/DisplayDimensions" \
+    "$$SAMPLEPATHCPP/Layers/DisplayFeatureLayers" \
+    "$$SAMPLEPATHCPP/Layers/DisplayKml" \
+    "$$SAMPLEPATHCPP/Layers/DisplayKmlNetworkLinks" \
+    "$$SAMPLEPATHCPP/Layers/DisplayOgcApiFeatureCollection" \
+    "$$SAMPLEPATHCPP/Layers/DisplaySubtypeFeatureLayer" \
+    "$$SAMPLEPATHCPP/Layers/DisplayWfsLayer" \
+    "$$SAMPLEPATHCPP/Layers/ExportTiles" \
+    "$$SAMPLEPATHCPP/Layers/ExportVectorTiles" \
+    "$$SAMPLEPATHCPP/Layers/Feature_Collection_Layer" \
+    "$$SAMPLEPATHCPP/Layers/FeatureCollectionLayerFromPortal" \
+    "$$SAMPLEPATHCPP/Layers/FeatureCollectionLayerQuery" \
+    "$$SAMPLEPATHCPP/Layers/FeatureLayerRenderingModeMap" \
+    "$$SAMPLEPATHCPP/Layers/FeatureLayerRenderingModeScene" \
+    "$$SAMPLEPATHCPP/Layers/GroupLayers" \
+    "$$SAMPLEPATHCPP/Layers/Hillshade_Renderer" \
+    "$$SAMPLEPATHCPP/Layers/IdentifyKmlFeatures" \
+    "$$SAMPLEPATHCPP/Layers/IdentifyRasterCell" \
+    "$$SAMPLEPATHCPP/Layers/ListKmlContents" \
+    "$$SAMPLEPATHCPP/Layers/LoadWfsXmlQuery" \
+    "$$SAMPLEPATHCPP/Layers/ManageOperationalLayers" \
+    "$$SAMPLEPATHCPP/Layers/OSM_Layer" \
+    "$$SAMPLEPATHCPP/Layers/PlayAKmlTour" \
+    "$$SAMPLEPATHCPP/Layers/QueryMapImageSublayer" \
+    "$$SAMPLEPATHCPP/Layers/QueryOGCAPICQLFilters" \
+    "$$SAMPLEPATHCPP/Layers/RasterColormapRenderer" \
+    "$$SAMPLEPATHCPP/Layers/RasterFunctionService" \
+    "$$SAMPLEPATHCPP/Layers/RasterLayerFile" \
+    "$$SAMPLEPATHCPP/Layers/RasterLayerGeoPackage" \
+    "$$SAMPLEPATHCPP/Layers/RasterLayerService"\
+    "$$SAMPLEPATHCPP/Layers/RasterRenderingRule" \
+    "$$SAMPLEPATHCPP/Layers/RasterRgbRenderer" \
+    "$$SAMPLEPATHCPP/Layers/RasterStretchRenderer" \
+    "$$SAMPLEPATHCPP/Layers/StyleWmsLayer" \
+    "$$SAMPLEPATHCPP/Layers/TileCacheLayer" \
+    "$$SAMPLEPATHCPP/Layers/VectorTiledLayerUrl" \
+    "$$SAMPLEPATHCPP/Layers/Web_Tiled_Layer" \
+    "$$SAMPLEPATHCPP/Layers/WmsLayerUrl" \
+    "$$SAMPLEPATHCPP/Layers/WMTS_Layer" \
+    "$$SAMPLEPATHCPP/Maps/ApplyScheduledMapUpdates" \
+    "$$SAMPLEPATHCPP/Maps/BrowseBuildingFloors" \
+    "$$SAMPLEPATHCPP/Maps/ChangeBasemap" \
+    "$$SAMPLEPATHCPP/Maps/ChangeViewpoint" \
+    "$$SAMPLEPATHCPP/Maps/ConfigureBasemapStyleLanguage" \
+    "$$SAMPLEPATHCPP/Maps/CreateAndSaveMap" \
+    "$$SAMPLEPATHCPP/Maps/CreateDynamicBasemapGallery" \
+    "$$SAMPLEPATHCPP/Maps/DisplayDeviceLocation" \
+    "$$SAMPLEPATHCPP/Maps/DisplayDeviceLocationWithNmeaDataSources" \
+    "$$SAMPLEPATHCPP/Maps/DisplayDrawingStatus" \
+    "$$SAMPLEPATHCPP/Maps/DisplayLayerViewDrawState" \
+    "$$SAMPLEPATHCPP/Maps/DisplayMap" \
+    "$$SAMPLEPATHCPP/Maps/DisplayOverviewMap" \
+    "$$SAMPLEPATHCPP/Maps/DownloadPreplannedMap" \
+    "$$SAMPLEPATHCPP/Maps/GenerateOfflineMap_Overrides" \
+    "$$SAMPLEPATHCPP/Maps/GenerateOfflineMap" \
+    "$$SAMPLEPATHCPP/Maps/GenerateOfflineMapLocalBasemap" \
+    "$$SAMPLEPATHCPP/Maps/HonorMobileMapPackageExpiration" \
+    "$$SAMPLEPATHCPP/Maps/IdentifyLayers" \
+    "$$SAMPLEPATHCPP/Maps/ManageBookmarks" \
+    "$$SAMPLEPATHCPP/Maps/MapLoaded" \
+    "$$SAMPLEPATHCPP/Maps/MapReferenceScale" \
+    "$$SAMPLEPATHCPP/Maps/MapRotation" \
+    "$$SAMPLEPATHCPP/Maps/MinMaxScale" \
+    "$$SAMPLEPATHCPP/Maps/MobileMap_SearchAndRoute" \
+    "$$SAMPLEPATHCPP/Maps/OpenMapUrl" \
+    "$$SAMPLEPATHCPP/Maps/OpenMobileMap_MapPackage" \
+    "$$SAMPLEPATHCPP/Maps/ReadGeoPackage" \
+    "$$SAMPLEPATHCPP/Maps/SetInitialMapArea" \
+    "$$SAMPLEPATHCPP/Maps/SetInitialMapLocation" \
+    "$$SAMPLEPATHCPP/Maps/SetMapSpatialReference" \
+    "$$SAMPLEPATHCPP/Maps/SetMaxExtent" \
+    "$$SAMPLEPATHCPP/Maps/ShowDeviceLocationUsingIndoorPositioning" \
+    "$$SAMPLEPATHCPP/Maps/ShowLocationHistory" \
+    "$$SAMPLEPATHCPP/Maps/ShowMagnifier" \
+    "$$SAMPLEPATHCPP/Maps/TakeScreenshot" \
+    "$$SAMPLEPATHCPP/Routing/ClosestFacility" \
+    "$$SAMPLEPATHCPP/Routing/DisplayRouteLayer" \
+    "$$SAMPLEPATHCPP/Routing/FindClosestFacilityToMultipleIncidentsService" \
+    "$$SAMPLEPATHCPP/Routing/FindRoute" \
+    "$$SAMPLEPATHCPP/Routing/FindServiceAreasForMultipleFacilities" \
+    "$$SAMPLEPATHCPP/Routing/NavigateRoute" \
+    "$$SAMPLEPATHCPP/Routing/NavigateARouteWithRerouting" \
+    "$$SAMPLEPATHCPP/Routing/OfflineRouting" \
+    "$$SAMPLEPATHCPP/Routing/RouteAroundBarriers" \
+    "$$SAMPLEPATHCPP/Routing/ServiceArea" \
+    "$$SAMPLEPATHCPP/Scenes/Add3DTilesLayer" \
+    "$$SAMPLEPATHCPP/Scenes/AddAPointSceneLayer" \
+    "$$SAMPLEPATHCPP/Scenes/AddIntegratedMeshLayer" \
+    "$$SAMPLEPATHCPP/Scenes/Animate3DSymbols" \
+    "$$SAMPLEPATHCPP/Scenes/AnimateImagesWithImageOverlay" \
+    "$$SAMPLEPATHCPP/Scenes/BasicSceneView" \
+    "$$SAMPLEPATHCPP/Scenes/ChangeAtmosphereEffect" \
+    "$$SAMPLEPATHCPP/Scenes/ChooseCameraController" \
+    "$$SAMPLEPATHCPP/Scenes/CreateTerrainSurfaceFromLocalRaster" \
+    "$$SAMPLEPATHCPP/Scenes/CreateTerrainSurfaceFromLocalTilePackage" \
+    "$$SAMPLEPATHCPP/Scenes/Display3DLabelsInScene" \
+    "$$SAMPLEPATHCPP/Scenes/DisplaySceneLayer" \
+    "$$SAMPLEPATHCPP/Scenes/DistanceCompositeSymbol" \
+    "$$SAMPLEPATHCPP/Scenes/ExtrudeGraphics" \
+    "$$SAMPLEPATHCPP/Scenes/FeatureLayerExtrusion" \
+    "$$SAMPLEPATHCPP/Scenes/FilterFeaturesInScene" \
+    "$$SAMPLEPATHCPP/Scenes/GetElevationAtPoint" \
+    "$$SAMPLEPATHCPP/Scenes/OpenMobileScenePackage" \
+    "$$SAMPLEPATHCPP/Scenes/OpenScene" \
+    "$$SAMPLEPATHCPP/Scenes/OrbitCameraAroundObject" \
+    "$$SAMPLEPATHCPP/Scenes/RealisticLightingAndShadows" \
+    "$$SAMPLEPATHCPP/Scenes/SceneLayerSelection" \
+    "$$SAMPLEPATHCPP/Scenes/ScenePropertiesExpressions" \
+    "$$SAMPLEPATHCPP/Scenes/SetSurfacePlacementMode" \
+    "$$SAMPLEPATHCPP/Scenes/Symbols" \
+    "$$SAMPLEPATHCPP/Scenes/SyncMapViewSceneView" \
+    "$$SAMPLEPATHCPP/Scenes/TerrainExaggeration" \
+    "$$SAMPLEPATHCPP/Scenes/ViewContentBeneathTerrainSurface" \
+    "$$SAMPLEPATHCPP/Scenes/ViewPointCloudDataOffline" \
+    "$$SAMPLEPATHCPP/Search/FindAddress" \
+    "$$SAMPLEPATHCPP/Search/FindPlace" \
+    "$$SAMPLEPATHCPP/Search/OfflineGeocode" \
+    "$$SAMPLEPATHCPP/Search/ReverseGeocodeOnline" \
+    "$$SAMPLEPATHCPP/Search/SearchDictionarySymbolStyle" \
+    "$$SAMPLEPATHCPP/UtilityNetwork/ConfigureSubnetworkTrace" \
+    "$$SAMPLEPATHCPP/UtilityNetwork/CreateLoadReport" \
+    "$$SAMPLEPATHCPP/UtilityNetwork/DisplayContentOfUtilityNetworkContainer" \
+    "$$SAMPLEPATHCPP/UtilityNetwork/DisplayUtilityAssociations" \
+    "$$SAMPLEPATHCPP/UtilityNetwork/PerformValveIsolationTrace" \
+    "$$SAMPLEPATHCPP/UtilityNetwork/TraceUtilityNetwork" \
+    "$$SAMPLEPATHCPP/UtilityNetwork/ValidateUtilityNetworkTopology"
+
 HEADERS += \
     "$$SAMPLEPATHCPP/Analysis/AnalyzeHotspots/AnalyzeHotspots.h" \
     "$$SAMPLEPATHCPP/Analysis/AnalyzeViewshed/AnalyzeViewshed.h" \
@@ -37,6 +256,7 @@ HEADERS += \
     "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h" \
+    "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid/DisplayGrid.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters/DisplayClusters.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h" \
@@ -47,7 +267,6 @@ HEADERS += \
     "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout/ShowCallout.h" \
-    "$$SAMPLEPATHCPP/DisplayInformation/ShowGrid/ShowGrid.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup/ShowPopup.h" \
     "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h" \
@@ -264,6 +483,7 @@ SOURCES += \
     "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp" \
+    "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid/DisplayGrid.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters/DisplayClusters.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp" \
@@ -274,7 +494,6 @@ SOURCES += \
     "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout/ShowCallout.cpp" \
-    "$$SAMPLEPATHCPP/DisplayInformation/ShowGrid/ShowGrid.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup/ShowPopup.cpp" \
     "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp" \
@@ -490,6 +709,7 @@ RESOURCES += \
     "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qrc" \
+    "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid/DisplayGrid.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters/DisplayClusters.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qrc" \
@@ -499,7 +719,6 @@ RESOURCES += \
     "$$SAMPLEPATHCPP/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout/ShowCallout.qrc" \
-    "$$SAMPLEPATHCPP/DisplayInformation/ShowGrid/ShowGrid.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup/ShowPopup.qrc" \
     "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qrc" \
@@ -686,8 +905,8 @@ RESOURCES += \
     "$$SAMPLEPATHCPP/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qrc" \
     "$$SAMPLEPATHCPP/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qrc"
 
-# Local Server Only (Linux x86_64 and Windows x86_64)
-win32:contains(QMAKE_TARGET.arch, x86_64)|unix:contains(QMAKE_TARGET.arch, x86_64) {
+# Local Server Only (Linux and Windows)
+!android:!ios:!macx {
   INCLUDEPATH += \
     "$$SAMPLEPATHCPP/LocalServer/LocalServerFeatureLayer" \
     "$$SAMPLEPATHCPP/LocalServer/LocalServerGeoprocessing" \
diff --git a/Templates/CppSampleTemplate/main.cpp.tmpl b/Templates/CppSampleTemplate/main.cpp.tmpl
index 2ebfb786ee..191e60f848 100644
--- a/Templates/CppSampleTemplate/main.cpp.tmpl
+++ b/Templates/CppSampleTemplate/main.cpp.tmpl
@@ -1,10 +1,10 @@
 // Copyright %{CurrentYear} Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/Templates/CppSampleTemplate/main.qml.tmpl b/Templates/CppSampleTemplate/main.qml.tmpl
index c323079bf2..359de8b4d2 100644
--- a/Templates/CppSampleTemplate/main.qml.tmpl
+++ b/Templates/CppSampleTemplate/main.qml.tmpl
@@ -1,10 +1,10 @@
 // Copyright %{CurrentYear} Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/Templates/CppSampleTemplate/sample.cpp.tmpl b/Templates/CppSampleTemplate/sample.cpp.tmpl
index 14f7f570eb..6e0dda42a8 100644
--- a/Templates/CppSampleTemplate/sample.cpp.tmpl
+++ b/Templates/CppSampleTemplate/sample.cpp.tmpl
@@ -1,12 +1,12 @@
 // [WriteFile Name=%{SampleName}, Category=%{SampleCategory}]
 // [Legal]
 // Copyright %{CurrentYear} Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/Templates/CppSampleTemplate/sample.h.tmpl b/Templates/CppSampleTemplate/sample.h.tmpl
index 3a6215c541..bb669921a6 100644
--- a/Templates/CppSampleTemplate/sample.h.tmpl
+++ b/Templates/CppSampleTemplate/sample.h.tmpl
@@ -1,12 +1,12 @@
 // [WriteFile Name=%{SampleName}, Category=%{SampleCategory}]
 // [Legal]
 // Copyright %{CurrentYear} Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,6 @@
 #ifndef %{IncludeGuard}
 #define %{IncludeGuard}
 
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 @if %{UseFeatureLayer}
@@ -33,6 +31,8 @@ namespace Esri::ArcGISRuntime
 @endif
 }
 
+#include <QObject>
+
 @if %{ThreeDSample}
   Q_MOC_INCLUDE("SceneQuickView.h");
 @else
diff --git a/Templates/CppSampleTemplate/sample.pro.tmpl b/Templates/CppSampleTemplate/sample.pro.tmpl
index d489710d5b..3270d7b996 100644
--- a/Templates/CppSampleTemplate/sample.pro.tmpl
+++ b/Templates/CppSampleTemplate/sample.pro.tmpl
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = %{SampleName}
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------
diff --git a/Templates/CppSampleTemplate/wizard.json b/Templates/CppSampleTemplate/wizard.json
index b6ee345718..c709225779 100644
--- a/Templates/CppSampleTemplate/wizard.json
+++ b/Templates/CppSampleTemplate/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "kind": "project",
     "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ],
-    "id": "A.Sample_ArcGISQt_CPP_200_6_0",
+    "id": "A.Sample_ArcGISQt_CPP_200_5_0",
     "category": "B.CustomProjects",
-    "trDescription": "Creates a Sample ArcGIS Maps 200.6.0 Qt Quick C++ application.",
-    "trDisplayName": "Sample ArcGIS Maps 200.6.0 C++ Qt Quick App",
+    "trDescription": "Creates a Sample ArcGIS Maps 200.5.0 Qt Quick C++ application.",
+    "trDisplayName": "Sample ArcGIS Maps 200.5.0 C++ Qt Quick App",
     "trDisplayCategory": "ArcGIS",
     "icon": "wizard.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
diff --git a/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl b/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl
index 0aabc65b83..dd5b3f3409 100644
--- a/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl
+++ b/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl
@@ -1,10 +1,10 @@
 // Copyright %{CurrentYear} Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl b/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl
index 40b15d5c12..c82518bb39 100644
--- a/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl
+++ b/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl
@@ -1,12 +1,12 @@
 // [WriteFile Name=%{SampleName}, Category=%{SampleCategory}]
 // [Legal]
 // Copyright %{CurrentYear} Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/Templates/CppWidgetsSampleTemplate/sample.h.tmpl b/Templates/CppWidgetsSampleTemplate/sample.h.tmpl
index 8e30abf38d..0de1f35f50 100644
--- a/Templates/CppWidgetsSampleTemplate/sample.h.tmpl
+++ b/Templates/CppWidgetsSampleTemplate/sample.h.tmpl
@@ -1,12 +1,12 @@
 // [WriteFile Name=GORenderers, Category=DisplayInformation]
 // [Legal]
 // Copyright %{CurrentYear} Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,6 @@
 #ifndef %{IncludeGuard}
 #define %{IncludeGuard}
 
-#include <QWidget>
-
 namespace Esri::ArcGISRuntime
 {
 @if %{UseFeatureLayer}
@@ -33,6 +31,8 @@ namespace Esri::ArcGISRuntime
 @endif
 }
 
+#include <QWidget>
+
 class %{SampleName} : public QWidget
 {
   Q_OBJECT
diff --git a/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl b/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl
index 66367b0503..9a9cffb40f 100644
--- a/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl
+++ b/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl
@@ -27,7 +27,7 @@ QT += widgets
 TEMPLATE = app
 TARGET = %{SampleName}
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 win32:CONFIG += \\
diff --git a/Templates/CppWidgetsSampleTemplate/wizard.json b/Templates/CppWidgetsSampleTemplate/wizard.json
index f81997d97b..670bd54609 100644
--- a/Templates/CppWidgetsSampleTemplate/wizard.json
+++ b/Templates/CppWidgetsSampleTemplate/wizard.json
@@ -1,199 +1,199 @@
 {
-  "version": 1,
-  "kind": "project",
-  "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ],
-  "id": "A.Sample_ArcGISQt_CPP__Widgets_200_6_0",
-  "category": "B.CustomProjects",
-  "trDescription": "Creates a Sample ArcGIS Maps 200.6.0 Qt C++ Widgets application.",
-  "trDisplayName": "Sample ArcGIS Maps 200.6.0 Qt C++ Widgets App",
-  "trDisplayCategory": "ArcGIS",
-  "icon": "wizard.png",
-  "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQWidgets", "QtSupport.Wizards.FeatureDesktop" ],
-  "platformIndependent": "false",
-  "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Plugins} ].indexOf('CppEditor') >= 0}",
+    "version": 1,
+    "kind": "project",
+    "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ],
+    "id": "A.Sample_ArcGISQt_CPP__Widgets_200_5_0",
+    "category": "B.CustomProjects",
+    "trDescription": "Creates a Sample ArcGIS Maps 200.5.0 Qt C++ Widgets application.",
+    "trDisplayName": "Sample ArcGIS Maps 200.5.0 Qt C++ Widgets App",
+    "trDisplayCategory": "ArcGIS",
+    "icon": "wizard.png",
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQWidgets", "QtSupport.Wizards.FeatureDesktop" ],
+    "platformIndependent": "false",
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Plugins} ].indexOf('CppEditor') >= 0}",
 
-  "options":
-  [
-    { "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" },
-    { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
-    { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" },
-    { "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" },
-    { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" },
-    { "key": "DisplayName", "value": "%{JS: Cpp.className('%{DispName}')}" },
-    { "key": "SampleName", "value": "%{JS: '%{Class}'.charAt(0).toUpperCase() + '%{Class}'.substring(1)}" },
-    { "key": "SampleDescription", "value": "%{SampleDesc}" },
-    { "key": "SampleCategory", "value": "%{SampleCat}" },
-    { "key": "IncludeGuard", "value": "%{JS: Cpp.classToHeaderGuard('%{Class}', '%{JS: Util.preferredSuffix('text/x-c++hdr')}')}" },
-    { "key": "ThreeDSample", "value": "%{threeD}" },
-    { "key": "UseFeatureLayer", "value": "%{JS: ( '%{FeatureLayerURL}'.length === 0 ) ? 'false' : 'true'}" },
-    { "key": "UseAPIKey", "value": "%{apiKey}" },
-    { "key": "CurrentYear", "value": "%{JS: new Date().getFullYear()}" }
-  ],
+    "options":
+    [
+        { "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" },
+        { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
+        { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" },
+        { "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" },
+        { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" },
+        { "key": "DisplayName", "value": "%{JS: Cpp.className('%{DispName}')}" },
+        { "key": "SampleName", "value": "%{JS: '%{Class}'.charAt(0).toUpperCase() + '%{Class}'.substring(1)}" },
+        { "key": "SampleDescription", "value": "%{SampleDesc}" },
+        { "key": "SampleCategory", "value": "%{SampleCat}" },
+        { "key": "IncludeGuard", "value": "%{JS: Cpp.classToHeaderGuard('%{Class}', '%{JS: Util.preferredSuffix('text/x-c++hdr')}')}" },
+        { "key": "ThreeDSample", "value": "%{threeD}" },
+        { "key": "UseFeatureLayer", "value": "%{JS: ( '%{FeatureLayerURL}'.length === 0 ) ? 'false' : 'true'}" },
+        { "key": "UseAPIKey", "value": "%{apiKey}" },
+        { "key": "CurrentYear", "value": "%{JS: new Date().getFullYear()}" }
+    ],
 
-  "pages":
-  [
-    {
-      "trDisplayName": "Project Location",
-      "trShortTitle": "Location",
-      "typeId": "Project"
-    },
-    {
-      "trDisplayName": "Define Project Details",
-      "trShortTitle": "Details",
-      "typeId": "Fields",
-      "data":
-      [
+    "pages":
+    [
         {
-          "name": "SampleCat",
-          "trDisplayName": "ArcGIS SDK Samples Category:",
-          "type": "ComboBox",
-          "data":
-          {
-            "index": 0,
-            "items":
-            [
-              {
-                "trKey": "Analysis",
-                "value": "Analysis"
-              },
-              {
-                "trKey": "CloudAndPortal",
-                "value": "CloudAndPortal"
-              },
-              {
-                "trKey": "DisplayInformation",
-                "value": "DisplayInformation"
-              },
-              {
-                "trKey": "EditData",
-                "value": "EditData"
-              },
-              {
-                "trKey": "Features",
-                "value": "Features"
-              },
-              {
-                "trKey": "Layers",
-                "value": "Layers"
-              },
-              {
-                "trKey": "Maps",
-                "value": "Maps"
-              },
-              {
-                "trKey": "Routing",
-                "value": "Routing"
-              },
-              {
-                "trKey": "Scenes",
-                "value": "Scenes"
-              },
-              {
-                "trKey": "Search",
-                "value": "Search"
-              }
-            ]
-          }
-        },
-        {
-          "name": "DispName",
-          "trDisplayName": "Display Name:",
-          "mandatory": true,
-          "type": "LineEdit",
-          "data": { "trPlaceholder" : "This will be the name we display to the user etc." }
-        },
-        {
-          "name": "Class",
-          "trDisplayName": "Sample Name:",
-          "mandatory": true,
-          "type": "LineEdit",
-          "data": { "validator": "(?:[a-zA-Z_0-9]*)", "trPlaceholder" : "This will be the name of files/classes etc." }
+            "trDisplayName": "Project Location",
+            "trShortTitle": "Location",
+            "typeId": "Project"
         },
         {
-          "name": "SampleDesc",
-          "trDisplayName": "Sample Description:",
-          "mandatory": false,
-          "type": "LineEdit",
-          "data":
-          {
-            "trText": "This sample demonstrates how to XXXXX."
-          }
-        },
-        {
-          "name": "threeD",
-          "trDisplayName": "3-D sample",
-          "type": "CheckBox",
-          "data":{"checked": false}
+            "trDisplayName": "Define Project Details",
+            "trShortTitle": "Details",
+            "typeId": "Fields",
+            "data":
+            [
+				{
+                    "name": "SampleCat",
+                    "trDisplayName": "ArcGIS SDK Samples Category:",
+                    "type": "ComboBox",
+                    "data":
+                    {
+                        "index": 0,
+                        "items":
+                        [
+                            {
+                                "trKey": "Analysis",
+                                "value": "Analysis"
+                            },
+                            {
+                                "trKey": "CloudAndPortal",
+                                "value": "CloudAndPortal"
+                            },
+							{
+                                "trKey": "DisplayInformation",
+                                "value": "DisplayInformation"
+                            },
+							{
+                                "trKey": "EditData",
+                                "value": "EditData"
+                            },
+							{
+                                "trKey": "Features",
+                                "value": "Features"
+                            },
+							{
+                                "trKey": "Layers",
+                                "value": "Layers"
+                            },
+							{
+                                "trKey": "Maps",
+                                "value": "Maps"
+                            },
+							{
+                                "trKey": "Routing",
+                                "value": "Routing"
+                            },
+							{
+                                "trKey": "Scenes",
+                                "value": "Scenes"
+                            },
+							{
+                                "trKey": "Search",
+                                "value": "Search"
+                            }
+                        ]
+                    }
+                },
+				{
+					"name": "DispName",
+					"trDisplayName": "Display Name:",
+					"mandatory": true,
+					"type": "LineEdit",
+					"data": { "trPlaceholder" : "This will be the name we display to the user etc." }
+				},
+				{
+					"name": "Class",
+					"trDisplayName": "Sample Name:",
+					"mandatory": true,
+					"type": "LineEdit",
+					"data": { "validator": "(?:[a-zA-Z_0-9]*)", "trPlaceholder" : "This will be the name of files/classes etc." }
+				},
+				{
+					"name": "SampleDesc",
+					"trDisplayName": "Sample Description:",
+					"mandatory": false,
+					"type": "LineEdit",
+					"data":
+					{
+						"trText": "This sample demonstrates how to XXXXX."
+					}
+				},
+				{
+					"name": "threeD",
+					"trDisplayName": "3-D sample",
+					"type": "CheckBox",
+					"data":{"checked": false}
+				},
+				{
+					"name": "FeatureLayerURL",
+					"trDisplayName": "Feature Layer URL:",
+					"mandatory": false,
+					"type": "LineEdit",
+					"data":
+					{
+						"trPlaceholder" : "Optionally add the URL for a FeatureLayer"
+					}
+                                },
+                                {
+                                        "name": "apiKey",
+                                        "trDisplayName": "Use API Key",
+                                        "type": "CheckBox",
+                                        "data":{"checked": true}
+                                }
+            ]
         },
         {
-          "name": "FeatureLayerURL",
-          "trDisplayName": "Feature Layer URL:",
-          "mandatory": false,
-          "type": "LineEdit",
-          "data":
-          {
-            "trPlaceholder" : "Optionally add the URL for a FeatureLayer"
-          }
+            "trDisplayName": "Kit Selection",
+            "trShortTitle": "Kits",
+            "typeId": "Kits",
+            "data": {
+                "projectFilePath": "%{ProFileName}"
+            }
         },
         {
-          "name": "apiKey",
-          "trDisplayName": "Use API Key",
-          "type": "CheckBox",
-          "data":{"checked": true}
+            "trDisplayName": "Project Management",
+            "trShortTitle": "Summary",
+            "typeId": "Summary"
         }
-      ]
-    },
-    {
-      "trDisplayName": "Kit Selection",
-      "trShortTitle": "Kits",
-      "typeId": "Kits",
-      "data": {
-        "projectFilePath": "%{ProFileName}"
-      }
-    },
-    {
-      "trDisplayName": "Project Management",
-      "trShortTitle": "Summary",
-      "typeId": "Summary"
-    }
-  ],
-  "generators":
-  [
-    {
-      "typeId": "File",
-      "data":
-      [
-        {
-          "source": "main.cpp.tmpl",
-          "target": "%{MainCppFileName}"
-        },
+    ],
+    "generators":
+    [
         {
-          "source": "sample.cpp.tmpl",
-          "target": "%{SampleName}.cpp",
-          "openInEditor": true
-        },
-        {
-          "source": "sample.h.tmpl",
-          "target": "%{SampleName}.h"
-        },
-        {
-          "source": "sample.pro.tmpl",
-          "target": "%{ProFileName}",
-          "openAsProject": true
-        },
-        {
-          "source": "screenshot.png",
-          "isBinary": true
-        },
-        {
-          "source": "README.md.tmpl",
-          "target": "README.md"
-        },
-        {
-          "source": "arcgisruntime.pri",
-          "target": "arcgisruntime.pri"
+            "typeId": "File",
+            "data":
+            [
+				{
+                    "source": "main.cpp.tmpl",
+                    "target": "%{MainCppFileName}"
+                },
+				{
+                    "source": "sample.cpp.tmpl",
+                    "target": "%{SampleName}.cpp",
+					"openInEditor": true
+                },
+				{
+                    "source": "sample.h.tmpl",
+                    "target": "%{SampleName}.h"
+                },
+				{
+                    "source": "sample.pro.tmpl",
+                    "target": "%{ProFileName}",
+                    "openAsProject": true
+                },
+				{
+                    "source": "screenshot.png",
+					"isBinary": true
+                },
+				{
+                    "source": "README.md.tmpl",
+                    "target": "README.md"
+                },
+                {
+                    "source": "arcgisruntime.pri",
+                    "target": "arcgisruntime.pri"
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }