diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25fd4731e6..ff9fbe9244 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# If we're running under the gradle build, HIFI_ANDROID will be set here, but 
+# If we're running under the gradle build, HIFI_ANDROID will be set here, but
 # ANDROID will not be set until after the `project` statement.  This is the *ONLY*
 # place you need to use `HIFI_ANDROID` instead of `ANDROID`
 if (WIN32 AND NOT HIFI_ANDROID)
@@ -61,8 +61,6 @@ else()
 endif()
 option(DISABLE_KTX_CACHE "Disable KTX Cache" OFF)
 
-
-
 set(PLATFORM_QT_GL OpenGL)
 
 if (USE_GLES)
@@ -132,8 +130,8 @@ set_packaging_parameters()
 
 # FIXME hack to work on the proper Android toolchain
 if (ANDROID)
-    add_subdirectory(android/app)
-    return()
+  add_subdirectory(android/app)
+  return()
 endif()
 
 # add subdirectories for all targets
@@ -148,16 +146,14 @@ if (BUILD_SERVER)
 endif()
 
 if (BUILD_CLIENT)
-    add_subdirectory(interface)
-    set_target_properties(interface PROPERTIES FOLDER "Apps")
-    if (ANDROID)
-        add_subdirectory(gvr-interface)
-        set_target_properties(gvr-interface PROPERTIES FOLDER "Apps")
-    endif()
+  add_subdirectory(interface)
+  set_target_properties(interface PROPERTIES FOLDER "Apps")
+
+  option(USE_SIXENSE "Build Interface with sixense library/plugin" OFF)
 endif()
 
 if (BUILD_CLIENT OR BUILD_SERVER)
-    add_subdirectory(plugins)
+  add_subdirectory(plugins)
 endif()
 
 # BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 702636dd01..032f83e8be 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -46,9 +46,18 @@ macro(GENERATE_INSTALLERS)
     set(UNINSTALLER_HEADER_IMAGE "")
     fix_path_for_nsis(${_UNINSTALLER_HEADER_BAD_PATH} UNINSTALLER_HEADER_IMAGE)
 
-    # grab the latest VC redist (2017) and add it to the installer, our NSIS template
-    # will call it during the install
-    install(CODE "file(DOWNLOAD https://go.microsoft.com/fwlink/?LinkId=746572 \"\${CMAKE_INSTALL_PREFIX}/vcredist_x64.exe\")")
+    # we use external libraries that still need the 120 (VS2013) redistributables
+    # so we include them as well until those external libraries are updated
+    # to use the redistributables that match what we build our applications for
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
+      "C:/Windows/System32/msvcp120.dll"
+      "C:/Windows/System32/msvcr120.dll"
+    )
+
+    set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${INTERFACE_INSTALL_DIR})
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT ${CLIENT_COMPONENT})
+    include(InstallRequiredSystemLibraries)
   elseif (APPLE)
     # produce a drag and drop DMG on OS X
     set(CPACK_GENERATOR "DragNDrop")
diff --git a/cmake/macros/PackageLibrariesForDeployment.cmake b/cmake/macros/PackageLibrariesForDeployment.cmake
index d324776572..29f4617a6f 100644
--- a/cmake/macros/PackageLibrariesForDeployment.cmake
+++ b/cmake/macros/PackageLibrariesForDeployment.cmake
@@ -39,7 +39,9 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT)
     add_custom_command(
       TARGET ${TARGET_NAME}
       POST_BUILD
-      COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND} ${EXTRA_DEPLOY_OPTIONS} $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>,$<CONFIG:RelWithDebInfo>>:--release> \"$<TARGET_FILE:${TARGET_NAME}>\""
+      COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND}\
+       ${EXTRA_DEPLOY_OPTIONS} $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>,$<CONFIG:RelWithDebInfo>>:--release>\
+       --no-compiler-runtime --no-opengl-sw --no-angle -no-system-d3d-compiler \"$<TARGET_FILE:${TARGET_NAME}>\""
     )
 
     set(QTAUDIO_PATH "$<TARGET_FILE_DIR:${TARGET_NAME}>/audio")
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 1e828e9186..f174727f95 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -938,9 +938,6 @@ Section "-Core installation"
   Delete "$INSTDIR\ui_resources_200_percent.pak"
   Delete "$INSTDIR\vccorlib120.dll"
   Delete "$INSTDIR\version"
