diff --git a/.azuredevops/policies/branchClassification.yml b/.azuredevops/policies/branchClassification.yml
new file mode 100644
index 00000000..bea0ee31
--- /dev/null
+++ b/.azuredevops/policies/branchClassification.yml
@@ -0,0 +1,15 @@
+name: branch_classification
+description: Branch classification configuration for repository
+resource: repository
+disabled: false
+where:
+configuration:
+  branchClassificationSettings:
+    defaultClassification: nonproduction
+    ruleset:
+      - name: prod-branches
+        branchNames:
+          - main
+          - ms_1.6.0_release
+          - release
+        classification: production
diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
index 7e0e964c..f9b1752b 100644
--- a/build/CompilerAndLinker.cmake
+++ b/build/CompilerAndLinker.cmake
@@ -76,7 +76,7 @@ endif()
 #--- General MSVC-like SDL options
 if(MSVC)
     list(APPEND COMPILER_SWITCHES /Gd /GS /Zc:forScope /Zc:inline /Zc:wchar_t $<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>)
-    list(APPEND LINKER_SWITCHES /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO)
+    list(APPEND LINKER_SWITCHES /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO $<$<CONFIG:RELWITHDEBINFO>:/OPT:REF,ICF>)
 
     if(WINDOWS_STORE)
       list(APPEND COMPILER_SWITCHES /bigobj)
@@ -142,6 +142,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     list(APPEND COMPILER_SWITCHES /Zc:__cplusplus /Zc:inline /fp:fast /Qdiag-disable:161)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     list(APPEND COMPILER_SWITCHES /sdl /fp:fast)
+    list(APPEND LINKER_SWITCHES $<$<CONFIG:RELWITHDEBINFO>:/DEBUG:FULL /DEBUGTYPE:CV,FIXUP /OPT:REF,ICF>)
 
     if(WINDOWS_STORE)
       list(APPEND COMPILER_SWITCHES /await)