-  Delete "$INSTDIR\msvcr140.dll"
-  Delete "$INSTDIR\msvcp140.dll"
-  Delete "$INSTDIR\vcruntime140.dll"
   Delete "$INSTDIR\xinput1_3.dll"
 
   ; Delete old desktop shortcuts before they were renamed during Sandbox rename
@@ -959,11 +956,8 @@ Section "-Core installation"
   ; Rename the incorrectly cased Raleway font
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
 
-  ExecWait "$INSTDIR\vcredist_x64.exe /install /q /norestart"
-
   ; Remove the Old Interface directory and vcredist_x64.exe (from installs prior to Server Console)
   RMDir /r "$INSTDIR\Interface"
-  Delete "$INSTDIR\vcredist_x64.exe"
 
   ;Use the entire tree produced by the INSTALL target.  Keep the
   ;list of directories here in sync with the RMDir commands below.
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 49877cacc3..4ce35027f2 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -191,7 +191,11 @@ add_dependencies(${TARGET_NAME} resources)
 if (WIN32)
   # These are external plugins, but we need to do the 'add dependency' here so that their
   # binary directories get added to the fixup path
-  add_dependency_external_projects(sixense)
+
+  if (USE_SIXENSE)
+    add_dependency_external_projects(sixense)
+  endif ()
+
   add_dependency_external_projects(sdl2)
   add_dependency_external_projects(OpenVR)
   add_dependency_external_projects(neuron)
@@ -328,13 +332,13 @@ if (APPLE)
 else()
   # copy the resources files beside the executable
   add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different 
-    "${RESOURCES_RCC}" 
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+    "${RESOURCES_RCC}"
     "$<TARGET_FILE_DIR:interface>"
     # FIXME, the edit script code loads HTML from the scripts folder
     # which in turn relies on CSS that refers to the fonts.  In theory
-    # we should be able to modify the CSS to reference the QRC path to 
-    # the ttf files, but doing so generates a CORS policy violation, 
+    # we should be able to modify the CSS to reference the QRC path to
+    # the ttf files, but doing so generates a CORS policy violation,
     # so we have to retain a copy of the fonts outside of the resources binary
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
     "${PROJECT_SOURCE_DIR}/resources/fonts"
@@ -389,3 +393,6 @@ endif()
 add_dependency_external_projects(GifCreator)
 find_package(GifCreator REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GIFCREATOR_INCLUDE_DIRS})
+
+# tell CMake to exclude ui_console.h for policy CMP0071
+set_property(SOURCE ui_console.h PROPERTY SKIP_AUTOMOC ON)
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 7fece45b2f..319b6ad415 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -8,6 +8,9 @@ include_hifi_library_headers(audio)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)
 
+# tell CMake to exclude qrc_fonts.cpp for policy CMP0071
+set_property(SOURCE qrc_fonts.cpp PROPERTY SKIP_AUTOMOC ON)
+
 if (NOT ANDROID)
   target_nsight()
 endif ()
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 06cf929368..4a0f52e272 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -20,8 +20,12 @@ if (NOT SERVER_ONLY AND NOT ANDROID)
   add_subdirectory(${DIR})
   set(DIR "oculusLegacy")
   add_subdirectory(${DIR})
-  set(DIR "hifiSixense")
-  add_subdirectory(${DIR})
+
+  if (USE_SIXENSE)
+    set(DIR "hifiSixense")
+    add_subdirectory(${DIR})
+  endif()
+  
   set(DIR "hifiSpacemouse")
   add_subdirectory(${DIR})
   set(DIR "hifiNeuron")