diff --git a/.github/ISSUE_TEMPLATE/analyzer-suggestion.md b/.github/ISSUE_TEMPLATE/analyzer-suggestion.md
index eaed5aea5a99e..56522c01b2f76 100644
--- a/.github/ISSUE_TEMPLATE/analyzer-suggestion.md
+++ b/.github/ISSUE_TEMPLATE/analyzer-suggestion.md
@@ -19,3 +19,7 @@ A small code snippet that describes a case that the analyzer should report.
 **Additional information:**
 
 Any more additional information you would like to add.
+
+**Documentation requirements:**
+
+When this analyzer is implemented, it must be documented by following the steps at [Documentation for IDE CodeStyle analyzers](../../docs/contributing/Documentation for IDE CodeStyle analyzers.md).
diff --git a/Roslyn.sln b/Roslyn.sln
index abe1a82b59ef5..38484cd382fbf 100644
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -549,1335 +549,675 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{600AF682-E097-407B-AD85-EE3CED37E680}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{600AF682-E097-407B-AD85-EE3CED37E680}.Debug|x86.Build.0 = Debug|Any CPU
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|Any CPU.Build.0 = Release|Any CPU
-		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|x86.ActiveCfg = Release|Any CPU
-		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|x86.Build.0 = Release|Any CPU
 		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Debug|x86.Build.0 = Debug|Any CPU
 		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Release|x86.ActiveCfg = Release|Any CPU
-		{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}.Release|x86.Build.0 = Release|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.Build.0 = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.ActiveCfg = Release|Any CPU
-		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.Build.0 = Release|Any CPU
 		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Debug|x86.Build.0 = Debug|Any CPU
 		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{9508F118-F62E-4C16-A6F4-7C3B56E166AD}.Release|x86.Build.0 = Release|Any CPU
 		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Debug|x86.Build.0 = Debug|Any CPU
 		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5CE416E-B906-41D2-80B9-0078E887A3F6}.Release|x86.Build.0 = Release|Any CPU
 		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Debug|x86.Build.0 = Debug|Any CPU
 		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Release|x86.ActiveCfg = Release|Any CPU
-		{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}.Release|x86.Build.0 = Release|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.Build.0 = Debug|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.ActiveCfg = Release|Any CPU
-		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.Build.0 = Release|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Debug|x86.Build.0 = Debug|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Release|x86.ActiveCfg = Release|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D203}.Release|x86.Build.0 = Release|Any CPU
 		{4462B57A-7245-4146-B504-D46FDE762948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4462B57A-7245-4146-B504-D46FDE762948}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4462B57A-7245-4146-B504-D46FDE762948}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4462B57A-7245-4146-B504-D46FDE762948}.Debug|x86.Build.0 = Debug|Any CPU
 		{4462B57A-7245-4146-B504-D46FDE762948}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4462B57A-7245-4146-B504-D46FDE762948}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4462B57A-7245-4146-B504-D46FDE762948}.Release|x86.ActiveCfg = Release|Any CPU
-		{4462B57A-7245-4146-B504-D46FDE762948}.Release|x86.Build.0 = Release|Any CPU
 		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Debug|x86.Build.0 = Debug|Any CPU
 		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{1AF3672A-C5F1-4604-B6AB-D98C4DE9C3B1}.Release|x86.Build.0 = Release|Any CPU
 		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Debug|x86.Build.0 = Debug|Any CPU
 		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2C33A93-DB30-4099-903E-77D75C4C3F45}.Release|x86.Build.0 = Release|Any CPU
 		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Debug|x86.Build.0 = Debug|Any CPU
 		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Release|x86.ActiveCfg = Release|Any CPU
-		{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}.Release|x86.Build.0 = Release|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Debug|x86.Build.0 = Debug|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Release|x86.ActiveCfg = Release|Any CPU
-		{50D26304-0961-4A51-ABF6-6CAD1A56D202}.Release|x86.Build.0 = Release|Any CPU
 		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x86.Build.0 = Debug|Any CPU
 		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x86.ActiveCfg = Release|Any CPU
-		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x86.Build.0 = Release|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Debug|x86.Build.0 = Debug|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Release|x86.ActiveCfg = Release|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Release|x86.Build.0 = Release|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Debug|x86.Build.0 = Debug|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}.Release|x86.Build.0 = Release|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x86.Build.0 = Debug|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x86.ActiveCfg = Release|Any CPU
-		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x86.Build.0 = Release|Any CPU
 		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Debug|x86.Build.0 = Debug|Any CPU
 		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Release|x86.ActiveCfg = Release|Any CPU
-		{E3B32027-3362-41DF-9172-4D3B623F42A5}.Release|x86.Build.0 = Release|Any CPU
 		{190CE348-596E-435A-9E5B-12A689F9FC29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{190CE348-596E-435A-9E5B-12A689F9FC29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{190CE348-596E-435A-9E5B-12A689F9FC29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{190CE348-596E-435A-9E5B-12A689F9FC29}.Debug|x86.Build.0 = Debug|Any CPU
 		{190CE348-596E-435A-9E5B-12A689F9FC29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{190CE348-596E-435A-9E5B-12A689F9FC29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{190CE348-596E-435A-9E5B-12A689F9FC29}.Release|x86.ActiveCfg = Release|Any CPU
-		{190CE348-596E-435A-9E5B-12A689F9FC29}.Release|x86.Build.0 = Release|Any CPU
 		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Debug|x86.Build.0 = Debug|Any CPU
 		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Release|x86.ActiveCfg = Release|Any CPU
-		{9C9DABA4-0E72-4469-ADF1-4991F3CA572A}.Release|x86.Build.0 = Release|Any CPU
 		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Debug|x86.Build.0 = Debug|Any CPU
 		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Release|x86.ActiveCfg = Release|Any CPU
-		{BF180BD2-4FB7-4252-A7EC-A00E0C7A028A}.Release|x86.Build.0 = Release|Any CPU
 		{BDA5D613-596D-4B61-837C-63554151C8F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BDA5D613-596D-4B61-837C-63554151C8F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDA5D613-596D-4B61-837C-63554151C8F5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BDA5D613-596D-4B61-837C-63554151C8F5}.Debug|x86.Build.0 = Debug|Any CPU
 		{BDA5D613-596D-4B61-837C-63554151C8F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BDA5D613-596D-4B61-837C-63554151C8F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDA5D613-596D-4B61-837C-63554151C8F5}.Release|x86.ActiveCfg = Release|Any CPU
-		{BDA5D613-596D-4B61-837C-63554151C8F5}.Release|x86.Build.0 = Release|Any CPU
 		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Debug|x86.Build.0 = Debug|Any CPU
 		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Release|x86.ActiveCfg = Release|Any CPU
-		{91F6F646-4F6E-449A-9AB4-2986348F329D}.Release|x86.Build.0 = Release|Any CPU
 		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|x86.Build.0 = Debug|Any CPU
 		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x86.ActiveCfg = Release|Any CPU
-		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x86.Build.0 = Release|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|x86.Build.0 = Debug|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|x86.ActiveCfg = Release|Any CPU
-		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|x86.Build.0 = Release|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.Build.0 = Debug|x64
-		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|x86.ActiveCfg = Debug|x64
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.ActiveCfg = Release|x64
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.Build.0 = Release|x64
-		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|x86.ActiveCfg = Release|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.Build.0 = Debug|x64
-		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|x86.ActiveCfg = Debug|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.ActiveCfg = Release|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.Build.0 = Release|x64
-		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|x86.ActiveCfg = Release|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Any CPU.Build.0 = Debug|x64
-		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|x86.ActiveCfg = Debug|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Any CPU.ActiveCfg = Release|x64
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Any CPU.Build.0 = Release|x64
-		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|x86.ActiveCfg = Release|x64
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.Build.0 = Debug|x64
-		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|x86.ActiveCfg = Debug|x64
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.ActiveCfg = Release|x64
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.Build.0 = Release|x64
-		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|x86.ActiveCfg = Release|x64
 		{C50166F1-BABC-40A9-95EB-8200080CD701}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C50166F1-BABC-40A9-95EB-8200080CD701}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C50166F1-BABC-40A9-95EB-8200080CD701}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C50166F1-BABC-40A9-95EB-8200080CD701}.Debug|x86.Build.0 = Debug|Any CPU
 		{C50166F1-BABC-40A9-95EB-8200080CD701}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C50166F1-BABC-40A9-95EB-8200080CD701}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C50166F1-BABC-40A9-95EB-8200080CD701}.Release|x86.ActiveCfg = Release|Any CPU
-		{C50166F1-BABC-40A9-95EB-8200080CD701}.Release|x86.Build.0 = Release|Any CPU
 		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Debug|x86.Build.0 = Debug|Any CPU
 		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{E195A63F-B5A4-4C5A-96BD-8E7ED6A181B7}.Release|x86.Build.0 = Release|Any CPU
 		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Debug|x86.Build.0 = Debug|Any CPU
 		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Release|x86.Build.0 = Release|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.Build.0 = Debug|x64
-		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|x86.ActiveCfg = Debug|x64
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.ActiveCfg = Release|x64
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.Build.0 = Release|x64
-		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|x86.ActiveCfg = Release|x64
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|x86.Build.0 = Debug|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E87FA96-50BB-4607-8676-46521599F998}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E87FA96-50BB-4607-8676-46521599F998}.Release|x86.Build.0 = Release|Any CPU
 		{96EB2D3B-F694-48C6-A284-67382841E086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{96EB2D3B-F694-48C6-A284-67382841E086}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96EB2D3B-F694-48C6-A284-67382841E086}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{96EB2D3B-F694-48C6-A284-67382841E086}.Debug|x86.Build.0 = Debug|Any CPU
 		{96EB2D3B-F694-48C6-A284-67382841E086}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96EB2D3B-F694-48C6-A284-67382841E086}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96EB2D3B-F694-48C6-A284-67382841E086}.Release|x86.ActiveCfg = Release|Any CPU
-		{96EB2D3B-F694-48C6-A284-67382841E086}.Release|x86.Build.0 = Release|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|x86.Build.0 = Debug|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21B239D0-D144-430F-A394-C066D58EE267}.Release|x86.ActiveCfg = Release|Any CPU
-		{21B239D0-D144-430F-A394-C066D58EE267}.Release|x86.Build.0 = Release|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|x86.Build.0 = Debug|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|x86.ActiveCfg = Release|Any CPU
-		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|x86.Build.0 = Release|Any CPU
 		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Debug|x86.Build.0 = Debug|Any CPU
 		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x86.ActiveCfg = Release|Any CPU
-		{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x86.Build.0 = Release|Any CPU
 		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|x86.Build.0 = Debug|Any CPU
 		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Release|x86.ActiveCfg = Release|Any CPU
-		{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Release|x86.Build.0 = Release|Any CPU
 		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Debug|x86.Build.0 = Debug|Any CPU
 		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Release|x86.ActiveCfg = Release|Any CPU
-		{3973B09A-4FBF-44A5-8359-3D22CEB71F71}.Release|x86.Build.0 = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|x86.Build.0 = Debug|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|x86.ActiveCfg = Release|Any CPU
-		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|x86.Build.0 = Release|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|x86.Build.0 = Debug|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|x86.ActiveCfg = Release|Any CPU
-		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|x86.Build.0 = Release|Any CPU
 		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Debug|x86.Build.0 = Debug|Any CPU
 		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Release|x86.ActiveCfg = Release|Any CPU
-		{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}.Release|x86.Build.0 = Release|Any CPU
 		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Debug|x86.Build.0 = Debug|Any CPU
 		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Release|x86.ActiveCfg = Release|Any CPU
-		{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}.Release|x86.Build.0 = Release|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|x86.Build.0 = Debug|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|x86.ActiveCfg = Release|Any CPU
-		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|x86.Build.0 = Release|Any CPU
 		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Debug|x86.Build.0 = Debug|Any CPU
 		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Release|x86.ActiveCfg = Release|Any CPU
-		{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A}.Release|x86.Build.0 = Release|Any CPU
 		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|x86.Build.0 = Debug|Any CPU
 		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x86.ActiveCfg = Release|Any CPU
-		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x86.Build.0 = Release|Any CPU
 		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|x86.Build.0 = Debug|Any CPU
 		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|x86.ActiveCfg = Release|Any CPU
-		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|x86.Build.0 = Release|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Release|x86.ActiveCfg = Release|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Release|x86.Build.0 = Release|Any CPU
 		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|x86.Build.0 = Debug|Any CPU
 		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|Any CPU.Build.0 = Release|Any CPU
-		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|x86.ActiveCfg = Release|Any CPU
-		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|x86.Build.0 = Release|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|x86.ActiveCfg = Release|Any CPU
-		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|x86.Build.0 = Release|Any CPU
 		{8E2A252E-A140-45A6-A81A-2652996EA589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E2A252E-A140-45A6-A81A-2652996EA589}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E2A252E-A140-45A6-A81A-2652996EA589}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8E2A252E-A140-45A6-A81A-2652996EA589}.Debug|x86.Build.0 = Debug|Any CPU
 		{8E2A252E-A140-45A6-A81A-2652996EA589}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E2A252E-A140-45A6-A81A-2652996EA589}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E2A252E-A140-45A6-A81A-2652996EA589}.Release|x86.ActiveCfg = Release|Any CPU
-		{8E2A252E-A140-45A6-A81A-2652996EA589}.Release|x86.Build.0 = Release|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Debug|x86.Build.0 = Debug|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Release|x86.Build.0 = Release|Any CPU
 		{16E93074-4252-466C-89A3-3B905ABAF779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16E93074-4252-466C-89A3-3B905ABAF779}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16E93074-4252-466C-89A3-3B905ABAF779}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{16E93074-4252-466C-89A3-3B905ABAF779}.Debug|x86.Build.0 = Debug|Any CPU
 		{16E93074-4252-466C-89A3-3B905ABAF779}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16E93074-4252-466C-89A3-3B905ABAF779}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16E93074-4252-466C-89A3-3B905ABAF779}.Release|x86.ActiveCfg = Release|Any CPU
-		{16E93074-4252-466C-89A3-3B905ABAF779}.Release|x86.Build.0 = Release|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Debug|x86.Build.0 = Debug|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Release|x86.ActiveCfg = Release|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Release|x86.Build.0 = Release|Any CPU
 		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Debug|x86.Build.0 = Debug|Any CPU
 		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Release|x86.ActiveCfg = Release|Any CPU
-		{3CEA0D69-00D3-40E5-A661-DC41EA07269B}.Release|x86.Build.0 = Release|Any CPU
 		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Debug|x86.Build.0 = Debug|Any CPU
 		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Release|x86.ActiveCfg = Release|Any CPU
-		{76C6F005-C89D-4348-BB4A-39189DDBEB52}.Release|x86.Build.0 = Release|Any CPU
 		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Debug|x86.Build.0 = Debug|Any CPU
 		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Release|x86.ActiveCfg = Release|Any CPU
-		{FE2CBEA6-D121-4FAA-AA8B-FC9900BF8C83}.Release|x86.Build.0 = Release|Any CPU
 		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Debug|x86.Build.0 = Debug|Any CPU
 		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Release|x86.ActiveCfg = Release|Any CPU
-		{EBA4DFA1-6DED-418F-A485-A3B608978906}.Release|x86.Build.0 = Release|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Debug|x86.Build.0 = Debug|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Release|x86.ActiveCfg = Release|Any CPU
-		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34}.Release|x86.Build.0 = Release|Any CPU
 		{14118347-ED06-4608-9C45-18228273C712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14118347-ED06-4608-9C45-18228273C712}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14118347-ED06-4608-9C45-18228273C712}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{14118347-ED06-4608-9C45-18228273C712}.Debug|x86.Build.0 = Debug|Any CPU
 		{14118347-ED06-4608-9C45-18228273C712}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14118347-ED06-4608-9C45-18228273C712}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14118347-ED06-4608-9C45-18228273C712}.Release|x86.ActiveCfg = Release|Any CPU
-		{14118347-ED06-4608-9C45-18228273C712}.Release|x86.Build.0 = Release|Any CPU
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Debug|x86.Build.0 = Debug|Any CPU
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Release|x86.ActiveCfg = Release|Any CPU
-		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Release|x86.Build.0 = Release|Any CPU
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Debug|x86.Build.0 = Debug|Any CPU
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Release|x86.ActiveCfg = Release|Any CPU
-		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Release|x86.Build.0 = Release|Any CPU
 		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Debug|x86.Build.0 = Debug|Any CPU
 		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Release|x86.ActiveCfg = Release|Any CPU
-		{C0E80510-4FBE-4B0C-AF2C-4F473787722C}.Release|x86.Build.0 = Release|Any CPU
 		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Debug|x86.Build.0 = Debug|Any CPU
 		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Release|x86.ActiveCfg = Release|Any CPU
-		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6}.Release|x86.Build.0 = Release|Any CPU
 		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Debug|x86.Build.0 = Debug|Any CPU
 		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Release|x86.ActiveCfg = Release|Any CPU
-		{D49439D7-56D2-450F-A4F0-74CB95D620E6}.Release|x86.Build.0 = Release|Any CPU
 		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Debug|x86.Build.0 = Debug|Any CPU
 		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Release|x86.ActiveCfg = Release|Any CPU
-		{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}.Release|x86.Build.0 = Release|Any CPU
 		{91C574AD-0352-47E9-A019-EE02CC32A396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91C574AD-0352-47E9-A019-EE02CC32A396}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91C574AD-0352-47E9-A019-EE02CC32A396}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{91C574AD-0352-47E9-A019-EE02CC32A396}.Debug|x86.Build.0 = Debug|Any CPU
 		{91C574AD-0352-47E9-A019-EE02CC32A396}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91C574AD-0352-47E9-A019-EE02CC32A396}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91C574AD-0352-47E9-A019-EE02CC32A396}.Release|x86.ActiveCfg = Release|Any CPU
-		{91C574AD-0352-47E9-A019-EE02CC32A396}.Release|x86.Build.0 = Release|Any CPU
 		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Debug|x86.Build.0 = Debug|Any CPU
 		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Release|x86.ActiveCfg = Release|Any CPU
-		{A1455D30-55FC-45EF-8759-3AEBDB13D940}.Release|x86.Build.0 = Release|Any CPU
 		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Debug|x86.Build.0 = Debug|Any CPU
 		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}.Release|x86.Build.0 = Release|Any CPU
 		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Debug|x86.Build.0 = Debug|Any CPU
 		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Release|x86.ActiveCfg = Release|Any CPU
-		{A486D7DE-F614-409D-BB41-0FFDF582E35C}.Release|x86.Build.0 = Release|Any CPU
 		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Debug|x86.Build.0 = Debug|Any CPU
 		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Release|x86.ActiveCfg = Release|Any CPU
-		{B617717C-7881-4F01-AB6D-B1B6CC0483A0}.Release|x86.Build.0 = Release|Any CPU
 		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Debug|x86.Build.0 = Debug|Any CPU
 		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Release|x86.ActiveCfg = Release|Any CPU
-		{FD6BA96C-7905-4876-8BCC-E38E2CA64F31}.Release|x86.Build.0 = Release|Any CPU
 		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Debug|x86.Build.0 = Debug|Any CPU
 		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Release|x86.ActiveCfg = Release|Any CPU
-		{AE297965-4D56-4BA9-85EB-655AC4FC95A0}.Release|x86.Build.0 = Release|Any CPU
 		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Debug|x86.Build.0 = Debug|Any CPU
 		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Release|x86.ActiveCfg = Release|Any CPU
-		{60DB272A-21C9-4E8D-9803-FF4E132392C8}.Release|x86.Build.0 = Release|Any CPU
 		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Debug|x86.Build.0 = Debug|Any CPU
 		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Release|x86.ActiveCfg = Release|Any CPU
-		{73242A2D-6300-499D-8C15-FADF7ECB185C}.Release|x86.Build.0 = Release|Any CPU
 		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Debug|x86.Build.0 = Debug|Any CPU
 		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC5E3515-482C-4C6A-92D9-D0CEA687DFC2}.Release|x86.Build.0 = Release|Any CPU
 		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Debug|x86.Build.0 = Debug|Any CPU
 		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Release|x86.ActiveCfg = Release|Any CPU
-		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395}.Release|x86.Build.0 = Release|Any CPU
 		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Debug|x86.Build.0 = Debug|Any CPU
 		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Release|x86.ActiveCfg = Release|Any CPU
-		{ACE53515-482C-4C6A-E2D2-4242A687DFEE}.Release|x86.Build.0 = Release|Any CPU
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Debug|x86.Build.0 = Debug|Any CPU
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Release|x86.ActiveCfg = Release|Any CPU
-		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Release|x86.Build.0 = Release|Any CPU
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Debug|x86.Build.0 = Debug|Any CPU
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Release|x86.Build.0 = Release|Any CPU
 		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Debug|x86.Build.0 = Debug|Any CPU
 		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Release|x86.ActiveCfg = Release|Any CPU
-		{FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E}.Release|x86.Build.0 = Release|Any CPU
 		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|x86.Build.0 = Debug|Any CPU
 		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|x86.Build.0 = Release|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Debug|x86.Build.0 = Debug|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Release|x86.ActiveCfg = Release|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1842}.Release|x86.Build.0 = Release|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Debug|x86.Build.0 = Debug|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Release|x86.ActiveCfg = Release|Any CPU
-		{76242A2D-2600-49DD-8C15-FEA07ECB1843}.Release|x86.Build.0 = Release|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Debug|x86.Build.0 = Debug|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Release|x86.ActiveCfg = Release|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Release|x86.Build.0 = Release|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Debug|x86.Build.0 = Debug|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Release|x86.ActiveCfg = Release|Any CPU
-		{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Release|x86.Build.0 = Release|Any CPU
 		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Debug|x86.Build.0 = Debug|Any CPU
 		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Release|x86.Build.0 = Release|Any CPU
 		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Debug|x86.Build.0 = Debug|Any CPU
 		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Release|x86.ActiveCfg = Release|Any CPU
-		{FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Release|x86.Build.0 = Release|Any CPU
 		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Debug|x86.Build.0 = Debug|Any CPU
 		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|x86.ActiveCfg = Release|Any CPU
-		{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|x86.Build.0 = Release|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x86.Build.0 = Debug|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x86.ActiveCfg = Release|Any CPU
-		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x86.Build.0 = Release|Any CPU
 		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|x86.Build.0 = Debug|Any CPU
 		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|x86.ActiveCfg = Release|Any CPU
-		{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|x86.Build.0 = Release|Any CPU
 		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|x86.Build.0 = Debug|Any CPU
 		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|x86.ActiveCfg = Release|Any CPU
-		{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|x86.Build.0 = Release|Any CPU
 		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|x86.Build.0 = Debug|Any CPU
 		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|x86.ActiveCfg = Release|Any CPU
-		{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|x86.Build.0 = Release|Any CPU
 		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.Build.0 = Debug|Any CPU
 		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.ActiveCfg = Release|Any CPU
-		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.Build.0 = Release|Any CPU
 		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Release|x86.ActiveCfg = Release|Any CPU
-		{E2E889A5-2489-4546-9194-47C63E49EAEB}.Release|x86.Build.0 = Release|Any CPU
 		{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x86.Build.0 = Debug|Any CPU
 		{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x86.ActiveCfg = Release|Any CPU
-		{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x86.Build.0 = Release|Any CPU
 		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x86.Build.0 = Debug|Any CPU
 		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x86.Build.0 = Release|Any CPU
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Debug|x86.Build.0 = Debug|Any CPU
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Release|x86.ActiveCfg = Release|Any CPU
-		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Release|x86.Build.0 = Release|Any CPU
 		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x86.Build.0 = Debug|Any CPU
 		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x86.ActiveCfg = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x86.Build.0 = Release|Any CPU
 		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Debug|x86.Build.0 = Debug|Any CPU
 		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Release|x86.ActiveCfg = Release|Any CPU
-		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}.Release|x86.Build.0 = Release|Any CPU
 		{971E832B-7471-48B5-833E-5913188EC0E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{971E832B-7471-48B5-833E-5913188EC0E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{971E832B-7471-48B5-833E-5913188EC0E4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{971E832B-7471-48B5-833E-5913188EC0E4}.Debug|x86.Build.0 = Debug|Any CPU
 		{971E832B-7471-48B5-833E-5913188EC0E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{971E832B-7471-48B5-833E-5913188EC0E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{971E832B-7471-48B5-833E-5913188EC0E4}.Release|x86.ActiveCfg = Release|Any CPU
-		{971E832B-7471-48B5-833E-5913188EC0E4}.Release|x86.Build.0 = Release|Any CPU
 		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|x86.Build.0 = Debug|Any CPU
 		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|x86.ActiveCfg = Release|Any CPU
-		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|x86.Build.0 = Release|Any CPU
 		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Debug|x86.Build.0 = Debug|Any CPU
 		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Release|x86.ActiveCfg = Release|Any CPU
-		{F822F72A-CC87-4E31-B57D-853F65CBEBF3}.Release|x86.Build.0 = Release|Any CPU
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Debug|x86.Build.0 = Debug|Any CPU
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Release|x86.ActiveCfg = Release|Any CPU
-		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Release|x86.Build.0 = Release|Any CPU
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x86.Build.0 = Debug|Any CPU
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x86.ActiveCfg = Release|Any CPU
-		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x86.Build.0 = Release|Any CPU
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Debug|x86.Build.0 = Debug|Any CPU
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Release|x86.Build.0 = Release|Any CPU
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|x86.Build.0 = Debug|Any CPU
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x86.ActiveCfg = Release|Any CPU
-		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x86.Build.0 = Release|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|x86.Build.0 = Debug|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x86.ActiveCfg = Release|Any CPU
-		{21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x86.Build.0 = Release|Any CPU
 		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Debug|x86.Build.0 = Debug|Any CPU
 		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Release|x86.Build.0 = Release|Any CPU
 		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Debug|x86.Build.0 = Debug|Any CPU
 		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Release|x86.ActiveCfg = Release|Any CPU
-		{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Release|x86.Build.0 = Release|Any CPU
 		{69F853E5-BD04-4842-984F-FC68CC51F402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69F853E5-BD04-4842-984F-FC68CC51F402}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69F853E5-BD04-4842-984F-FC68CC51F402}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{69F853E5-BD04-4842-984F-FC68CC51F402}.Debug|x86.Build.0 = Debug|Any CPU
 		{69F853E5-BD04-4842-984F-FC68CC51F402}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{69F853E5-BD04-4842-984F-FC68CC51F402}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69F853E5-BD04-4842-984F-FC68CC51F402}.Release|x86.ActiveCfg = Release|Any CPU
-		{69F853E5-BD04-4842-984F-FC68CC51F402}.Release|x86.Build.0 = Release|Any CPU
 		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Debug|x86.Build.0 = Debug|Any CPU
 		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Release|x86.ActiveCfg = Release|Any CPU
-		{6FC8E6F5-659C-424D-AEB5-331B95883E29}.Release|x86.Build.0 = Release|Any CPU
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Debug|x86.Build.0 = Debug|Any CPU
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Release|x86.ActiveCfg = Release|Any CPU
-		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Release|x86.Build.0 = Release|Any CPU
 		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|x86.Build.0 = Debug|Any CPU
 		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x86.ActiveCfg = Release|Any CPU
-		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x86.Build.0 = Release|Any CPU
 		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Debug|x86.Build.0 = Debug|Any CPU
 		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Release|x86.ActiveCfg = Release|Any CPU
-		{1688E1E5-D510-4E06-86F3-F8DB10B1393D}.Release|x86.Build.0 = Release|Any CPU
 		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Debug|x86.Build.0 = Debug|Any CPU
 		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Release|x86.ActiveCfg = Release|Any CPU
-		{F040CEC5-5E11-4DBD-9F6A-250478E28177}.Release|x86.Build.0 = Release|Any CPU
 		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Debug|x86.Build.0 = Debug|Any CPU
 		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Release|x86.ActiveCfg = Release|Any CPU
-		{275812EE-DEDB-4232-9439-91C9757D2AE4}.Release|x86.Build.0 = Release|Any CPU
 		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Debug|x86.Build.0 = Debug|Any CPU
 		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{5FF1E493-69CC-4D0B-83F2-039F469A04E1}.Release|x86.Build.0 = Release|Any CPU
 		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Debug|x86.Build.0 = Debug|Any CPU
 		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA87BFED-089A-4096-B8D5-690BDC7D5B24}.Release|x86.Build.0 = Release|Any CPU
 		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Debug|x86.Build.0 = Debug|Any CPU
 		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Release|x86.ActiveCfg = Release|Any CPU
-		{A07ABCF5-BC43-4EE9-8FD8-B2D77FD54D73}.Release|x86.Build.0 = Release|Any CPU
 		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Debug|x86.Build.0 = Debug|Any CPU
 		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Release|x86.ActiveCfg = Release|Any CPU
-		{2531A8C4-97DD-47BC-A79C-B7846051E137}.Release|x86.Build.0 = Release|Any CPU
 		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Debug|x86.Build.0 = Debug|Any CPU
 		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Release|x86.ActiveCfg = Release|Any CPU
-		{0141285D-8F6C-42C7-BAF3-3C0CCD61C716}.Release|x86.Build.0 = Release|Any CPU
 		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Debug|x86.Build.0 = Debug|Any CPU
 		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Release|x86.ActiveCfg = Release|Any CPU
-		{9FF1205F-1D7C-4EE4-B038-3456FE6EBEAF}.Release|x86.Build.0 = Release|Any CPU
 		{5018D049-5870-465A-889B-C742CE1E31CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5018D049-5870-465A-889B-C742CE1E31CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5018D049-5870-465A-889B-C742CE1E31CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5018D049-5870-465A-889B-C742CE1E31CB}.Debug|x86.Build.0 = Debug|Any CPU
 		{5018D049-5870-465A-889B-C742CE1E31CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5018D049-5870-465A-889B-C742CE1E31CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5018D049-5870-465A-889B-C742CE1E31CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{5018D049-5870-465A-889B-C742CE1E31CB}.Release|x86.Build.0 = Release|Any CPU
 		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Debug|x86.Build.0 = Debug|Any CPU
 		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Release|x86.ActiveCfg = Release|Any CPU
-		{E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510}.Release|x86.Build.0 = Release|Any CPU
 		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Debug|x86.Build.0 = Debug|Any CPU
 		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D36C343-BB6A-4CB5-902B-E2145ACCB58F}.Release|x86.Build.0 = Release|Any CPU
 		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Debug|x86.Build.0 = Debug|Any CPU
 		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1}.Release|x86.Build.0 = Release|Any CPU
 		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Debug|x86.Build.0 = Debug|Any CPU
 		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Release|x86.ActiveCfg = Release|Any CPU
-		{60166C60-813C-46C4-911D-2411B4ABBC0F}.Release|x86.Build.0 = Release|Any CPU
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Debug|x86.Build.0 = Debug|Any CPU
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Release|x86.ActiveCfg = Release|Any CPU
-		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Release|x86.Build.0 = Release|Any CPU
 		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Debug|x86.Build.0 = Debug|Any CPU
 		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Release|x86.ActiveCfg = Release|Any CPU
-		{49E7C367-181B-499C-AC2E-8E17C81418D6}.Release|x86.Build.0 = Release|Any CPU
 		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Debug|x86.Build.0 = Debug|Any CPU
 		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Release|x86.ActiveCfg = Release|Any CPU
-		{037F06F0-3BE8-42D0-801E-2F74FC380AB8}.Release|x86.Build.0 = Release|Any CPU
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Debug|x86.Build.0 = Debug|Any CPU
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Release|x86.ActiveCfg = Release|Any CPU
-		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Release|x86.Build.0 = Release|Any CPU
 		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Debug|x86.Build.0 = Debug|Any CPU
 		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Release|x86.ActiveCfg = Release|Any CPU
-		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Release|x86.Build.0 = Release|Any CPU
 		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Debug|x86.Build.0 = Debug|Any CPU
 		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Release|x86.ActiveCfg = Release|Any CPU
-		{9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Release|x86.Build.0 = Release|Any CPU
 		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Debug|x86.Build.0 = Debug|Any CPU
 		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Release|x86.ActiveCfg = Release|Any CPU
-		{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Release|x86.Build.0 = Release|Any CPU
 		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Debug|x86.Build.0 = Debug|Any CPU
 		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Release|x86.ActiveCfg = Release|Any CPU
-		{CFA94A39-4805-456D-A369-FC35CCC170E9}.Release|x86.Build.0 = Release|Any CPU
 		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Debug|x86.Build.0 = Debug|Any CPU
 		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Release|x86.ActiveCfg = Release|Any CPU
-		{4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Release|x86.Build.0 = Release|Any CPU
 		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Debug|x86.Build.0 = Debug|Any CPU
 		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Release|x86.ActiveCfg = Release|Any CPU
-		{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Release|x86.Build.0 = Release|Any CPU
 		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Debug|x86.Build.0 = Debug|Any CPU
 		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Release|x86.Build.0 = Release|Any CPU
 		{3636D3E2-E3EF-4815-B020-819F382204CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3636D3E2-E3EF-4815-B020-819F382204CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3636D3E2-E3EF-4815-B020-819F382204CD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3636D3E2-E3EF-4815-B020-819F382204CD}.Debug|x86.Build.0 = Debug|Any CPU
 		{3636D3E2-E3EF-4815-B020-819F382204CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3636D3E2-E3EF-4815-B020-819F382204CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3636D3E2-E3EF-4815-B020-819F382204CD}.Release|x86.ActiveCfg = Release|Any CPU
-		{3636D3E2-E3EF-4815-B020-819F382204CD}.Release|x86.Build.0 = Release|Any CPU
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Debug|x86.Build.0 = Debug|Any CPU
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|x86.ActiveCfg = Release|Any CPU
-		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|x86.Build.0 = Release|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|x86.Build.0 = Debug|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|x86.Build.0 = Release|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|x86.Build.0 = Debug|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|x86.ActiveCfg = Release|Any CPU
-		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|x86.Build.0 = Release|Any CPU
 		{23405307-7EFF-4774-8B11-8F5885439761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23405307-7EFF-4774-8B11-8F5885439761}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23405307-7EFF-4774-8B11-8F5885439761}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{23405307-7EFF-4774-8B11-8F5885439761}.Debug|x86.Build.0 = Debug|Any CPU
 		{23405307-7EFF-4774-8B11-8F5885439761}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23405307-7EFF-4774-8B11-8F5885439761}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23405307-7EFF-4774-8B11-8F5885439761}.Release|x86.ActiveCfg = Release|Any CPU
-		{23405307-7EFF-4774-8B11-8F5885439761}.Release|x86.Build.0 = Release|Any CPU
 		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Debug|x86.Build.0 = Debug|Any CPU
 		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Release|x86.ActiveCfg = Release|Any CPU
-		{6362616E-6A47-48F0-9EE0-27800B306ACB}.Release|x86.Build.0 = Release|Any CPU
 		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Debug|x86.Build.0 = Debug|Any CPU
 		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Release|x86.ActiveCfg = Release|Any CPU
-		{BD8CE303-5F04-45EC-8DCF-73C9164CD614}.Release|x86.Build.0 = Release|Any CPU
 		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Debug|x86.Build.0 = Debug|Any CPU
 		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Release|x86.ActiveCfg = Release|Any CPU
-		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC}.Release|x86.Build.0 = Release|Any CPU
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Debug|x86.Build.0 = Debug|Any CPU
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Release|x86.ActiveCfg = Release|Any CPU
-		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Release|x86.Build.0 = Release|Any CPU
 		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Debug|x86.Build.0 = Debug|Any CPU
 		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Release|x86.Build.0 = Release|Any CPU
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Debug|x86.Build.0 = Debug|Any CPU
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Release|Any CPU.Build.0 = Release|Any CPU
-		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Release|x86.ActiveCfg = Release|Any CPU
-		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Release|x86.Build.0 = Release|Any CPU
 		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Debug|x86.Build.0 = Debug|Any CPU
 		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Release|x86.ActiveCfg = Release|Any CPU
-		{1DDE89EE-5819-441F-A060-2FF4A986F372}.Release|x86.Build.0 = Release|Any CPU
 		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Debug|x86.Build.0 = Debug|Any CPU
 		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|x86.ActiveCfg = Release|Any CPU
-		{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|x86.Build.0 = Release|Any CPU
 		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|x86.Build.0 = Debug|Any CPU
 		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|x86.Build.0 = Release|Any CPU
 		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|x86.Build.0 = Debug|Any CPU
 		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Release|x86.ActiveCfg = Release|Any CPU
-		{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Release|x86.Build.0 = Release|Any CPU
 		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Debug|x86.Build.0 = Debug|Any CPU
 		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}.Release|x86.Build.0 = Release|Any CPU
 		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Debug|x86.Build.0 = Debug|Any CPU
 		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Release|x86.ActiveCfg = Release|Any CPU
-		{FC32EF16-31B1-47B3-B625-A80933CB3F29}.Release|x86.Build.0 = Release|Any CPU
 		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Debug|x86.Build.0 = Debug|Any CPU
 		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Release|x86.ActiveCfg = Release|Any CPU
-		{453C8E28-81D4-431E-BFB0-F3D413346E51}.Release|x86.Build.0 = Release|Any CPU
 		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Debug|x86.Build.0 = Debug|Any CPU
 		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Release|x86.ActiveCfg = Release|Any CPU
-		{CE7F7553-DB2D-4839-92E3-F042E4261B4E}.Release|x86.Build.0 = Release|Any CPU
 		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Debug|x86.Build.0 = Debug|Any CPU
 		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{FF38E9C9-7A25-44F0-B2C4-24C9BFD6A8F6}.Release|x86.Build.0 = Release|Any CPU
 		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Debug|x86.Build.0 = Debug|Any CPU
 		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Release|x86.ActiveCfg = Release|Any CPU
-		{D55FB2BD-CC9E-454B-9654-94AF5D910BF7}.Release|x86.Build.0 = Release|Any CPU
 		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Debug|x86.Build.0 = Debug|Any CPU
 		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Release|x86.ActiveCfg = Release|Any CPU
-		{B9899CF1-E0EB-4599-9E24-6939A04B4979}.Release|x86.Build.0 = Release|Any CPU
 		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Debug|x86.Build.0 = Debug|Any CPU
 		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{D15BF03E-04ED-4BEE-A72B-7620F541F4E2}.Release|x86.Build.0 = Release|Any CPU
 		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Debug|x86.Build.0 = Debug|Any CPU
 		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Release|x86.ActiveCfg = Release|Any CPU
-		{B64766CD-1A1F-4C1B-B11F-C30F82B8E41E}.Release|x86.Build.0 = Release|Any CPU
 		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Debug|x86.Build.0 = Debug|Any CPU
 		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D5E2DE4-5DA8-41C1-A14F-49855DCCE9C5}.Release|x86.Build.0 = Release|Any CPU
 		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Debug|x86.Build.0 = Debug|Any CPU
 		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Release|x86.ActiveCfg = Release|Any CPU
-		{CEA80C83-5848-4FF6-B4E8-CEEE9482E4AA}.Release|x86.Build.0 = Release|Any CPU
 		{2801F82B-78CE-4BAE-B06F-537574751E2E}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{2801F82B-78CE-4BAE-B06F-537574751E2E}.Debug|x86.ActiveCfg = Debug|x86
-		{2801F82B-78CE-4BAE-B06F-537574751E2E}.Debug|x86.Build.0 = Debug|x86
 		{2801F82B-78CE-4BAE-B06F-537574751E2E}.Release|Any CPU.ActiveCfg = Release|x86
-		{2801F82B-78CE-4BAE-B06F-537574751E2E}.Release|x86.ActiveCfg = Release|x86
-		{2801F82B-78CE-4BAE-B06F-537574751E2E}.Release|x86.Build.0 = Release|x86
 		{9B25E472-DF94-4E24-9F5D-E487CE5A91FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9B25E472-DF94-4E24-9F5D-E487CE5A91FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B25E472-DF94-4E24-9F5D-E487CE5A91FB}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md
index 2a2a0b67625c1..425333f885395 100644
--- a/docs/contributing/Building, Debugging, and Testing on Windows.md	
+++ b/docs/contributing/Building, Debugging, and Testing on Windows.md	
@@ -17,10 +17,10 @@ The minimal required version of .NET Framework is 4.7.2.
 
 1. [Visual Studio 2019 16.8p2](https://visualstudio.microsoft.com/downloads/)
     - Ensure C#, VB, MSBuild, .NET Core and Visual Studio Extensibility are included in the selected work loads
-    - Ensure Visual Studio is on Version "16.8 Preview 2" or greater
+    - Ensure Visual Studio is on Version "16.8 Preview 3" or greater
     - Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
     - Restart Visual Studio
-1. [.NET Core SDK 5.0 Preview 8](https://dotnet.microsoft.com/download/dotnet-core/5.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-5.0.100-preview.8-windows-x64-installer)
+1. [.NET Core SDK 5.0 Release Candidate 1](https://dotnet.microsoft.com/download/dotnet-core/5.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-5.0.100-rc.1-windows-x64-installer)
 1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading.
 1. Run Restore.cmd
 1. Open Roslyn.sln
diff --git a/docs/contributing/Documentation for IDE CodeStyle analyzers.md b/docs/contributing/Documentation for IDE CodeStyle analyzers.md
new file mode 100644
index 0000000000000..46e9397e27b73
--- /dev/null
+++ b/docs/contributing/Documentation for IDE CodeStyle analyzers.md	
@@ -0,0 +1,33 @@
+# Documentation for IDE CodeStyle analyzers
+
+## Overview
+
+1. Official documentation for all [IDE analyzer diagnostic IDs](../../src/Analyzers/Core/Analyzers/IDEDiagnosticIds.cs) is added to `dotnet/docs` repo at <https://github.com/dotnet/docs/tree/master/docs/fundamentals/code-analysis/style-rules>.
+
+2. Each IDE diagnostic ID has a dedicated documentation page. For example:
+   1. Diagnostic with code style option: <https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0011>
+   2. Diagnostic without code style option: <https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0004>
+   3. Multiple diagnostic IDs sharing the same option(s): <https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0003-ide0009>
+
+3. We have tabular indices for IDE diagnostic IDs and code style options for easier reference and navigation:
+   1. Primary index (rule ID + code style options): <https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/>
+   2. Secondary index (code style options only): <https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/language-rules#net-style-rules>
+   3. Indices for each preference/option group. For example:
+      1. Modifier preferences: <https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/modifier-preferences>
+      2. Expression-level preferences: <https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/expression-level-preferences>
+ 
+## Action items when adding or updating IDE analyzers
+
+Roslyn IDE team (@dotnet/roslyn-ide) is responsible for ensuring that the documentation for IDE analyzers is up-to-date. Whenever we add a new IDE analyzer, add new code style option(s) OR update semantics of existing IDE analyzers the following needs to be done:
+
+1. **Action required in [dotnet\docs](https://github.com/dotnet/docs) repo**:
+   1. If you _creating a Roslyn PR for an IDE analyzer_:
+      1. Please follow the steps at [Contribute docs for 'IDExxxx' rules](https://docs.microsoft.com/contribute/dotnet/dotnet-contribute-code-analysis#contribute-docs-for-idexxxx-rules) to add documentation for IDE analyzers to [dotnet\docs](https://github.com/dotnet/docs) repo.
+      2. Ideally, the documentation PR should be created in parallel to the Roslyn PR or immediately following the approval/merge of Roslyn PR.
+   2. If you are _reviewing a Roslyn PR for an IDE analyzer_:
+      1. Please ensure that the analyzer author is made aware of the above doc contribution requirements, especially if it is a community PR.
+      2. If the documentation PR in is not being created in parallel to the Roslyn PR, please ensure that a [new doc issue](https://github.com/dotnet/docs/issues) is filed in `dotnet/docs` repo to track this work.
+ 
+2. **No action required in Roslyn repo**: Help links have been hooked up to IDE code style analyzers in Roslyn repo in the base analyzer types, so every new IDE analyzer diagnostic ID will automatically have `https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ideXXXX` as its help link. There is no action required on the Roslyn PR to ensure this linking.
+ 
+If you feel any of the existing IDE rule docs have insufficient or incorrect information, please submit a PR to [dotnet\docs](https://github.com/dotnet/docs) repo to update the documentation.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ed1c823c0bd5d..fd7afc8a6e5a6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -7,9 +7,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>4f384ab6a49fc642aec2acc4bcc938172a0744d1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-1.20504.1">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-1.20512.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>88287e9625dd15e0bad4f2a9a33fb5af3b3d0315</Sha>
+      <Sha>53f4d5b526c845d39387f8d2782e6c2bb7301ac9</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index ee3b6b0685764..bd77cdb6c1fca 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,7 +23,7 @@
     </MajorVersion>
     <MinorVersion>
     </MinorVersion>
-    <MicrosoftNetCompilersToolsetVersion>3.9.0-1.20504.1</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetVersion>3.9.0-1.20512.2</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Versions used by several individual references below -->
@@ -57,7 +57,6 @@
     <NuGetVisualStudioContractsVersion>5.7.0</NuGetVisualStudioContractsVersion>
     <!-- This is working around Microsoft.VisualStudio.Shell.15.0 having an unstated conflicting reference on this with NuGet.VisualStudio.Contracts -->
     <MicrosoftVisualStudioRpcContractsVersion>16.7.50</MicrosoftVisualStudioRpcContractsVersion>
-
     <!--
       Since the Microsoft.CodeAnalysis.Analyzers package is a public dependency of our NuGet
       packages we will keep it untied to the RoslynDiagnosticsNugetPackageVersion we use for
diff --git a/src/Analyzers/CSharp/Analyzers/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs
index e79f777a2d475..0b2c2793c14da 100644
--- a/src/Analyzers/CSharp/Analyzers/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs
+++ b/src/Analyzers/CSharp/Analyzers/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs
@@ -11,15 +11,18 @@
 namespace Microsoft.CodeAnalysis.CSharp.RemoveConfusingSuppression
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    internal class CSharpRemoveConfusingSuppressionDiagnosticAnalyzer : AbstractCodeStyleDiagnosticAnalyzer
+    internal sealed class CSharpRemoveConfusingSuppressionDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer
     {
         public CSharpRemoveConfusingSuppressionDiagnosticAnalyzer()
             : base(IDEDiagnosticIds.RemoveConfusingSuppressionForIsExpressionDiagnosticId,
+                   option: null,
                    new LocalizableResourceString(nameof(CSharpAnalyzersResources.Remove_unnecessary_suppression_operator), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
                    new LocalizableResourceString(nameof(CSharpAnalyzersResources.Suppression_operator_has_no_effect_and_can_be_misinterpreted), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
         {
         }
 
+        public override DiagnosticAnalyzerCategory GetAnalyzerCategory() => DiagnosticAnalyzerCategory.SemanticSpanAnalysis;
+
         protected override void InitializeWorker(AnalysisContext context)
             => context.RegisterSyntaxNodeAction(AnalyzeSyntax, SyntaxKind.IsExpression, SyntaxKind.IsPatternExpression);
 
diff --git a/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs
index cbe365ad790b3..aca20279aa343 100644
--- a/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs
@@ -15,7 +15,7 @@
 
 namespace Microsoft.CodeAnalysis.CodeStyle
 {
-    internal abstract class AbstractBuiltInCodeStyleDiagnosticAnalyzer : AbstractCodeStyleDiagnosticAnalyzer, IBuiltInAnalyzer
+    internal abstract partial class AbstractBuiltInCodeStyleDiagnosticAnalyzer
     {
         /// <summary>
         /// Constructor for a code style analyzer with a single diagnostic descriptor and
@@ -40,7 +40,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             LocalizableString? messageFormat = null,
             bool isUnnecessary = false,
             bool configurable = true)
-            : base(diagnosticId, title, messageFormat, isUnnecessary, configurable)
+            : this(diagnosticId, title, messageFormat, isUnnecessary, configurable)
         {
             AddDiagnosticIdToOptionMapping(diagnosticId, option);
         }
@@ -70,7 +70,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             LocalizableString? messageFormat = null,
             bool isUnnecessary = false,
             bool configurable = true)
-            : base(diagnosticId, title, messageFormat, isUnnecessary, configurable)
+            : this(diagnosticId, title, messageFormat, isUnnecessary, configurable)
         {
             AddDiagnosticIdToOptionMapping(diagnosticId, option, language);
         }
@@ -97,7 +97,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             LocalizableString? messageFormat = null,
             bool isUnnecessary = false,
             bool configurable = true)
-            : base(diagnosticId, title, messageFormat, isUnnecessary, configurable)
+            : this(diagnosticId, title, messageFormat, isUnnecessary, configurable)
         {
             RoslynDebug.Assert(options != null);
             Debug.Assert(options.Count > 1);
@@ -128,7 +128,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             LocalizableString? messageFormat = null,
             bool isUnnecessary = false,
             bool configurable = true)
-            : base(diagnosticId, title, messageFormat, isUnnecessary, configurable)
+            : this(diagnosticId, title, messageFormat, isUnnecessary, configurable)
         {
             RoslynDebug.Assert(options != null);
             Debug.Assert(options.Count > 1);
@@ -139,7 +139,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
         /// Constructor for a code style analyzer with a multiple diagnostic descriptors with per-language options that can be used to configure each descriptor.
         /// </summary>
         protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(ImmutableDictionary<DiagnosticDescriptor, IPerLanguageOption> supportedDiagnosticsWithOptions)
-            : base(supportedDiagnosticsWithOptions.Keys.ToImmutableArray())
+            : this(supportedDiagnosticsWithOptions.Keys.ToImmutableArray())
         {
             foreach (var kvp in supportedDiagnosticsWithOptions)
             {
@@ -153,7 +153,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(ImmutableDictionary<Diagnos
         protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             ImmutableDictionary<DiagnosticDescriptor, ILanguageSpecificOption> supportedDiagnosticsWithOptions,
             string language)
-            : base(supportedDiagnosticsWithOptions.Keys.ToImmutableArray())
+            : this(supportedDiagnosticsWithOptions.Keys.ToImmutableArray())
         {
             foreach (var kvp in supportedDiagnosticsWithOptions)
             {
@@ -168,7 +168,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             ImmutableDictionary<DiagnosticDescriptor, ILanguageSpecificOption> supportedDiagnosticsWithLangaugeSpecificOptions,
             ImmutableDictionary<DiagnosticDescriptor, IPerLanguageOption> supportedDiagnosticsWithPerLanguageOptions,
             string language)
-            : base(supportedDiagnosticsWithLangaugeSpecificOptions.Keys.Concat(supportedDiagnosticsWithPerLanguageOptions.Keys).ToImmutableArray())
+            : this(supportedDiagnosticsWithLangaugeSpecificOptions.Keys.Concat(supportedDiagnosticsWithPerLanguageOptions.Keys).ToImmutableArray())
         {
             foreach (var kvp in supportedDiagnosticsWithLangaugeSpecificOptions)
             {
@@ -181,14 +181,6 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             }
         }
 
-        /// <summary>
-        /// Constructor for a code style analyzer with a multiple diagnostic descriptors such that all the descriptors have no unique code style option to configure the descriptors.
-        /// </summary>
-        protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(ImmutableArray<DiagnosticDescriptor> supportedDiagnosticsWithoutOptions)
-            : base(supportedDiagnosticsWithoutOptions)
-        {
-        }
-
         private static void AddDiagnosticIdToOptionMapping(string diagnosticId, IPerLanguageOption? option)
         {
             if (option != null)
diff --git a/src/Analyzers/Core/Analyzers/AbstractCodeStyleDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer_Core.cs
similarity index 77%
rename from src/Analyzers/Core/Analyzers/AbstractCodeStyleDiagnosticAnalyzer.cs
rename to src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer_Core.cs
index 80f3ba8379510..5e6684db0fc75 100644
--- a/src/Analyzers/Core/Analyzers/AbstractCodeStyleDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer_Core.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.CodeAnalysis.CodeStyle
 {
-    internal abstract class AbstractCodeStyleDiagnosticAnalyzer : DiagnosticAnalyzer
+    internal abstract partial class AbstractBuiltInCodeStyleDiagnosticAnalyzer : DiagnosticAnalyzer, IBuiltInAnalyzer
     {
         protected readonly string? DescriptorId;
 
@@ -16,11 +16,11 @@ internal abstract class AbstractCodeStyleDiagnosticAnalyzer : DiagnosticAnalyzer
         protected readonly LocalizableString _localizableTitle;
         protected readonly LocalizableString _localizableMessageFormat;
 
-        protected AbstractCodeStyleDiagnosticAnalyzer(
+        private AbstractBuiltInCodeStyleDiagnosticAnalyzer(
             string descriptorId, LocalizableString title,
-            LocalizableString? messageFormat = null,
-            bool isUnnecessary = false,
-            bool configurable = true)
+            LocalizableString? messageFormat,
+            bool isUnnecessary,
+            bool configurable)
         {
             DescriptorId = descriptorId;
             _localizableTitle = title;
@@ -30,7 +30,10 @@ protected AbstractCodeStyleDiagnosticAnalyzer(
             SupportedDiagnostics = ImmutableArray.Create(Descriptor);
         }
 
-        protected AbstractCodeStyleDiagnosticAnalyzer(ImmutableArray<DiagnosticDescriptor> supportedDiagnostics)
+        /// <summary>
+        /// Constructor for a code style analyzer with a multiple diagnostic descriptors such that all the descriptors have no unique code style option to configure the descriptors.
+        /// </summary>
+        protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(ImmutableArray<DiagnosticDescriptor> supportedDiagnostics)
         {
             SupportedDiagnostics = supportedDiagnostics;
 
@@ -55,6 +58,7 @@ protected static DiagnosticDescriptor CreateDescriptorWithId(
                     DiagnosticSeverity.Hidden,
                     isEnabledByDefault: true,
                     description: description,
+                    helpLinkUri: DiagnosticHelper.GetHelpLinkForDiagnosticId(id),
                     customTags: DiagnosticCustomTags.Create(isUnnecessary, isConfigurable, customTags));
 
         public sealed override void Initialize(AnalysisContext context)
diff --git a/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
index 9aa73658f7515..8dc6e64e2ea73 100644
--- a/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
@@ -59,6 +59,7 @@ protected static DiagnosticDescriptor CreateDescriptor(
                     DiagnosticSeverity.Info,
                     isEnabledByDefault,
                     description,
+                    helpLinkUri: DiagnosticHelper.GetHelpLinkForDiagnosticId(id),
                     customTags: DiagnosticCustomTags.Create(isUnnecessary, isConfigurable, customTags));
     }
 }
diff --git a/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs
index f09595484554d..b5c45b509595b 100644
--- a/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs
@@ -15,15 +15,12 @@ namespace Microsoft.CodeAnalysis.RemoveUnnecessaryParentheses
     internal abstract class AbstractParenthesesDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer
     {
         protected AbstractParenthesesDiagnosticAnalyzer(
-            string descriptorId, LocalizableString title, LocalizableString message)
+            string descriptorId, LocalizableString title, LocalizableString message, bool isUnnecessary = false)
             : base(descriptorId,
                    options: ImmutableHashSet.Create<IPerLanguageOption>(CodeStyleOptions2.ArithmeticBinaryParentheses, CodeStyleOptions2.RelationalBinaryParentheses, CodeStyleOptions2.OtherBinaryParentheses, CodeStyleOptions2.OtherParentheses),
-                   title, message)
-        {
-        }
-
-        protected AbstractParenthesesDiagnosticAnalyzer(ImmutableArray<DiagnosticDescriptor> diagnosticDescriptors)
-            : base(diagnosticDescriptors)
+                   title,
+                   message,
+                   isUnnecessary: isUnnecessary)
         {
         }
 
diff --git a/src/Analyzers/Core/Analyzers/Analyzers.projitems b/src/Analyzers/Core/Analyzers/Analyzers.projitems
index 4bdc2d70b5a2f..34335203d43b7 100644
--- a/src/Analyzers/Core/Analyzers/Analyzers.projitems
+++ b/src/Analyzers/Core/Analyzers/Analyzers.projitems
@@ -15,7 +15,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AbstractCodeQualityDiagnosticAnalyzer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AbstractCodeStyleDiagnosticAnalyzer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AbstractBuiltInCodeStyleDiagnosticAnalyzer_Core.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AbstractParenthesesDiagnosticAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AddAccessibilityModifiers\AbstractAddAccessibilityModifiersDiagnosticAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AddRequiredParentheses\AbstractAddRequiredParenthesesDiagnosticAnalyzer.cs" />
@@ -91,4 +91,4 @@
   <ItemGroup Condition="'$(DefaultLanguageSourceExtension)' != '' AND '$(BuildingInsideVisualStudio)' != 'true'">
     <ExpectedCompile Include="$(MSBuildThisFileDirectory)**\*$(DefaultLanguageSourceExtension)" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Analyzers/Core/Analyzers/Helpers/DiagnosticHelper.cs b/src/Analyzers/Core/Analyzers/Helpers/DiagnosticHelper.cs
index ce75e2141a3de..87908bb9732ee 100644
--- a/src/Analyzers/Core/Analyzers/Helpers/DiagnosticHelper.cs
+++ b/src/Analyzers/Core/Analyzers/Helpers/DiagnosticHelper.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization.Json;
@@ -256,6 +257,19 @@ public static Diagnostic CreateWithMessage(
                 properties);
         }
 
+        public static string GetHelpLinkForDiagnosticId(string id)
+        {
+            if (id == "RE0001")
+            {
+                // TODO: Add documentation for Regex analyzer
+                // Tracked with https://github.com/dotnet/roslyn/issues/48530
+                return null;
+            }
+
+            Debug.Assert(id.StartsWith("IDE", StringComparison.Ordinal));
+            return $"https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/{id.ToLowerInvariant()}";
+        }
+
         public sealed class LocalizableStringWithArguments : LocalizableString, IObjectWritable
         {
             private readonly LocalizableString _messageFormat;
diff --git a/src/Analyzers/Core/Analyzers/RemoveUnnecessaryParentheses/AbstractRemoveUnnecessaryParenthesesDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnnecessaryParentheses/AbstractRemoveUnnecessaryParenthesesDiagnosticAnalyzer.cs
index 4924a35467277..8725b7caa3b0c 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnnecessaryParentheses/AbstractRemoveUnnecessaryParenthesesDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnnecessaryParentheses/AbstractRemoveUnnecessaryParenthesesDiagnosticAnalyzer.cs
@@ -21,18 +21,11 @@ internal abstract class AbstractRemoveUnnecessaryParenthesesDiagnosticAnalyzer<
         where TLanguageKindEnum : struct
         where TParenthesizedExpressionSyntax : SyntaxNode
     {
-
-        /// <summary>
-        /// A diagnostic descriptor used to squiggle and message the span.
-        /// </summary>
-        private static readonly DiagnosticDescriptor s_diagnosticDescriptor = CreateDescriptorWithId(
-                IDEDiagnosticIds.RemoveUnnecessaryParenthesesDiagnosticId,
-                new LocalizableResourceString(nameof(AnalyzersResources.Remove_unnecessary_parentheses), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
-                new LocalizableResourceString(nameof(AnalyzersResources.Parentheses_can_be_removed), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
-                isUnnecessary: true);
-
         protected AbstractRemoveUnnecessaryParenthesesDiagnosticAnalyzer()
-            : base(ImmutableArray.Create(s_diagnosticDescriptor))
+            : base(IDEDiagnosticIds.RemoveUnnecessaryParenthesesDiagnosticId,
+                  new LocalizableResourceString(nameof(AnalyzersResources.Remove_unnecessary_parentheses), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
+                  new LocalizableResourceString(nameof(AnalyzersResources.Parentheses_can_be_removed), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
+                  isUnnecessary: true)
         {
         }
 
@@ -117,7 +110,7 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context)
                 parenthesizedExpression.GetLastToken().GetLocation());
 
             context.ReportDiagnostic(DiagnosticHelper.CreateWithLocationTags(
-                s_diagnosticDescriptor,
+                Descriptor,
                 GetDiagnosticSquiggleLocation(parenthesizedExpression, context.CancellationToken),
                 severity,
                 additionalLocations,
diff --git a/src/CodeStyle/Core/Analyzers/AbstractFormattingAnalyzer.cs b/src/CodeStyle/Core/Analyzers/AbstractFormattingAnalyzer.cs
index dfbdc27beb796..5100ebd0c6b8c 100644
--- a/src/CodeStyle/Core/Analyzers/AbstractFormattingAnalyzer.cs
+++ b/src/CodeStyle/Core/Analyzers/AbstractFormattingAnalyzer.cs
@@ -11,22 +11,26 @@
 namespace Microsoft.CodeAnalysis.CodeStyle
 {
     internal abstract class AbstractFormattingAnalyzer
-        : AbstractCodeStyleDiagnosticAnalyzer
+        : AbstractBuiltInCodeStyleDiagnosticAnalyzer
     {
         protected AbstractFormattingAnalyzer()
             : base(
                 IDEDiagnosticIds.FormattingDiagnosticId,
+                option: null,
                 new LocalizableResourceString(nameof(CodeStyleResources.Fix_formatting), CodeStyleResources.ResourceManager, typeof(CodeStyleResources)),
                 new LocalizableResourceString(nameof(CodeStyleResources.Fix_formatting), CodeStyleResources.ResourceManager, typeof(CodeStyleResources)))
         {
         }
 
-        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+        public sealed override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
             => ImmutableArray.Create(Descriptor);
 
+        public sealed override DiagnosticAnalyzerCategory GetAnalyzerCategory()
+            => DiagnosticAnalyzerCategory.SyntaxTreeWithoutSemanticsAnalysis;
+
         protected abstract ISyntaxFormattingService SyntaxFormattingService { get; }
 
-        protected override void InitializeWorker(AnalysisContext context)
+        protected sealed override void InitializeWorker(AnalysisContext context)
             => context.RegisterSyntaxTreeAction(AnalyzeSyntaxTree);
 
         private void AnalyzeSyntaxTree(SyntaxTreeAnalysisContext context)
diff --git a/src/Compilers/CSharp/Portable/CSharpResources.resx b/src/Compilers/CSharp/Portable/CSharpResources.resx
index cc05a789ad16a..a16c900148417 100644
--- a/src/Compilers/CSharp/Portable/CSharpResources.resx
+++ b/src/Compilers/CSharp/Portable/CSharpResources.resx
@@ -1150,7 +1150,7 @@
     <value>Cannot implicitly convert type '{0}' to '{1}'. An explicit conversion exists (are you missing a cast?)</value>
   </data>
   <data name="ERR_PartialMisplaced" xml:space="preserve">
-    <value>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</value>
+    <value>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</value>
   </data>
   <data name="ERR_ImportedCircularBase" xml:space="preserve">
     <value>Imported type '{0}' is invalid. It contains a circular base type dependency.</value>
diff --git a/src/Compilers/CSharp/Portable/Compiler/ClsComplianceChecker.cs b/src/Compilers/CSharp/Portable/Compiler/ClsComplianceChecker.cs
index 36cae37804896..8a72f6ba66521 100644
--- a/src/Compilers/CSharp/Portable/Compiler/ClsComplianceChecker.cs
+++ b/src/Compilers/CSharp/Portable/Compiler/ClsComplianceChecker.cs
@@ -211,7 +211,7 @@ private void VisitNamespaceMembersAsTasks(NamespaceSymbol symbol)
                     {
                         Visit(m);
                     }
-                    catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                    catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                     {
                         throw ExceptionUtilities.Unreachable;
                     }
diff --git a/src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs b/src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs
index 3c1fa98da84c2..c7596fd0301af 100644
--- a/src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs
+++ b/src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs
@@ -351,7 +351,7 @@ private Task CompileNamespaceAsAsync(NamespaceSymbol symbol)
                     {
                         CompileNamespace(symbol);
                     }
-                    catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                    catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                     {
                         throw ExceptionUtilities.Unreachable;
                     }
@@ -397,7 +397,7 @@ private Task CompileNamedTypeAsync(NamedTypeSymbol symbol)
                     {
                         CompileNamedType(symbol);
                     }
-                    catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                    catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                     {
                         throw ExceptionUtilities.Unreachable;
                     }
diff --git a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
index b96fd1af317dd..944bd62333659 100644
--- a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
+++ b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
@@ -1918,12 +1918,11 @@ internal enum ErrorCode
 
         ERR_InitCannotBeReadonly = 8903,
 
-        ERR_FunctionPointersCannotBeCalledWithNamedArguments = 8904,
+        ERR_UnexpectedVarianceStaticMember = 8904,
+        ERR_FunctionPointersCannotBeCalledWithNamedArguments = 8905,
 
         #endregion diagnostics introduced for C# 9.0
 
-        ERR_UnexpectedVarianceStaticMember = 9100,
-
         // Note: you will need to re-generate compiler code after adding warnings (eng\generate-compiler-code.cmd)
     }
 }
diff --git a/src/Compilers/CSharp/Portable/Parser/SyntaxParser.cs b/src/Compilers/CSharp/Portable/Parser/SyntaxParser.cs
index fee63b5c1d856..bf5a3fa945869 100644
--- a/src/Compilers/CSharp/Portable/Parser/SyntaxParser.cs
+++ b/src/Compilers/CSharp/Portable/Parser/SyntaxParser.cs
@@ -152,8 +152,19 @@ protected ResetPoint GetResetPoint()
 
         protected void Reset(ref ResetPoint point)
         {
-            _mode = point.Mode;
             var offset = point.Position - _firstToken;
+            Debug.Assert(offset >= 0);
+
+            if (offset >= _tokenCount)
+            {
+                // Re-fetch tokens to the position in the reset point
+                PeekToken(offset - _tokenOffset);
+
+                // Re-calculate new offset in case tokens got shifted to the left while we were peeking. 
+                offset = point.Position - _firstToken;
+            }
+
+            _mode = point.Mode;
             Debug.Assert(offset >= 0 && offset < _tokenCount);
             _tokenOffset = offset;
             _currentToken = null;
diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/MetadataDecoder.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/MetadataDecoder.cs
index 407c74405ab54..c6f5a51b451c4 100644
--- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/MetadataDecoder.cs
+++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/MetadataDecoder.cs
@@ -139,7 +139,7 @@ protected override TypeSymbol LookupTopLevelTypeDefSymbol(
             {
                 return assembly.LookupTopLevelMetadataType(ref emittedName, digThroughForwardedTypes: true);
             }
-            catch (Exception e) when (FatalError.Report(e)) // Trying to get more useful Watson dumps.
+            catch (Exception e) when (FatalError.ReportAndPropagate(e)) // Trying to get more useful Watson dumps.
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
index 997c8a5447f31..1b08bea163e75 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">Modifikátor partial se smí objevit jenom bezprostředně před klíčovým slovem class, struct, interface nebo void.</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
index b8d8af61982ef..1271236f7c759 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">Der "partial"-Modifizierer kann nur unmittelbar vor "class", "struct", "interface" oder "void" verwendet werden.</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
index 0c6defc759eaf..a86699ad0f0dc 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">El modificador 'partial' solo puede aparecer inmediatamente antes de 'class', 'struct', 'interface' o 'void'</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
index ae0e77fd04077..acae940691fea 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">Le modificateur 'partial' ne peut apparaître qu'immédiatement avant 'class', 'struct', 'interface' ou 'void'</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf
index f2e55d1954733..fe94118edeacd 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">Il modificatore 'partial' può trovarsi solo immediatamente prima di 'class', 'struct', 'interface' o 'void'</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf
index aaad9d29d0988..0d740374ec4ce 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">partial' 修飾子は、'class'、'struct'、'interface'、または 'void' の直前にのみ指定できます</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf
index 73c02193237e0..81d72599f9960 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">partial' 한정자는 'class', 'struct', 'interface' 또는 'void' 바로 앞에만 올 수 있습니다.</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf
index 5244a0bd172bb..fdee53439e9f0 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">Modyfikator „partial” może się pojawić tylko bezpośrednio przed typem „class”, „struct”, „interface” lub „void”</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf
index 2152a0a213e07..60aa0487f8cfe 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf
@@ -4105,7 +4105,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">O modificador 'partial' só pode aparecer imediatamente antes de 'class', 'struct', 'interface' ou 'void'</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf
index 19d831daf2730..b04a28eca4481 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">Модификатор "partial" может использоваться только перед "class", "struct", "interface" или "void".</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf
index 0c265f649f34d..dd8af0ad975cc 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">partial' değiştiricisi yalnızca 'class', 'struct', 'interface' veya 'void' sözcüklerinden hemen önce gelebilir</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf
index c4dd6456e973f..9482458c825d5 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">"partial" 修饰符的后面只能紧跟 "class"、"struct"、"interface" 或 "void"</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf
index e1ab9f224a25f..8159c1043e02e 100644
--- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf
+++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf
@@ -4107,7 +4107,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ERR_PartialMisplaced">
-        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'</source>
+        <source>The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.</source>
         <target state="needs-review-translation">partial' 修飾元只可緊接在 'class'、'struct'、'interface' 或 'void' 之前。</target>
         <note />
       </trans-unit>
diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs
index 36dc81997c639..ce8e075d27c6f 100644
--- a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs
@@ -23881,7 +23881,7 @@ partial public record C  // CS0267
 ";
 
             CreateCompilation(test).VerifyDiagnostics(
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial public class C  // CS0267
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1));
         }
diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs
index 9094162100b39..ef09ec26c44b6 100644
--- a/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs
@@ -8604,5 +8604,78 @@ public void Span_02()
                 Diagnostic(ErrorCode.ERR_EscapeLocal, "inner").WithArguments("inner").WithLocation(7, 13)
                 );
         }
+
+        [Fact]
+        [WorkItem(1179569, "https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1179569")]
+        public void Issue1179569()
+        {
+            var text1 =
+@"Task v0123456789012345678901234567()
+{
+    Console.Write(""start v0123456789012345678901234567"");
+    await Task.Delay(2 * 1000);
+    Console.Write(""end v0123456789012345678901234567"");
+}
+
+Task On01234567890123456()
+{
+    return v0123456789012345678901234567();
+}
+
+string
+
+return Task.WhenAll(
+    Task.WhenAll(this.c01234567890123456789012345678.Select(v01234567 => On01234567890123456(v01234567))),
+    Task.WhenAll(this.c01234567890123456789.Select(v01234567 => v01234567.U0123456789012345678901234())));
+";
+
+            var oldTree = Parse(text: text1, options: TestOptions.RegularDefault);
+
+            var text2 =
+@"Task v0123456789012345678901234567()
+{
+    Console.Write(""start v0123456789012345678901234567"");
+    await Task.Delay(2 * 1000);
+    Console.Write(""end v0123456789012345678901234567"");
+}
+
+Task On01234567890123456()
+{
+    return v0123456789012345678901234567();
+}
+
+string[
+
+return Task.WhenAll(
+    Task.WhenAll(this.c01234567890123456789012345678.Select(v01234567 => On01234567890123456(v01234567))),
+    Task.WhenAll(this.c01234567890123456789.Select(v01234567 => v01234567.U0123456789012345678901234())));
+";
+
+            var newText = Microsoft.CodeAnalysis.Text.StringText.From(text2, System.Text.Encoding.UTF8);
+            using var lexer = new Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax.Lexer(newText, TestOptions.RegularDefault);
+            using var parser = new Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax.LanguageParser(lexer,
+                                       (CSharpSyntaxNode)oldTree.GetRoot(), new[] { new Microsoft.CodeAnalysis.Text.TextChangeRange(new Microsoft.CodeAnalysis.Text.TextSpan(282, 0), 1) });
+
+            var compilationUnit = (CompilationUnitSyntax)parser.ParseCompilationUnit().CreateRed();
+            var tree = CSharpSyntaxTree.Create(compilationUnit, TestOptions.RegularDefault, encoding: System.Text.Encoding.UTF8);
+            Assert.Equal(text2, tree.GetText().ToString());
+            tree.VerifySource();
+
+            var fullParseTree = Parse(text: text2, options: TestOptions.RegularDefault);
+            var nodes1 = tree.GetRoot().DescendantNodesAndTokensAndSelf(descendIntoTrivia: true).ToArray();
+            var nodes2 = fullParseTree.GetRoot().DescendantNodesAndTokensAndSelf(descendIntoTrivia: true).ToArray();
+            Assert.Equal(nodes1.Length, nodes2.Length);
+
+            for (int i = 0; i < nodes1.Length; i++)
+            {
+                var node1 = nodes1[i];
+                var node2 = nodes2[i];
+                Assert.Equal(node1.RawKind, node2.RawKind);
+                Assert.Equal(node1.Span, node2.Span);
+                Assert.Equal(node1.FullSpan, node2.FullSpan);
+                Assert.Equal(node1.ToString(), node2.ToString());
+                Assert.Equal(node1.ToFullString(), node2.ToFullString());
+            }
+        }
     }
 }
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
index bf73c1516584a..ff711d95762fe 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
@@ -9465,7 +9465,7 @@ void M3()
                 // (10,27): error CS0762: Cannot create delegate from method 'I1.M2()' because it is a partial method without an implementing declaration
                 //         new System.Action(M2).Invoke();
                 Diagnostic(ErrorCode.ERR_PartialMethodToDelegate, "M2").WithArguments("I1.M2()").WithLocation(10, 27),
-                // (13,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (13,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial static void M4();
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(13, 5)
                 );
@@ -38726,10 +38726,10 @@ interface I19
                 // (62,20): error CS0106: The modifier 'virtual' is not valid for this item
                 //     virtual static I13() => throw null;
                 Diagnostic(ErrorCode.ERR_BadMemberFlag, "I13").WithArguments("virtual").WithLocation(62, 20),
-                // (66,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (66,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial static I14();
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(66, 5),
-                // (66,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (66,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial static I14();
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(66, 5),
                 // (70,12): error CS0246: The type or namespace name 'partial' could not be found (are you missing a using directive or an assembly reference?)
@@ -38741,10 +38741,10 @@ interface I19
                 // (70,20): error CS0542: 'I15': member names cannot be the same as their enclosing type
                 //     static partial I15();
                 Diagnostic(ErrorCode.ERR_MemberNameSameAsType, "I15").WithArguments("I15").WithLocation(70, 20),
-                // (74,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (74,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial static I16() {}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(74, 5),
-                // (74,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (74,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial static I16() {}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(74, 5),
                 // (78,12): error CS0246: The type or namespace name 'partial' could not be found (are you missing a using directive or an assembly reference?)
@@ -59277,10 +59277,10 @@ interface I2<out T1, in T2>
                                                  parseOptions: TestOptions.Regular8,
                                                  targetFramework: TargetFramework.NetStandardLatest);
             compilation1.VerifyDiagnostics(
-                // (15,12): error CS9100: Invalid variance: The type parameter 'T1' must be invariantly valid on 'I2<T1, T2>.P1' unless language version 'preview' or greater is used. 'T1' is covariant.
+                // (15,12): error CS8904: Invalid variance: The type parameter 'T1' must be invariantly valid on 'I2<T1, T2>.P1' unless language version 'preview' or greater is used. 'T1' is covariant.
                 //     static T1 P1 { get; set; }
                 Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T1").WithArguments("I2<T1, T2>.P1", "T1", "covariant", "invariantly", "preview").WithLocation(15, 12),
-                // (16,12): error CS9100: Invalid variance: The type parameter 'T2' must be invariantly valid on 'I2<T1, T2>.P2' unless language version 'preview' or greater is used. 'T2' is contravariant.
+                // (16,12): error CS8904: Invalid variance: The type parameter 'T2' must be invariantly valid on 'I2<T1, T2>.P2' unless language version 'preview' or greater is used. 'T2' is contravariant.
                 //     static T2 P2 { get; set; }
                 Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T2").WithArguments("I2<T1, T2>.P2", "T2", "contravariant", "invariantly", "preview").WithLocation(16, 12)
                 );
@@ -59323,10 +59323,10 @@ interface I2<out T1, in T2>
                                                  parseOptions: TestOptions.Regular8,
                                                  targetFramework: TargetFramework.NetStandardLatest);
             compilation1.VerifyDiagnostics(
-                // (13,18): error CS9100: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2<T1, T2>.M1(T1)' unless language version 'preview' or greater is used. 'T1' is covariant.
+                // (13,18): error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2<T1, T2>.M1(T1)' unless language version 'preview' or greater is used. 'T1' is covariant.
                 //     static T1 M1(T1 x) => x;
                 Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T1").WithArguments("I2<T1, T2>.M1(T1)", "T1", "covariant", "contravariantly", "preview").WithLocation(13, 18),
-                // (14,12): error CS9100: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2<T1, T2>.M2(T2)' unless language version 'preview' or greater is used. 'T2' is contravariant.
+                // (14,12): error CS8904: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2<T1, T2>.M2(T2)' unless language version 'preview' or greater is used. 'T2' is contravariant.
                 //     static T2 M2(T2 x) => x;
                 Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T2").WithArguments("I2<T1, T2>.M2(T2)", "T2", "contravariant", "covariantly", "preview").WithLocation(14, 12)
                 );
@@ -59391,10 +59391,10 @@ static T3 Print<T3>(T3 x)
                                                  parseOptions: TestOptions.Regular8,
                                                  targetFramework: TargetFramework.NetStandardLatest);
             compilation1.VerifyDiagnostics(
-                // (24,53): error CS9100: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2<T1, T2>.E1' unless language version 'preview' or greater is used. 'T1' is covariant.
+                // (24,53): error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2<T1, T2>.E1' unless language version 'preview' or greater is used. 'T1' is covariant.
                 //     static event System.Action<System.Func<T1, T1>> E1;
                 Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "E1").WithArguments("I2<T1, T2>.E1", "T1", "covariant", "contravariantly", "preview").WithLocation(24, 53),
-                // (25,53): error CS9100: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2<T1, T2>.E2' unless language version 'preview' or greater is used. 'T2' is contravariant.
+                // (25,53): error CS8904: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2<T1, T2>.E2' unless language version 'preview' or greater is used. 'T2' is contravariant.
                 //     static event System.Action<System.Func<T2, T2>> E2;
                 Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "E2").WithArguments("I2<T1, T2>.E2", "T2", "contravariant", "covariantly", "preview").WithLocation(25, 53)
                 );
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/RecordTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/RecordTests.cs
index 8aeafb1e40531..a57c3c59e78f4 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/RecordTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/RecordTests.cs
@@ -1220,7 +1220,7 @@ partial public record C
 }
 ";
             CreateCompilation(src).VerifyDiagnostics(
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial public record C
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1)
                 );
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
index 01d0e3a9ca9ee..f24c2b20a0abb 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
@@ -13685,13 +13685,13 @@ partial int this[int index]
 ";
             var comp = CreateCompilation(text);
             comp.VerifyDiagnostics(
-                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial int f;
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(4, 5),
-                // (5,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (5,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial object P { get { return null; } }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(5, 5),
-                // (6,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (6,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial int this[int index]
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(6, 5),
                 // (4,17): warning CS0169: The field 'C.f' is never used
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/UserDefinedOperatorErrorTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/UserDefinedOperatorErrorTests.cs
index f3a62513bfd7e..e1bb171219fb6 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/UserDefinedOperatorErrorTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/UserDefinedOperatorErrorTests.cs
@@ -194,10 +194,10 @@ partial class C
 
             var comp = CreateCompilation(text);
             comp.VerifyDiagnostics(
-                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial public static int operator + (C c1, C c2) { return 0; }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(4, 5),
-                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial public static int operator + (C c1, C c2) { return 0; }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(4, 5),
                 // (5,34): error CS0106: The modifier 'abstract' is not valid for this item
diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/DeclarationParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/DeclarationParsingTests.cs
index 189ea44c05158..a4ba2feca2bae 100644
--- a/src/Compilers/CSharp/Test/Syntax/Parsing/DeclarationParsingTests.cs
+++ b/src/Compilers/CSharp/Test/Syntax/Parsing/DeclarationParsingTests.cs
@@ -5726,10 +5726,10 @@ public void TestPartialEnum()
         {
             var text = @"partial enum E{}";
             CreateCompilationWithMscorlib45(text).VerifyDiagnostics(
-                // (1,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (1,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial enum E{}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(1, 1),
-                // (1,14): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (1,14): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial enum E{}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "E").WithLocation(1, 14));
         }
diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserErrorMessageTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserErrorMessageTests.cs
index 8955d140435e2..d852b27ddb69f 100644
--- a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserErrorMessageTests.cs
+++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserErrorMessageTests.cs
@@ -609,7 +609,7 @@ public static int Main ()
 ";
 
             CreateCompilation(test).VerifyDiagnostics(
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial public class C  // CS0267
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1));
         }
@@ -622,10 +622,10 @@ partial enum E { }
 ";
 
             CreateCompilation(test).VerifyDiagnostics(
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial enum E { }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1),
-                // (2,14): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,14): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial enum E { }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "E").WithLocation(2, 14));
         }
@@ -639,7 +639,7 @@ partial delegate E { }
 
             // Extra errors
             CreateCompilation(test, options: TestOptions.DebugExe, parseOptions: TestOptions.Regular9).VerifyDiagnostics(
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial delegate E { }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1),
                 // (2,20): error CS1001: Identifier expected
@@ -657,7 +657,7 @@ partial delegate E { }
                 // (2,20): error CS8803: Top-level statements must precede namespace and type declarations.
                 // partial delegate E { }
                 Diagnostic(ErrorCode.ERR_TopLevelStatementAfterNamespaceOrType, "{ }").WithLocation(2, 20),
-                // (2,20): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,20): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial delegate E { }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "").WithLocation(2, 20),
                 // (2,18): error CS0246: The type or namespace name 'E' could not be found (are you missing a using directive or an assembly reference?)
@@ -674,10 +674,10 @@ public void CS0267ERR_PartialMisplaced_Delegate2()
 
             // Extra errors
             CreateCompilation(test).VerifyDiagnostics(
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial delegate void E();
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1),
-                // (2,23): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,23): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial delegate void E();
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "E").WithLocation(2, 23));
         }
diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs
index c16cdbc045c65..189943c013712 100644
--- a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs
+++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs
@@ -33,10 +33,10 @@ partial abstract struct S {}
     partial abstract struct S {}
 }");
             comp.VerifyDiagnostics(
-                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (4,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial abstract class A {}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(4, 5),
-                // (5,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (5,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial abstract class A {}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(5, 5),
                 // (7,13): error CS1525: Invalid expression term 'partial'
@@ -51,10 +51,10 @@ partial abstract struct S {}
                 // (8,13): error CS1002: ; expected
                 //     partial partial class B {}
                 Diagnostic(ErrorCode.ERR_SemicolonExpected, "partial").WithLocation(8, 13),
-                // (10,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (10,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial abstract struct S {}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(10, 5),
-                // (11,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (11,5): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 //     partial abstract struct S {}
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(11, 5),
                 // (10,29): error CS0106: The modifier 'abstract' is not valid for this item
diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ScriptParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ScriptParsingTests.cs
index 880b0bae89de7..93d5b99c954fb 100644
--- a/src/Compilers/CSharp/Test/Syntax/Parsing/ScriptParsingTests.cs
+++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ScriptParsingTests.cs
@@ -1952,10 +1952,10 @@ public void EnumDeclaration()
 partial enum en {};
 ";
             CreateCompilation(test).VerifyDiagnostics(
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial enum en {};
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1),
-                // (2,14): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,14): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial enum en {};
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "en").WithLocation(2, 14));
         }
diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs
index 25a96c881a617..6e19aea99dcec 100644
--- a/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs
+++ b/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs
@@ -938,7 +938,7 @@ public void CS0267ERR_PartialMisplaced_Delegate1()
 partial delegate E { }
 ";
             UsingTree(test,
-                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or 'void'
+                // (2,1): error CS0267: The 'partial' modifier can only appear immediately before 'class', 'record', 'struct', 'interface', or a method return type.
                 // partial delegate E { }
                 Diagnostic(ErrorCode.ERR_PartialMisplaced, "partial").WithLocation(2, 1),
                 // (2,20): error CS1001: Identifier expected
diff --git a/src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs b/src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs
index 63ec173c9b74f..840f48bf76577 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs
@@ -5,18 +5,27 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Test.Utilities;
 using Xunit;
-using System.Collections.Generic;
+using Xunit.Abstractions;
 
 namespace Microsoft.CodeAnalysis.UnitTests
 {
     public class TextChangeTests
     {
+        private readonly ITestOutputHelper _output;
+
+        public TextChangeTests(ITestOutputHelper output)
+        {
+            _output = output;
+        }
+
         [Fact]
         public void TestSubTextStart()
         {
@@ -803,6 +812,19 @@ public void TestMergeChanges_SameStart_AndBothHaveDeletion_NewDeletionSmallerTha
             Assert.Equal(new[] { new TextChange(new TextSpan(1, 3), "bba") }, changes);
         }
 
+        [Fact]
+        [WorkItem(39405, "https://github.com/dotnet/roslyn/issues/39405")]
+        public void TestMergeChanges_NewDeletionLargerThanOld()
+        {
+            var original = SourceText.From("01234");
+            var change1 = original.WithChanges(new TextChange(new TextSpan(1, 3), "aa"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(1, 3), "bb"));
+
+            var changes = change2.GetTextChanges(original);
+            Assert.Equal("0aa4", change1.ToString());
+            Assert.Equal("0bb", change2.ToString());
+        }
+
         [Fact]
         public void TestMergeChanges_AfterAdjacent()
         {
@@ -904,12 +926,318 @@ public void TestMergeChanges_IntegrationTestCase1()
                 new TextChangeRange(new TextSpan(919, 10), 468),
                 new TextChangeRange(new TextSpan(936, 33), 33),
                 new TextChangeRange(new TextSpan(1098, 0), 70),
-                new TextChangeRange(new TextSpan(1125, 4), 34),
-                new TextChangeRange(new TextSpan(1134, 0), 4),
+                new TextChangeRange(new TextSpan(1125, 4), 38),
                 new TextChangeRange(new TextSpan(1138, 0), 47));
             Assert.Equal<TextChangeRange>(expected, merged);
         }
 
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void DebuggerDisplay()
+        {
+            Assert.Equal("new TextChange(new TextSpan(0, 0), null)", default(TextChange).GetDebuggerDisplay());
+            Assert.Equal("new TextChange(new TextSpan(0, 1), \"abc\")", new TextChange(new TextSpan(0, 1), "abc").GetDebuggerDisplay());
+            Assert.Equal("new TextChange(new TextSpan(0, 1), (NewLength = 10))", new TextChange(new TextSpan(0, 1), "0123456789").GetDebuggerDisplay());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz()
+        {
+            var random = new Random();
+
+            // Adjust upper bound as needed to generate a simpler reproducer for an error scenario
+            var originalText = SourceText.From(string.Join("", Enumerable.Range(0, random.Next(10))));
+
+            for (var iteration = 0; iteration < 100000; iteration++)
+            {
+                var editedLength = originalText.Length;
+                ArrayBuilder<TextChange> oldChangesBuilder = ArrayBuilder<TextChange>.GetInstance();
+
+                // Adjust as needed to get a simpler error reproducer.
+                var oldMaxInsertLength = originalText.Length * 2;
+                const int maxSkipLength = 2;
+                // generate sequence of "old edits" which meet invariants
+                for (int i = 0; i < originalText.Length; i += random.Next(maxSkipLength))
+                {
+                    var newText = string.Join("", Enumerable.Repeat('a', random.Next(oldMaxInsertLength)));
+                    var newChange = new TextChange(new TextSpan(i, length: random.Next(originalText.Length - i)), newText);
+                    i = newChange.Span.End;
+
+                    editedLength = editedLength - newChange.Span.Length + newChange.NewText.Length;
+                    oldChangesBuilder.Add(newChange);
+
+                    // Adjust as needed to generate a simpler reproducer for an error scenario
+                    if (oldChangesBuilder.Count == 5) break;
+                }
+
+                var change1 = originalText.WithChanges(oldChangesBuilder);
+
+                ArrayBuilder<TextChange> newChangesBuilder = ArrayBuilder<TextChange>.GetInstance();
+
+                // Adjust as needed to get a simpler error reproducer.
+                var newMaxInsertLength = editedLength * 2;
+                // generate sequence of "new edits" which meet invariants
+                for (int i = 0; i < editedLength; i += random.Next(maxSkipLength))
+                {
+                    var newText = string.Join("", Enumerable.Repeat('b', random.Next(newMaxInsertLength)));
+                    var newChange = new TextChange(new TextSpan(i, length: random.Next(editedLength - i)), newText);
+                    i = newChange.Span.End;
+
+                    newChangesBuilder.Add(newChange);
+
+                    // Adjust as needed to generate a simpler reproducer for an error scenario
+                    if (newChangesBuilder.Count == 5) break;
+                }
+
+                var change2 = change1.WithChanges(newChangesBuilder);
+                try
+                {
+                    var textChanges = change2.GetTextChanges(originalText);
+                    Assert.Equal(originalText.WithChanges(textChanges).ToString(), change2.ToString());
+                }
+                catch
+                {
+                    _output.WriteLine($@"
+    [Fact]
+    public void Fuzz_{iteration}()
+    {{
+        var originalText = SourceText.From(""{originalText}"");
+        var change1 = originalText.WithChanges({string.Join(", ", oldChangesBuilder.Select(c => c.GetDebuggerDisplay()))});
+        var change2 = change1.WithChanges({string.Join(", ", newChangesBuilder.Select(c => c.GetDebuggerDisplay()))});
+        Assert.Equal(""{change1}"", change1.ToString()); // double-check for correctness
+        Assert.Equal(""{change2}"", change2.ToString()); // double-check for correctness
+
+        var changes = change2.GetTextChanges(originalText);
+        Assert.Equal(""{change2}"", originalText.WithChanges(changes).ToString());
+    }}
+");
+                    throw;
+                }
+                finally
+                {
+                    // we delay freeing so that if we need to debug the fuzzer
+                    // it's easier to see what changes were introduced at each stage.
+                    oldChangesBuilder.Free();
+                    newChangesBuilder.Free();
+                }
+            }
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_0()
+        {
+            var originalText = SourceText.From("01234");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 2), "a"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 2), "bb"));
+            Assert.Equal("a234", change1.ToString());
+            Assert.Equal("bb34", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("bb34", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_1()
+        {
+            var original = SourceText.From("01234");
+            var change1 = original.WithChanges(new TextChange(new TextSpan(0, 0), "aa"), new TextChange(new TextSpan(1, 1), "aa"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 1), "b"), new TextChange(new TextSpan(2, 2), ""));
+
+            var changes = change2.GetTextChanges(original);
+            Assert.Equal("aa0aa234", change1.ToString());
+            Assert.Equal("baa234", change2.ToString());
+            Assert.Equal(change2.ToString(), original.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_2()
+        {
+            var originalText = SourceText.From("01234");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 0), "a"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 2), ""), new TextChange(new TextSpan(2, 0), "bb"));
+            Assert.Equal("a01234", change1.ToString());
+            Assert.Equal("bb1234", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("bb1234", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_3()
+        {
+            var originalText = SourceText.From("01234");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 1), "aa"), new TextChange(new TextSpan(3, 1), "aa"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 0), "bbb"));
+            Assert.Equal("aa12aa4", change1.ToString());
+            Assert.Equal("bbbaa12aa4", change2.ToString());
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("bbbaa12aa4", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_4()
+        {
+            var originalText = SourceText.From("012345");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 3), "a"), new TextChange(new TextSpan(5, 0), "aaa"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 2), ""), new TextChange(new TextSpan(3, 1), "bb"));
+            Assert.Equal("a34aaa5", change1.ToString());
+            Assert.Equal("4bbaa5", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("4bbaa5", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_7()
+        {
+            var originalText = SourceText.From("01234567");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 1), "aaaaa"), new TextChange(new TextSpan(3, 1), "aaaa"), new TextChange(new TextSpan(6, 1), "aaaaa"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 0), "b"), new TextChange(new TextSpan(2, 0), "b"), new TextChange(new TextSpan(3, 4), "bbbbb"), new TextChange(new TextSpan(9, 5), "bbbbb"), new TextChange(new TextSpan(15, 3), ""));
+            Assert.Equal("aaaaa12aaaa45aaaaa7", change1.ToString());
+            Assert.Equal("baababbbbbaabbbbba7", change2.ToString());
+
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("baababbbbbaabbbbba7", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_10()
+        {
+            var originalText = SourceText.From("01234");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 1), "a"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 1), "b"), new TextChange(new TextSpan(2, 2), "b"));
+            Assert.Equal("a1234", change1.ToString());
+            Assert.Equal("b1b4", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("b1b4", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_23()
+        {
+            var originalText = SourceText.From("01234");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 1), "aa"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 0), "b"), new TextChange(new TextSpan(1, 2), "b"));
+            Assert.Equal("aa1234", change1.ToString());
+            Assert.Equal("bab234", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("bab234", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_32()
+        {
+            var originalText = SourceText.From("012345");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 2), "a"), new TextChange(new TextSpan(3, 2), "a"));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 3), "bbb"));
+            Assert.Equal("a2a5", change1.ToString());
+            Assert.Equal("bbb5", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("bbb5", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_39()
+        {
+            var originalText = SourceText.From("0123456");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 4), ""), new TextChange(new TextSpan(5, 1), ""));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 1), ""), new TextChange(new TextSpan(1, 0), ""));
+            Assert.Equal("46", change1.ToString());
+            Assert.Equal("6", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("6", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_55()
+        {
+            var originalText = SourceText.From("012345");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 2), ""), new TextChange(new TextSpan(3, 1), ""), new TextChange(new TextSpan(4, 0), ""), new TextChange(new TextSpan(4, 0), ""), new TextChange(new TextSpan(4, 0), ""));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 1), ""), new TextChange(new TextSpan(1, 1), ""), new TextChange(new TextSpan(2, 0), ""));
+            Assert.Equal("245", change1.ToString());
+            Assert.Equal("5", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("5", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(47234, "https://github.com/dotnet/roslyn/issues/47234")]
+        public void Fuzz_110()
+        {
+            var originalText = SourceText.From("01234");
+            var change1 = originalText.WithChanges(new TextChange(new TextSpan(0, 1), ""), new TextChange(new TextSpan(2, 1), ""));
+            var change2 = change1.WithChanges(new TextChange(new TextSpan(0, 0), ""), new TextChange(new TextSpan(1, 1), ""));
+            Assert.Equal("134", change1.ToString());
+            Assert.Equal("14", change2.ToString());
+
+            var changes = change2.GetTextChanges(originalText);
+            Assert.Equal("14", originalText.WithChanges(changes).ToString());
+        }
+
+        [Fact]
+        [WorkItem(41413, "https://github.com/dotnet/roslyn/issues/41413")]
+        public void GetTextChanges_NonOverlappingSpans()
+        {
+            var content = @"@functions{
+    public class Foo
+    {
+void Method()
+{
+    
+}
+    }
+}";
+
+            var text = SourceText.From(content);
+            var edits1 = new TextChange[]
+            {
+                new TextChange(new TextSpan(39, 0), "    "),
+                new TextChange(new TextSpan(42, 0), "            "),
+                new TextChange(new TextSpan(57, 0), "            "),
+                new TextChange(new TextSpan(58, 0), "\r\n"),
+                new TextChange(new TextSpan(64, 2), "        "),
+                new TextChange(new TextSpan(69, 0), "    "),
+            };
+            var changedText = text.WithChanges(edits1);
+
+            var edits2 = new TextChange[]
+            {
+                new TextChange(new TextSpan(35, 4), string.Empty),
+                new TextChange(new TextSpan(46, 4), string.Empty),
+                new TextChange(new TextSpan(73, 4), string.Empty),
+                new TextChange(new TextSpan(88, 0), "    "),
+                new TextChange(new TextSpan(90, 4), string.Empty),
+                new TextChange(new TextSpan(105, 4), string.Empty),
+            };
+            var changedText2 = changedText.WithChanges(edits2);
+
+            var changes = changedText2.GetTextChanges(text);
+
+            var position = 0;
+            foreach (var change in changes)
+            {
+                Assert.True(position <= change.Span.Start);
+                position = change.Span.End;
+            }
+        }
         private SourceText GetChangesWithoutMiddle(
             SourceText original,
             Func<SourceText, SourceText> fnChange1,
diff --git a/src/Compilers/Core/Portable/Compilation/SemanticModel.cs b/src/Compilers/Core/Portable/Compilation/SemanticModel.cs
index 0b9d2b57fd486..d7c7447a81c1b 100644
--- a/src/Compilers/Core/Portable/Compilation/SemanticModel.cs
+++ b/src/Compilers/Core/Portable/Compilation/SemanticModel.cs
@@ -78,7 +78,7 @@ public SyntaxTree SyntaxTree
             {
                 return GetOperationCore(node, cancellationToken);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // Log a Non-fatal-watson and then ignore the crash in the attempt of getting operation
                 Debug.Assert(false, "\n" + e.ToString());
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.cs
index aeb5a6ab3d9d9..ffc3c5095af0b 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.cs
@@ -122,7 +122,7 @@ public async Task OnCompilationEventsGeneratedAsync(
                     OnCompilationEventsGenerated_NoLock(getCompilationEvents(eventQueue, additionalFiles));
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
index e0ee25c5c9f75..14f2380c9dfdc 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
@@ -1407,7 +1407,7 @@ private async Task ProcessCompilationEventsAsync(AnalysisScope analysisScope, An
                     await ProcessEventAsync(completedEvent, analysisScope, analysisState, cancellationToken).ConfigureAwait(false);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -1466,7 +1466,7 @@ private async Task ProcessCompilationEventsAsync(AnalysisScope analysisScope, An
 
                 return completedEvent;
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -2686,7 +2686,7 @@ ImmutableArray<IOperation> getOperationsToAnalyzeWithStackGuard(ImmutableArray<I
                 {
                     return GetOperationsToAnalyze(operationBlocksToAnalyze);
                 }
-                catch (Exception ex) when (ex is InsufficientExecutionStackException || FatalError.ReportWithoutCrashUnlessCanceled(ex))
+                catch (Exception ex) when (ex is InsufficientExecutionStackException || FatalError.ReportAndCatchUnlessCanceled(ex))
                 {
                     // the exception filter will short-circuit if `ex` is `InsufficientExecutionStackException` (from OperationWalker)
                     // and no non-fatal-watson will be logged as a result.
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs
index de96565487343..6ea7917e679f1 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs
@@ -1665,7 +1665,7 @@ private static string CreateDisablingMessage(DiagnosticAnalyzer analyzer)
                     diagnosticIds = diagnosticIds.Add(diagnostic.Id);
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 // Intentionally empty
             }
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/CompilationWithAnalyzers.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/CompilationWithAnalyzers.cs
index 1e98d611aea92..cdcbc5375849f 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/CompilationWithAnalyzers.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/CompilationWithAnalyzers.cs
@@ -593,7 +593,7 @@ private async Task ComputeAnalyzerSyntaxDiagnosticsAsync(AnalysisScope analysisS
                     await ComputeAnalyzerDiagnosticsAsync(pendingAnalysisScope, getPendingEventsOpt: null, taskToken, cancellationToken).ConfigureAwait(false);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -698,7 +698,7 @@ private async Task ComputeAnalyzerSemanticDiagnosticsAsync(SemanticModel model,
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -829,7 +829,7 @@ await Task.WhenAll(partialTrees.Select(tree =>
                                                 FreeEventQueue(eventQueue, _eventQueuePool);
                                             }
                                         }
-                                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                                         {
                                             throw ExceptionUtilities.Unreachable;
                                         }
@@ -868,7 +868,7 @@ await Task.WhenAll(partialTrees.Select(tree =>
                     FreeDriver(driver);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -962,7 +962,7 @@ private async Task<AnalyzerDriver> GetAnalyzerDriverAsync(CancellationToken canc
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -1009,7 +1009,7 @@ private async Task ComputeAnalyzerDiagnosticsCoreAsync(AnalyzerDriver driver, As
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -1137,7 +1137,7 @@ private async Task<Task> SetActiveTreeAnalysisTaskAsync(Func<Tuple<Task, Cancell
                     await WaitForExecutingTaskAsync(executingTreeTask.Item1).ConfigureAwait(false);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -1344,7 +1344,7 @@ public async Task<AnalyzerTelemetryInfo> GetAnalyzerTelemetryInfoAsync(Diagnosti
                 var executionTime = GetAnalyzerExecutionTime(analyzer);
                 return new AnalyzerTelemetryInfo(actionCounts, suppressionActionCounts, executionTime);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs b/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs
index 46c1e498efd12..3893b57a0017e 100644
--- a/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs
+++ b/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs
@@ -89,14 +89,14 @@ private static bool IsCurrentOperationBeingCancelled(Exception exception, Cancel
         /// </summary>
         /// <returns>False to avoid catching the exception.</returns>
         [DebuggerHidden]
-        public static bool ReportUnlessCanceled(Exception exception)
+        public static bool ReportAndPropagateUnlessCanceled(Exception exception)
         {
             if (exception is OperationCanceledException)
             {
                 return false;
             }
 
-            return Report(exception);
+            return ReportAndPropagate(exception);
         }
 
         /// <summary>
@@ -106,14 +106,14 @@ public static bool ReportUnlessCanceled(Exception exception)
         /// </summary>
         /// <returns>False to avoid catching the exception.</returns>
         [DebuggerHidden]
-        public static bool ReportUnlessCanceled(Exception exception, CancellationToken cancellationToken)
+        public static bool ReportAndPropagateUnlessCanceled(Exception exception, CancellationToken cancellationToken)
         {
             if (IsCurrentOperationBeingCancelled(exception, cancellationToken))
             {
                 return false;
             }
 
-            return Report(exception);
+            return ReportAndPropagate(exception);
         }
 
         /// <summary>
@@ -123,14 +123,14 @@ public static bool ReportUnlessCanceled(Exception exception, CancellationToken c
         /// </summary>
         /// <returns>True to catch the exception.</returns>
         [DebuggerHidden]
-        public static bool ReportWithoutCrashUnlessCanceled(Exception exception)
+        public static bool ReportAndCatchUnlessCanceled(Exception exception)
         {
             if (exception is OperationCanceledException)
             {
                 return false;
             }
 
-            return ReportWithoutCrash(exception);
+            return ReportAndCatch(exception);
         }
 
         /// <summary>
@@ -140,31 +140,14 @@ public static bool ReportWithoutCrashUnlessCanceled(Exception exception)
         /// </summary>
         /// <returns>True to catch the exception.</returns>
         [DebuggerHidden]
-        public static bool ReportWithoutCrashUnlessCanceled(Exception exception, CancellationToken cancellationToken)
+        public static bool ReportAndCatchUnlessCanceled(Exception exception, CancellationToken cancellationToken)
         {
             if (IsCurrentOperationBeingCancelled(exception, cancellationToken))
             {
                 return false;
             }
 
-            return ReportWithoutCrash(exception);
-        }
-
-        /// <summary>
-        /// Use in an exception filter to report a fatal error. 
-        /// Unless the exception is <see cref="NotImplementedException"/> 
-        /// it calls <see cref="Handler"/>. The exception is passed through (the method returns false).
-        /// </summary>
-        /// <returns>False to avoid catching the exception.</returns>
-        [DebuggerHidden]
-        public static bool ReportUnlessNotImplemented(Exception exception)
-        {
-            if (exception is NotImplementedException)
-            {
-                return false;
-            }
-
-            return Report(exception);
+            return ReportAndCatch(exception);
         }
 
         /// <summary>
@@ -173,7 +156,7 @@ public static bool ReportUnlessNotImplemented(Exception exception)
         /// </summary>
         /// <returns>False to avoid catching the exception.</returns>
         [DebuggerHidden]
-        public static bool Report(Exception exception)
+        public static bool ReportAndPropagate(Exception exception)
         {
             Report(exception, s_fatalHandler);
             return false;
@@ -190,53 +173,12 @@ public static bool Report(Exception exception)
         /// </summary>
         /// <returns>True to catch the exception.</returns>
         [DebuggerHidden]
-        public static bool ReportWithoutCrash(Exception exception)
+        public static bool ReportAndCatch(Exception exception)
         {
             Report(exception, s_nonFatalHandler);
             return true;
         }
 
-        /// <summary>
-        /// Report a non-fatal error like <see cref="ReportWithoutCrash"/> but propagates the exception.
-        /// </summary>
-        /// <returns>False to propagate the exception.</returns>
-        [DebuggerHidden]
-        public static bool ReportWithoutCrashAndPropagate(Exception exception)
-        {
-            Report(exception, s_nonFatalHandler);
-            return false;
-        }
-
-        /// <summary>
-        /// Report a non-fatal error like <see cref="ReportWithoutCrash"/> but propagates the exception.
-        /// </summary>
-        /// <returns>False to propagate the exception.</returns>
-        [DebuggerHidden]
-        public static bool ReportWithoutCrashUnlessCanceledAndPropagate(Exception exception)
-        {
-            if (!(exception is OperationCanceledException))
-            {
-                Report(exception, s_nonFatalHandler);
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Report a non-fatal error like <see cref="ReportWithoutCrash"/> but propagates the exception, unless the operation has been cancelled.
-        /// </summary>
-        /// <returns>False to propagate the exception.</returns>
-        [DebuggerHidden]
-        public static bool ReportWithoutCrashUnlessCanceledAndPropagate(Exception exception, CancellationToken cancellationToken)
-        {
-            if (!IsCurrentOperationBeingCancelled(exception, cancellationToken))
-            {
-                Report(exception, s_nonFatalHandler);
-            }
-
-            return false;
-        }
-
         private static readonly object s_reportedMarker = new();
 
         private static void Report(Exception exception, Action<Exception>? handler)
diff --git a/src/Compilers/Core/Portable/InternalUtilities/RoslynParallel.cs b/src/Compilers/Core/Portable/InternalUtilities/RoslynParallel.cs
index 7e07d94cbd03b..f48c2176b9445 100644
--- a/src/Compilers/Core/Portable/InternalUtilities/RoslynParallel.cs
+++ b/src/Compilers/Core/Portable/InternalUtilities/RoslynParallel.cs
@@ -29,7 +29,7 @@ void errorHandlingBody(int i)
                 {
                     body(i);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e, cancellationToken))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e, cancellationToken))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Compilers/Core/Portable/Operations/ControlFlowGraph.cs b/src/Compilers/Core/Portable/Operations/ControlFlowGraph.cs
index 513f3a93c1cec..581de227e7c93 100644
--- a/src/Compilers/Core/Portable/Operations/ControlFlowGraph.cs
+++ b/src/Compilers/Core/Portable/Operations/ControlFlowGraph.cs
@@ -184,7 +184,7 @@ internal static ControlFlowGraph CreateCore(IOperation operation, string argumen
                 Debug.Assert(controlFlowGraph.OriginalOperation == operation);
                 return controlFlowGraph;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // Log a Non-fatal-watson and then ignore the crash in the attempt of getting flow graph.
                 Debug.Assert(false, "\n" + e.ToString());
diff --git a/src/Compilers/Core/Portable/Text/ChangedText.cs b/src/Compilers/Core/Portable/Text/ChangedText.cs
index e6e4a570542b8..0c17a34792f5e 100644
--- a/src/Compilers/Core/Portable/Text/ChangedText.cs
+++ b/src/Compilers/Core/Portable/Text/ChangedText.cs
@@ -6,9 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using System.Text;
-using System.Threading;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Roslyn.Utilities;
 
@@ -238,177 +236,331 @@ private static ImmutableArray<TextChangeRange> Merge(IReadOnlyList<ImmutableArra
             return merged;
         }
 
+        /// <summary>
+        /// Represents a new change being processed by <see cref="Merge(ImmutableArray&lt;TextChangeRange&gt;, ImmutableArray&lt;TextChangeRange&gt;)"/>.
+        /// Such a new change must be adjusted before being added to the result list.
+        /// </summary>
+        /// <remarks>
+        /// A value of this type may represent the intermediate state of merging of an old change into an unadjusted new change,
+        /// resulting in a temporary unadjusted new change whose <see cref="SpanStart"/> is negative (not valid) until it is adjusted.
+        /// This tends to happen when we need to merge an old change deletion into a new change near the beginning of the text. (see TextChangeTests.Fuzz_4)
+        /// </remarks>
+        private readonly struct UnadjustedNewChange
+        {
+            public readonly int SpanStart { get; }
+            public readonly int SpanLength { get; }
+            public readonly int NewLength { get; }
+
+            public int SpanEnd => SpanStart + SpanLength;
+
+            public UnadjustedNewChange(int spanStart, int spanLength, int newLength)
+            {
+                SpanStart = spanStart;
+                SpanLength = spanLength;
+                NewLength = newLength;
+            }
+
+            public UnadjustedNewChange(TextChangeRange range)
+                : this(range.Span.Start, range.Span.Length, range.NewLength)
+            {
+            }
+        }
+
+        /// <summary>
+        /// Merges the new change ranges into the old change ranges, adjusting the new ranges to be with respect to the original text
+        /// (with neither old or new changes applied) instead of with respect to the original text after "old changes" are applied.
+        ///
+        /// This may require splitting, concatenation, etc. of individual change ranges.
+        /// </summary>
+        /// <remarks>
+        /// Both `oldChanges` and `newChanges` must contain non-overlapping spans in ascending order.
+        /// </remarks>
         private static ImmutableArray<TextChangeRange> Merge(ImmutableArray<TextChangeRange> oldChanges, ImmutableArray<TextChangeRange> newChanges)
         {
-            var list = new List<TextChangeRange>(oldChanges.Length + newChanges.Length);
+            // Earlier steps are expected to prevent us from ever reaching this point with empty change sets.
+            if (oldChanges.IsEmpty)
+            {
+                throw new ArgumentException(nameof(oldChanges));
+            }
 
-            int oldIndex = 0;
-            int newIndex = 0;
-            int oldDelta = 0;
+            if (newChanges.IsEmpty)
+            {
+                throw new ArgumentException(nameof(newChanges));
+            }
 
-            var needNextNewChange = true;
-            var needNextOldChange = true;
-            TextChangeRange newChange = default;
-            TextChangeRange oldChange = default;
+            var builder = ArrayBuilder<TextChangeRange>.GetInstance();
 
-nextNewChange:
-            if (newIndex < newChanges.Length)
+            var oldChange = oldChanges[0];
+            var newChange = new UnadjustedNewChange(newChanges[0]);
+
+            var oldIndex = 0;
+            var newIndex = 0;
+
+            // The sum of characters inserted by old changes minus characters deleted by old changes.
+            // This value must be adjusted whenever characters from an old change are added to `builder`.
+            var oldDelta = 0;
+
+            // In this loop we "zip" together potentially overlapping old and new changes.
+            // It's important that when overlapping changes are found, we don't consume past the end of the overlapping section until the next iteration.
+            // so that we don't miss scenarios where the section after the overlap we found itself overlaps with another change
+            // e.g.:
+            // [-------oldChange1------]
+            // [--newChange1--]   [--newChange2--]
+            while (true)
             {
-                if (needNextNewChange)
+                if (oldChange.Span.Length == 0 && oldChange.NewLength == 0)
                 {
-                    newChange = newChanges[newIndex];
-                    needNextNewChange = false;
+                    // old change does not insert or delete any characters, so it can be dropped to no effect.
+                    if (tryGetNextOldChange()) continue;
+                    else break;
                 }
-
-nextOldChange:
-                if (oldIndex < oldChanges.Length)
+                else if (newChange.SpanLength == 0 && newChange.NewLength == 0)
                 {
-                    if (needNextOldChange)
-                    {
-                        oldChange = oldChanges[oldIndex];
-                        needNextOldChange = false;
-                    }
+                    // new change does not insert or delete any characters, so it can be dropped to no effect.
+                    if (tryGetNextNewChange()) continue;
+                    else break;
+                }
+                else if (newChange.SpanEnd <= oldChange.Span.Start + oldDelta)
+                {
+                    // new change is entirely before old change, so just take the new change
+                    //                old[--------]
+                    // new[--------]
+                    adjustAndAddNewChange(builder, oldDelta, newChange);
+                    if (tryGetNextNewChange()) continue;
+                    else break;
+                }
+                else if (newChange.SpanStart >= oldChange.NewEnd + oldDelta)
+                {
+                    // new change is entirely after old change, so just take the old change
+                    // old[--------]
+                    //                new[--------]
+                    addAndAdjustOldDelta(builder, ref oldDelta, oldChange);
+                    if (tryGetNextOldChange()) continue;
+                    else break;
+                }
+                else if (newChange.SpanStart < oldChange.Span.Start + oldDelta)
+                {
+                    // new change starts before old change, but the new change deletion overlaps with the old change insertion
+                    // note: 'd' represents a deleted character, 'a' represents a character inserted by an old change, and 'b' represents a character inserted by a new change.
+                    //
+                    //    old|dddddd|
+                    //       |aaaaaa|
+                    // ---------------
+                    // new|dddddd|
+                    //    |bbbbbb|
+
+                    // align the new change and old change start by consuming the part of the new deletion before the old change
+                    // (this only deletes characters of the original text)
+                    //
+                    // old|dddddd|
+                    //    |aaaaaa|
+                    // ---------------
+                    // new|ddd|
+                    //    |bbbbbb|
+                    var newChangeLeadingDeletion = oldChange.Span.Start + oldDelta - newChange.SpanStart;
+                    adjustAndAddNewChange(builder, oldDelta, new UnadjustedNewChange(newChange.SpanStart, newChangeLeadingDeletion, newLength: 0));
+                    newChange = new UnadjustedNewChange(oldChange.Span.Start + oldDelta, newChange.SpanLength - newChangeLeadingDeletion, newChange.NewLength);
+                    continue;
+                }
+                else if (newChange.SpanStart > oldChange.Span.Start + oldDelta)
+                {
+                    // new change starts after old change, but overlaps
+                    //
+                    // old|dddddd|
+                    //    |aaaaaa|
+                    // ---------------
+                    //    new|dddddd|
+                    //       |bbbbbb|
+
+                    // align the old change to the new change by consuming the part of the old change which is before the new change.
+                    //
+                    //    old|ddd|
+                    //       |aaa|
+                    // ---------------
+                    //    new|dddddd|
+                    //       |bbbbbb|
+
+                    var oldChangeLeadingInsertion = newChange.SpanStart - (oldChange.Span.Start + oldDelta);
+                    // we must make sure to delete at most as many characters as the entire oldChange deletes
+                    var oldChangeLeadingDeletion = Math.Min(oldChange.Span.Length, oldChangeLeadingInsertion);
+                    addAndAdjustOldDelta(builder, ref oldDelta, new TextChangeRange(new TextSpan(oldChange.Span.Start, oldChangeLeadingDeletion), oldChangeLeadingInsertion));
+                    oldChange = new TextChangeRange(new TextSpan(newChange.SpanStart - oldDelta, oldChange.Span.Length - oldChangeLeadingDeletion), oldChange.NewLength - oldChangeLeadingInsertion);
+                    continue;
+                }
+                else
+                {
+                    // old and new change start at same adjusted position
+                    Debug.Assert(newChange.SpanStart == oldChange.Span.Start + oldDelta);
 
-tryAgain:
-                    if (oldChange.Span.Length == 0 && oldChange.NewLength == 0)
-                    {
-                        // old change is a non-change, just ignore it and move on
-                        oldIndex++;
-                        needNextOldChange = true;
-                        goto nextOldChange;
-                    }
-                    else if (newChange.Span.Length == 0 && newChange.NewLength == 0)
-                    {
-                        // new change is a non-change, just ignore it and move on
-                        newIndex++;
-                        needNextNewChange = true;
-                        goto nextNewChange;
-                    }
-                    else if (newChange.Span.End < (oldChange.Span.Start + oldDelta))
+                    if (newChange.SpanLength <= oldChange.NewLength)
                     {
-                        // new change occurs entirely before old change
-                        var adjustedNewChange = new TextChangeRange(new TextSpan(newChange.Span.Start - oldDelta, newChange.Span.Length), newChange.NewLength);
-                        AddRange(list, adjustedNewChange);
-                        newIndex++;
-                        needNextNewChange = true;
-                        goto nextNewChange;
+                        // new change deletes fewer characters than old change inserted
+                        //
+                        // old|dddddd|
+                        //    |aaaaaa|
+                        // ---------------
+                        // new|ddd|
+                        //    |bbbbbb|
+
+                        // - apply the new change deletion to the old change insertion
+                        //
+                        //    old|dddddd|
+                        //       |aaa|
+                        // ---------------
+                        // new||
+                        //    |bbbbbb|
+                        //
+                        // - move the new change insertion forward by the same amount as its consumed deletion to remain aligned with the old change.
+                        // (because the old change and new change have the same adjusted start position, the new change insertion appears directly before the old change insertion in the final text)
+                        //
+                        //    old|dddddd|
+                        //       |aaa|
+                        // ---------------
+                        //    new||
+                        //       |bbbbbb|
+
+                        oldChange = new TextChangeRange(oldChange.Span, oldChange.NewLength - newChange.SpanLength);
+
+                        // the new change deletion is equal to the subset of the old change insertion that we are consuming this iteration
+                        oldDelta = oldDelta + newChange.SpanLength;
+
+                        // since the new change insertion occurs before the old change, consume it now
+                        newChange = new UnadjustedNewChange(newChange.SpanEnd, spanLength: 0, newChange.NewLength);
+                        adjustAndAddNewChange(builder, oldDelta, newChange);
+                        if (tryGetNextNewChange()) continue;
+                        else break;
                     }
-                    else if (newChange.Span.Start > oldChange.Span.Start + oldDelta + oldChange.NewLength)
+                    else
                     {
-                        // new change occurs entirely after old change
-                        AddRange(list, oldChange);
+                        // new change deletes more characters than old change inserted
+                        //
+                        // old|d|
+                        //    |aa|
+                        // ---------------
+                        // new|ddd|
+                        //    |bbb|
+
+                        // merge the old change into the new change:
+                        // - new change deletion deletes all of the old change insertion. reduce the new change deletion accordingly
+                        //
+                        //   old|d|
+                        //      ||
+                        // ---------------
+                        // new|d|
+                        //    |bbb|
+                        //
+                        // - old change deletion is simply added to the new change deletion.
+                        //
+                        //  old||
+                        //     ||
+                        // ---------------
+                        // new|dd|
+                        //    |bbb|
+                        //
+                        // - new change is moved to put its adjusted position equal to the old change we just merged in
+                        //
+                        //  old||
+                        //     ||
+                        // ---------------
+                        //  new|dd|
+                        //     |bbb|
+
+                        // adjust the oldDelta to reflect that the old change has been consumed
                         oldDelta = oldDelta - oldChange.Span.Length + oldChange.NewLength;
-                        oldIndex++;
-                        needNextOldChange = true;
-                        goto nextOldChange;
-                    }
-                    else if (newChange.Span.Start < oldChange.Span.Start + oldDelta)
-                    {
-                        // new change starts before old change, but overlaps
-                        // add as much of new change deletion as possible and try again
-                        var newChangeLeadingDeletion = (oldChange.Span.Start + oldDelta) - newChange.Span.Start;
-                        AddRange(list, new TextChangeRange(new TextSpan(newChange.Span.Start - oldDelta, newChangeLeadingDeletion), 0));
-                        newChange = new TextChangeRange(new TextSpan(oldChange.Span.Start + oldDelta, newChange.Span.Length - newChangeLeadingDeletion), newChange.NewLength);
-                        goto tryAgain;
-                    }
-                    else if (newChange.Span.Start > oldChange.Span.Start + oldDelta)
-                    {
-                        // new change starts after old change, but overlaps
-                        // add as much of the old change as possible and try again
-                        var oldChangeLeadingInsertion = newChange.Span.Start - (oldChange.Span.Start + oldDelta);
-                        var oldChangeLeadingDeletion = Math.Min(oldChange.Span.Length, oldChangeLeadingInsertion);
-                        AddRange(list, new TextChangeRange(new TextSpan(oldChange.Span.Start, oldChangeLeadingDeletion), oldChangeLeadingInsertion));
-                        oldDelta = oldDelta - oldChangeLeadingDeletion + oldChangeLeadingInsertion;
-                        oldChange = new TextChangeRange(new TextSpan(newChange.Span.Start - oldDelta, oldChange.Span.Length - oldChangeLeadingDeletion), oldChange.NewLength - oldChangeLeadingInsertion);
-                        goto tryAgain;
-                    }
-                    else if (newChange.Span.Start == oldChange.Span.Start + oldDelta)
-                    {
-                        // new change and old change start at same position
-                        if (oldChange.NewLength == 0)
-                        {
-                            // old change is just a deletion, go ahead and old change now and deal with new change separately
-                            AddRange(list, oldChange);
-                            oldDelta = oldDelta - oldChange.Span.Length + oldChange.NewLength;
-                            oldIndex++;
-                            needNextOldChange = true;
-                            goto nextOldChange;
-                        }
-                        else if (newChange.Span.Length < oldChange.NewLength)
-                        {
-                            // new change deletes fewer characters than old change inserted
-                            // apply as much of the new change as possible, and adjust the old change
-                            var appliedDeletion = Math.Min(oldChange.Span.Length, newChange.Span.Length);
-                            var adjustedNewChange = new TextChangeRange(new TextSpan(oldChange.Span.Start, appliedDeletion), newChange.NewLength);
-                            AddRange(list, adjustedNewChange);
-                            oldChange = new TextChangeRange(new TextSpan(oldChange.Span.Start + appliedDeletion, oldChange.Span.Length - appliedDeletion), oldChange.NewLength - newChange.Span.Length);
-                            newIndex++;
-                            needNextNewChange = true;
-                            goto nextNewChange;
-                        }
-                        else
-                        {
-                            // new change deletes the entire old change. apply as much of the new change as possible and
-                            // adjust the remaining.
-                            var appliedDeletion = oldChange.NewLength;
-                            var adjustedNewChange = new TextChangeRange(oldChange.Span, 0);
-                            AddRange(list, adjustedNewChange);
-                            newChange = new TextChangeRange(new TextSpan(newChange.Span.Start + appliedDeletion, newChange.Span.Length - appliedDeletion), newChange.NewLength);
-
-                            oldDelta = oldDelta - oldChange.Span.Length + oldChange.NewLength;
-                            oldIndex++;
-                            needNextOldChange = true;
-                            goto nextOldChange;
-                        }
+
+                        var newDeletion = newChange.SpanLength + oldChange.Span.Length - oldChange.NewLength;
+                        newChange = new UnadjustedNewChange(oldChange.Span.Start + oldDelta, newDeletion, newChange.NewLength);
+                        if (tryGetNextOldChange()) continue;
+                        else break;
                     }
                 }
-                else
-                {
-                    // no more old changes, just add adjusted new change
-                    var adjustedNewChange = new TextChangeRange(new TextSpan(newChange.Span.Start - oldDelta, newChange.Span.Length), newChange.NewLength);
-                    AddRange(list, adjustedNewChange);
-                    newIndex++;
-                    needNextNewChange = true;
-                    goto nextNewChange;
-                }
             }
-            else
+
+            // there may be remaining old changes or remaining new changes (not both, and not neither)
+            switch (oldIndex == oldChanges.Length, newIndex == newChanges.Length)
             {
-                // no more new changes, just add remaining old changes
-                while (oldIndex < oldChanges.Length)
-                {
-                    if (needNextOldChange)
-                    {
-                        oldChange = oldChanges[oldIndex];
-                    }
+                case (true, true):
+                case (false, false):
+                    throw new InvalidOperationException();
+            }
 
-                    AddRange(list, oldChange);
-                    oldIndex++;
-                    needNextOldChange = true;
-                }
+            while (oldIndex < oldChanges.Length)
+            {
+                addAndAdjustOldDelta(builder, ref oldDelta, oldChange);
+                tryGetNextOldChange();
             }
 
-            return list.ToImmutableArray();
-        }
+            while (newIndex < newChanges.Length)
+            {
+                adjustAndAddNewChange(builder, oldDelta, newChange);
+                tryGetNextNewChange();
+            }
 
-        private static void AddRange(List<TextChangeRange> list, TextChangeRange range)
-        {
-            if (list.Count > 0)
+            return builder.ToImmutableAndFree();
+
+            bool tryGetNextOldChange()
             {
-                var last = list[list.Count - 1];
-                if (last.Span.End == range.Span.Start)
+                oldIndex++;
+                if (oldIndex < oldChanges.Length)
                 {
-                    // merge changes together if they are adjacent
-                    list[list.Count - 1] = new TextChangeRange(new TextSpan(last.Span.Start, last.Span.Length + range.Span.Length), last.NewLength + range.NewLength);
-                    return;
+                    oldChange = oldChanges[oldIndex];
+                    return true;
                 }
                 else
                 {
-                    Debug.Assert(range.Span.Start > last.Span.End);
+                    oldChange = default;
+                    return false;
                 }
             }
 
-            list.Add(range);
+            bool tryGetNextNewChange()
+            {
+                newIndex++;
+                if (newIndex < newChanges.Length)
+                {
+                    newChange = new UnadjustedNewChange(newChanges[newIndex]);
+                    return true;
+                }
+                else
+                {
+                    newChange = default;
+                    return false;
+                }
+            }
+
+            static void addAndAdjustOldDelta(ArrayBuilder<TextChangeRange> builder, ref int oldDelta, TextChangeRange oldChange)
+            {
+                // modify oldDelta to reflect characters deleted and inserted by an old change
+                oldDelta = oldDelta - oldChange.Span.Length + oldChange.NewLength;
+                add(builder, oldChange);
+            }
+
+            static void adjustAndAddNewChange(ArrayBuilder<TextChangeRange> builder, int oldDelta, UnadjustedNewChange newChange)
+            {
+                // unadjusted new change is relative to the original text with old changes applied. Subtract oldDelta to make it relative to the original text.
+                add(builder, new TextChangeRange(new TextSpan(newChange.SpanStart - oldDelta, newChange.SpanLength), newChange.NewLength));
+            }
+
+            static void add(ArrayBuilder<TextChangeRange> builder, TextChangeRange change)
+            {
+                if (builder.Count > 0)
+                {
+                    var last = builder[^1];
+                    if (last.Span.End == change.Span.Start)
+                    {
+                        // merge changes together if they are adjacent
+                        builder[^1] = new TextChangeRange(new TextSpan(last.Span.Start, last.Span.Length + change.Span.Length), last.NewLength + change.NewLength);
+                        return;
+                    }
+                    else if (last.Span.End > change.Span.Start)
+                    {
+                        throw new ArgumentOutOfRangeException(nameof(change));
+                    }
+
+                }
+
+                builder.Add(change);
+            }
         }
 
         /// <summary>
diff --git a/src/Compilers/Core/Portable/Text/TextChange.cs b/src/Compilers/Core/Portable/Text/TextChange.cs
index 7b63c1a8336a1..c6ca7b96b2486 100644
--- a/src/Compilers/Core/Portable/Text/TextChange.cs
+++ b/src/Compilers/Core/Portable/Text/TextChange.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.Serialization;
-using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Text
@@ -15,6 +14,7 @@ namespace Microsoft.CodeAnalysis.Text
     /// Describes a single change when a particular span is replaced with a new text.
     /// </summary>
     [DataContract]
+    [DebuggerDisplay("{GetDebuggerDisplay(),nq}")]
     public readonly struct TextChange : IEquatable<TextChange>
     {
         /// <summary>
@@ -95,5 +95,16 @@ public static implicit operator TextChangeRange(TextChange change)
         /// An empty set of changes.
         /// </summary>
         public static IReadOnlyList<TextChange> NoChanges => SpecializedCollections.EmptyReadOnlyList<TextChange>();
+
+        internal string GetDebuggerDisplay()
+        {
+            var newTextDisplay = NewText switch
+            {
+                null => "null",
+                { Length: < 10 } => $"\"{NewText}\"",
+                { Length: var length } => $"(NewLength = {length})"
+            };
+            return $"new TextChange(new TextSpan({Span.Start}, {Span.Length}), {newTextDisplay})";
+        }
     }
 }
diff --git a/src/Compilers/Core/Portable/Text/TextChangeRange.cs b/src/Compilers/Core/Portable/Text/TextChangeRange.cs
index 85920b714672b..24d65b45216b8 100644
--- a/src/Compilers/Core/Portable/Text/TextChangeRange.cs
+++ b/src/Compilers/Core/Portable/Text/TextChangeRange.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Text;
+using System.Diagnostics;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Text
@@ -12,6 +12,7 @@ namespace Microsoft.CodeAnalysis.Text
     /// <summary>
     /// Represents the change to a span of text.
     /// </summary>
+    [DebuggerDisplay("{GetDebuggerDisplay(),nq}")]
     public readonly struct TextChangeRange : IEquatable<TextChangeRange>
     {
         /// <summary>
@@ -24,6 +25,8 @@ namespace Microsoft.CodeAnalysis.Text
         /// </summary>
         public int NewLength { get; }
 
+        internal int NewEnd => Span.Start + NewLength;
+
         /// <summary>
         /// Initializes a new instance of <see cref="TextChangeRange"/>.
         /// </summary>
@@ -125,5 +128,10 @@ public static TextChangeRange Collapse(IEnumerable<TextChangeRange> changes)
 
             return new TextChangeRange(combined, newLen);
         }
+
+        private string GetDebuggerDisplay()
+        {
+            return $"new TextChangeRange(new TextSpan({Span.Start}, {Span.Length}), {NewLength})";
+        }
     }
 }
diff --git a/src/Compilers/VisualBasic/Portable/Compilation/ClsComplianceChecker.vb b/src/Compilers/VisualBasic/Portable/Compilation/ClsComplianceChecker.vb
index bbf2fb3dbc564..365e359fcf9e8 100644
--- a/src/Compilers/VisualBasic/Portable/Compilation/ClsComplianceChecker.vb
+++ b/src/Compilers/VisualBasic/Portable/Compilation/ClsComplianceChecker.vb
@@ -112,7 +112,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                             Sub()
                                 Try
                                     VisitModule(m)
-                                Catch e As Exception When FatalError.ReportUnlessCanceled(e)
+                                Catch e As Exception When FatalError.ReportAndPropagateUnlessCanceled(e)
                                     Throw ExceptionUtilities.Unreachable
                                 End Try
                             End Sub),
@@ -156,7 +156,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                             Sub()
                                 Try
                                     Visit(m)
-                                Catch e As Exception When FatalError.ReportUnlessCanceled(e)
+                                Catch e As Exception When FatalError.ReportAndPropagateUnlessCanceled(e)
                                     Throw ExceptionUtilities.Unreachable
                                 End Try
                             End Sub),
diff --git a/src/Compilers/VisualBasic/Portable/Compilation/MethodCompiler.vb b/src/Compilers/VisualBasic/Portable/Compilation/MethodCompiler.vb
index 49fa92ca18d36..d75452edbdb1d 100644
--- a/src/Compilers/VisualBasic/Portable/Compilation/MethodCompiler.vb
+++ b/src/Compilers/VisualBasic/Portable/Compilation/MethodCompiler.vb
@@ -472,7 +472,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     Sub()
                         Try
                             CompileNamespace(symbol)
-                        Catch e As Exception When FatalError.ReportUnlessCanceled(e)
+                        Catch e As Exception When FatalError.ReportAndPropagateUnlessCanceled(e)
                             Throw ExceptionUtilities.Unreachable
                         End Try
                     End Sub),
@@ -505,7 +505,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     Sub()
                         Try
                             CompileNamedType(symbol, filter)
-                        Catch e As Exception When FatalError.ReportUnlessCanceled(e)
+                        Catch e As Exception When FatalError.ReportAndPropagateUnlessCanceled(e)
                             Throw ExceptionUtilities.Unreachable
                         End Try
                     End Sub),
diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/MetadataDecoder.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/MetadataDecoder.vb
index 0f7e072db7f6c..eb9e2aba47a95 100644
--- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/MetadataDecoder.vb
+++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/MetadataDecoder.vb
@@ -133,7 +133,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE
 
             Try
                 Return assembly.LookupTopLevelMetadataType(emittedName, digThroughForwardedTypes:=True)
-            Catch e As Exception When FatalError.Report(e) ' Trying to get more useful Watson dumps.
+            Catch e As Exception When FatalError.ReportAndPropagate(e) ' Trying to get more useful Watson dumps.
                 Throw ExceptionUtilities.Unreachable
             End Try
         End Function
diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceModuleSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceModuleSymbol.vb
index 7d3845a36db64..bdd9b97e148c5 100644
--- a/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceModuleSymbol.vb
+++ b/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceModuleSymbol.vb
@@ -700,7 +700,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
                                 Sub()
                                     Try
                                         visitor(symbol)
-                                    Catch e As Exception When FatalError.ReportUnlessCanceled(e)
+                                    Catch e As Exception When FatalError.ReportAndPropagateUnlessCanceled(e)
                                         Throw ExceptionUtilities.Unreachable
                                     End Try
                                 End Sub),
diff --git a/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs b/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs
index 0545de7066054..2c370bfc666ac 100644
--- a/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs
+++ b/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs
@@ -58,7 +58,7 @@ public async Task<Document> AddSourceToAsync(Document document, Compilation symb
                     var fullAssemblyName = symbol.ContainingAssembly.Identity.GetDisplayName();
                     GlobalAssemblyCache.Instance.ResolvePartialName(fullAssemblyName, out assemblyLocation, preferredCulture: CultureInfo.CurrentCulture);
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+                catch (Exception e) when (FatalError.ReportAndCatch(e))
                 {
                 }
             }
diff --git a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs
index e55312af06969..aa35ef4149071 100644
--- a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs
@@ -7485,6 +7485,17 @@ struct C
             await VerifyItemExistsAsync(markup, "C");
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.Completion)]
+        public async Task RecordDestructor()
+        {
+            var markup = @"
+record C
+{
+   ~$$
+}";
+            await VerifyItemExistsAsync(markup, "C");
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.Completion)]
         public async Task FieldAvailableInBothLinkedFiles()
         {
diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs
index 61f9f98434fe7..13bdf214790df 100644
--- a/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs
+++ b/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs
@@ -991,7 +991,7 @@ public void N()
         }
 
         [Fact]
-        public async Task UpgradeProjectForVarianceSafetyForStaticInterfaceMembers_CS9100()
+        public async Task UpgradeProjectForVarianceSafetyForStaticInterfaceMembers_CS8904()
         {
             await TestLanguageVersionUpgradedAsync(
 @"
diff --git a/src/EditorFeatures/CSharpTest/GenerateDefaultConstructors/GenerateDefaultConstructorsTests.cs b/src/EditorFeatures/CSharpTest/GenerateDefaultConstructors/GenerateDefaultConstructorsTests.cs
index 79c1e62ce64da..adb8035f9475f 100644
--- a/src/EditorFeatures/CSharpTest/GenerateDefaultConstructors/GenerateDefaultConstructorsTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateDefaultConstructors/GenerateDefaultConstructorsTests.cs
@@ -932,6 +932,76 @@ public C(int x) : base(x)
     }
 }
 
+abstract class B
+{
+    protected B(int x)
+    {
+    }
+}");
+        }
+
+        [WorkItem(48318, "https://github.com/dotnet/roslyn/issues/48318")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateDefaultConstructors)]
+        public async Task TestGenerateConstructorFromProtectedConstructorCursorAtTypeOpening()
+        {
+            await TestInRegularAndScriptAsync(
+@"class C : B
+{
+
+[||]
+
+}
+
+abstract class B
+{
+    protected B(int x)
+    {
+    }
+}",
+@"class C : B
+{
+    public C(int x) : base(x)
+    {
+    }
+}
+
+abstract class B
+{
+    protected B(int x)
+    {
+    }
+}");
+        }
+
+        [WorkItem(48318, "https://github.com/dotnet/roslyn/issues/48318")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateDefaultConstructors)]
+        public async Task TestGenerateConstructorFromProtectedConstructorCursorBetweenTypeMembers()
+        {
+            await TestInRegularAndScriptAsync(
+@"class C : B
+{
+    int X;
+[||]
+    int Y;
+}
+
+abstract class B
+{
+    protected B(int x)
+    {
+    }
+}",
+@"class C : B
+{
+    int X;
+
+    int Y;
+
+    public C(int x) : base(x)
+    {
+    }
+}
+
 abstract class B
 {
     protected B(int x)
diff --git a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsFormatDefinition.cs b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsFormatDefinition.cs
similarity index 70%
rename from src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsFormatDefinition.cs
rename to src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsFormatDefinition.cs
index 19c70996bb9fd..f3e8d3cde7568 100644
--- a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsFormatDefinition.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsFormatDefinition.cs
@@ -17,23 +17,23 @@ namespace Microsoft.CodeAnalysis.Editor.InlineHints
     internal sealed class ClassificationTypeDefinitions
     {
         [Export]
-        [Name(InlineParameterNameHintsTag.TagId)]
+        [Name(InlineHintsTag.TagId)]
         [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)]
-        internal ClassificationTypeDefinition InlineParameterNameHints;
+        internal ClassificationTypeDefinition InlineHints;
 
         [Export(typeof(EditorFormatDefinition))]
-        [Name(InlineParameterNameHintsTag.TagId)]
+        [Name(InlineHintsTag.TagId)]
         [Order(After = LanguagePriority.NaturalLanguage, Before = LanguagePriority.FormalLanguage)]
         [UserVisible(true)]
-        internal sealed class InlineParameterNameHintsFormatDefinition : EditorFormatDefinition
+        internal sealed class InlineHintsFormatDefinition : EditorFormatDefinition
         {
             [ImportingConstructor]
             [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-            public InlineParameterNameHintsFormatDefinition()
+            public InlineHintsFormatDefinition()
             {
-                this.DisplayName = EditorFeaturesResources.Inline_Parameter_Name_Hints;
-                this.ForegroundBrush = Brushes.Black;
-                this.BackgroundBrush = Brushes.LightGray;
+                this.DisplayName = EditorFeaturesResources.Inline_Hints;
+                this.ForegroundBrush = new SolidColorBrush(Color.FromRgb(104, 104, 104));
+                this.BackgroundBrush = new SolidColorBrush(Color.FromRgb(230, 230, 230));
             }
         }
     }
diff --git a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTag.cs b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTag.cs
similarity index 66%
rename from src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTag.cs
rename to src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTag.cs
index b2ae66d9e45f7..16716bfb8e037 100644
--- a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTag.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTag.cs
@@ -10,16 +10,20 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using Microsoft.CodeAnalysis.DocumentationComments;
 using Microsoft.CodeAnalysis.Editor.Host;
+using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.InlineHints;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Adornments;
+using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Formatting;
 
@@ -29,27 +33,28 @@ namespace Microsoft.CodeAnalysis.Editor.InlineHints
     /// This is the tag which implements the IntraTextAdornmentTag and is meant to create the UIElements that get shown
     /// in the editor
     /// </summary>
-    internal class InlineParameterNameHintsTag : IntraTextAdornmentTag
+    internal class InlineHintsTag : IntraTextAdornmentTag
     {
-        public const string TagId = "inline parameter name hints";
+        public const string TagId = "inline hints";
+
         private readonly IToolTipService _toolTipService;
         private readonly ITextView _textView;
         private readonly SnapshotSpan _span;
-        private readonly SymbolKey _key;
+        private readonly InlineHint _hint;
         private readonly IThreadingContext _threadingContext;
         private readonly Lazy<IStreamingFindUsagesPresenter> _streamingPresenter;
 
-        private InlineParameterNameHintsTag(
+        private InlineHintsTag(
             FrameworkElement adornment,
             ITextView textView,
             SnapshotSpan span,
-            SymbolKey key,
-            InlineParameterNameHintsTaggerProvider taggerProvider)
+            InlineHint hint,
+            InlineHintsTaggerProvider taggerProvider)
             : base(adornment, removalCallback: null, PositionAffinity.Predecessor)
         {
             _textView = textView;
             _span = span;
-            _key = key;
+            _hint = hint;
             _streamingPresenter = taggerProvider.StreamingFindUsagesPresenter;
             _threadingContext = taggerProvider.ThreadingContext;
             _toolTipService = taggerProvider.ToolTipService;
@@ -67,64 +72,44 @@ private InlineParameterNameHintsTag(
         /// </summary>
         /// <param name="textView">The view of the editor</param>
         /// <param name="span">The span that has the location of the hint</param>
-        /// <param name="key">The symbolkey associated with each parameter</param>
-        public static InlineParameterNameHintsTag Create(string text, TextFormattingRunProperties format,
-                                                         IWpfTextView textView, SnapshotSpan span, SymbolKey key,
-                                                         InlineParameterNameHintsTaggerProvider taggerProvider)
+        public static InlineHintsTag Create(
+            InlineHint hint,
+            TextFormattingRunProperties format,
+            IWpfTextView textView,
+            SnapshotSpan span,
+            InlineHintsTaggerProvider taggerProvider,
+            IClassificationFormatMap formatMap,
+            bool classify)
         {
-            return new InlineParameterNameHintsTag(CreateElement(text, textView, format), textView,
-                                                   span, key, taggerProvider);
+            return new InlineHintsTag(
+                CreateElement(hint.DisplayParts, textView, span, format, formatMap, taggerProvider.TypeMap, classify),
+                textView, span, hint, taggerProvider);
         }
 
         public async Task<IReadOnlyCollection<object>> CreateDescriptionAsync(CancellationToken cancellationToken)
         {
-            var document = _textView.TextBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
-            var textContentBuilder = new List<TaggedText>();
-
+            var document = _span.Snapshot.GetOpenDocumentInCurrentContextWithChanges();
             if (document != null)
             {
-                var compilation = await document.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
-                var symbol = _key.Resolve(compilation, cancellationToken: cancellationToken).Symbol;
-
-                if (symbol != null)
+                var taggedText = await _hint.GetDescriptionAsync(document, cancellationToken).ConfigureAwait(false);
+                if (!taggedText.IsDefaultOrEmpty)
                 {
-                    var workspace = document.Project.Solution.Workspace;
-                    var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-                    var symbolDisplayService = document.Project.LanguageServices.GetRequiredService<ISymbolDisplayService>();
-                    var formatter = document.Project.LanguageServices.GetService<IDocumentationCommentFormattingService>();
-                    var sections = await symbolDisplayService.ToDescriptionGroupsAsync(workspace, semanticModel, _span.Start, ImmutableArray.Create(symbol), cancellationToken).ConfigureAwait(false);
-                    textContentBuilder.AddRange(sections[SymbolDescriptionGroups.MainDescription]);
-                    if (formatter != null)
-                    {
-                        var documentation = symbol.GetDocumentationParts(semanticModel, _span.Start, formatter, cancellationToken);
-
-                        if (documentation.Any())
-                        {
-                            textContentBuilder.AddLineBreak();
-                            textContentBuilder.AddRange(documentation);
-                        }
-                    }
-
-                    if (sections.TryGetValue(SymbolDescriptionGroups.AnonymousTypes, out var parts))
-                    {
-                        if (!parts.IsDefaultOrEmpty)
-                        {
-                            textContentBuilder.AddLineBreak();
-                            textContentBuilder.AddLineBreak();
-                            textContentBuilder.AddRange(parts);
-                        }
-                    }
+                    return Implementation.IntelliSense.Helpers.BuildInteractiveTextElements(
+                        taggedText, document, _threadingContext, _streamingPresenter);
                 }
-
-                var uiCollection = Implementation.IntelliSense.Helpers.BuildInteractiveTextElements(textContentBuilder.ToImmutableArray<TaggedText>(),
-                    document, _threadingContext, _streamingPresenter);
-                return uiCollection;
             }
 
             return Array.Empty<object>();
         }
 
-        private static FrameworkElement CreateElement(string text, IWpfTextView textView, TextFormattingRunProperties format)
+        private static FrameworkElement CreateElement(
+            ImmutableArray<TaggedText> taggedTexts,
+            IWpfTextView textView,
+            SnapshotSpan span,
+            TextFormattingRunProperties format,
+            IClassificationFormatMap formatMap,
+            ClassificationTypeMap typeMap,
+            bool classify)
         {
             // Constructs the hint block which gets assigned parameter name and fontstyles according to the options
             // page. Calculates a font size 1/4 smaller than the font size of the rest of the editor
@@ -137,14 +122,32 @@ private static FrameworkElement CreateElement(string text, IWpfTextView textView
 
                 // Adds a little bit of padding to the left of the text relative to the border
                 // to make the text seem more balanced in the border
-                Padding = new Thickness(left: 1, top: 0, right: 0, bottom: 0),
-                Text = text + ":",
+                Padding = new Thickness(left: 1, top: 0, right: 1, bottom: 0),
                 VerticalAlignment = VerticalAlignment.Center,
             };
 
+            foreach (var taggedText in taggedTexts)
+            {
+                var run = new Run(taggedText.ToVisibleDisplayString(includeLeftToRightMarker: true));
+
+                if (classify && taggedText.Tag != TextTags.Text)
+                {
+                    var properties = formatMap.GetTextProperties(typeMap.GetClassificationType(taggedText.Tag.ToClassificationTypeName()));
+                    var brush = properties.ForegroundBrush.Clone();
+                    run.Foreground = brush;
+                }
+
+                block.Inlines.Add(run);
+            }
+
             // Encapsulates the textblock within a border. Sets the height of the border to be 3/4 of the original 
             // height. Gets foreground/background colors from the options menu. The margin is the distance from the 
             // adornment to the text and pushing the adornment upwards to create a separation when on a specific line
+
+            // If the tag is followed by a space, just create a normal border (as there will already be a buffer to the right).
+            // If not, then pad the right a little so the tag doesn't feel too cramped with the following text.
+            var right = span.End < span.Snapshot.Length && char.IsWhiteSpace(span.End.GetChar()) ? 0 : 5;
+
             var border = new Border
             {
                 Background = format.BackgroundBrush,
@@ -152,7 +155,7 @@ private static FrameworkElement CreateElement(string text, IWpfTextView textView
                 CornerRadius = new CornerRadius(2),
                 Height = textView.LineHeight - (0.25 * textView.LineHeight),
                 HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(left: 0, top: -0.20 * textView.LineHeight, right: 5, bottom: 0),
+                Margin = new Thickness(left: 0, top: -0.20 * textView.LineHeight, right, bottom: 0),
                 Padding = new Thickness(1),
 
                 // Need to set SnapsToDevicePixels and UseLayoutRounding to avoid unnecessary reformatting
diff --git a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTagger.cs b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTagger.cs
similarity index 77%
rename from src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTagger.cs
rename to src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTagger.cs
index 5f81e0453b812..8bcf4daf765f1 100644
--- a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTagger.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTagger.cs
@@ -6,6 +6,8 @@
 using System.Collections.Generic;
 using System.Composition;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.InlineHints;
+using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Text.Editor;
@@ -15,13 +17,13 @@
 namespace Microsoft.CodeAnalysis.Editor.InlineHints
 {
     /// <summary>
-    /// The purpose of this tagger is to convert the <see cref="InlineParameterNameHintDataTag"/> to
-    /// the <see cref="InlineParameterNameHintsTag"/>, which actually creates the UIElement. It reacts to
-    /// tags changing and updates the adornments accordingly.
+    /// The purpose of this tagger is to convert the <see cref="InlineHintDataTag"/> to the <see
+    /// cref="InlineHintsTag"/>, which actually creates the UIElement. It reacts to tags changing and updates the
+    /// adornments accordingly.
     /// </summary>
-    internal sealed class InlineParameterNameHintsTagger : ITagger<IntraTextAdornmentTag>, IDisposable
+    internal sealed class InlineHintsTagger : ITagger<IntraTextAdornmentTag>, IDisposable
     {
-        private readonly ITagAggregator<InlineParameterNameHintDataTag> _tagAggregator;
+        private readonly ITagAggregator<InlineHintDataTag> _tagAggregator;
 
         /// <summary>
         /// stores the parameter hint tags in a global location 
@@ -42,26 +44,30 @@ internal sealed class InlineParameterNameHintsTagger : ITagger<IntraTextAdornmen
         private readonly IClassificationType _hintClassification;
 
         private readonly ForegroundThreadAffinitizedObject _threadAffinitizedObject;
-        private readonly InlineParameterNameHintsTaggerProvider _inlineParameterNameHintsTaggerProvider;
+        private readonly InlineHintsTaggerProvider _taggerProvider;
 
         private readonly ITextBuffer _buffer;
         private readonly IWpfTextView _textView;
 
         public event EventHandler<SnapshotSpanEventArgs>? TagsChanged;
 
-        public InlineParameterNameHintsTagger(InlineParameterNameHintsTaggerProvider taggerProvider, IWpfTextView textView, ITextBuffer buffer, ITagAggregator<InlineParameterNameHintDataTag> tagAggregator)
+        public InlineHintsTagger(
+            InlineHintsTaggerProvider taggerProvider,
+            IWpfTextView textView,
+            ITextBuffer buffer,
+            ITagAggregator<InlineHintDataTag> tagAggregator)
         {
             _cache = new List<ITagSpan<IntraTextAdornmentTag>>();
 
             _threadAffinitizedObject = new ForegroundThreadAffinitizedObject(taggerProvider.ThreadingContext);
-            _inlineParameterNameHintsTaggerProvider = taggerProvider;
+            _taggerProvider = taggerProvider;
 
             _textView = textView;
             _buffer = buffer;
 
             _tagAggregator = tagAggregator;
             _formatMap = taggerProvider.ClassificationFormatMapService.GetClassificationFormatMap(textView);
-            _hintClassification = taggerProvider.ClassificationTypeRegistryService.GetClassificationType(InlineParameterNameHintsTag.TagId);
+            _hintClassification = taggerProvider.ClassificationTypeRegistryService.GetClassificationType(InlineHintsTag.TagId);
             _formatMap.ClassificationFormatMappingChanged += this.OnClassificationFormatMappingChanged;
             _tagAggregator.TagsChanged += OnTagAggregatorTagsChanged;
         }
@@ -110,25 +116,26 @@ public IEnumerable<ITagSpan<IntraTextAdornmentTag>> GetTags(NormalizedSnapshotSp
                 _cache.Clear();
                 _cacheSnapshot = snapshot;
 
+                var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
+                var classify = document?.Project.Solution.Workspace.Options.GetOption(InlineHintsOptions.ColorHints, document?.Project.Language) ?? false;
+
                 // Calling into the InlineParameterNameHintsDataTaggerProvider which only responds with the current
                 // active view and disregards and requests for tags not in that view
                 var fullSpan = new SnapshotSpan(snapshot, 0, snapshot.Length);
-                var dataTags = _tagAggregator.GetTags(new NormalizedSnapshotSpanCollection(fullSpan));
-                foreach (var dataTag in dataTags)
+                var tags = _tagAggregator.GetTags(new NormalizedSnapshotSpanCollection(fullSpan));
+                foreach (var tag in tags)
                 {
                     // Gets the associated span from the snapshot span and creates the IntraTextAdornmentTag from the data
                     // tags. Only dealing with the dataTagSpans if the count is 1 because we do not see a multi-buffer case
                     // occuring 
-                    var dataTagSpans = dataTag.Span.GetSpans(snapshot);
-                    var textTag = dataTag.Tag;
+                    var dataTagSpans = tag.Span.GetSpans(snapshot);
                     if (dataTagSpans.Count == 1)
                     {
                         var dataTagSpan = dataTagSpans[0];
-                        var parameterHintSnapshotSpan = new SnapshotSpan(dataTagSpan.Start, 0);
-                        var parameterHintUITag = InlineParameterNameHintsTag.Create(textTag.ParameterName,
-                                   Format, _textView, dataTagSpan, textTag.ParameterSymbolKey, _inlineParameterNameHintsTaggerProvider);
+                        var parameterHintUITag = InlineHintsTag.Create(
+                            tag.Tag.Hint, Format, _textView, dataTagSpan, _taggerProvider, _formatMap, classify);
 
-                        _cache.Add(new TagSpan<IntraTextAdornmentTag>(parameterHintSnapshotSpan, parameterHintUITag));
+                        _cache.Add(new TagSpan<IntraTextAdornmentTag>(dataTagSpan, parameterHintUITag));
                     }
                 }
             }
diff --git a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTaggerProvider.cs b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTaggerProvider.cs
similarity index 86%
rename from src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTaggerProvider.cs
rename to src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTaggerProvider.cs
index 9b8771d8c3938..ac7b467242502 100644
--- a/src/EditorFeatures/Core.Wpf/InlineHints/InlineParameterNameHintsTaggerProvider.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTaggerProvider.cs
@@ -23,24 +23,26 @@ namespace Microsoft.CodeAnalysis.Editor.InlineHints
     [Export(typeof(IViewTaggerProvider))]
     [ContentType(ContentTypeNames.RoslynContentType)]
     [TagType(typeof(IntraTextAdornmentTag))]
-    [Name(nameof(InlineParameterNameHintsTaggerProvider))]
-    internal class InlineParameterNameHintsTaggerProvider : IViewTaggerProvider
+    [Name(nameof(InlineHintsTaggerProvider))]
+    internal class InlineHintsTaggerProvider : IViewTaggerProvider
     {
         private readonly IViewTagAggregatorFactoryService _viewTagAggregatorFactoryService;
         public readonly IClassificationFormatMapService ClassificationFormatMapService;
         public readonly IClassificationTypeRegistryService ClassificationTypeRegistryService;
         public readonly IThreadingContext ThreadingContext;
         public readonly IToolTipService ToolTipService;
+        public readonly ClassificationTypeMap TypeMap;
         public readonly Lazy<IStreamingFindUsagesPresenter> StreamingFindUsagesPresenter;
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public InlineParameterNameHintsTaggerProvider(
+        public InlineHintsTaggerProvider(
             IViewTagAggregatorFactoryService viewTagAggregatorFactoryService,
             IClassificationFormatMapService classificationFormatMapService,
             IClassificationTypeRegistryService classificationTypeRegistryService,
             IThreadingContext threadingContext,
             IToolTipService toolTipService,
+            ClassificationTypeMap typeMap,
             Lazy<IStreamingFindUsagesPresenter> streamingFindUsagesPresenter)
         {
             _viewTagAggregatorFactoryService = viewTagAggregatorFactoryService;
@@ -49,6 +51,7 @@ public InlineParameterNameHintsTaggerProvider(
             this.ThreadingContext = threadingContext;
             this.ToolTipService = toolTipService;
             this.StreamingFindUsagesPresenter = streamingFindUsagesPresenter;
+            this.TypeMap = typeMap;
         }
 
         public ITagger<T>? CreateTagger<T>(ITextView textView, ITextBuffer buffer) where T : ITag
@@ -60,8 +63,8 @@ public InlineParameterNameHintsTaggerProvider(
                 return null;
             }
 
-            var tagAggregator = _viewTagAggregatorFactoryService.CreateTagAggregator<InlineParameterNameHintDataTag>(textView);
-            return new InlineParameterNameHintsTagger(this, (IWpfTextView)textView, buffer, tagAggregator) as ITagger<T>;
+            var tagAggregator = _viewTagAggregatorFactoryService.CreateTagAggregator<InlineHintDataTag>(textView);
+            return new InlineHintsTagger(this, (IWpfTextView)textView, buffer, tagAggregator) as ITagger<T>;
         }
     }
 }
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.OpenTextBufferManager.cs b/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.OpenTextBufferManager.cs
index 9154501ade098..a5de4bf45f14a 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.OpenTextBufferManager.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.OpenTextBufferManager.cs
@@ -575,7 +575,7 @@ private static async Task<IEnumerable<TextChange>> GetTextChangesFromTextDiffere
                         return await textDiffService.GetTextChangesAsync(oldDocument, newDocument, cancellationToken).ConfigureAwait(false);
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.cs b/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.cs
index f4af452dc24c9..7e509d00e0e43 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.cs
@@ -226,7 +226,7 @@ private void InitializeOpenBuffers(SnapshotSpan triggerSpan)
                     var textSnapshot = text.FindCorrespondingEditorTextSnapshot();
                     if (textSnapshot == null)
                     {
-                        FatalError.ReportWithoutCrash(new NullTextBufferException(document, text));
+                        FatalError.ReportAndCatch(new NullTextBufferException(document, text));
                         continue;
                     }
                     Contract.ThrowIfNull(textSnapshot.TextBuffer);
diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs
index e8c8afb8ffa69..3abee8d00b54d 100644
--- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs
+++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs
@@ -458,7 +458,7 @@ private async Task<ExecutionResult> ResetCoreAsync(InteractiveHostOptions option
 
                 return new ExecutionResult(result.Success);
             }
-            catch (Exception e) when (FatalError.Report(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -509,7 +509,7 @@ public async Task<ExecutionResult> ExecuteCodeAsync(string text)
                     return new ExecutionResult(result.Success);
                 }, _shutdownCancellationSource.Token).ConfigureAwait(false);
             }
-            catch (Exception e) when (FatalError.Report(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -542,7 +542,7 @@ public async Task SetPathsAsync(ImmutableArray<string> referenceSearchPaths, Imm
                 var result = await _interactiveHost.SetPathsAsync(referenceSearchPaths.ToArray(), sourceSearchPaths.ToArray(), workingDirectory).ConfigureAwait(false);
                 UpdatePathsNoLock(result);
             }
-            catch (Exception e) when (FatalError.Report(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/EditorFeatures/Core.Wpf/Preview/DifferenceViewerPreview.cs b/src/EditorFeatures/Core.Wpf/Preview/DifferenceViewerPreview.cs
index 1014f703791ae..0683872c4e174 100644
--- a/src/EditorFeatures/Core.Wpf/Preview/DifferenceViewerPreview.cs
+++ b/src/EditorFeatures/Core.Wpf/Preview/DifferenceViewerPreview.cs
@@ -45,7 +45,7 @@ public void Dispose()
                 return;
             }
 
-            FatalError.ReportWithoutCrash(new Exception($"Dispose is not called how? viewer state : {_viewer.IsClosed}"));
+            FatalError.ReportAndCatch(new Exception($"Dispose is not called how? viewer state : {_viewer.IsClosed}"));
         }
     }
 }
diff --git a/src/EditorFeatures/Core.Wpf/Structure/AbstractStructureTaggerProvider.cs b/src/EditorFeatures/Core.Wpf/Structure/AbstractStructureTaggerProvider.cs
index 4766223b5f83c..756a0f680c959 100644
--- a/src/EditorFeatures/Core.Wpf/Structure/AbstractStructureTaggerProvider.cs
+++ b/src/EditorFeatures/Core.Wpf/Structure/AbstractStructureTaggerProvider.cs
@@ -105,7 +105,7 @@ protected sealed override async Task ProduceTagsAsync(
                         blockStructure.Spans);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -135,7 +135,7 @@ protected sealed override void ProduceTagsSynchronously(
                         blockStructure.Spans);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -243,7 +243,7 @@ private static ImmutableArray<BlockSpan> GetMultiLineRegions(
                             {
                                 throw new InvalidOutliningRegionException(service, snapshot, snapshotSpan, regionSpan);
                             }
-                            catch (InvalidOutliningRegionException e) when (FatalError.ReportWithoutCrash(e))
+                            catch (InvalidOutliningRegionException e) when (FatalError.ReportAndCatch(e))
                             {
                             }
                         }
diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedActions.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedActions.cs
index 7fc751ffd49d7..c447aaf4f616d 100644
--- a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedActions.cs
+++ b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedActions.cs
@@ -62,7 +62,7 @@ protected override void InnerInvoke(IProgressTracker progressTracker, Cancellati
             {
                 throw new InvalidOperationException("Invoke should not be called on a SuggestedActionWithNestedActions");
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
             }
         }
diff --git a/src/EditorFeatures/Core/EditorFeaturesResources.resx b/src/EditorFeatures/Core/EditorFeaturesResources.resx
index e12d425a5a077..b3acd7a18475e 100644
--- a/src/EditorFeatures/Core/EditorFeaturesResources.resx
+++ b/src/EditorFeatures/Core/EditorFeaturesResources.resx
@@ -936,8 +936,8 @@ Do you want to proceed?</value>
   <data name="external" xml:space="preserve">
     <value>(external)</value>
   </data>
-  <data name="Inline_Parameter_Name_Hints" xml:space="preserve">
-    <value>Inline Parameter Name Hints</value>
+  <data name="Inline_Hints" xml:space="preserve">
+    <value>Inline Hints</value>
   </data>
   <data name="Error_creating_instance_of_CodeFixProvider_0" xml:space="preserve">
     <value>Error creating instance of CodeFixProvider '{0}'</value>
diff --git a/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs b/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs
index 5fca76d0424f4..adee8a24dad0f 100644
--- a/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs
+++ b/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs
@@ -139,7 +139,7 @@ private async Task StreamingFindReferencesAsync(
             catch (OperationCanceledException)
             {
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
             }
         }
diff --git a/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationUtilities.cs b/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationUtilities.cs
index 0c69103b8401a..968111eca7daa 100644
--- a/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationUtilities.cs
+++ b/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationUtilities.cs
@@ -162,7 +162,7 @@ await AddSemanticClassificationsAsync(
                     context.State = version;
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/EditorFeatures/Core/Implementation/Diagnostics/AbstractDiagnosticsTaggerProvider.cs b/src/EditorFeatures/Core/Implementation/Diagnostics/AbstractDiagnosticsTaggerProvider.cs
index 0581c8042d616..ec3127c536eb8 100644
--- a/src/EditorFeatures/Core/Implementation/Diagnostics/AbstractDiagnosticsTaggerProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/Diagnostics/AbstractDiagnosticsTaggerProvider.cs
@@ -227,7 +227,7 @@ private void ProduceTags(
                     }
                 }
             }
-            catch (ArgumentOutOfRangeException ex) when (FatalError.ReportWithoutCrash(ex))
+            catch (ArgumentOutOfRangeException ex) when (FatalError.ReportAndCatch(ex))
             {
                 // https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems?id=428328&_a=edit&triage=false
                 // explicitly report NFW to find out what is causing us for out of range.
diff --git a/src/EditorFeatures/Core/Implementation/Diagnostics/DiagnosticsClassificationTaggerProvider.cs b/src/EditorFeatures/Core/Implementation/Diagnostics/DiagnosticsClassificationTaggerProvider.cs
index 46fc1b19f327c..9909e353a6eb8 100644
--- a/src/EditorFeatures/Core/Implementation/Diagnostics/DiagnosticsClassificationTaggerProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/Diagnostics/DiagnosticsClassificationTaggerProvider.cs
@@ -95,7 +95,7 @@ static IEnumerable<int> GetLocationIndices(string indicesProperty)
                     var result = serializer.ReadObject(stream) as IEnumerable<int>;
                     return result ?? Array.Empty<int>();
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+                catch (Exception e) when (FatalError.ReportAndCatch(e))
                 {
                     return ImmutableArray<int>.Empty;
                 }
diff --git a/src/EditorFeatures/Core/Implementation/EditAndContinue/ActiveStatementTrackingService.cs b/src/EditorFeatures/Core/Implementation/EditAndContinue/ActiveStatementTrackingService.cs
index 82903956fc9c8..7858f5f45cba0 100644
--- a/src/EditorFeatures/Core/Implementation/EditAndContinue/ActiveStatementTrackingService.cs
+++ b/src/EditorFeatures/Core/Implementation/EditAndContinue/ActiveStatementTrackingService.cs
@@ -155,7 +155,7 @@ private async Task TrackActiveSpansAsync(Document document, CancellationToken ca
                 {
                     // nop
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+                catch (Exception e) when (FatalError.ReportAndCatch(e))
                 {
                     // nop
                 }
@@ -223,7 +223,7 @@ private async Task TrackActiveSpansAsync(CancellationToken cancellationToken)
                 {
                     // nop
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+                catch (Exception e) when (FatalError.ReportAndCatch(e))
                 {
                     // nop
                 }
@@ -333,7 +333,7 @@ internal async Task<ImmutableArray<ActiveStatementTrackingSpan>> GetAdjustedTrac
                 {
                     // nop
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+                catch (Exception e) when (FatalError.ReportAndCatch(e))
                 {
                     // nop
                 }
diff --git a/src/EditorFeatures/Core/Implementation/ForegroundNotification/ForegroundNotificationService.cs b/src/EditorFeatures/Core/Implementation/ForegroundNotification/ForegroundNotificationService.cs
index d9f384930504d..92d24c850562f 100644
--- a/src/EditorFeatures/Core/Implementation/ForegroundNotification/ForegroundNotificationService.cs
+++ b/src/EditorFeatures/Core/Implementation/ForegroundNotification/ForegroundNotificationService.cs
@@ -114,7 +114,7 @@ private async Task ProcessAsync()
                     // run them in UI thread
                     await InvokeBelowInputPriorityAsync(NotifyOnForeground).ConfigureAwait(continueOnCapturedContext: false);
                 }
-                catch (Exception ex) when (FatalError.ReportWithoutCrash(ex))
+                catch (Exception ex) when (FatalError.ReportAndCatch(ex))
                 {
                     // This is an error condition but we must continue to drain the work queue.  If we
                     // do not then IAsyncToken values will remain uncomplete and the unit test code
@@ -165,7 +165,7 @@ private void NotifyOnForegroundWorker()
                         {
                             // eat up cancellation
                         }
-                        catch (Exception ex) when (FatalError.ReportWithoutCrash(ex))
+                        catch (Exception ex) when (FatalError.ReportAndCatch(ex))
                         {
                             // The PendingWork callbacks should never throw.  In the case they do we
                             // must ensure the IAsyncToken implementation is completed.  If it is not
diff --git a/src/EditorFeatures/Core/Implementation/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs b/src/EditorFeatures/Core/Implementation/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs
index 876f07ebdda82..c2e7620c0d4f0 100644
--- a/src/EditorFeatures/Core/Implementation/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs
+++ b/src/EditorFeatures/Core/Implementation/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs
@@ -71,7 +71,7 @@ public bool TryGetDocumentOption(OptionKey option, out object? value)
                             }
                             else
                             {
-                                FatalError.ReportWithoutCrash(new System.Exception("We had an open document but it wasn't associated with a buffer. That meant we coudln't apply formatting settings."));
+                                FatalError.ReportAndCatch(new System.Exception("We had an open document but it wasn't associated with a buffer. That meant we coudln't apply formatting settings."));
                             }
                         }
                     }
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs
index 844a03a9c4b41..03a50dda744a2 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs
@@ -187,13 +187,13 @@ private AsyncCompletionData.CommitResult Commit(
             if (!subjectBuffer.CheckEditAccess())
             {
                 // We are on the wrong thread.
-                FatalError.ReportWithoutCrash(new InvalidOperationException("Subject buffer did not provide Edit Access"));
+                FatalError.ReportAndCatch(new InvalidOperationException("Subject buffer did not provide Edit Access"));
                 return new AsyncCompletionData.CommitResult(isHandled: true, AsyncCompletionData.CommitBehavior.None);
             }
 
             if (subjectBuffer.EditInProgress)
             {
-                FatalError.ReportWithoutCrash(new InvalidOperationException("Subject buffer is editing by someone else."));
+                FatalError.ReportAndCatch(new InvalidOperationException("Subject buffer is editing by someone else."));
                 return new AsyncCompletionData.CommitResult(isHandled: true, AsyncCompletionData.CommitBehavior.None);
             }
 
@@ -208,7 +208,7 @@ private AsyncCompletionData.CommitResult Commit(
             {
                 change = completionService.GetChangeAsync(document, roslynItem, completionListSpan, commitCharacter, disallowAddingImports, cancellationToken).WaitAndGetResult(cancellationToken);
             }
-            catch (OperationCanceledException e) when (e.CancellationToken != cancellationToken && FatalError.ReportWithoutCrash(e))
+            catch (OperationCanceledException e) when (e.CancellationToken != cancellationToken && FatalError.ReportAndCatch(e))
             {
                 return CommitResultUnhandled;
             }
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/QuickInfoSourceProvider.QuickInfoSource.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/QuickInfoSourceProvider.QuickInfoSource.cs
index 9888a8fc92047..1f3392502d905 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/QuickInfoSourceProvider.QuickInfoSource.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/QuickInfoSourceProvider.QuickInfoSource.cs
@@ -78,7 +78,7 @@ public async Task<IntellisenseQuickInfoItem> GetQuickInfoItemAsync(IAsyncQuickIn
                         return null;
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs
index db6ec60a689c6..46d99b4c66c4c 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs
@@ -118,7 +118,7 @@ private async Task<Model> ComputeModelInBackgroundAsync(
                                     .WithSelectedParameter(selection.SelectedParameter);
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -209,7 +209,7 @@ private static bool CompareParts(TaggedText p1, TaggedText p2)
 
                     return (bestProvider, bestItems);
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
                 {
                     return (null, null);
                 }
diff --git a/src/EditorFeatures/Core/Implementation/Interactive/Completion/AbstractDirectivePathCompletionProvider.cs b/src/EditorFeatures/Core/Implementation/Interactive/Completion/AbstractDirectivePathCompletionProvider.cs
index d1476f45e6ee9..1925b6c51a6db 100644
--- a/src/EditorFeatures/Core/Implementation/Interactive/Completion/AbstractDirectivePathCompletionProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/Interactive/Completion/AbstractDirectivePathCompletionProvider.cs
@@ -54,7 +54,7 @@ public sealed override async Task ProvideCompletionsAsync(CompletionContext cont
 
                 await ProvideCompletionsAsync(context, pathThroughLastSlash).ConfigureAwait(false);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.StateMachine.cs b/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.StateMachine.cs
index 903f3b2691fa0..5f15c01a7d742 100644
--- a/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.StateMachine.cs
+++ b/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.StateMachine.cs
@@ -318,7 +318,7 @@ public bool CanInvokeRename(
 
                     return default;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.cs b/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.cs
index 52c2e958773a3..43ca512dd0487 100644
--- a/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/RenameTracking/RenameTrackingTaggerProvider.cs
@@ -125,7 +125,7 @@ public static (CodeAction action, TextSpan renameSpan) TryGetCodeAction(
 
                 return default;
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/EditorFeatures/Core/InlineHints/InlineHintDataTag.cs b/src/EditorFeatures/Core/InlineHints/InlineHintDataTag.cs
new file mode 100644
index 0000000000000..33a2ee3c0bf1c
--- /dev/null
+++ b/src/EditorFeatures/Core/InlineHints/InlineHintDataTag.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CodeAnalysis.InlineHints;
+using Microsoft.VisualStudio.Text.Tagging;
+
+namespace Microsoft.CodeAnalysis.Editor.InlineHints
+{
+    /// <summary>
+    /// The simple tag that only holds information regarding the associated parameter name
+    /// for the argument
+    /// </summary>
+    internal class InlineHintDataTag : ITag
+    {
+        public readonly InlineHint Hint;
+
+        public InlineHintDataTag(InlineHint hint)
+        {
+            Hint = hint;
+        }
+    }
+}
diff --git a/src/EditorFeatures/Core/InlineHints/InlineParameterNameHintsDataTaggerProvider.cs b/src/EditorFeatures/Core/InlineHints/InlineHintsDataTaggerProvider.cs
similarity index 74%
rename from src/EditorFeatures/Core/InlineHints/InlineParameterNameHintsDataTaggerProvider.cs
rename to src/EditorFeatures/Core/InlineHints/InlineHintsDataTaggerProvider.cs
index 89ae80bb39706..d1e4ca9ba81b0 100644
--- a/src/EditorFeatures/Core/InlineHints/InlineParameterNameHintsDataTaggerProvider.cs
+++ b/src/EditorFeatures/Core/InlineHints/InlineHintsDataTaggerProvider.cs
@@ -14,11 +14,12 @@
 using Microsoft.CodeAnalysis.InlineHints;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
+using Microsoft.CodeAnalysis.Text.Shared.Extensions;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
-using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
+using VSUtilities = Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.InlineHints
 {
@@ -26,10 +27,10 @@ namespace Microsoft.CodeAnalysis.Editor.InlineHints
     /// The TaggerProvider that calls upon the service in order to locate the spans and names
     /// </summary>
     [Export(typeof(IViewTaggerProvider))]
-    [ContentType(ContentTypeNames.RoslynContentType)]
-    [TagType(typeof(InlineParameterNameHintDataTag))]
-    [Name(nameof(InlineParameterNameHintsDataTaggerProvider))]
-    internal class InlineParameterNameHintsDataTaggerProvider : AsynchronousViewTaggerProvider<InlineParameterNameHintDataTag>
+    [VSUtilities.ContentType(ContentTypeNames.RoslynContentType)]
+    [TagType(typeof(InlineHintDataTag))]
+    [VSUtilities.Name(nameof(InlineHintsDataTaggerProvider))]
+    internal class InlineHintsDataTaggerProvider : AsynchronousViewTaggerProvider<InlineHintDataTag>
     {
         private readonly IAsynchronousOperationListener _listener;
 
@@ -37,7 +38,7 @@ internal class InlineParameterNameHintsDataTaggerProvider : AsynchronousViewTagg
 
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         [ImportingConstructor]
-        public InlineParameterNameHintsDataTaggerProvider(
+        public InlineHintsDataTaggerProvider(
             IThreadingContext threadingContext,
             IAsynchronousOperationListenerProvider listenerProvider,
             IForegroundNotificationService notificationService)
@@ -57,7 +58,10 @@ protected override ITaggerEventSource CreateEventSource(ITextView textViewOpt, I
                 TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.ForObjectCreationParameters, TaggerDelay.NearImmediate),
                 TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.ForOtherParameters, TaggerDelay.NearImmediate),
                 TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.SuppressForParametersThatMatchMethodIntent, TaggerDelay.NearImmediate),
-                TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix, TaggerDelay.NearImmediate));
+                TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix, TaggerDelay.NearImmediate),
+                TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.EnabledForTypes, TaggerDelay.NearImmediate),
+                TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.ForImplicitVariableTypes, TaggerDelay.NearImmediate),
+                TaggerEventSources.OnOptionChanged(subjectBuffer, InlineHintsOptions.ForLambdaParameterTypes, TaggerDelay.NearImmediate));
         }
 
         protected override IEnumerable<SnapshotSpan> GetSpansToTag(ITextView textView, ITextBuffer subjectBuffer)
@@ -76,27 +80,21 @@ protected override IEnumerable<SnapshotSpan> GetSpansToTag(ITextView textView, I
             return SpecializedCollections.SingletonEnumerable(visibleSpanOpt.Value);
         }
 
-        protected override async Task ProduceTagsAsync(TaggerContext<InlineParameterNameHintDataTag> context, DocumentSnapshotSpan documentSnapshotSpan, int? caretPosition)
+        protected override async Task ProduceTagsAsync(TaggerContext<InlineHintDataTag> context, DocumentSnapshotSpan documentSnapshotSpan, int? caretPosition)
         {
             var cancellationToken = context.CancellationToken;
             var document = documentSnapshotSpan.Document;
+            var service = document.GetLanguageService<IInlineHintsService>();
+            if (service == null)
+                return;
 
             var snapshotSpan = documentSnapshotSpan.SnapshotSpan;
-            var paramNameHintsService = document.GetLanguageService<IInlineParameterNameHintsService>();
-            if (paramNameHintsService != null)
+            var hints = await service.GetInlineHintsAsync(document, snapshotSpan.Span.ToTextSpan(), cancellationToken).ConfigureAwait(false);
+            foreach (var hint in hints)
             {
-                var parameterHints = await paramNameHintsService.GetInlineParameterNameHintsAsync(document, snapshotSpan.Span.ToTextSpan(), cancellationToken).ConfigureAwait(false);
-                foreach (var parameterHint in parameterHints)
-                {
-                    Contract.ThrowIfNull(parameterHint.Parameter);
-
-                    cancellationToken.ThrowIfCancellationRequested();
-                    context.AddTag(new TagSpan<InlineParameterNameHintDataTag>(
-                        new SnapshotSpan(snapshotSpan.Snapshot, parameterHint.Position, 0),
-                        new InlineParameterNameHintDataTag(
-                            parameterHint.Parameter.GetSymbolKey(cancellationToken),
-                            parameterHint.Parameter.Name)));
-                }
+                context.AddTag(new TagSpan<InlineHintDataTag>(
+                    hint.Span.ToSnapshotSpan(snapshotSpan.Snapshot),
+                    new InlineHintDataTag(hint)));
             }
         }
     }
diff --git a/src/EditorFeatures/Core/InlineHints/InlineParameterNameHintDataTag.cs b/src/EditorFeatures/Core/InlineHints/InlineParameterNameHintDataTag.cs
deleted file mode 100644
index 226b065bc3ec1..0000000000000
--- a/src/EditorFeatures/Core/InlineHints/InlineParameterNameHintDataTag.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.VisualStudio.Text.Tagging;
-
-namespace Microsoft.CodeAnalysis.Editor.InlineHints
-{
-    /// <summary>
-    /// The simple tag that only holds information regarding the associated parameter name
-    /// for the argument
-    /// </summary>
-    internal class InlineParameterNameHintDataTag : ITag
-    {
-        public readonly SymbolKey ParameterSymbolKey;
-        public readonly string ParameterName;
-
-        public InlineParameterNameHintDataTag(SymbolKey parameterSymbolKey, string parameterName)
-        {
-            if (parameterName.Length == 0)
-            {
-                throw new ArgumentException("Must have a length greater than 0", nameof(parameterName));
-            }
-
-            ParameterSymbolKey = parameterSymbolKey;
-            ParameterName = parameterName;
-        }
-    }
-}
diff --git a/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs b/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs
index 086568501c741..11debf182e641 100644
--- a/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs
+++ b/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs
@@ -180,7 +180,7 @@ private static async Task AddTagSpansAsync(
                         textSnapshot.GetSpan(Span.FromBounds(span.TextSpan.Start, span.TextSpan.End)), tag));
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // report NFW and continue.
                 // also, rather than return partial results, return nothing
diff --git a/src/EditorFeatures/Core/Shared/Extensions/ITextBufferEditExtensions.cs b/src/EditorFeatures/Core/Shared/Extensions/ITextBufferEditExtensions.cs
index 6ee4d248aba9b..78d965571c2cf 100644
--- a/src/EditorFeatures/Core/Shared/Extensions/ITextBufferEditExtensions.cs
+++ b/src/EditorFeatures/Core/Shared/Extensions/ITextBufferEditExtensions.cs
@@ -26,7 +26,7 @@ public static ITextSnapshot ApplyAndLogExceptions(this ITextBufferEdit edit)
             {
                 return edit.Apply();
             }
-            catch (Exception e) when (ErrorReporting.FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (ErrorReporting.FatalError.ReportAndCatch(e))
             {
                 s_lastException = e;
 
diff --git a/src/EditorFeatures/Core/Shared/Extensions/ITextBufferExtensions.cs b/src/EditorFeatures/Core/Shared/Extensions/ITextBufferExtensions.cs
index 3c0609a100390..3397d0fd35574 100644
--- a/src/EditorFeatures/Core/Shared/Extensions/ITextBufferExtensions.cs
+++ b/src/EditorFeatures/Core/Shared/Extensions/ITextBufferExtensions.cs
@@ -43,7 +43,7 @@ internal static bool GetFeatureOnOffOption(this ITextBuffer buffer, PerLanguageO
 
                 return option.DefaultValue;
             }
-            catch (Exception e) when (FatalError.Report(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/EditorFeatures/Core/Shared/Utilities/ClassificationTypeMap.cs b/src/EditorFeatures/Core/Shared/Utilities/ClassificationTypeMap.cs
index 153e0c1e7f462..27a65b51fac38 100644
--- a/src/EditorFeatures/Core/Shared/Utilities/ClassificationTypeMap.cs
+++ b/src/EditorFeatures/Core/Shared/Utilities/ClassificationTypeMap.cs
@@ -47,7 +47,7 @@ public IClassificationType GetClassificationType(string name)
             var type = GetClassificationTypeWorker(name);
             if (type == null)
             {
-                FatalError.ReportWithoutCrash(new Exception($"classification type doesn't exist for {name}"));
+                FatalError.ReportAndCatch(new Exception($"classification type doesn't exist for {name}"));
             }
 
             return type ?? GetClassificationTypeWorker(ClassificationTypeNames.Text);
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.cs b/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.cs
index bb21bf6e06044..cff2d39f83b3f 100644
--- a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.cs
+++ b/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.cs
@@ -43,7 +43,7 @@ public SymbolSearchUpdateEngine(ISymbolSearchLogService logService)
                    new PatchService(),
                    new DatabaseFactoryService(),
                    // Report all exceptions we encounter, but don't crash on them.
-                   FatalError.ReportWithoutCrash)
+                   FatalError.ReportAndCatch)
         {
         }
 
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf
index eb3bdc9abc207..612c4de0091b1 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Přejít na základní typ</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="translated">Nápovědy k názvům vložených parametrů</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf
index 39fbb426d8974..8996d95829ab2 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Zu Basis wechseln</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf
index 072ed41b36a20..7a7eb082c9983 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Ir a base</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf
index b147a5775ea10..40946fff72a4c 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Accéder à la base</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf
index 2e1a7d77a8627..31703fea76a2e 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Vai a base</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf
index 83e3bb54f5c4f..f3accbbda67bf 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf
@@ -77,9 +77,9 @@
         <target state="translated">基本へ移動</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf
index f78de6ca7e666..31c59ead8db6d 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf
@@ -77,9 +77,9 @@
         <target state="translated">기본으로 이동</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf
index 47295051a5027..ee5d157df8658 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Przejdź do podstawy</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf
index cd4558d54ece8..0cae43970e1be 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Ir Para a Base</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf
index 682b877a4ea2d..d0b0819d0a7d4 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Перейти к базовому</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf
index 7be0cb4db4642..102ec5ee07d7b 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf
@@ -77,9 +77,9 @@
         <target state="translated">Tabana Git</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf
index a5037ff8d868f..cc9df3e209b03 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf
@@ -77,9 +77,9 @@
         <target state="translated">转到基础映像</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="translated">内联参数名提示</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf
index c377644d5a8fb..533e0d1b4f736 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf
@@ -77,9 +77,9 @@
         <target state="translated">移至基底</target>
         <note />
       </trans-unit>
-      <trans-unit id="Inline_Parameter_Name_Hints">
-        <source>Inline Parameter Name Hints</source>
-        <target state="new">Inline Parameter Name Hints</target>
+      <trans-unit id="Inline_Hints">
+        <source>Inline Hints</source>
+        <target state="new">Inline Hints</target>
         <note />
       </trans-unit>
       <trans-unit id="Invalid_assembly_name">
diff --git a/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs b/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs
index ae25354ec66bb..ee3e1a24a96bd 100644
--- a/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs
+++ b/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs
@@ -833,8 +833,17 @@ No editorconfig based code style option
 # IDE0046, PreferConditionalExpressionOverReturn
 dotnet_style_prefer_conditional_expression_over_return = true:silent
 
-# IDE0047
-No editorconfig based code style option
+# IDE0047, ArithmeticBinaryParentheses
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+
+# IDE0047, OtherBinaryParentheses
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+
+# IDE0047, OtherParentheses
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+
+# IDE0047, RelationalBinaryParentheses
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 
 # IDE0048, ArithmeticBinaryParentheses
 dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
@@ -1066,8 +1075,17 @@ No editorconfig based code style option
 # IDE0046, PreferConditionalExpressionOverReturn
 dotnet_style_prefer_conditional_expression_over_return = true:silent
 
-# IDE0047
-No editorconfig based code style option
+# IDE0047, ArithmeticBinaryParentheses
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+
+# IDE0047, OtherBinaryParentheses
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+
+# IDE0047, OtherParentheses
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+
+# IDE0047, RelationalBinaryParentheses
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 
 # IDE0048, ArithmeticBinaryParentheses
 dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
diff --git a/src/EditorFeatures/Test2/InlineHints/AbstractInlineHintsTests.vb b/src/EditorFeatures/Test2/InlineHints/AbstractInlineHintsTests.vb
new file mode 100644
index 0000000000000..0b594002aa7f6
--- /dev/null
+++ b/src/EditorFeatures/Test2/InlineHints/AbstractInlineHintsTests.vb
@@ -0,0 +1,70 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Threading
+Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
+Imports Microsoft.CodeAnalysis.InlineHints
+
+Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
+    <[UseExportProvider]>
+    Public MustInherit Class AbstractInlineHintsTests
+        Protected Async Function VerifyParamHints(test As XElement, Optional optionIsEnabled As Boolean = True) As Task
+            Using workspace = TestWorkspace.Create(test)
+                WpfTestRunner.RequireWpfFact($"{NameOf(AbstractInlineHintsTests)}.{NameOf(Me.VerifyParamHints)} creates asynchronous taggers")
+
+                workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(workspace.Options.WithChangedOption(
+                    InlineHintsOptions.EnabledForParameters,
+                    workspace.CurrentSolution.Projects().First().Language,
+                    optionIsEnabled)))
+
+                Dim hostDocument = workspace.Documents.Single()
+                Dim snapshot = hostDocument.GetTextBuffer().CurrentSnapshot
+                Dim document = workspace.CurrentSolution.GetDocument(hostDocument.Id)
+                Dim tagService = document.GetRequiredLanguageService(Of IInlineParameterNameHintsService)
+                Dim inlineHints = Await tagService.GetInlineHintsAsync(document, New Text.TextSpan(0, snapshot.Length), New CancellationToken())
+
+                Dim producedTags = From hint In inlineHints
+                                   Select hint.DisplayParts.GetFullText() + hint.Span.ToString
+
+                ValidateSpans(hostDocument, producedTags)
+            End Using
+        End Function
+
+        Private Shared Sub ValidateSpans(hostDocument As TestHostDocument, producedTags As IEnumerable(Of String))
+            Dim expectedTags As New List(Of String)
+
+            Dim nameAndSpansList = hostDocument.AnnotatedSpans.SelectMany(
+                Function(name) name.Value,
+                Function(name, span) New With {.Name = name.Key, span})
+
+            For Each nameAndSpan In nameAndSpansList.OrderBy(Function(x) x.span.Start)
+                expectedTags.Add(nameAndSpan.Name + ":" + nameAndSpan.span.ToString())
+            Next
+
+            AssertEx.Equal(expectedTags, producedTags)
+        End Sub
+
+        Protected Async Function VerifyTypeHints(test As XElement, Optional optionIsEnabled As Boolean = True) As Task
+            Using workspace = TestWorkspace.Create(test)
+                WpfTestRunner.RequireWpfFact($"{NameOf(AbstractInlineHintsTests)}.{NameOf(Me.VerifyTypeHints)} creates asynchronous taggers")
+
+                workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(workspace.Options.WithChangedOption(
+                    InlineHintsOptions.EnabledForTypes,
+                    workspace.CurrentSolution.Projects().First().Language,
+                    optionIsEnabled)))
+
+                Dim hostDocument = workspace.Documents.Single()
+                Dim snapshot = hostDocument.GetTextBuffer().CurrentSnapshot
+                Dim document = workspace.CurrentSolution.GetDocument(hostDocument.Id)
+                Dim tagService = document.GetRequiredLanguageService(Of IInlineTypeHintsService)
+                Dim typeHints = Await tagService.GetInlineHintsAsync(document, New Text.TextSpan(0, snapshot.Length), New CancellationToken())
+
+                Dim producedTags = From hint In typeHints
+                                   Select hint.DisplayParts.GetFullText() + ":" + hint.Span.ToString()
+
+                ValidateSpans(hostDocument, producedTags)
+            End Using
+        End Function
+    End Class
+End Namespace
diff --git a/src/EditorFeatures/Test2/InlineHints/AbstractInlineParameterNameHintsTests.vb b/src/EditorFeatures/Test2/InlineHints/AbstractInlineParameterNameHintsTests.vb
deleted file mode 100644
index a032b961f399e..0000000000000
--- a/src/EditorFeatures/Test2/InlineHints/AbstractInlineParameterNameHintsTests.vb
+++ /dev/null
@@ -1,45 +0,0 @@
-' Licensed to the .NET Foundation under one or more agreements.
-' The .NET Foundation licenses this file to you under the MIT license.
-' See the LICENSE file in the project root for more information.
-
-Imports System.Threading
-Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.InlineHints
-
-Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
-    <[UseExportProvider]>
-    Public MustInherit Class AbstractInlineParameterNameHintsTests
-
-        Protected Async Function VerifyParamHints(test As XElement, Optional optionIsEnabled As Boolean = True) As Task
-            Using workspace = TestWorkspace.Create(test)
-                WpfTestRunner.RequireWpfFact($"{NameOf(AbstractInlineParameterNameHintsTests)}.{NameOf(Me.VerifyParamHints)} creates asynchronous taggers")
-
-                workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(workspace.Options.WithChangedOption(
-                    InlineHintsOptions.EnabledForParameters,
-                    workspace.CurrentSolution.Projects().First().Language,
-                    optionIsEnabled)))
-
-                Dim hostDocument = workspace.Documents.Single()
-                Dim snapshot = hostDocument.GetTextBuffer().CurrentSnapshot
-                Dim document = workspace.CurrentSolution.GetDocument(hostDocument.Id)
-                Dim tagService = document.GetRequiredLanguageService(Of IInlineParameterNameHintsService)
-                Dim paramNameHintSpans = Await tagService.GetInlineParameterNameHintsAsync(document, New Text.TextSpan(0, snapshot.Length), New CancellationToken())
-
-                Dim producedTags = From tag In paramNameHintSpans
-                                   Select tag.Parameter.Name + ":" + tag.Position.ToString
-
-                Dim expectedTags As New List(Of String)
-
-                Dim nameAndSpansList = hostDocument.AnnotatedSpans.SelectMany(
-                    Function(name) name.Value,
-                    Function(name, span) New With {.Name = name.Key, span})
-
-                For Each nameAndSpan In nameAndSpansList.OrderBy(Function(x) x.Span.Start)
-                    expectedTags.Add(nameAndSpan.Name + ":" + nameAndSpan.Span.Start.ToString())
-                Next
-
-                AssertEx.Equal(expectedTags, producedTags)
-            End Using
-        End Function
-    End Class
-End Namespace
diff --git a/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb b/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb
index d6a929902f2af..340a7e821f067 100644
--- a/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb
+++ b/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb
@@ -4,9 +4,9 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
     Public Class CSharpInlineParameterNameHintsTests
-        Inherits AbstractInlineParameterNameHintsTests
+        Inherits AbstractInlineHintsTests
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNoParameterSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -30,7 +30,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOneParameterSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -44,7 +44,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:5|});
+        testMethod({|x:|}5);
     }
 }
                     </Document>
@@ -54,7 +54,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestTwoParametersSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -68,7 +68,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:5|}, {|y:2|});
+        testMethod({|x:|}5, {|y:|}2);
     }
 }
                     </Document>
@@ -78,7 +78,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNegativeNumberParametersSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -92,7 +92,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:-5|}, {|y:2|});
+        testMethod({|x:|}-5, {|y:|}2);
     }
 }
                     </Document>
@@ -102,7 +102,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestLiteralNestedCastParametersSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -116,7 +116,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:(int)(double)(int)5.5|}, {|y:2|});
+        testMethod({|x:|}(int)(double)(int)5.5, {|y:|}2);
     }
 }
                     </Document>
@@ -126,7 +126,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestObjectCreationParametersSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -140,7 +140,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:(int)5.5|}, {|y:new object()|});
+        testMethod({|x:|}(int)5.5, {|y:|}new object());
     }
 }
                     </Document>
@@ -150,7 +150,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestCastingANegativeSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -164,7 +164,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:(int)-5.5|}, {|y:new object()|});
+        testMethod({|x:|}(int)-5.5, {|y:|}new object());
     }
 }
                     </Document>
@@ -174,7 +174,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNegatingACastSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -188,7 +188,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:-(int)5.5|}, {|y:new object()|});
+        testMethod({|x:|}-(int)5.5, {|y:|}new object());
     }
 }
                     </Document>
@@ -198,7 +198,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMissingParameterNameSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -222,7 +222,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestDelegateParameter() As Task
             Dim input =
             <Workspace>
@@ -240,7 +240,7 @@ class Test
     static void Main()
     {
         D cd1 = new D(C.M1);
-        cd1({|x:-1|});
+        cd1({|x:|}-1);
     }
 }
                     </Document>
@@ -250,7 +250,7 @@ class Test
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestFunctionPointerNoParameter() As Task
             Dim input =
             <Workspace>
@@ -268,7 +268,7 @@ unsafe class Example {
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestParamsArgument() As Task
             Dim input =
             <Workspace>
@@ -282,7 +282,7 @@ class A
 
     public void Main(string[] args)
     {
-        UseParams({|list:1|}, 2, 3, 4, 5, 6); 
+        UseParams({|list:|}1, 2, 3, 4, 5, 6); 
     } 
 }
                     </Document>
@@ -292,7 +292,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestAttributesArgument() As Task
             Dim input =
             <Workspace>
@@ -300,7 +300,7 @@ class A
                     <Document>
 using System;
 
-[Obsolete({|message:"test"|})]
+[Obsolete({|message:|}"test")]
 class Foo
 {
         
@@ -313,7 +313,7 @@ class Foo
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestIncompleteFunctionCall() As Task
             Dim input =
             <Workspace>
@@ -327,7 +327,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:-(int)5.5|},);
+        testMethod({|x:|}-(int)5.5,);
     }
 }
                     </Document>
@@ -337,7 +337,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestInterpolatedString() As Task
             Dim input =
             <Workspace>
@@ -351,7 +351,7 @@ class A
     }
     void Main() 
     {
-        testMethod({|x:$""|});
+        testMethod({|x:|}$"");
     }
 }
                     </Document>
@@ -361,7 +361,7 @@ class A
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         <WorkItem(47696, "https://github.com/dotnet/roslyn/issues/47696")>
         Public Async Function TestRecordBaseType() As Task
             Dim input =
@@ -369,7 +369,7 @@ class A
                 <Project Language="C#" CommonReferences="true">
                     <Document>
 record Base(int Alice, int Bob);
-record Derived(int Other) : Base({|Alice:2|}, {|Bob:2|});
+record Derived(int Other) : Base({|Alice:|}2, {|Bob:|}2);
                     </Document>
                 </Project>
             </Workspace>
@@ -377,7 +377,7 @@ record Derived(int Other) : Base({|Alice:2|}, {|Bob:2|});
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         <WorkItem(47696, "https://github.com/dotnet/roslyn/issues/47696")>
         Public Async Function TestClassBaseType() As Task
             Dim input =
@@ -390,7 +390,7 @@ class Base
 }
 class Derived : Base
 {
-    public Derived() : base({|paramName:20|}) {}
+    public Derived() : base({|paramName:|}20) {}
 }
                     </Document>
                 </Project>
@@ -400,7 +400,7 @@ class Derived : Base
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNotOnEnableDisableBoolean1() As Task
             Dim input =
             <Workspace>
@@ -425,7 +425,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNotOnEnableDisableBoolean2() As Task
             Dim input =
             <Workspace>
@@ -450,7 +450,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnEnableDisableNonBoolean1() As Task
             Dim input =
             <Workspace>
@@ -464,7 +464,7 @@ class A
 
     void Main() 
     {
-        EnableLogging({|value:"IO"|});
+        EnableLogging({|value:|}"IO");
     }
 }
                     </Document>
@@ -475,7 +475,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnEnableDisableNonBoolean2() As Task
             Dim input =
             <Workspace>
@@ -489,7 +489,7 @@ class A
 
     void Main() 
     {
-        DisableLogging({|value:"IO"|});
+        DisableLogging({|value:|}"IO");
     }
 }
                     </Document>
@@ -500,7 +500,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnSetMethodWithClearContext() As Task
             Dim input =
             <Workspace>
@@ -525,7 +525,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnSetMethodWithUnclearContext() As Task
             Dim input =
             <Workspace>
@@ -539,7 +539,7 @@ class A
 
     void Main() 
     {
-        SetClassification({|values:"IO"|});
+        SetClassification({|values:|}"IO");
     }
 }
                     </Document>
@@ -550,7 +550,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -575,7 +575,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithNonAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -589,7 +589,7 @@ class A
 
     void Main() 
     {
-        Goo({|objA:1|}, {|objB:2|}, {|nonobjC:3|});
+        Goo({|objA:|}1, {|objB:|}2, {|nonobjC:|}3);
     }
 }
                     </Document>
@@ -600,7 +600,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithNumericSuffix1() As Task
             Dim input =
             <Workspace>
@@ -625,7 +625,7 @@ class A
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithNonNumericSuffix1() As Task
             Dim input =
             <Workspace>
@@ -639,7 +639,7 @@ class A
 
     void Main() 
     {
-        Goo({|obj1:1|}, {|obj2:2|}, {|nonobj3:3|});
+        Goo({|obj1:|}1, {|obj2:|}2, {|nonobj3:|}3);
     }
 }
                     </Document>
diff --git a/src/EditorFeatures/Test2/InlineHints/CSharpInlineTypeHintsTests.vb b/src/EditorFeatures/Test2/InlineHints/CSharpInlineTypeHintsTests.vb
new file mode 100644
index 0000000000000..99a6f55896fe8
--- /dev/null
+++ b/src/EditorFeatures/Test2/InlineHints/CSharpInlineTypeHintsTests.vb
@@ -0,0 +1,212 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
+    Public Class CSharpInlineTypeHintsTests
+        Inherits AbstractInlineHintsTests
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestNotOnLocalVariableWithType() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+class A
+{
+    void Main() 
+    {
+        int i = 0;
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestOnLocalVariableWithVarType() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+class A
+{
+    void Main() 
+    {
+        var {|int:|}i = 0;
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestOnDeconstruction() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+class A
+{
+    void Main() 
+    {
+        var ({|int:|}i, {|string:|}j) = (0, "");
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestWithForeachVar() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+class A
+{
+    void Main(string[] args) 
+    {
+        foreach (var {|string:|}j in args) {}
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestNotWithForeachType() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+class A
+{
+    void Main(string[] args) 
+    {
+        foreach (string j in args) {}
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestWithPatternVar() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+class A
+{
+    void Main(string[] args) 
+    {
+        if (args is { Length: var {|int:|}goo }) { }
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestNotWithPatternType() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+class A
+{
+    void Main(string[] args) 
+    {
+        if (args is { Length: int goo }) { }
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestWithSimpleLambda() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+using System.Linq;
+class A
+{
+    void Main(string[] args) 
+    {
+        args.Where({|string:|}a => a.Length > 0);
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestWithParenthesizedLambda() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+using System.Linq;
+class A
+{
+    void Main(string[] args) 
+    {
+        args.Where(({|string:|}a) => a.Length > 0);
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
+        Public Async Function TestNotWithParenthesizedLambdaWithType() As Task
+            Dim input =
+            <Workspace>
+                <Project Language="C#" CommonReferences="true">
+                    <Document>
+using System.Linq;
+class A
+{
+    void Main(string[] args) 
+    {
+        args.Where((string a) => a.Length > 0);
+    }
+}
+                    </Document>
+                </Project>
+            </Workspace>
+
+            Await VerifyTypeHints(input)
+        End Function
+    End Class
+End Namespace
diff --git a/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb b/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb
index e1169778b55ec..2bc85485d97ec 100644
--- a/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb
+++ b/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb
@@ -4,9 +4,9 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
     Public Class VisualBasicInlineParameterNameHintsTests
-        Inherits AbstractInlineParameterNameHintsTests
+        Inherits AbstractInlineHintsTests
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNoParameterSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOneParameterSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -36,7 +36,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:5|})
+                                TestMethod({|x:|}5)
                             End Sub
 
                             Sub TestMethod(x As Integer)
@@ -50,7 +50,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestTwoParametersSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -58,7 +58,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:5|}, {|y:2.2|})
+                                TestMethod({|x:|}5, {|y:|}2.2)
                             End Sub
 
                             Sub TestMethod(x As Integer, y As Double)
@@ -72,7 +72,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNegativeNumberParametersSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -80,7 +80,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:-5|}, {|y:2.2|})
+                                TestMethod({|x:|}-5, {|y:|}2.2)
                             End Sub
 
                             Sub TestMethod(x As Integer, y As Double)
@@ -94,7 +94,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestCIntCast() As Task
             Dim input =
             <Workspace>
@@ -102,7 +102,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:CInt(5.5)|}, {|y:2.2|})
+                                TestMethod({|x:|}CInt(5.5), {|y:|}2.2)
                             End Sub
 
                             Sub TestMethod(x As Integer, y As Double)
@@ -116,7 +116,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestCTypeCast() As Task
             Dim input =
             <Workspace>
@@ -124,7 +124,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:CType(5.5, Integer)|}, {|y:2.2|})
+                                TestMethod({|x:|}CType(5.5, Integer), {|y:|}2.2)
                             End Sub
 
                             Sub TestMethod(x As Integer, y As Double)
@@ -138,7 +138,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestTryCastCase() As Task
             Dim input =
             <Workspace>
@@ -150,7 +150,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
 		                    End Sub
 
 		                    Public Sub Main()
-			                    test({|x:TryCast(New Object(), String)|})
+			                    test({|x:|}TryCast(New Object(), String))
 		                    End Sub
 	                    End Class
                     </Document>
@@ -160,7 +160,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestDirectCastCase() As Task
             Dim input =
             <Workspace>
@@ -172,7 +172,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
 		                    End Sub
 
 		                    Public Sub Main()
-			                    test({|x:DirectCast(New Object(), String)|})
+			                    test({|x:|}DirectCast(New Object(), String))
 		                    End Sub
 	                    End Class
                     </Document>
@@ -182,7 +182,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestCastingANegativeSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -190,7 +190,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:CInt(-5.5)|}, {|y:2.2|})
+                                TestMethod({|x:|}CInt(-5.5), {|y:|}2.2)
                             End Sub
 
                             Sub TestMethod(x As Integer, y As Double)
@@ -204,7 +204,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestObjectCreationParametersSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -212,7 +212,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:CInt(-5.5)|}, {|y:2.2|}, {|obj:New Object()|})
+                                TestMethod({|x:|}CInt(-5.5), {|y:|}2.2, {|obj:|}New Object())
                             End Sub
 
                             Sub TestMethod(x As Integer, y As Double, obj As Object)
@@ -226,7 +226,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMissingParameterNameSimpleCase() As Task
             Dim input =
             <Workspace>
@@ -248,7 +248,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestDelegateParameter() As Task
             Dim input =
             <Workspace>
@@ -258,7 +258,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
 		                    Public Delegate Sub TestDelegate(ByVal str As String)
 
 		                    Public Sub TestTheDelegate(ByVal test As TestDelegate)
-			                    test({|str:"Test"|})
+			                    test({|str:|}"Test")
 		                    End Sub
 	                    End Class
                     </Document>
@@ -268,7 +268,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestParamsArgument() As Task
             Dim input =
             <Workspace>
@@ -280,7 +280,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
 		                    End Sub
 
 		                    Public Sub Main()
-			                    UseParams({|args:1|}, 2, 3, 4, 5)
+			                    UseParams({|args:|}1, 2, 3, 4, 5)
 		                    End Sub
 	                    End Class
                     </Document>
@@ -290,13 +290,13 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestAttributesArgument() As Task
             Dim input =
             <Workspace>
                 <Project Language="Visual Basic" CommonReferences="true">
                     <Document>
-                        &lt;Obsolete({|message:"test"|})&gt;
+                        &lt;Obsolete({|message:|}"test")&gt;
                         Public Class Foo
                             Sub TestMethod()
 
@@ -309,7 +309,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestIncompleteFunctionCall() As Task
             Dim input =
             <Workspace>
@@ -317,7 +317,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:5|},)
+                                TestMethod({|x:|}5,)
                             End Sub
 
                             Sub TestMethod(x As Integer, y As Double)
@@ -331,7 +331,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input)
         End Function
 
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestInterpolatedString() As Task
             Dim input =
             <Workspace>
@@ -339,7 +339,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
                     <Document>
                         Class Foo
                             Sub Main(args As String())
-                                TestMethod({|x:$""|})
+                                TestMethod({|x:|}$"")
                             End Sub
 
                             Sub TestMethod(x As String)
@@ -354,7 +354,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNotOnEnableDisableBoolean1() As Task
             Dim input =
             <Workspace>
@@ -376,7 +376,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestNotOnEnableDisableBoolean2() As Task
             Dim input =
             <Workspace>
@@ -398,7 +398,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnEnableDisableNonBoolean1() As Task
             Dim input =
             <Workspace>
@@ -409,7 +409,7 @@ class A
     end sub
 
     sub Main() 
-        EnableLogging({|value:"IO"|})
+        EnableLogging({|value:|}"IO")
     end sub
 end class
                     </Document>
@@ -420,7 +420,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnEnableDisableNonBoolean2() As Task
             Dim input =
             <Workspace>
@@ -431,7 +431,7 @@ class A
     end sub
 
     sub Main() 
-        DisableLogging({|value:"IO"|})
+        DisableLogging({|value:|}"IO")
     end sub
 end class
                     </Document>
@@ -442,7 +442,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnSetMethodWithClearContext() As Task
             Dim input =
             <Workspace>
@@ -464,7 +464,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestOnSetMethodWithUnclearContext() As Task
             Dim input =
             <Workspace>
@@ -475,7 +475,7 @@ class A
     end sub
 
     sub Main() 
-        SetClassification({|values:"IO"|})
+        SetClassification({|values:|}"IO")
     end sub
 end class
                     </Document>
@@ -486,7 +486,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -508,7 +508,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithNonAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -519,7 +519,7 @@ class A
     end sub
 
     sub Main() 
-        Goo({|objA:1|}, {|objB:2|}, {|nonobjC:3|})
+        Goo({|objA:|}1, {|objB:|}2, {|nonobjC:|}3)
     end sub
 end class
                     </Document>
@@ -530,7 +530,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithNumericSuffix1() As Task
             Dim input =
             <Workspace>
@@ -552,7 +552,7 @@ end class
         End Function
 
         <WorkItem(47597, "https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineParameterNameHints)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.InlineHints)>
         Public Async Function TestMethodWithNonNumericSuffix1() As Task
             Dim input =
             <Workspace>
@@ -563,7 +563,7 @@ class A
     end sub
 
     sub Main() 
-        Goo({|obj1:1|}, {|obj2:2|}, {|nonobj3:3|})
+        Goo({|obj1:|}1, {|obj2:|}2, {|nonobj3:|}3)
     end sub
 end class
                     </Document>
diff --git a/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs b/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
index 1f595d1157f3e..f8bfb44ec17bf 100644
--- a/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
+++ b/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
@@ -69,12 +69,6 @@ public ImmutableArray<Document> GetDocuments(Uri documentUri)
                 Contract.ThrowIfNull(_currentSolution);
                 return _currentSolution.GetDocuments(documentUri);
             }
-
-            public ImmutableArray<TextDocument> GetTextDocuments(Uri documentUri)
-            {
-                Contract.ThrowIfNull(_currentSolution);
-                return _currentSolution.GetTextDocuments(documentUri);
-            }
         }
 
         private class TestSpanMapperProvider : IDocumentServiceProvider
diff --git a/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb b/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb
index bf925e51c348a..46dbf32e47864 100644
--- a/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb
+++ b/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb
@@ -105,7 +105,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar
                 Loop
 
                 Return typesAndDeclarations.Select(Function(kvp) Tuple.Create(kvp.Key, kvp.Value)).OrderBy(Function(t) t.Item1.Name)
-            Catch ex As Exception When FatalError.ReportUnlessCanceled(ex)
+            Catch ex As Exception When FatalError.ReportAndPropagateUnlessCanceled(ex)
                 Throw ExceptionUtilities.Unreachable
             End Try
         End Function
diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs
index c5ea09c845103..14f9fd413db72 100644
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs
@@ -34,11 +34,6 @@ public abstract class ExpressionCompiler :
         private readonly IDkmLanguageInstructionDecoder _languageInstructionDecoder;
         private readonly bool _useReferencedAssembliesOnly;
 
-        static ExpressionCompiler()
-        {
-            FatalError.Handler = FailFast.OnFatalException;
-        }
-
         public ExpressionCompiler(IDkmLanguageFrameDecoder languageFrameDecoder, IDkmLanguageInstructionDecoder languageInstructionDecoder)
         {
             _languageFrameDecoder = languageFrameDecoder;
diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionEvaluatorFatalError.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionEvaluatorFatalError.cs
index 863badb6d5057..8d133831fe449 100644
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionEvaluatorFatalError.cs
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionEvaluatorFatalError.cs
@@ -87,7 +87,7 @@ internal static bool CrashIfFailFastEnabled(Exception exception)
                 }
             }
 
-            return FatalError.Report(exception);
+            return FatalError.ReportAndPropagate(exception);
         }
     }
 }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/AttributeNamedParameterCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/AttributeNamedParameterCompletionProvider.cs
index fa4b16fecae46..58ad72fc6bc90 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/AttributeNamedParameterCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/AttributeNamedParameterCompletionProvider.cs
@@ -100,7 +100,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                     context.AddItems(nameColonItems);
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs
index 20b8b8501ff84..aedbf30f9aeba 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs
@@ -103,7 +103,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
 
                 context.AddItems(items);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
index a327932dbbf04..1d272d95976b5 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
@@ -82,7 +82,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
                 completionContext.SuggestionModeItem = CommonCompletionItem.Create(
                     CSharpFeaturesResources.Name, displayTextSuffix: "", CompletionItemRules.Default);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
index 0590327a5b806..f9f1c42f144cc 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
@@ -150,7 +150,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                     context.AddItem(item);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceMemberCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceMemberCompletionProvider.cs
index e07c2f918d9fb..3e1d8123aa5fd 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceMemberCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceMemberCompletionProvider.cs
@@ -114,7 +114,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                         rules: CompletionItemRules.Default));
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceTypeCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceTypeCompletionProvider.cs
index 51b5f5c3d2949..1d87776178de2 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceTypeCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceTypeCompletionProvider.cs
@@ -68,7 +68,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                         CSharpFeaturesResources.Autoselect_disabled_due_to_member_declaration);
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/ExternAliasCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/ExternAliasCompletionProvider.cs
index 28f29d61cfe3f..2d817529c9e03 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/ExternAliasCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/ExternAliasCompletionProvider.cs
@@ -88,7 +88,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/FunctionPointerUnmanagedCallingConventionCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/FunctionPointerUnmanagedCallingConventionCompletionProvider.cs
index 8373b4f906c50..9406539220e54 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/FunctionPointerUnmanagedCallingConventionCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/FunctionPointerUnmanagedCallingConventionCompletionProvider.cs
@@ -82,7 +82,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
 
                 context.AddItems(completionItems);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.cs
index 95c29478572a3..9adf2d0403b55 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.cs
@@ -125,7 +125,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                         filterText: escapedName));
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs
index 44a509876b26c..6dd112069c0e8 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs
@@ -73,7 +73,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                     context.AddItems(snippetCompletionItems);
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs
index 8e1606794a0a7..a7bd864836114 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs
@@ -57,7 +57,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                         T, displayTextSuffix: "", CompletionItemRules.Default, glyph: Glyph.TypeParameter));
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs
index ca04f42e1a98e..54e9ab6c4d5b2 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs
@@ -63,7 +63,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
 
                 AddItems(inferredTypes, index.Value, completionContext, context.TargetToken.Parent.SpanStart);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.cs
index eb30d7b95ff10..d624c03cf33a0 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.cs
@@ -156,7 +156,7 @@ protected override async Task<IEnumerable<CompletionItem>> GetItemsWorkerAsync(
                 items.AddRange(GetAlwaysVisibleItems());
                 return items;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return SpecializedCollections.EmptyEnumerable<CompletionItem>();
             }
diff --git a/src/Features/CSharp/Portable/Debugging/CSharpBreakpointResolutionService.cs b/src/Features/CSharp/Portable/Debugging/CSharpBreakpointResolutionService.cs
index edff7fd30ff10..367066f9412dc 100644
--- a/src/Features/CSharp/Portable/Debugging/CSharpBreakpointResolutionService.cs
+++ b/src/Features/CSharp/Portable/Debugging/CSharpBreakpointResolutionService.cs
@@ -47,7 +47,7 @@ public async Task<BreakpointResolutionResult> ResolveBreakpointAsync(Document do
 
                 return BreakpointResolutionResult.CreateSpanResult(document, span);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return null;
             }
diff --git a/src/Features/CSharp/Portable/Debugging/CSharpProximityExpressionsService.cs b/src/Features/CSharp/Portable/Debugging/CSharpProximityExpressionsService.cs
index 8575b3b6b5ea0..3a592513ecfac 100644
--- a/src/Features/CSharp/Portable/Debugging/CSharpProximityExpressionsService.cs
+++ b/src/Features/CSharp/Portable/Debugging/CSharpProximityExpressionsService.cs
@@ -94,7 +94,7 @@ public async Task<IList<string>> GetProximityExpressionsAsync(
                 var tree = await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
                 return Do(tree, position, cancellationToken);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return null;
             }
diff --git a/src/Features/CSharp/Portable/Debugging/DataTipInfoGetter.cs b/src/Features/CSharp/Portable/Debugging/DataTipInfoGetter.cs
index 6db08f5d46402..fd952bef4f7f8 100644
--- a/src/Features/CSharp/Portable/Debugging/DataTipInfoGetter.cs
+++ b/src/Features/CSharp/Portable/Debugging/DataTipInfoGetter.cs
@@ -87,7 +87,7 @@ internal static async Task<DebugDataTipInfo> GetInfoAsync(Document document, int
 
                 return new DebugDataTipInfo(expression.Span, textOpt);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return default;
             }
diff --git a/src/Features/CSharp/Portable/GenerateMember/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsService.cs b/src/Features/CSharp/Portable/GenerateMember/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsService.cs
index e763b40ab8647..7698c1727ed67 100644
--- a/src/Features/CSharp/Portable/GenerateMember/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsService.cs
+++ b/src/Features/CSharp/Portable/GenerateMember/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsService.cs
@@ -32,11 +32,12 @@ protected override bool TryInitializeState(
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            // Offer the feature if we're on the header for the class/struct, or if we're on the 
-            // first base-type of a class.
+            // Offer the feature if we're on the header / between members of the class/struct,
+            // or if we're on the first base-type of a class
 
             var syntaxFacts = semanticDocument.Document.GetLanguageService<ISyntaxFactsService>();
-            if (syntaxFacts.IsOnTypeHeader(semanticDocument.Root, textSpan.Start, out var typeDeclaration))
+            if (syntaxFacts.IsOnTypeHeader(semanticDocument.Root, textSpan.Start, out var typeDeclaration) ||
+                syntaxFacts.IsBetweenTypeMembers(semanticDocument.Text, semanticDocument.Root, textSpan.Start, out typeDeclaration))
             {
                 classType = semanticDocument.SemanticModel.GetDeclaredSymbol(typeDeclaration, cancellationToken) as INamedTypeSymbol;
                 return classType?.TypeKind == TypeKind.Class;
diff --git a/src/Features/CSharp/Portable/InlineHints/CSharpInlineHintsService.cs b/src/Features/CSharp/Portable/InlineHints/CSharpInlineHintsService.cs
new file mode 100644
index 0000000000000..27d1eefde90bb
--- /dev/null
+++ b/src/Features/CSharp/Portable/InlineHints/CSharpInlineHintsService.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Composition;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.InlineHints;
+
+namespace Microsoft.CodeAnalysis.CSharp.InlineHints
+{
+    /// <summary>
+    /// The service to locate all positions where inline hints should be placed.
+    /// </summary>
+    [ExportLanguageService(typeof(IInlineHintsService), LanguageNames.CSharp), Shared]
+    internal class CSharpInlineHintsService : AbstractInlineHintsService
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public CSharpInlineHintsService()
+        {
+        }
+    }
+}
diff --git a/src/Features/CSharp/Portable/InlineHints/CSharpInlineParameterNameHintsService.cs b/src/Features/CSharp/Portable/InlineHints/CSharpInlineParameterNameHintsService.cs
index 78d12b863157a..898e982bf8697 100644
--- a/src/Features/CSharp/Portable/InlineHints/CSharpInlineParameterNameHintsService.cs
+++ b/src/Features/CSharp/Portable/InlineHints/CSharpInlineParameterNameHintsService.cs
@@ -13,6 +13,7 @@
 
 namespace Microsoft.CodeAnalysis.CSharp.InlineHints
 {
+
     /// <summary>
     /// The service to locate the positions in which the adornments should appear
     /// as well as associate the adornments back to the parameter name
@@ -29,7 +30,7 @@ public CSharpInlineParameterNameHintsService()
         protected override void AddAllParameterNameHintLocations(
              SemanticModel semanticModel,
              SyntaxNode node,
-             ArrayBuilder<InlineParameterHint> buffer,
+             ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)> buffer,
              CancellationToken cancellationToken)
         {
             if (node is BaseArgumentListSyntax argumentList)
@@ -42,7 +43,11 @@ protected override void AddAllParameterNameHintLocations(
             }
         }
 
-        private static void AddArguments(SemanticModel semanticModel, ArrayBuilder<InlineParameterHint> buffer, AttributeArgumentListSyntax argumentList, CancellationToken cancellationToken)
+        private static void AddArguments(
+            SemanticModel semanticModel,
+            ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)> buffer,
+            AttributeArgumentListSyntax argumentList,
+            CancellationToken cancellationToken)
         {
             foreach (var argument in argumentList.Arguments)
             {
@@ -50,14 +55,15 @@ private static void AddArguments(SemanticModel semanticModel, ArrayBuilder<Inlin
                     continue;
 
                 var parameter = argument.DetermineParameter(semanticModel, cancellationToken: cancellationToken);
-                buffer.Add(new InlineParameterHint(
-                    parameter,
-                    argument.Span.Start,
-                    GetKind(argument.Expression)));
+                buffer.Add((argument.Span.Start, parameter, GetKind(argument.Expression)));
             }
         }
 
-        private static void AddArguments(SemanticModel semanticModel, ArrayBuilder<InlineParameterHint> buffer, BaseArgumentListSyntax argumentList, CancellationToken cancellationToken)
+        private static void AddArguments(
+            SemanticModel semanticModel,
+            ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)> buffer,
+            BaseArgumentListSyntax argumentList,
+            CancellationToken cancellationToken)
         {
             foreach (var argument in argumentList.Arguments)
             {
@@ -65,21 +71,18 @@ private static void AddArguments(SemanticModel semanticModel, ArrayBuilder<Inlin
                     continue;
 
                 var parameter = argument.DetermineParameter(semanticModel, cancellationToken: cancellationToken);
-                buffer.Add(new InlineParameterHint(
-                    parameter,
-                    argument.Span.Start,
-                    GetKind(argument.Expression)));
+                buffer.Add((argument.Span.Start, parameter, GetKind(argument.Expression)));
             }
         }
 
-        private static InlineParameterHintKind GetKind(ExpressionSyntax arg)
+        private static HintKind GetKind(ExpressionSyntax arg)
             => arg switch
             {
-                LiteralExpressionSyntax or InterpolatedStringExpressionSyntax => InlineParameterHintKind.Literal,
-                ObjectCreationExpressionSyntax => InlineParameterHintKind.ObjectCreation,
+                LiteralExpressionSyntax or InterpolatedStringExpressionSyntax => HintKind.Literal,
+                ObjectCreationExpressionSyntax => HintKind.ObjectCreation,
                 CastExpressionSyntax cast => GetKind(cast.Expression),
                 PrefixUnaryExpressionSyntax prefix => GetKind(prefix.Operand),
-                _ => InlineParameterHintKind.Other,
+                _ => HintKind.Other,
             };
     }
 }
diff --git a/src/Features/CSharp/Portable/InlineHints/CSharpInlineTypeHintsService.cs b/src/Features/CSharp/Portable/InlineHints/CSharpInlineTypeHintsService.cs
new file mode 100644
index 0000000000000..2c9624ee4915c
--- /dev/null
+++ b/src/Features/CSharp/Portable/InlineHints/CSharpInlineTypeHintsService.cs
@@ -0,0 +1,104 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Composition;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.InlineHints;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.CSharp.InlineHints
+{
+    [ExportLanguageService(typeof(IInlineTypeHintsService), LanguageNames.CSharp), Shared]
+    internal class CSharpInlineTypeHintsService : AbstractInlineTypeHintsService
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public CSharpInlineTypeHintsService()
+        {
+        }
+
+        protected override (ITypeSymbol type, TextSpan span)? TryGetTypeHint(
+            SemanticModel semanticModel,
+            SyntaxNode node,
+            bool displayAllOverride,
+            bool forImplicitVariableTypes,
+            bool forLambdaParameterTypes,
+            CancellationToken cancellationToken)
+        {
+            if (forImplicitVariableTypes || displayAllOverride)
+            {
+                if (node is VariableDeclarationSyntax variableDeclaration &&
+                    variableDeclaration.Type.IsVar &&
+                    variableDeclaration.Variables.Count == 1 &&
+                    !variableDeclaration.Variables[0].Identifier.IsMissing)
+                {
+                    var type = semanticModel.GetTypeInfo(variableDeclaration.Type, cancellationToken).Type;
+                    if (IsValidType(type))
+                        return (type, GetSpan(displayAllOverride, forImplicitVariableTypes, variableDeclaration.Type, variableDeclaration.Variables[0].Identifier));
+                }
+                else if (node is SingleVariableDesignationSyntax { Parent: not DeclarationPatternSyntax } variableDesignation)
+                {
+                    var local = semanticModel.GetDeclaredSymbol(variableDesignation, cancellationToken) as ILocalSymbol;
+                    var type = local?.Type;
+                    if (IsValidType(type))
+                    {
+                        return node.Parent is VarPatternSyntax varPattern
+                            ? (type, GetSpan(displayAllOverride, forImplicitVariableTypes, varPattern.VarKeyword, variableDesignation.Identifier))
+                            : (type, new TextSpan(variableDesignation.Identifier.SpanStart, 0));
+                    }
+                }
+                else if (node is ForEachStatementSyntax forEachStatement &&
+                         forEachStatement.Type.IsVar)
+                {
+                    var info = semanticModel.GetForEachStatementInfo(forEachStatement);
+                    var type = info.ElementType;
+                    if (IsValidType(type))
+                        return (type, GetSpan(displayAllOverride, forImplicitVariableTypes, forEachStatement.Type, forEachStatement.Identifier));
+                }
+            }
+
+            if (forLambdaParameterTypes || displayAllOverride)
+            {
+                if (node is ParameterSyntax { Type: null } parameterNode)
+                {
+                    var parameter = semanticModel.GetDeclaredSymbol(parameterNode, cancellationToken);
+                    if (parameter?.ContainingSymbol is IMethodSymbol { MethodKind: MethodKind.AnonymousFunction } &&
+                        IsValidType(parameter?.Type))
+                    {
+                        return (parameter.Type, new TextSpan(parameterNode.Identifier.SpanStart, 0));
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private static TextSpan GetSpan(
+            bool displayAllOverride,
+            bool normalOption,
+            SyntaxNodeOrToken displayAllSpan,
+            SyntaxNodeOrToken normalSpan)
+        {
+            // If we're showing this because the normal option is on, then place the hint prior to the node being marked.
+            if (normalOption)
+                return new TextSpan(normalSpan.SpanStart, 0);
+
+            // Otherwise, we're showing because the user explicitly asked to see all hints.  In that case, overwrite the
+            // provided span (i.e. overwrite 'var' with 'int') as this provides a cleaner view while the user is in this
+            // mode.
+            Contract.ThrowIfFalse(displayAllOverride);
+            return displayAllSpan.Span;
+        }
+
+        private static bool IsValidType([NotNullWhen(true)] ITypeSymbol? type)
+        {
+            return type is not null or IErrorTypeSymbol && type.Name != "var";
+        }
+    }
+}
diff --git a/src/Features/CSharp/Portable/LanguageServices/CSharpAnonymousTypeDisplayService.cs b/src/Features/CSharp/Portable/LanguageServices/CSharpAnonymousTypeDisplayService.cs
index 81441109e64a9..a67ec6bd8c17d 100644
--- a/src/Features/CSharp/Portable/LanguageServices/CSharpAnonymousTypeDisplayService.cs
+++ b/src/Features/CSharp/Portable/LanguageServices/CSharpAnonymousTypeDisplayService.cs
@@ -6,12 +6,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Composition;
 using System.Linq;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.LanguageServices
@@ -25,10 +27,10 @@ public CSharpAnonymousTypeDisplayService()
         {
         }
 
-        public override IEnumerable<SymbolDisplayPart> GetAnonymousTypeParts(
+        public override ImmutableArray<SymbolDisplayPart> GetAnonymousTypeParts(
             INamedTypeSymbol anonymousType, SemanticModel semanticModel, int position)
         {
-            var members = new List<SymbolDisplayPart>();
+            using var _ = ArrayBuilder<SymbolDisplayPart>.GetInstance(out var members);
 
             members.Add(Keyword(SyntaxFacts.GetText(SyntaxKind.NewKeyword)));
             members.AddRange(Space());
@@ -53,7 +55,7 @@ public override IEnumerable<SymbolDisplayPart> GetAnonymousTypeParts(
             members.AddRange(Space());
             members.Add(Punctuation(SyntaxFacts.GetText(SyntaxKind.CloseBraceToken)));
 
-            return members;
+            return members.ToImmutable();
         }
     }
 }
diff --git a/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs b/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs
index 3a071ed5c45d9..a1169fd13ecc2 100644
--- a/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs
+++ b/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs
@@ -45,7 +45,7 @@ public CSharpUpgradeProjectCodeFixProvider()
                 "CS8652", // error CS8652: The feature '' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version.
                 "CS8703", // error CS8703: The modifier '{0}' is not valid for this item in C# {1}. Please use language version '{2}' or greater.
                 "CS8706", // error CS8706: '{0}' cannot implement interface member '{1}' in type '{2}' because feature '{3}' is not available in C# {4}. Please use language version '{5}' or greater. 
-                "CS9100", // error CS9100: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2<T1, T2>.M1(T1)' unless language version 'preview' or greater is used. 'T1' is covariant.
+                "CS8904", // error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2<T1, T2>.M1(T1)' unless language version 'preview' or greater is used. 'T1' is covariant.
             });
 
         public override string UpgradeThisProjectResource => CSharpFeaturesResources.Upgrade_this_project_to_csharp_language_version_0;
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractInternalsVisibleToCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractInternalsVisibleToCompletionProvider.cs
index 98d96c98cc306..74e9ec0f5032d 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractInternalsVisibleToCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractInternalsVisibleToCompletionProvider.cs
@@ -76,7 +76,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractPartialTypeCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractPartialTypeCompletionProvider.cs
index e0638bd06b9b3..65cebeb68329a 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractPartialTypeCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractPartialTypeCompletionProvider.cs
@@ -52,7 +52,7 @@ public sealed override async Task ProvideCompletionsAsync(CompletionContext comp
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
index 8e6d1071f28c8..756ae7e141b53 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
@@ -293,7 +293,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // nop
             }
@@ -365,7 +365,7 @@ private Task<ImmutableArray<ISymbol>> GetSymbolsAsync(int position, bool presele
                     ? GetPreselectedSymbolsAsync(context, position, options, cancellationToken)
                     : GetSymbolsAsync(context, position, options, cancellationToken);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Features/Core/Portable/Debugging/AbstractBreakpointResolver.cs b/src/Features/Core/Portable/Debugging/AbstractBreakpointResolver.cs
index dc74c186e7716..69f6109df4e39 100644
--- a/src/Features/Core/Portable/Debugging/AbstractBreakpointResolver.cs
+++ b/src/Features/Core/Portable/Debugging/AbstractBreakpointResolver.cs
@@ -114,7 +114,7 @@ public async Task<IEnumerable<BreakpointResolutionResult>> DoAsync(CancellationT
                 return members.Where(m => IsApplicable(m, parameterCount, cancellationToken)).
                     Select(CreateBreakpoint).ToImmutableArrayOrEmpty();
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return ImmutableArray<BreakpointResolutionResult>.Empty;
             }
@@ -150,7 +150,7 @@ private async Task<IEnumerable<ISymbol>> FindMembersAsync(
                         return FindMembers(containers, nameParts.ToArray());
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return ImmutableArray<ISymbol>.Empty;
             }
diff --git a/src/Features/Core/Portable/DesignerAttribute/AbstractDesignerAttributeIncrementalAnalyzer.cs b/src/Features/Core/Portable/DesignerAttribute/AbstractDesignerAttributeIncrementalAnalyzer.cs
index c868a9debe602..b4644fa2c466e 100644
--- a/src/Features/Core/Portable/DesignerAttribute/AbstractDesignerAttributeIncrementalAnalyzer.cs
+++ b/src/Features/Core/Portable/DesignerAttribute/AbstractDesignerAttributeIncrementalAnalyzer.cs
@@ -157,7 +157,7 @@ private async Task AnalyzeProjectAsync(Project project, Document? specificDocume
 
                 return (document, data);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return default;
             }
diff --git a/src/Features/Core/Portable/Diagnostics/AnalyzerHelper.cs b/src/Features/Core/Portable/Diagnostics/AnalyzerHelper.cs
index eaad6a6585c6b..95b4632c27099 100644
--- a/src/Features/Core/Portable/Diagnostics/AnalyzerHelper.cs
+++ b/src/Features/Core/Portable/Diagnostics/AnalyzerHelper.cs
@@ -278,10 +278,13 @@ Func<Exception, bool> GetAnalyzerExceptionFilter()
             {
                 return ex =>
                 {
-                    if (project.Solution.Workspace.Options.GetOption(InternalDiagnosticsOptions.CrashOnAnalyzerException))
+                    if (ex is not OperationCanceledException && project.Solution.Workspace.Options.GetOption(InternalDiagnosticsOptions.CrashOnAnalyzerException))
                     {
-                        // if option is on, crash the host to get crash dump.
-                        FatalError.ReportUnlessCanceled(ex);
+                        // report telemetry
+                        FatalError.ReportAndPropagate(ex);
+
+                        // force fail fast (the host might not crash when reporting telemetry):
+                        FailFast.OnFatalException(ex);
                     }
 
                     return true;
diff --git a/src/Features/Core/Portable/Diagnostics/DocumentAnalysisExecutor.cs b/src/Features/Core/Portable/Diagnostics/DocumentAnalysisExecutor.cs
index 6562cedfcb4bb..289bac11adfa3 100644
--- a/src/Features/Core/Portable/Diagnostics/DocumentAnalysisExecutor.cs
+++ b/src/Features/Core/Portable/Diagnostics/DocumentAnalysisExecutor.cs
@@ -304,7 +304,7 @@ async Task VerifySpanBasedCompilerDiagnosticsAsync()
                 if (!AnalyzerHelper.AreEquivalent(rangeDiagnostics, wholeDiagnostics))
                 {
                     // otherwise, report non-fatal watson so that we can fix those cases
-                    FatalError.ReportWithoutCrash(new Exception("Bug in GetDiagnostics"));
+                    FatalError.ReportAndCatch(new Exception("Bug in GetDiagnostics"));
 
                     // make sure we hold onto these for debugging.
                     GC.KeepAlive(rangeDeclaractionDiagnostics);
diff --git a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.Executor.cs b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.Executor.cs
index 1407e23776e4a..6e1a9554da44b 100644
--- a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.Executor.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.Executor.cs
@@ -47,7 +47,7 @@ internal partial class DiagnosticIncrementalAnalyzer
 
                 return null;
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -82,7 +82,7 @@ private static async Task<DocumentAnalysisData> ComputeDocumentAnalysisDataAsync
                     // we only care about local diagnostics
                     return new DocumentAnalysisData(version, existingData.Items, diagnostics.ToImmutableArrayOrEmpty());
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -128,7 +128,7 @@ private async Task<ProjectAnalysisData> GetProjectAnalysisDataAsync(
 
                     return new ProjectAnalysisData(project.Id, version, existingData.Result, result);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -211,7 +211,7 @@ private async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisRes
                 // check whether there is IDE specific project diagnostic analyzer
                 return await MergeProjectDiagnosticAnalyzerDiagnosticsAsync(project, ideAnalyzers, compilationWithAnalyzers?.Compilation, result, cancellationToken).ConfigureAwait(false);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -246,7 +246,7 @@ private async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisRes
                 // we couldn't reduce the set.
                 return await ComputeDiagnosticsAsync(compilationWithAnalyzers, project, ideAnalyzers, forcedAnalysis, cancellationToken).ConfigureAwait(false);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -365,7 +365,7 @@ private static async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnal
 
                 return result;
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.InProcOrRemoteHostAnalyzerRunner.cs b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.InProcOrRemoteHostAnalyzerRunner.cs
index 4efac22fede97..6bda2212f918d 100644
--- a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.InProcOrRemoteHostAnalyzerRunner.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.InProcOrRemoteHostAnalyzerRunner.cs
@@ -147,7 +147,7 @@ private async Task FireAndForgetReportAnalyzerPerformanceAsync(
                     callbackTarget: null,
                     cancellationToken).ConfigureAwait(false);
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceled(ex))
+            catch (Exception ex) when (FatalError.ReportAndCatchUnlessCanceled(ex))
             {
                 // ignore all, this is fire and forget method
             }
diff --git a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_GetDiagnosticsForSpan.cs b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_GetDiagnosticsForSpan.cs
index 383653abf9719..f2f5985cfedc0 100644
--- a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_GetDiagnosticsForSpan.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_GetDiagnosticsForSpan.cs
@@ -140,7 +140,7 @@ public async Task<bool> TryGetAsync(ArrayBuilder<DiagnosticData> list, Cancellat
                     Debug.Assert(!_blockForData || containsFullResult);
                     return containsFullResult;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
index 2320ee077a694..9a84271a4bc1e 100644
--- a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
@@ -83,7 +83,7 @@ private async Task AnalyzeDocumentForKindAsync(TextDocument document, AnalysisKi
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -163,7 +163,7 @@ private async Task AnalyzeProjectAsync(Project project, bool forceAnalyzerRun, C
 
                 RaiseProjectDiagnosticsIfNeeded(project, stateSets, result.OldResult, result.Result);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs b/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs
index 4e6a59d7c72e3..8d13544b738f2 100644
--- a/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs
+++ b/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs
@@ -320,7 +320,7 @@ private static async Task AddLocationSpanAsync(Location location, Solution solut
                     }
                 }
             }
-            catch (NullReferenceException e) when (FatalError.ReportWithoutCrash(e))
+            catch (NullReferenceException e) when (FatalError.ReportAndCatch(e))
             {
                 // We currently are seeing a strange null references crash in this code.  We have
                 // a strong belief that this is recoverable, but we'd like to know why it is 
diff --git a/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs b/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
index 3296319bc3b9c..e1c68dc154a15 100644
--- a/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
+++ b/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
@@ -589,7 +589,7 @@ public async Task<DocumentAnalysisResults> AnalyzeDocumentAsync(
                     lineEdits.AsImmutable(),
                     hasSemanticErrors: false);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // The same behavior as if there was a syntax error - we are unable to analyze the document. 
                 // We expect OOM to be thrown during the analysis if the number of top-level entities is too large.
@@ -1162,7 +1162,7 @@ private void AnalyzeUpdatedActiveMethodBodies(
                     newActiveStatements[ordinal] = oldActiveStatements[ordinal].WithSpan(newText.Lines.GetLinePositionSpan(newSpan));
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 // Set the new spans of active statements overlapping the method body to match the old spans.
                 // Even though these might be now outside of the method body it's ok since we report a rude edit and don't allow to continue.
diff --git a/src/Features/Core/Portable/EditAndContinue/CommittedSolution.cs b/src/Features/Core/Portable/EditAndContinue/CommittedSolution.cs
index 5d0624945c2e9..630e7eaed2964 100644
--- a/src/Features/Core/Portable/EditAndContinue/CommittedSolution.cs
+++ b/src/Features/Core/Portable/EditAndContinue/CommittedSolution.cs
@@ -334,7 +334,7 @@ public void CommitSolution(Solution solution)
                     debugInfoReaderProvider.Dispose();
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 EditAndContinueWorkspaceService.Log.Write("Source '{0}' doesn't match PDB: unexpected exception: {1}", sourceFilePath, e.Message);
             }
diff --git a/src/Features/Core/Portable/EditAndContinue/EditAndContinueMethodDebugInfoReader.cs b/src/Features/Core/Portable/EditAndContinue/EditAndContinueMethodDebugInfoReader.cs
index 798f774c7e7f2..98917b86fbc76 100644
--- a/src/Features/Core/Portable/EditAndContinue/EditAndContinueMethodDebugInfoReader.cs
+++ b/src/Features/Core/Portable/EditAndContinue/EditAndContinueMethodDebugInfoReader.cs
@@ -74,7 +74,7 @@ public override EditAndContinueMethodDebugInformation GetDebugInfo(MethodDefinit
                     // for methods without custom debug info (https://github.com/dotnet/roslyn/issues/4138).
                     debugInfo = null;
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrash(e)) // likely a bug in the compiler/debugger
+                catch (Exception e) when (FatalError.ReportAndCatch(e)) // likely a bug in the compiler/debugger
                 {
                     throw new InvalidDataException(e.Message, e);
                 }
@@ -94,7 +94,7 @@ public override EditAndContinueMethodDebugInformation GetDebugInfo(MethodDefinit
 
                     return EditAndContinueMethodDebugInformation.Create(localSlots, lambdaMap);
                 }
-                catch (InvalidOperationException e) when (FatalError.ReportWithoutCrash(e)) // likely a bug in the compiler/debugger
+                catch (InvalidOperationException e) when (FatalError.ReportAndCatch(e)) // likely a bug in the compiler/debugger
                 {
                     // TODO: CustomDebugInfoReader should throw InvalidDataException
                     throw new InvalidDataException(e.Message, e);
diff --git a/src/Features/Core/Portable/EditAndContinue/EditAndContinueWorkspaceService.cs b/src/Features/Core/Portable/EditAndContinue/EditAndContinueWorkspaceService.cs
index 1fdf90e8e187b..94d9cc0f7905b 100644
--- a/src/Features/Core/Portable/EditAndContinue/EditAndContinueWorkspaceService.cs
+++ b/src/Features/Core/Portable/EditAndContinue/EditAndContinueWorkspaceService.cs
@@ -237,7 +237,7 @@ public async Task<ImmutableArray<Diagnostic>> GetDocumentDiagnosticsAsync(Docume
                 var tree = await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
                 return analysis.RudeEditErrors.SelectAsArray((e, t) => e.ToDiagnostic(t), tree);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return ImmutableArray<Diagnostic>.Empty;
             }
@@ -529,7 +529,7 @@ public void DiscardSolutionUpdate()
 
                 return currentActiveStatements[baseActiveStatement.PrimaryDocumentOrdinal].Span;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return null;
             }
@@ -569,7 +569,7 @@ public void DiscardSolutionUpdate()
                 // If the document is out-of-sync the exception regions can't be determined.
                 return baseExceptionRegions.Spans.IsDefault ? (bool?)null : baseExceptionRegions.IsActiveStatementCovered;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return null;
             }
diff --git a/src/Features/Core/Portable/EditAndContinue/EditSession.cs b/src/Features/Core/Portable/EditAndContinue/EditSession.cs
index 9ac47afe119b3..fa32e276611d7 100644
--- a/src/Features/Core/Portable/EditAndContinue/EditSession.cs
+++ b/src/Features/Core/Portable/EditAndContinue/EditSession.cs
@@ -113,7 +113,7 @@ private async Task<ActiveStatementsMap> GetBaseActiveStatementsAsync(ActiveState
                 // Last committed solution reflects the state of the source that is in sync with the binaries that are loaded in the debuggee.
                 return CreateActiveStatementsMap(await activeStatementProvider(cancellationToken).ConfigureAwait(false));
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return new ActiveStatementsMap(
                     SpecializedCollections.EmptyReadOnlyDictionary<DocumentId, ImmutableArray<ActiveStatement>>(),
@@ -279,7 +279,7 @@ internal async Task<ImmutableArray<ActiveStatementExceptionRegions>> GetBaseActi
 
                 return result;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return ImmutableArray<ActiveStatementExceptionRegions>.Empty;
             }
@@ -445,7 +445,7 @@ private AsyncLazy<DocumentAnalysisResults> GetDocumentAnalysisNoLock(Document? b
 
                         return await analyzer.AnalyzeDocumentAsync(baseDocument, documentBaseActiveStatements, document, activeStatementSpans, cancellationToken).ConfigureAwait(false);
                     }
-                    catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                    catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                     {
                         throw ExceptionUtilities.Unreachable;
                     }
@@ -548,7 +548,7 @@ from documentId in solution.GetDocumentIdsWithFilePath(sourceFilePath)
 
                 return false;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -654,7 +654,7 @@ private static async Task<ProjectChanges> GetProjectChangesAsync(ImmutableArray<
                     allAddedSymbolResult,
                     activeStatementsInChangedDocuments.ToImmutableAndFree());
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -772,7 +772,7 @@ await Task.Factory.StartNew(() =>
                             {
                                 Emit();
                             }
-                            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+                            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                             {
                                 throw ExceptionUtilities.Unreachable;
                             }
@@ -893,7 +893,7 @@ void Emit()
                     emitBaselines.ToImmutable(),
                     diagnostics.ToImmutable());
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Features/Core/Portable/ExtractMethod/ExtractMethodMatrix.cs b/src/Features/Core/Portable/ExtractMethod/ExtractMethodMatrix.cs
index b5cace461754e..55b7fe25afa52 100644
--- a/src/Features/Core/Portable/ExtractMethod/ExtractMethodMatrix.cs
+++ b/src/Features/Core/Portable/ExtractMethod/ExtractMethodMatrix.cs
@@ -95,7 +95,7 @@ public static bool TryGetVariableStyle(
 
             // Some combination we didn't anticipate.  Can't do anything here.  Log the issue
             // and bail out.
-            FatalError.ReportWithoutCrash(new Exception($"extract method encountered unknown states: {key.ToString()}"));
+            FatalError.ReportAndCatch(new Exception($"extract method encountered unknown states: {key.ToString()}"));
 
             return false;
         }
diff --git a/src/Features/Core/Portable/InlineHints/AbstractInlineHintsService.cs b/src/Features/Core/Portable/InlineHints/AbstractInlineHintsService.cs
new file mode 100644
index 0000000000000..ae8ecbaff3699
--- /dev/null
+++ b/src/Features/Core/Portable/InlineHints/AbstractInlineHintsService.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.InlineHints
+{
+    internal abstract class AbstractInlineHintsService : IInlineHintsService
+    {
+        public async Task<ImmutableArray<InlineHint>> GetInlineHintsAsync(
+            Document document, TextSpan textSpan, CancellationToken cancellationToken)
+        {
+            var inlineParameterService = document.GetLanguageService<IInlineParameterNameHintsService>();
+            var inlineTypeService = document.GetLanguageService<IInlineTypeHintsService>();
+
+            var parameters = inlineParameterService == null
+                ? ImmutableArray<InlineHint>.Empty
+                : await inlineParameterService.GetInlineHintsAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+
+            var types = inlineTypeService == null
+                ? ImmutableArray<InlineHint>.Empty
+                : await inlineTypeService.GetInlineHintsAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+
+            return parameters.Concat(types);
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/InlineHints/AbstractInlineParameterNameHintsService.cs b/src/Features/Core/Portable/InlineHints/AbstractInlineParameterNameHintsService.cs
index 8ef54685b4383..862027e8e0800 100644
--- a/src/Features/Core/Portable/InlineHints/AbstractInlineParameterNameHintsService.cs
+++ b/src/Features/Core/Portable/InlineHints/AbstractInlineParameterNameHintsService.cs
@@ -15,38 +15,45 @@ namespace Microsoft.CodeAnalysis.InlineHints
 {
     internal abstract class AbstractInlineParameterNameHintsService : IInlineParameterNameHintsService
     {
+        protected enum HintKind
+        {
+            Literal,
+            ObjectCreation,
+            Other
+        }
+
         protected abstract void AddAllParameterNameHintLocations(
             SemanticModel semanticModel,
             SyntaxNode node,
-            ArrayBuilder<InlineParameterHint> buffer,
+            ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)> buffer,
             CancellationToken cancellationToken);
 
-        public async Task<ImmutableArray<InlineParameterHint>> GetInlineParameterNameHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken)
+        public async Task<ImmutableArray<InlineHint>> GetInlineHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken)
         {
             var options = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
 
             var displayAllOverride = options.GetOption(InlineHintsOptions.DisplayAllOverride);
 
-            var forParameters = displayAllOverride || options.GetOption(InlineHintsOptions.EnabledForParameters);
-            if (!forParameters)
-                return ImmutableArray<InlineParameterHint>.Empty;
+            var enabledForParameters = displayAllOverride || options.GetOption(InlineHintsOptions.EnabledForParameters);
+            if (!enabledForParameters)
+                return ImmutableArray<InlineHint>.Empty;
 
             var literalParameters = displayAllOverride || options.GetOption(InlineHintsOptions.ForLiteralParameters);
             var objectCreationParameters = displayAllOverride || options.GetOption(InlineHintsOptions.ForObjectCreationParameters);
             var otherParameters = displayAllOverride || options.GetOption(InlineHintsOptions.ForOtherParameters);
             if (!literalParameters && !objectCreationParameters && !otherParameters)
-                return ImmutableArray<InlineParameterHint>.Empty;
+                return ImmutableArray<InlineHint>.Empty;
 
-            var suppressForParametersThatDifferOnlyBySuffix = options.GetOption(InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix);
-            var suppressForParametersThatMatchMethodIntent = options.GetOption(InlineHintsOptions.SuppressForParametersThatMatchMethodIntent);
+            var suppressForParametersThatDifferOnlyBySuffix = !displayAllOverride && options.GetOption(InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix);
+            var suppressForParametersThatMatchMethodIntent = !displayAllOverride && options.GetOption(InlineHintsOptions.SuppressForParametersThatMatchMethodIntent);
 
             var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
 
-            using var _1 = ArrayBuilder<InlineParameterHint>.GetInstance(out var result);
-            using var _2 = ArrayBuilder<InlineParameterHint>.GetInstance(out var buffer);
+            using var _1 = ArrayBuilder<InlineHint>.GetInstance(out var result);
+            using var _2 = ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)>.GetInstance(out var buffer);
 
-            foreach (var node in root.DescendantNodes(textSpan))
+            foreach (var node in root.DescendantNodes(textSpan, n => n.Span.IntersectsWith(textSpan)))
             {
                 cancellationToken.ThrowIfCancellationRequested();
                 AddAllParameterNameHintLocations(semanticModel, node, buffer, cancellationToken);
@@ -65,21 +72,27 @@ void AddHintsIfAppropriate()
                 if (suppressForParametersThatDifferOnlyBySuffix && ParametersDifferOnlyBySuffix(buffer))
                     return;
 
-                foreach (var hint in buffer)
+                foreach (var (position, parameter, kind) in buffer)
                 {
-                    if (string.IsNullOrEmpty(hint.Parameter?.Name))
+                    if (string.IsNullOrEmpty(parameter?.Name))
                         continue;
 
-                    if (suppressForParametersThatMatchMethodIntent && MatchesMethodIntent(hint))
+                    if (suppressForParametersThatMatchMethodIntent && MatchesMethodIntent(parameter))
                         continue;
 
-                    if (HintMatches(hint, literalParameters, objectCreationParameters, otherParameters))
-                        result.Add(hint);
+                    if (HintMatches(kind, literalParameters, objectCreationParameters, otherParameters))
+                    {
+                        result.Add(new InlineHint(
+                            new TextSpan(position, 0),
+                            ImmutableArray.Create(new TaggedText(TextTags.Text, parameter.Name + ":")),
+                            InlineHintHelpers.GetDescriptionFunction(position, parameter.GetSymbolKey())));
+                    }
                 }
             }
         }
 
-        private static bool ParametersDifferOnlyBySuffix(ArrayBuilder<InlineParameterHint> parameterHints)
+        private static bool ParametersDifferOnlyBySuffix(
+            ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)> parameterHints)
         {
             // Only relevant if we have two or more parameters.
             if (parameterHints.Count <= 1)
@@ -88,14 +101,15 @@ private static bool ParametersDifferOnlyBySuffix(ArrayBuilder<InlineParameterHin
             return ParametersDifferOnlyByAlphaSuffix(parameterHints) ||
                    ParametersDifferOnlyByNumericSuffix(parameterHints);
 
-            static bool ParametersDifferOnlyByAlphaSuffix(ArrayBuilder<InlineParameterHint> parameterHints)
+            static bool ParametersDifferOnlyByAlphaSuffix(
+                ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)> parameterHints)
             {
-                if (!HasAlphaSuffix(parameterHints[0], out var firstPrefix))
+                if (!HasAlphaSuffix(parameterHints[0].parameter, out var firstPrefix))
                     return false;
 
                 for (var i = 1; i < parameterHints.Count; i++)
                 {
-                    if (!HasAlphaSuffix(parameterHints[i], out var nextPrefix))
+                    if (!HasAlphaSuffix(parameterHints[i].parameter, out var nextPrefix))
                         return false;
 
                     if (!firstPrefix.Span.Equals(nextPrefix.Span, StringComparison.Ordinal))
@@ -105,14 +119,15 @@ static bool ParametersDifferOnlyByAlphaSuffix(ArrayBuilder<InlineParameterHint>
                 return true;
             }
 
-            static bool ParametersDifferOnlyByNumericSuffix(ArrayBuilder<InlineParameterHint> parameterHints)
+            static bool ParametersDifferOnlyByNumericSuffix(
+                ArrayBuilder<(int position, IParameterSymbol? parameter, HintKind kind)> parameterHints)
             {
-                if (!HasNumericSuffix(parameterHints[0], out var firstPrefix))
+                if (!HasNumericSuffix(parameterHints[0].parameter, out var firstPrefix))
                     return false;
 
                 for (var i = 1; i < parameterHints.Count; i++)
                 {
-                    if (!HasNumericSuffix(parameterHints[i], out var nextPrefix))
+                    if (!HasNumericSuffix(parameterHints[i].parameter, out var nextPrefix))
                         return false;
 
                     if (!firstPrefix.Span.Equals(nextPrefix.Span, StringComparison.Ordinal))
@@ -122,9 +137,9 @@ static bool ParametersDifferOnlyByNumericSuffix(ArrayBuilder<InlineParameterHint
                 return true;
             }
 
-            static bool HasAlphaSuffix(InlineParameterHint hint, out ReadOnlyMemory<char> prefix)
+            static bool HasAlphaSuffix(IParameterSymbol? parameter, out ReadOnlyMemory<char> prefix)
             {
-                var name = hint.Parameter?.Name;
+                var name = parameter?.Name;
 
                 // Has to end with A-Z
                 // That A-Z can't be following another A-Z (that's just a capitalized word).
@@ -140,9 +155,9 @@ static bool HasAlphaSuffix(InlineParameterHint hint, out ReadOnlyMemory<char> pr
                 return false;
             }
 
-            static bool HasNumericSuffix(InlineParameterHint hint, out ReadOnlyMemory<char> prefix)
+            static bool HasNumericSuffix(IParameterSymbol? parameter, out ReadOnlyMemory<char> prefix)
             {
-                var name = hint.Parameter?.Name;
+                var name = parameter?.Name;
 
                 // Has to end with 0-9.  only handles single-digit numeric suffix for now for simplicity
                 if (name?.Length >= 2 &&
@@ -163,22 +178,21 @@ static bool IsNumeric(char c)
                 => c is >= '0' and <= '9';
         }
 
-        private static bool HintMatches(InlineParameterHint hint, bool literalParameters, bool objectCreationParameters, bool otherParameters)
-            => hint.Kind switch
+        private static bool HintMatches(HintKind kind, bool literalParameters, bool objectCreationParameters, bool otherParameters)
+            => kind switch
             {
-                InlineParameterHintKind.Literal => literalParameters,
-                InlineParameterHintKind.ObjectCreation => objectCreationParameters,
-                InlineParameterHintKind.Other => otherParameters,
-                _ => throw ExceptionUtilities.UnexpectedValue(hint.Kind),
+                HintKind.Literal => literalParameters,
+                HintKind.ObjectCreation => objectCreationParameters,
+                HintKind.Other => otherParameters,
+                _ => throw ExceptionUtilities.UnexpectedValue(kind),
             };
 
-        protected static bool MatchesMethodIntent(InlineParameterHint hint)
+        protected static bool MatchesMethodIntent(IParameterSymbol? parameter)
         {
             // Methods like `SetColor(color: "y")` `FromResult(result: "x")` `Enable/DisablePolling(bool)` don't need
             // parameter names to improve clarity.  The parameter is clear from the context of the method name.
 
             // First, this only applies to methods (as we're looking at the method name itself) so filter down to those.
-            var parameter = hint.Parameter;
             if (parameter is not { ContainingSymbol: IMethodSymbol { MethodKind: MethodKind.Ordinary } method })
                 return false;
 
diff --git a/src/Features/Core/Portable/InlineHints/AbstractInlineTypeHintsService.cs b/src/Features/Core/Portable/InlineHints/AbstractInlineTypeHintsService.cs
new file mode 100644
index 0000000000000..13dd151c752d7
--- /dev/null
+++ b/src/Features/Core/Portable/InlineHints/AbstractInlineTypeHintsService.cs
@@ -0,0 +1,108 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.PooledObjects;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.InlineHints
+{
+    internal abstract class AbstractInlineTypeHintsService : IInlineTypeHintsService
+    {
+        private static readonly SymbolDisplayFormat s_minimalTypeStyle = new SymbolDisplayFormat(
+            genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+            miscellaneousOptions: SymbolDisplayMiscellaneousOptions.AllowDefaultLiteral | SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
+        protected abstract (ITypeSymbol type, TextSpan span)? TryGetTypeHint(
+            SemanticModel semanticModel, SyntaxNode node,
+            bool displayAllOverride,
+            bool forImplicitVariableTypes,
+            bool forLambdaParameterTypes,
+            CancellationToken cancellationToken);
+
+        public async Task<ImmutableArray<InlineHint>> GetInlineHintsAsync(
+            Document document, TextSpan textSpan, CancellationToken cancellationToken)
+        {
+            var options = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
+
+            var displayAllOverride = options.GetOption(InlineHintsOptions.DisplayAllOverride);
+            var enabledForTypes = options.GetOption(InlineHintsOptions.EnabledForTypes);
+            if (!enabledForTypes && !displayAllOverride)
+                return ImmutableArray<InlineHint>.Empty;
+
+            var forImplicitVariableTypes = enabledForTypes && options.GetOption(InlineHintsOptions.ForImplicitVariableTypes);
+            var forLambdaParameterTypes = enabledForTypes && options.GetOption(InlineHintsOptions.ForLambdaParameterTypes);
+            if (!forImplicitVariableTypes && !forLambdaParameterTypes && !displayAllOverride)
+                return ImmutableArray<InlineHint>.Empty;
+
+            var anonymousTypeService = document.GetRequiredLanguageService<IAnonymousTypeDisplayService>();
+            var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+            using var _1 = ArrayBuilder<InlineHint>.GetInstance(out var result);
+
+            foreach (var node in root.DescendantNodes(n => n.Span.IntersectsWith(textSpan)))
+            {
+                var hintOpt = TryGetTypeHint(
+                    semanticModel, node,
+                    displayAllOverride,
+                    forImplicitVariableTypes,
+                    forLambdaParameterTypes,
+                    cancellationToken);
+                if (hintOpt == null)
+                    continue;
+
+                var (type, span) = hintOpt.Value;
+
+                using var _2 = ArrayBuilder<SymbolDisplayPart>.GetInstance(out var finalParts);
+                var parts = type.ToDisplayParts(s_minimalTypeStyle);
+
+                AddParts(anonymousTypeService, finalParts, parts, semanticModel, span.Start);
+                result.Add(new InlineHint(
+                    span, finalParts.ToTaggedText(),
+                    InlineHintHelpers.GetDescriptionFunction(span.Start, type.GetSymbolKey())));
+            }
+
+            return result.ToImmutable();
+        }
+
+        private void AddParts(
+            IAnonymousTypeDisplayService anonymousTypeService,
+            ArrayBuilder<SymbolDisplayPart> finalParts,
+            ImmutableArray<SymbolDisplayPart> parts,
+            SemanticModel semanticModel,
+            int position,
+            HashSet<INamedTypeSymbol>? seenSymbols = null)
+        {
+            seenSymbols ??= new();
+
+            foreach (var part in parts)
+            {
+                if (part.Symbol is INamedTypeSymbol { IsAnonymousType: true } anonymousType)
+                {
+                    if (seenSymbols.Add(anonymousType))
+                    {
+                        var anonymousParts = anonymousTypeService.GetAnonymousTypeParts(anonymousType, semanticModel, position);
+                        AddParts(anonymousTypeService, finalParts, anonymousParts, semanticModel, position, seenSymbols);
+                        seenSymbols.Remove(anonymousType);
+                    }
+                    else
+                    {
+                        finalParts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Text, symbol: null, "..."));
+                    }
+                }
+                else
+                {
+                    finalParts.Add(part);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/InlineHints/IInlineHintsService.cs b/src/Features/Core/Portable/InlineHints/IInlineHintsService.cs
new file mode 100644
index 0000000000000..4952e0d0e0c4f
--- /dev/null
+++ b/src/Features/Core/Portable/InlineHints/IInlineHintsService.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.InlineHints
+{
+    internal interface IInlineHintsService : ILanguageService
+    {
+        Task<ImmutableArray<InlineHint>> GetInlineHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Features/Core/Portable/InlineHints/IInlineParameterNameHintsService.cs b/src/Features/Core/Portable/InlineHints/IInlineParameterNameHintsService.cs
index e149e2488e59e..63cb8906d01f3 100644
--- a/src/Features/Core/Portable/InlineHints/IInlineParameterNameHintsService.cs
+++ b/src/Features/Core/Portable/InlineHints/IInlineParameterNameHintsService.cs
@@ -2,18 +2,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.InlineHints
 {
+    /// <summary>
+    /// Gets inline hints for type locations.  This is an internal service only for C# and VB.  Use <see
+    /// cref="IInlineHintsService"/> for other languages.
+    /// </summary>
     internal interface IInlineParameterNameHintsService : ILanguageService
     {
-        Task<ImmutableArray<InlineParameterHint>> GetInlineParameterNameHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);
+        Task<ImmutableArray<InlineHint>> GetInlineHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);
     }
 }
diff --git a/src/Features/Core/Portable/InlineHints/IInlineTypeHintsService.cs b/src/Features/Core/Portable/InlineHints/IInlineTypeHintsService.cs
new file mode 100644
index 0000000000000..87f6b64be5f13
--- /dev/null
+++ b/src/Features/Core/Portable/InlineHints/IInlineTypeHintsService.cs
@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.InlineHints
+{
+    /// <summary>
+    /// Gets inline hints for type locations.  This is an internal service only for C# and VB.  Use <see
+    /// cref="IInlineHintsService"/> for other languages.
+    /// </summary>
+    internal interface IInlineTypeHintsService : ILanguageService
+    {
+        Task<ImmutableArray<InlineHint>> GetInlineHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Features/Core/Portable/InlineHints/InlineHint.cs b/src/Features/Core/Portable/InlineHints/InlineHint.cs
new file mode 100644
index 0000000000000..ae68b3553ec1c
--- /dev/null
+++ b/src/Features/Core/Portable/InlineHints/InlineHint.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.InlineHints
+{
+    internal readonly struct InlineHint
+    {
+        public readonly TextSpan Span;
+        public readonly ImmutableArray<TaggedText> DisplayParts;
+        private readonly Func<Document, CancellationToken, Task<ImmutableArray<TaggedText>>>? _getDescriptionAsync;
+
+        public InlineHint(
+            TextSpan span,
+            ImmutableArray<TaggedText> displayParts,
+            Func<Document, CancellationToken, Task<ImmutableArray<TaggedText>>>? getDescriptionAsync = null)
+        {
+            if (displayParts.Length == 0)
+                throw new ArgumentException($"{nameof(displayParts)} must be non-empty");
+
+            Span = span;
+            DisplayParts = displayParts;
+            _getDescriptionAsync = getDescriptionAsync;
+        }
+
+        /// <summary>
+        /// Gets a description for the inline hint, suitable to show when a user hovers over the editor adornment.  The
+        /// <paramref name="document"/> will represent the file at the time this hint was created.
+        /// </summary>
+        public Task<ImmutableArray<TaggedText>> GetDescriptionAsync(Document document, CancellationToken cancellationToken)
+            => _getDescriptionAsync?.Invoke(document, cancellationToken) ?? SpecializedTasks.EmptyImmutableArray<TaggedText>();
+    }
+}
diff --git a/src/Features/Core/Portable/InlineHints/InlineHintHelpers.cs b/src/Features/Core/Portable/InlineHints/InlineHintHelpers.cs
new file mode 100644
index 0000000000000..d384e413cfdb8
--- /dev/null
+++ b/src/Features/Core/Portable/InlineHints/InlineHintHelpers.cs
@@ -0,0 +1,64 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.DocumentationComments;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis.InlineHints
+{
+    internal static class InlineHintHelpers
+    {
+        public static Func<Document, CancellationToken, Task<ImmutableArray<TaggedText>>>? GetDescriptionFunction(int position, SymbolKey symbolKey)
+            => (document, cancellationToken) => GetDescriptionAsync(document, position, symbolKey, cancellationToken);
+
+        private static async Task<ImmutableArray<TaggedText>> GetDescriptionAsync(Document document, int position, SymbolKey symbolKey, CancellationToken cancellationToken)
+        {
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+            var symbol = symbolKey.Resolve(semanticModel.Compilation, cancellationToken: cancellationToken).Symbol;
+            if (symbol != null)
+            {
+                var workspace = document.Project.Solution.Workspace;
+                var symbolDisplayService = document.GetRequiredLanguageService<ISymbolDisplayService>();
+
+                var parts = new List<TaggedText>();
+
+                var groups = await symbolDisplayService.ToDescriptionGroupsAsync(
+                    workspace, semanticModel, position, ImmutableArray.Create(symbol), cancellationToken).ConfigureAwait(false);
+
+                parts.AddRange(groups[SymbolDescriptionGroups.MainDescription]);
+
+                var formatter = document.GetRequiredLanguageService<IDocumentationCommentFormattingService>();
+                var documentation = symbol.GetDocumentationParts(semanticModel, position, formatter, cancellationToken);
+
+                if (documentation.Any())
+                {
+                    parts.AddLineBreak();
+                    parts.AddRange(documentation);
+                }
+
+                if (groups.TryGetValue(SymbolDescriptionGroups.AnonymousTypes, out var anonymousTypes))
+                {
+                    if (!anonymousTypes.IsDefaultOrEmpty)
+                    {
+                        parts.AddLineBreak();
+                        parts.AddLineBreak();
+                        parts.AddRange(anonymousTypes);
+                    }
+                }
+
+                return parts.ToImmutableArray();
+            }
+
+            return default;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/InlineHints/InlineHintsOptions.cs b/src/Features/Core/Portable/InlineHints/InlineHintsOptions.cs
index 3e00e464006b6..1e26f3226d948 100644
--- a/src/Features/Core/Portable/InlineHints/InlineHintsOptions.cs
+++ b/src/Features/Core/Portable/InlineHints/InlineHintsOptions.cs
@@ -19,6 +19,12 @@ internal static class InlineHintsOptions
                 defaultValue: true,
                 storageLocations: new RoamingProfileStorageLocation("TextEditor.Specific.DisplayAllHintsWhilePressingCtrlAlt"));
 
+        public static readonly PerLanguageOption2<bool> ColorHints =
+            new(nameof(InlineHintsOptions),
+                nameof(ColorHints),
+                defaultValue: true,
+                storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.ColorHints"));
+
         /// <summary>
         /// Non-persisted option used to switch to displaying everything while the user is holding ctrl-alt.
         /// </summary>
@@ -62,6 +68,24 @@ internal static class InlineHintsOptions
                 nameof(SuppressForParametersThatMatchMethodIntent),
                 defaultValue: true,
                 storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.InlineParameterNameHints.SuppressForParametersThatMatchMethodIntent"));
+
+        public static readonly PerLanguageOption2<bool> EnabledForTypes =
+            new(nameof(InlineHintsOptions),
+                nameof(EnabledForTypes),
+                defaultValue: false,
+                storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.InlineTypeHints"));
+
+        public static readonly PerLanguageOption2<bool> ForImplicitVariableTypes =
+            new(nameof(InlineHintsOptions),
+                nameof(ForImplicitVariableTypes),
+                defaultValue: true,
+                storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.InlineTypeHints.ForImplicitVariableTypes"));
+
+        public static readonly PerLanguageOption2<bool> ForLambdaParameterTypes =
+            new(nameof(InlineHintsOptions),
+                nameof(ForLambdaParameterTypes),
+                defaultValue: true,
+                storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.InlineTypeHints.ForLambdaParameterTypes"));
     }
 
     [ExportOptionProvider, Shared]
@@ -75,9 +99,13 @@ public InlineHintsOptionsProvider()
 
         public ImmutableArray<IOption> Options { get; } = ImmutableArray.Create<IOption>(
             InlineHintsOptions.DisplayAllHintsWhilePressingCtrlAlt,
+            InlineHintsOptions.ColorHints,
             InlineHintsOptions.EnabledForParameters,
             InlineHintsOptions.ForLiteralParameters,
             InlineHintsOptions.ForObjectCreationParameters,
-            InlineHintsOptions.ForOtherParameters);
+            InlineHintsOptions.ForOtherParameters,
+            InlineHintsOptions.EnabledForTypes,
+            InlineHintsOptions.ForImplicitVariableTypes,
+            InlineHintsOptions.ForLambdaParameterTypes);
     }
 }
diff --git a/src/Features/Core/Portable/InlineHints/InlineParameterHint.cs b/src/Features/Core/Portable/InlineHints/InlineParameterHint.cs
deleted file mode 100644
index 92f9dec88bf06..0000000000000
--- a/src/Features/Core/Portable/InlineHints/InlineParameterHint.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.CodeAnalysis.InlineHints
-{
-    internal readonly struct InlineParameterHint
-    {
-        public readonly IParameterSymbol? Parameter;
-        public readonly int Position;
-        public readonly InlineParameterHintKind Kind;
-
-        public InlineParameterHint(
-            IParameterSymbol? parameter,
-            int position,
-            InlineParameterHintKind kind)
-        {
-            Parameter = parameter;
-            Position = position;
-            Kind = kind;
-        }
-    }
-}
diff --git a/src/Features/Core/Portable/InlineHints/InlineParameterHintKind.cs b/src/Features/Core/Portable/InlineHints/InlineParameterHintKind.cs
deleted file mode 100644
index 2c6f5bbadf674..0000000000000
--- a/src/Features/Core/Portable/InlineHints/InlineParameterHintKind.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.CodeAnalysis.InlineHints
-{
-    internal enum InlineParameterHintKind
-    {
-        Literal,
-        ObjectCreation,
-        Other
-    }
-}
diff --git a/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/AbstractAnonymousTypeDisplayService.cs b/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/AbstractAnonymousTypeDisplayService.cs
index a61cdb23ead1e..855260bce1d8d 100644
--- a/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/AbstractAnonymousTypeDisplayService.cs
+++ b/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/AbstractAnonymousTypeDisplayService.cs
@@ -5,6 +5,7 @@
 #nullable disable
 
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Roslyn.Utilities;
@@ -13,7 +14,7 @@ namespace Microsoft.CodeAnalysis.LanguageServices
 {
     internal abstract partial class AbstractAnonymousTypeDisplayService : IAnonymousTypeDisplayService
     {
-        public abstract IEnumerable<SymbolDisplayPart> GetAnonymousTypeParts(
+        public abstract ImmutableArray<SymbolDisplayPart> GetAnonymousTypeParts(
             INamedTypeSymbol anonymousType, SemanticModel semanticModel, int position);
 
         public AnonymousTypeDisplayInfo GetNormalAnonymousTypeDisplayInfo(
diff --git a/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/IAnonymousTypeDisplayService.cs b/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/IAnonymousTypeDisplayService.cs
index 61cf6e55722f4..2871ab58c2308 100644
--- a/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/IAnonymousTypeDisplayService.cs
+++ b/src/Features/Core/Portable/LanguageServices/AnonymousTypeDisplayService/IAnonymousTypeDisplayService.cs
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.Host;
 
 namespace Microsoft.CodeAnalysis.LanguageServices
@@ -17,7 +16,7 @@ AnonymousTypeDisplayInfo GetNormalAnonymousTypeDisplayInfo(
             SemanticModel semanticModel,
             int position);
 
-        IEnumerable<SymbolDisplayPart> GetAnonymousTypeParts(
+        ImmutableArray<SymbolDisplayPart> GetAnonymousTypeParts(
             INamedTypeSymbol anonymousType,
             SemanticModel semanticModel,
             int position);
diff --git a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs
index c94721b4f45c5..35bca760ead35 100644
--- a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs
+++ b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs
@@ -134,7 +134,7 @@ public async Task<MetadataAsSourceFile> GetGeneratedFileAsync(Project project, I
                                 useDecompiler = false;
                             }
                         }
-                        catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
                         {
                             useDecompiler = false;
                         }
diff --git a/src/Features/Core/Portable/SolutionCrawler/AbstractDocumentDifferenceService.cs b/src/Features/Core/Portable/SolutionCrawler/AbstractDocumentDifferenceService.cs
index 22ae7018d7ba8..fc774bdeca90c 100644
--- a/src/Features/Core/Portable/SolutionCrawler/AbstractDocumentDifferenceService.cs
+++ b/src/Features/Core/Portable/SolutionCrawler/AbstractDocumentDifferenceService.cs
@@ -94,7 +94,7 @@ internal abstract class AbstractDocumentDifferenceService : IDocumentDifferenceS
 
                 return new DocumentDifferenceResult(InvocationReasons.DocumentChanged);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.HighPriorityProcessor.cs b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.HighPriorityProcessor.cs
index 0e06bd7f85703..b9f9af2eed534 100644
--- a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.HighPriorityProcessor.cs
+++ b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.HighPriorityProcessor.cs
@@ -140,7 +140,7 @@ protected override async Task ExecuteAsync()
                             // okay now we have work to do
                             await ProcessDocumentAsync(solution, Analyzers, workItem, documentCancellation).ConfigureAwait(false);
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
@@ -199,7 +199,7 @@ private async Task ProcessDocumentAsync(Solution solution, ImmutableArray<IIncre
                                 }
                             }
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
diff --git a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.IncrementalAnalyzerProcessor.cs b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.IncrementalAnalyzerProcessor.cs
index 8425d6bbbacf8..731d3ea770ead 100644
--- a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.IncrementalAnalyzerProcessor.cs
+++ b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.IncrementalAnalyzerProcessor.cs
@@ -337,7 +337,7 @@ private async Task RunBodyAnalyzersAsync(ImmutableArray<IIncrementalAnalyzer> an
                         // re-run just the body
                         await RunAnalyzersAsync(analyzers, document, workItem, (a, d, c) => a.AnalyzeDocumentAsync(d, activeMember, reasons, c), cancellationToken).ConfigureAwait(false);
                     }
-                    catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                    catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                     {
                         throw ExceptionUtilities.Unreachable;
                     }
@@ -354,15 +354,26 @@ private async Task RunBodyAnalyzersAsync(ImmutableArray<IIncrementalAnalyzer> an
                     {
                         return null;
                     }
-                    catch (AggregateException e) when (CrashUnlessCanceled(e))
+                    catch (AggregateException e) when (ReportWithoutCrashUnlessAllCanceledAndPropagate(e))
                     {
                         return null;
                     }
-                    catch (Exception e) when (FatalError.Report(e))
+                    catch (Exception e) when (FatalError.ReportAndPropagate(e))
                     {
                         // TODO: manage bad workers like what code actions does now
                         throw ExceptionUtilities.Unreachable;
                     }
+
+                    static bool ReportWithoutCrashUnlessAllCanceledAndPropagate(AggregateException aggregate)
+                    {
+                        var flattened = aggregate.Flatten();
+                        if (flattened.InnerExceptions.All(e => e is OperationCanceledException))
+                        {
+                            return true;
+                        }
+
+                        return FatalError.ReportAndPropagate(flattened);
+                    }
                 }
 
                 private static SyntaxNode? GetMemberNode(ISyntaxFactsService service, SyntaxNode? root, SyntaxPath? memberPath)
@@ -393,18 +404,6 @@ private static string EnqueueLogger(int tick, object documentOrProjectId, bool r
                     return $"Tick:{tick}, {documentOrProjectId}, Replaced:{replaced}";
                 }
 
-                private static bool CrashUnlessCanceled(AggregateException aggregate)
-                {
-                    var flattened = aggregate.Flatten();
-                    if (flattened.InnerExceptions.All(e => e is OperationCanceledException))
-                    {
-                        return true;
-                    }
-
-                    FatalError.Report(flattened);
-                    return false;
-                }
-
                 internal TestAccessor GetTestAccessor()
                 {
                     return new TestAccessor(this);
diff --git a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
index f683e3c9a241f..20cf1398f8b98 100644
--- a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
+++ b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
@@ -59,7 +59,7 @@ protected override async Task ExecuteAsync()
                                 await ProcessProjectAsync(Analyzers, workItem, projectCancellation).ConfigureAwait(false);
                             }
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
@@ -157,7 +157,7 @@ private async Task ProcessProjectAsync(ImmutableArray<IIncrementalAnalyzer> anal
                                 }
                             }
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
diff --git a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
index 7f85d5e0be8a5..ad6f19aadff86 100644
--- a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
+++ b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
@@ -173,7 +173,7 @@ protected override async Task ExecuteAsync()
                             // process the new document
                             await ProcessDocumentAsync(Analyzers, workItem, documentCancellation).ConfigureAwait(false);
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
@@ -282,7 +282,7 @@ private async Task<bool> TryProcessOneHigherPriorityDocumentAsync()
 
                             return false;
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
@@ -365,7 +365,7 @@ private async Task ProcessDocumentAsync(ImmutableArray<IIncrementalAnalyzer> ana
                                 }
                             }
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
@@ -470,7 +470,7 @@ private async Task ProcessReanalyzeDocumentAsync(WorkItem workItem, TextDocument
                                 await Processor.RunAnalyzersAsync(reanalyzers, sourceDocument, workItem, (a, d, c) => a.AnalyzeDocumentAsync(d, null, reasons, c), cancellationToken).ConfigureAwait(false);
                             }
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
@@ -531,7 +531,7 @@ private async Task ResetStatesAsync()
 
                             SolutionCrawlerLogger.LogResetStates(Processor._logAggregator);
                         }
-                        catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                        catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                         {
                             throw ExceptionUtilities.Unreachable;
                         }
diff --git a/src/Features/Core/Portable/Structure/Syntax/AbstractBlockStructureProvider.cs b/src/Features/Core/Portable/Structure/Syntax/AbstractBlockStructureProvider.cs
index 086a2a15c16fe..7c58f0873fe1b 100644
--- a/src/Features/Core/Portable/Structure/Syntax/AbstractBlockStructureProvider.cs
+++ b/src/Features/Core/Portable/Structure/Syntax/AbstractBlockStructureProvider.cs
@@ -41,7 +41,7 @@ public override void ProvideBlockStructure(BlockStructureContext context)
 
                 ProvideBlockStructureWorker(context, syntaxRoot);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -58,7 +58,7 @@ public override async Task ProvideBlockStructureAsync(BlockStructureContext cont
 
                 ProvideBlockStructureWorker(context, syntaxRoot);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Features/LanguageServer/Protocol/CustomProtocol/FindUsagesLSPContext.cs b/src/Features/LanguageServer/Protocol/CustomProtocol/FindUsagesLSPContext.cs
index 31db6d55f87c2..3f0804ec6af0a 100644
--- a/src/Features/LanguageServer/Protocol/CustomProtocol/FindUsagesLSPContext.cs
+++ b/src/Features/LanguageServer/Protocol/CustomProtocol/FindUsagesLSPContext.cs
@@ -240,7 +240,7 @@ public override async ValueTask OnReferenceFoundAsync(SourceReferenceItem refere
                         Range = ProtocolConversions.LinePositionToRange(linePosSpan),
                     };
                 }
-                catch (UriFormatException e) when (FatalError.ReportWithoutCrash(e))
+                catch (UriFormatException e) when (FatalError.ReportAndCatch(e))
                 {
                     // We might reach this point if the file path is formatted incorrectly.
                     return null;
diff --git a/src/Features/LanguageServer/Protocol/Extensions/Extensions.cs b/src/Features/LanguageServer/Protocol/Extensions/Extensions.cs
index 09373fc909f21..9e35bb8377976 100644
--- a/src/Features/LanguageServer/Protocol/Extensions/Extensions.cs
+++ b/src/Features/LanguageServer/Protocol/Extensions/Extensions.cs
@@ -29,11 +29,6 @@ public static ImmutableArray<Document> GetDocuments(this Solution solution, Uri
             return GetDocuments<Document>(solution, documentUri, (s, i) => s.GetRequiredDocument(i));
         }
 
-        public static ImmutableArray<TextDocument> GetTextDocuments(this Solution solution, Uri documentUri)
-        {
-            return GetDocuments<TextDocument>(solution, documentUri, (s, i) => s.GetRequiredTextDocument(i));
-        }
-
         private static ImmutableArray<T> GetDocuments<T>(this Solution solution, Uri documentUri, Func<Solution, DocumentId, T> getDocument) where T : TextDocument
         {
             // TODO: we need to normalize this. but for now, we check both absolute and local path
@@ -68,11 +63,6 @@ public static ImmutableArray<Document> GetDocuments(this ILspSolutionProvider so
             return GetDocuments<Document>(solutionProvider, uri, (s, u, c) => s.GetDocuments(u), clientName);
         }
 
-        public static ImmutableArray<TextDocument> GetTextDocuments(this ILspSolutionProvider solutionProvider, Uri uri, string? clientName)
-        {
-            return GetDocuments<TextDocument>(solutionProvider, uri, (s, u, c) => s.GetTextDocuments(u), clientName);
-        }
-
         private static ImmutableArray<T> GetDocuments<T>(this ILspSolutionProvider solutionProvider, Uri uri, Func<ILspSolutionProvider, Uri, string?, ImmutableArray<T>> getDocuments, string? clientName) where T : TextDocument
         {
             var documents = getDocuments(solutionProvider, uri, clientName);
@@ -101,11 +91,6 @@ private static ImmutableArray<T> GetDocuments<T>(this ILspSolutionProvider solut
             return GetDocument<Document>(solutionProvider, documentIdentifier, (s, d, c) => s.GetDocuments(d, c), clientName);
         }
 
-        public static TextDocument? GetTextDocument(this ILspSolutionProvider solutionProvider, TextDocumentIdentifier documentIdentifier, string? clientName = null)
-        {
-            return GetDocument<TextDocument>(solutionProvider, documentIdentifier, (s, d, c) => s.GetTextDocuments(d, c), clientName);
-        }
-
         private static T? GetDocument<T>(this ILspSolutionProvider solutionProvider, TextDocumentIdentifier documentIdentifier, Func<ILspSolutionProvider, Uri, string?, ImmutableArray<T>> getDocuments, string? clientName = null) where T : TextDocument
         {
             var documents = getDocuments(solutionProvider, documentIdentifier.Uri, clientName);
diff --git a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs
index 41ff0941d4d4b..0a0583151e2f3 100644
--- a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs
+++ b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs
@@ -224,7 +224,7 @@ private async Task ProcessQueueAsync()
                 // If the queue is asked to shut down between the start of the while loop, and the Dequeue call
                 // we could end up here, but we don't want to report an error. The Shutdown call will take care of things.
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 OnRequestServerShutdown($"Error occured processing queue: {e.Message}.");
             }
diff --git a/src/Features/LanguageServer/Protocol/ILspSolutionProvider.cs b/src/Features/LanguageServer/Protocol/ILspSolutionProvider.cs
index c7c5150b4e6ce..ca5185aac2b7a 100644
--- a/src/Features/LanguageServer/Protocol/ILspSolutionProvider.cs
+++ b/src/Features/LanguageServer/Protocol/ILspSolutionProvider.cs
@@ -17,14 +17,6 @@ internal interface ILspSolutionProvider
         /// <returns>the documents in the correct workspace and solution context</returns>
         ImmutableArray<Document> GetDocuments(Uri documentUri);
 
-        /// <summary>
-        /// Finds the workspace and solution containing the specified document URI
-        /// and returns the text documents in that context.
-        /// </summary>
-        /// <param name="documentUri">the document's file path URI.</param>
-        /// <returns>the text documents in the correct workspace and solution context</returns>
-        ImmutableArray<TextDocument> GetTextDocuments(Uri documentUri);
-
         /// <summary>
         /// Return the latest solution from the main workspace that we know about.
         /// </summary>
diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/CrefCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/CrefCompletionProvider.vb
index 21eb844a8c4b8..bfdd64bc90024 100644
--- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/CrefCompletionProvider.vb
+++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/CrefCompletionProvider.vb
@@ -83,7 +83,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
                 End If
 
                 context.IsExclusive = True
-            Catch e As Exception When FatalError.ReportWithoutCrashUnlessCanceled(e)
+            Catch e As Exception When FatalError.ReportAndCatchUnlessCanceled(e)
                 ' nop
             End Try
         End Function
diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb
index c76f2999b3d87..07ddf89ffbfbe 100644
--- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb
+++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb
@@ -89,7 +89,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
                         contextPosition:=position,
                         rules:=s_itemRules))
                 Next
-            Catch e As Exception When FatalError.ReportWithoutCrashUnlessCanceled(e)
+            Catch e As Exception When FatalError.ReportAndCatchUnlessCanceled(e)
                 ' nop
             End Try
         End Function
diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.vb
index 761bb906cee8d..a5246e10b8892 100644
--- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.vb
+++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/XmlDocCommentCompletionProvider.vb
@@ -159,7 +159,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
                 End If
 
                 Return items
-            Catch e As Exception When FatalError.ReportWithoutCrashUnlessCanceled(e)
+            Catch e As Exception When FatalError.ReportAndCatchUnlessCanceled(e)
                 Return SpecializedCollections.EmptyEnumerable(Of CompletionItem)
             End Try
         End Function
diff --git a/src/Features/VisualBasic/Portable/Debugging/VisualBasicBreakpointService.vb b/src/Features/VisualBasic/Portable/Debugging/VisualBasicBreakpointService.vb
index 405d83a16b230..e7f8eda741a80 100644
--- a/src/Features/VisualBasic/Portable/Debugging/VisualBasicBreakpointService.vb
+++ b/src/Features/VisualBasic/Portable/Debugging/VisualBasicBreakpointService.vb
@@ -66,7 +66,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Debugging
                 End If
 
                 Return BreakpointResolutionResult.CreateSpanResult(document, span)
-            Catch e As Exception When FatalError.ReportWithoutCrashUnlessCanceled(e)
+            Catch e As Exception When FatalError.ReportAndCatchUnlessCanceled(e)
                 Return Nothing
             End Try
         End Function
diff --git a/src/Features/VisualBasic/Portable/InlineHints/VisualBasicInlineHintsService.vb b/src/Features/VisualBasic/Portable/InlineHints/VisualBasicInlineHintsService.vb
new file mode 100644
index 0000000000000..642cb370019ee
--- /dev/null
+++ b/src/Features/VisualBasic/Portable/InlineHints/VisualBasicInlineHintsService.vb
@@ -0,0 +1,22 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Composition
+Imports Microsoft.CodeAnalysis.Host.Mef
+Imports Microsoft.CodeAnalysis.InlineHints
+
+Namespace Microsoft.CodeAnalysis.VisualBasic.InlineHints
+    ''' <summary>
+    ''' The service to locate all positions where inline hints should be placed.
+    ''' </summary>
+    <ExportLanguageService(GetType(IInlineHintsService), LanguageNames.VisualBasic), [Shared]>
+    Friend Class VisualBasicInlineHintsService
+        Inherits AbstractInlineHintsService
+
+        <ImportingConstructor>
+        <Obsolete(MefConstruction.ImportingConstructorMessage, True)>
+        Public Sub New()
+        End Sub
+    End Class
+End Namespace
diff --git a/src/Features/VisualBasic/Portable/InlineParameterNameHints/VisualBasicInlineParameterNameHintsService.vb b/src/Features/VisualBasic/Portable/InlineHints/VisualBasicInlineParameterNameHintsService.vb
similarity index 84%
rename from src/Features/VisualBasic/Portable/InlineParameterNameHints/VisualBasicInlineParameterNameHintsService.vb
rename to src/Features/VisualBasic/Portable/InlineHints/VisualBasicInlineParameterNameHintsService.vb
index 598773234cb78..f0a52f3e7853b 100644
--- a/src/Features/VisualBasic/Portable/InlineParameterNameHints/VisualBasicInlineParameterNameHintsService.vb
+++ b/src/Features/VisualBasic/Portable/InlineHints/VisualBasicInlineParameterNameHintsService.vb
@@ -9,7 +9,7 @@ Imports Microsoft.CodeAnalysis.InlineHints
 Imports Microsoft.CodeAnalysis.PooledObjects
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
-Namespace Microsoft.CodeAnalysis.VisualBasic.InlineParameterNameHints
+Namespace Microsoft.CodeAnalysis.VisualBasic.InlineHints
     <ExportLanguageService(GetType(IInlineParameterNameHintsService), LanguageNames.VisualBasic), [Shared]>
     Friend Class VisualBasicInlineParameterNameHintsService
         Inherits AbstractInlineParameterNameHintsService
@@ -22,7 +22,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.InlineParameterNameHints
         Protected Overrides Sub AddAllParameterNameHintLocations(
                 semanticModel As SemanticModel,
                 node As SyntaxNode,
-                buffer As ArrayBuilder(Of InlineParameterHint),
+                buffer As ArrayBuilder(Of (position As Integer, parameter As IParameterSymbol, kind As HintKind)),
                 cancellationToken As CancellationToken)
 
             Dim argumentList = TryCast(node, ArgumentListSyntax)
@@ -49,21 +49,18 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.InlineParameterNameHints
                     Continue For
                 End If
 
-                buffer.Add(New InlineParameterHint(
-                    parameter,
-                    argument.Span.Start,
-                    GetKind(argument.Expression)))
+                buffer.Add((argument.Span.Start, parameter, GetKind(argument.Expression)))
             Next
         End Sub
 
-        Private Function GetKind(arg As ExpressionSyntax) As InlineParameterHintKind
+        Private Function GetKind(arg As ExpressionSyntax) As HintKind
             If TypeOf arg Is LiteralExpressionSyntax OrElse
                TypeOf arg Is InterpolatedStringExpressionSyntax Then
-                Return InlineParameterHintKind.Literal
+                Return HintKind.Literal
             End If
 
             If TypeOf arg Is ObjectCreationExpressionSyntax Then
-                Return InlineParameterHintKind.ObjectCreation
+                Return HintKind.ObjectCreation
             End If
 
             Dim predefinedCast = TryCast(arg, PredefinedCastExpressionSyntax)
@@ -87,7 +84,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.InlineParameterNameHints
                 Return GetKind(unary.Operand)
             End If
 
-            Return InlineParameterHintKind.Other
+            Return HintKind.Other
         End Function
     End Class
 End Namespace
diff --git a/src/Features/VisualBasic/Portable/LanguageServices/VisualBasicAnonymousTypeDisplayService.vb b/src/Features/VisualBasic/Portable/LanguageServices/VisualBasicAnonymousTypeDisplayService.vb
index d9fb3d3379124..6f8c8515459e5 100644
--- a/src/Features/VisualBasic/Portable/LanguageServices/VisualBasicAnonymousTypeDisplayService.vb
+++ b/src/Features/VisualBasic/Portable/LanguageServices/VisualBasicAnonymousTypeDisplayService.vb
@@ -2,9 +2,11 @@
 ' The .NET Foundation licenses this file to you under the MIT license.
 ' See the LICENSE file in the project root for more information.
 
+Imports System.Collections.Immutable
 Imports System.Composition
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.PooledObjects
 Imports Microsoft.CodeAnalysis.VisualBasic
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LanguageServices
@@ -35,7 +37,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LanguageServices
         Public Sub New()
         End Sub
 
-        Public Overrides Function GetAnonymousTypeParts(anonymousType As INamedTypeSymbol, semanticModel As SemanticModel, position As Integer) As IEnumerable(Of SymbolDisplayPart)
+        Public Overrides Function GetAnonymousTypeParts(anonymousType As INamedTypeSymbol, semanticModel As SemanticModel, position As Integer) As ImmutableArray(Of SymbolDisplayPart)
             If anonymousType.IsAnonymousDelegateType() Then
                 Return GetDelegateAnonymousType(anonymousType, semanticModel, position)
             Else
@@ -43,19 +45,20 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LanguageServices
             End If
         End Function
 
-        Private Shared Function GetDelegateAnonymousType(anonymousType As INamedTypeSymbol,
-                                                  semanticModel As SemanticModel,
-                                                  position As Integer) As IList(Of SymbolDisplayPart)
+        Private Shared Function GetDelegateAnonymousType(
+                anonymousType As INamedTypeSymbol,
+                semanticModel As SemanticModel,
+                position As Integer) As ImmutableArray(Of SymbolDisplayPart)
             Dim method = anonymousType.DelegateInvokeMethod
 
-            Dim members = New List(Of SymbolDisplayPart)()
+            Dim members = ArrayBuilder(Of SymbolDisplayPart).GetInstance()
             members.Add(Punctuation("<"))
             members.AddRange(MassageDelegateParts(
                 method,
                 method.ToMinimalDisplayParts(semanticModel, position, s_anonymousDelegateFormat)))
             members.Add(Punctuation(">"))
 
-            Return members
+            Return members.ToImmutableAndFree()
         End Function
 
         Private Shared Function MassageDelegateParts(delegateInvoke As IMethodSymbol,
@@ -77,10 +80,11 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LanguageServices
             Return result
         End Function
 
-        Private Shared Function GetNormalAnonymousType(anonymousType As INamedTypeSymbol,
-                                                semanticModel As SemanticModel,
-                                                position As Integer) As IList(Of SymbolDisplayPart)
-            Dim members = New List(Of SymbolDisplayPart)()
+        Private Shared Function GetNormalAnonymousType(
+                anonymousType As INamedTypeSymbol,
+                semanticModel As SemanticModel,
+                position As Integer) As ImmutableArray(Of SymbolDisplayPart)
+            Dim members = ArrayBuilder(Of SymbolDisplayPart).GetInstance()
 
             members.Add(Keyword(SyntaxFacts.GetText(SyntaxKind.NewKeyword)))
             members.AddRange(Space())
@@ -112,8 +116,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LanguageServices
             members.AddRange(Space())
             members.Add(Punctuation(SyntaxFacts.GetText(SyntaxKind.CloseBraceToken)))
 
-            Return members
+            Return members.ToImmutableAndFree()
         End Function
     End Class
-
 End Namespace
diff --git a/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs b/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs
index 368f917bbe135..a53876b654bf4 100644
--- a/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs
+++ b/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs
@@ -123,7 +123,7 @@ private async Task<InitializedRemoteService> TryStartAndInitializeProcessAsync(C
 
                     return new InitializedRemoteService(remoteService, result);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Interactive/Host/Interactive/Core/InteractiveHost.RemoteService.cs b/src/Interactive/Host/Interactive/Core/InteractiveHost.RemoteService.cs
index 98317b00fb720..18d2019751a20 100644
--- a/src/Interactive/Host/Interactive/Core/InteractiveHost.RemoteService.cs
+++ b/src/Interactive/Host/Interactive/Core/InteractiveHost.RemoteService.cs
@@ -93,7 +93,7 @@ private async Task ProcessExitedHandlerAsync()
                         await host.OnProcessExitedAsync(Process).ConfigureAwait(false);
                     }
                 }
-                catch (Exception e) when (FatalError.Report(e))
+                catch (Exception e) when (FatalError.ReportAndPropagate(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Interactive/Host/Interactive/Core/InteractiveHost.Service.cs b/src/Interactive/Host/Interactive/Core/InteractiveHost.Service.cs
index ea66e4e3973a2..f3cd1b5ec0bab 100644
--- a/src/Interactive/Host/Interactive/Core/InteractiveHost.Service.cs
+++ b/src/Interactive/Host/Interactive/Core/InteractiveHost.Service.cs
@@ -143,7 +143,7 @@ private Service(Func<Func<object>, object> invokeOnMainThread)
                 {
                     Console.OutputEncoding = Encoding.UTF8;
                 }
-                catch (IOException ex) when (FatalError.ReportWithoutCrash(ex))
+                catch (IOException ex) when (FatalError.ReportAndCatch(ex))
                 {
                     // Ignore this exception
                     // https://github.com/dotnet/roslyn/issues/47571
diff --git a/src/Interactive/Host/Interactive/Core/InteractiveHost.cs b/src/Interactive/Host/Interactive/Core/InteractiveHost.cs
index 02f07cbd1cb3c..7ce5ea1a7b71d 100644
--- a/src/Interactive/Host/Interactive/Core/InteractiveHost.cs
+++ b/src/Interactive/Host/Interactive/Core/InteractiveHost.cs
@@ -249,7 +249,7 @@ private async Task<InitializedRemoteService> TryGetOrCreateRemoteServiceAsync()
                 // The user reset the process during initialization. 
                 // The reset operation will recreate the process.
             }
-            catch (Exception e) when (FatalError.Report(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -338,7 +338,7 @@ public async Task<RemoteExecutionResult> ResetAsync(InteractiveHostOptions optio
 
                 return initializedService.InitializationResult;
             }
-            catch (Exception e) when (FatalError.Report(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Test/Utilities/Portable/Traits/Traits.cs b/src/Test/Utilities/Portable/Traits/Traits.cs
index d7f63fee3987e..fe5b3a444eb70 100644
--- a/src/Test/Utilities/Portable/Traits/Traits.cs
+++ b/src/Test/Utilities/Portable/Traits/Traits.cs
@@ -240,7 +240,7 @@ public static class Features
             public const string GoToBase = nameof(GoToBase);
             public const string GoToDefinition = nameof(GoToDefinition);
             public const string GoToImplementation = nameof(GoToImplementation);
-            public const string InlineParameterNameHints = nameof(InlineParameterNameHints);
+            public const string InlineHints = nameof(InlineHints);
             public const string Interactive = nameof(Interactive);
             public const string InteractiveHost = nameof(InteractiveHost);
             public const string KeywordHighlighting = nameof(KeywordHighlighting);
diff --git a/src/Tools/ExternalAccess/Apex/ApexAsynchronousOperationListenerProviderAccessor.cs b/src/Tools/ExternalAccess/Apex/ApexAsynchronousOperationListenerProviderAccessor.cs
index d6b320613d5c0..d6de1909b8716 100644
--- a/src/Tools/ExternalAccess/Apex/ApexAsynchronousOperationListenerProviderAccessor.cs
+++ b/src/Tools/ExternalAccess/Apex/ApexAsynchronousOperationListenerProviderAccessor.cs
@@ -28,7 +28,7 @@ public ApexAsynchronousOperationListenerProviderAccessor(
             _workspace = workspace;
         }
 
-        public Task WaitAllAsync(string[]? featureNames = null, Action? eventProcessingAction = null)
-            => _implementation.WaitAllAsync(_workspace, featureNames, eventProcessingAction);
+        public Task WaitAllAsync(string[]? featureNames = null, Action? eventProcessingAction = null, TimeSpan? timeout = null)
+            => _implementation.WaitAllAsync(_workspace, featureNames, eventProcessingAction, timeout);
     }
 }
diff --git a/src/Tools/ExternalAccess/Apex/IApexAsynchronousOperationListenerProviderAccessor.cs b/src/Tools/ExternalAccess/Apex/IApexAsynchronousOperationListenerProviderAccessor.cs
index b79123e17a867..df11ab995f128 100644
--- a/src/Tools/ExternalAccess/Apex/IApexAsynchronousOperationListenerProviderAccessor.cs
+++ b/src/Tools/ExternalAccess/Apex/IApexAsynchronousOperationListenerProviderAccessor.cs
@@ -11,6 +11,6 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.Apex
 {
     internal interface IApexAsynchronousOperationListenerProviderAccessor
     {
-        Task WaitAllAsync(string[] featureNames = null, Action eventProcessingAction = null);
+        Task WaitAllAsync(string[] featureNames = null, Action eventProcessingAction = null, TimeSpan? timeout = null);
     }
 }
diff --git a/src/Tools/ExternalAccess/FSharp/Editor/Shared/Utilities/FSharpClassificationTypeMap.cs b/src/Tools/ExternalAccess/FSharp/Editor/Shared/Utilities/FSharpClassificationTypeMap.cs
index 7e5a66f278a08..44cbbf463e0a9 100644
--- a/src/Tools/ExternalAccess/FSharp/Editor/Shared/Utilities/FSharpClassificationTypeMap.cs
+++ b/src/Tools/ExternalAccess/FSharp/Editor/Shared/Utilities/FSharpClassificationTypeMap.cs
@@ -46,7 +46,7 @@ public IClassificationType GetClassificationType(string name)
             var type = GetClassificationTypeWorker(name);
             if (type == null)
             {
-                FatalError.ReportWithoutCrash(new Exception($"classification type doesn't exist for {name}"));
+                FatalError.ReportAndCatch(new Exception($"classification type doesn't exist for {name}"));
             }
 
             return type ?? GetClassificationTypeWorker(ClassificationTypeNames.Text);
diff --git a/src/Tools/IdeBenchmarks/SQLitePersistentStorageBenchmark.cs b/src/Tools/IdeBenchmarks/SQLitePersistentStorageBenchmark.cs
index c84beaeab6e55..073fb04e88984 100644
--- a/src/Tools/IdeBenchmarks/SQLitePersistentStorageBenchmark.cs
+++ b/src/Tools/IdeBenchmarks/SQLitePersistentStorageBenchmark.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -35,6 +33,15 @@ public class SQLitePersistentStorageBenchmarks
         private Document _document;
         private Random _random;
 
+        public SQLitePersistentStorageBenchmarks()
+        {
+            _document = null!;
+            _storage = null!;
+            _storageService = null!;
+            _workspace = null!;
+            _random = null!;
+        }
+
         [GlobalSetup]
         public void GlobalSetup()
         {
@@ -80,12 +87,12 @@ public void GlobalCleanup()
                 throw new InvalidOperationException();
             }
 
-            _document = null;
+            _document = null!;
             _storage.Dispose();
-            _storage = null;
-            _storageService = null;
+            _storage = null!;
+            _storageService = null!;
             _workspace.Dispose();
-            _workspace = null;
+            _workspace = null!;
 
             _useExportProviderAttribute.After(null);
         }
diff --git a/src/VisualStudio/CSharp/Impl/CSharpPackage.cs b/src/VisualStudio/CSharp/Impl/CSharpPackage.cs
index c9e2496526b49..fe6afd68216d5 100644
--- a/src/VisualStudio/CSharp/Impl/CSharpPackage.cs
+++ b/src/VisualStudio/CSharp/Impl/CSharpPackage.cs
@@ -74,7 +74,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
                     return new TempPECompilerService(this.Workspace.Services.GetService<IMetadataService>());
                 });
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
             }
         }
diff --git a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs
index 5aa0bc278d781..efb5510af0c3e 100644
--- a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs
+++ b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs
@@ -352,6 +352,12 @@ private static bool TryGetTextForKeyword(SyntaxToken token, ISyntaxFactsService
                 }
             }
 
+            if (token.IsKind(SyntaxKind.DefaultKeyword) && token.Parent is DefaultSwitchLabelSyntax)
+            {
+                text = Keyword("defaultcase");
+                return true;
+            }
+
             if (token.IsKeyword())
             {
                 text = Keyword(token.Text);
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
index f07917a2954d7..a1e213adc2dbd 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
@@ -94,7 +94,7 @@
                               Content="{x:Static local:AdvancedOptionPageStrings.Option_Show_guides_for_code_level_constructs}" />
                 </StackPanel>
             </GroupBox>
-            
+
             <GroupBox x:Uid="CommentsGuidesGroupBox"
                       Header="{x:Static local:AdvancedOptionPageStrings.Option_Comments}">
                 <StackPanel>
@@ -193,6 +193,9 @@
                     <CheckBox x:Name="DisplayAllHintsWhilePressingCtrlAlt"
                               Content="{x:Static local:AdvancedOptionPageStrings.Option_Display_all_hints_while_pressing_Ctrl_Alt}" />
 
+                    <CheckBox x:Name="ColorHints"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Color_hints}" />
+
                     <CheckBox x:Name="DisplayInlineParameterNameHints"
                               Content="{x:Static local:AdvancedOptionPageStrings.Option_Display_inline_parameter_name_hints}"
                               Checked="DisplayInlineParameterNameHints_Checked"
@@ -219,6 +222,19 @@
                                   x:Name="SuppressHintsWhenParameterNamesDifferOnlyBySuffix"
                                   Content="{x:Static local:AdvancedOptionPageStrings.Option_Suppress_hints_when_parameter_names_differ_only_by_suffix}" />
                     </StackPanel>
+                    
+                    <CheckBox x:Name="DisplayInlineTypeHints"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Display_inline_type_hints}"
+                              Checked="DisplayInlineTypeHints_Checked"
+                              Unchecked="DisplayInlineTypeHints_Unchecked"/>
+                    <StackPanel Margin="15, 0, 0, 0">
+                        <CheckBox x:Uid="ShowHintsForVariablesWithInferredTypes"
+                                  x:Name="ShowHintsForVariablesWithInferredTypes"
+                                  Content="{x:Static local:AdvancedOptionPageStrings.Option_Show_hints_for_variables_with_inferred_types}" />
+                        <CheckBox x:Uid="ShowHintsForLambdaParameterTypes"
+                                  x:Name="ShowHintsForLambdaParameterTypes"
+                                  Content="{x:Static local:AdvancedOptionPageStrings.Option_Show_hints_for_lambda_parameter_types}" />
+                    </StackPanel>
                 </StackPanel>
             </GroupBox>
         </StackPanel>
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
index 04a2dc53e9b25..fa3995f5365ff 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
@@ -65,14 +65,6 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
             BindToOption(InsertSlashSlashAtTheStartOfNewLinesWhenWritingSingleLineComments, SplitStringLiteralOptions.Enabled, LanguageNames.CSharp);
             BindToOption(InsertAsteriskAtTheStartOfNewLinesWhenWritingBlockComments, FeatureOnOffOptions.AutoInsertBlockCommentStartString, LanguageNames.CSharp);
 
-            BindToOption(DisplayAllHintsWhilePressingCtrlAlt, InlineHintsOptions.DisplayAllHintsWhilePressingCtrlAlt);
-            BindToOption(DisplayInlineParameterNameHints, InlineHintsOptions.EnabledForParameters, LanguageNames.CSharp);
-            BindToOption(ShowHintsForLiterals, InlineHintsOptions.ForLiteralParameters, LanguageNames.CSharp);
-            BindToOption(ShowHintsForNewExpressions, InlineHintsOptions.ForObjectCreationParameters, LanguageNames.CSharp);
-            BindToOption(ShowHintsForEverythingElse, InlineHintsOptions.ForOtherParameters, LanguageNames.CSharp);
-            BindToOption(SuppressHintsWhenParameterNameMatchesTheMethodsIntent, InlineHintsOptions.SuppressForParametersThatMatchMethodIntent, LanguageNames.CSharp);
-            BindToOption(SuppressHintsWhenParameterNamesDifferOnlyBySuffix, InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix, LanguageNames.CSharp);
-
             BindToOption(ShowRemarksInQuickInfo, QuickInfoOptions.ShowRemarksInQuickInfo, LanguageNames.CSharp);
             BindToOption(DisplayLineSeparators, FeatureOnOffOptions.LineSeparator, LanguageNames.CSharp);
             BindToOption(EnableHighlightReferences, FeatureOnOffOptions.ReferenceHighlighting, LanguageNames.CSharp);
@@ -95,6 +87,20 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
             BindToOption(Show_completion_list, RegularExpressionsOptions.ProvideRegexCompletions, LanguageNames.CSharp);
 
             BindToOption(Editor_color_scheme, ColorSchemeOptions.ColorScheme);
+
+            BindToOption(DisplayAllHintsWhilePressingCtrlAlt, InlineHintsOptions.DisplayAllHintsWhilePressingCtrlAlt);
+            BindToOption(ColorHints, InlineHintsOptions.ColorHints, LanguageNames.CSharp);
+
+            BindToOption(DisplayInlineParameterNameHints, InlineHintsOptions.EnabledForParameters, LanguageNames.CSharp);
+            BindToOption(ShowHintsForLiterals, InlineHintsOptions.ForLiteralParameters, LanguageNames.CSharp);
+            BindToOption(ShowHintsForNewExpressions, InlineHintsOptions.ForObjectCreationParameters, LanguageNames.CSharp);
+            BindToOption(ShowHintsForEverythingElse, InlineHintsOptions.ForOtherParameters, LanguageNames.CSharp);
+            BindToOption(SuppressHintsWhenParameterNameMatchesTheMethodsIntent, InlineHintsOptions.SuppressForParametersThatMatchMethodIntent, LanguageNames.CSharp);
+            BindToOption(SuppressHintsWhenParameterNamesDifferOnlyBySuffix, InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix, LanguageNames.CSharp);
+
+            BindToOption(DisplayInlineTypeHints, InlineHintsOptions.EnabledForTypes, LanguageNames.CSharp);
+            BindToOption(ShowHintsForVariablesWithInferredTypes, InlineHintsOptions.ForImplicitVariableTypes, LanguageNames.CSharp);
+            BindToOption(ShowHintsForLambdaParameterTypes, InlineHintsOptions.ForLambdaParameterTypes, LanguageNames.CSharp);
         }
 
         // Since this dialog is constructed once for the lifetime of the application and VS Theme can be changed after the application has started,
@@ -121,6 +127,10 @@ private void UpdateInlineHintsOptions()
             ShowHintsForEverythingElse.IsEnabled = enabledForParameters;
             SuppressHintsWhenParameterNameMatchesTheMethodsIntent.IsEnabled = enabledForParameters;
             SuppressHintsWhenParameterNamesDifferOnlyBySuffix.IsEnabled = enabledForParameters;
+
+            var enabledForTypes = this.OptionStore.GetOption(InlineHintsOptions.EnabledForTypes, LanguageNames.CSharp);
+            ShowHintsForVariablesWithInferredTypes.IsEnabled = enabledForTypes;
+            ShowHintsForLambdaParameterTypes.IsEnabled = enabledForTypes;
         }
 
         private void DisplayInlineParameterNameHints_Checked(object sender, RoutedEventArgs e)
@@ -134,5 +144,17 @@ private void DisplayInlineParameterNameHints_Unchecked(object sender, RoutedEven
             this.OptionStore.SetOption(InlineHintsOptions.EnabledForParameters, LanguageNames.CSharp, false);
             UpdateInlineHintsOptions();
         }
+
+        private void DisplayInlineTypeHints_Checked(object sender, RoutedEventArgs e)
+        {
+            this.OptionStore.SetOption(InlineHintsOptions.EnabledForTypes, LanguageNames.CSharp, true);
+            UpdateInlineHintsOptions();
+        }
+
+        private void DisplayInlineTypeHints_Unchecked(object sender, RoutedEventArgs e)
+        {
+            this.OptionStore.SetOption(InlineHintsOptions.EnabledForTypes, LanguageNames.CSharp, false);
+            UpdateInlineHintsOptions();
+        }
     }
 }
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
index c268128662708..6f03e6706304f 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
@@ -37,6 +37,9 @@ public static string Option_Inline_Hints_experimental
         public static string Option_Display_all_hints_while_pressing_Ctrl_Alt
             => ServicesVSResources.Display_all_hints_while_pressing_Ctrl_Alt;
 
+        public static string Option_Color_hints
+            => ServicesVSResources.Color_hints;
+
         public static string Option_Display_inline_parameter_name_hints
             => ServicesVSResources.Display_inline_parameter_name_hints;
 
@@ -55,13 +58,20 @@ public static string Option_Suppress_hints_when_parameter_name_matches_the_metho
         public static string Option_Suppress_hints_when_parameter_names_differ_only_by_suffix
             => ServicesVSResources.Suppress_hints_when_parameter_names_differ_only_by_suffix;
 
+        public static string Option_Display_inline_type_hints
+            => ServicesVSResources.Display_inline_type_hints;
+
+        public static string Option_Show_hints_for_variables_with_inferred_types
+            => ServicesVSResources.Show_hints_for_variables_with_inferred_types;
+
+        public static string Option_Show_hints_for_lambda_parameter_types
+            => ServicesVSResources.Show_hints_for_lambda_parameter_types;
+
         public static string Option_RenameTrackingPreview => CSharpVSResources.Show_preview_for_rename_tracking;
         public static string Option_Split_string_literals_on_enter => CSharpVSResources.Split_string_literals_on_enter;
 
         public static string Option_DisplayLineSeparators
-        {
-            get { return CSharpVSResources.Show_procedure_line_separators; }
-        }
+            => CSharpVSResources.Show_procedure_line_separators;
 
         public static string Option_DontPutOutOrRefOnStruct
         {
@@ -123,9 +133,7 @@ public static string Option_InsertAsteriskAtTheStartOfNewLinesWhenWritingBlockCo
             => CSharpVSResources.Insert_at_the_start_of_new_lines_when_writing_comments;
 
         public static string Option_ShowRemarksInQuickInfo
-        {
-            get { return CSharpVSResources.Show_remarks_in_Quick_Info; }
-        }
+            => CSharpVSResources.Show_remarks_in_Quick_Info;
 
         public static string Option_Highlighting
         {
diff --git a/src/VisualStudio/CSharp/Impl/Progression/CSharpProgressionLanguageService.cs b/src/VisualStudio/CSharp/Impl/Progression/CSharpProgressionLanguageService.cs
index d5118e2c6156f..563dbc5fc85dd 100644
--- a/src/VisualStudio/CSharp/Impl/Progression/CSharpProgressionLanguageService.cs
+++ b/src/VisualStudio/CSharp/Impl/Progression/CSharpProgressionLanguageService.cs
@@ -67,6 +67,7 @@ public IEnumerable<SyntaxNode> GetTopLevelNodesFromDocument(SyntaxNode root, Can
                     if (!cancellationToken.IsCancellationRequested)
                     {
                         if (node.Kind() == SyntaxKind.ClassDeclaration ||
+                            node.Kind() == SyntaxKind.RecordDeclaration ||
                             node.Kind() == SyntaxKind.DelegateDeclaration ||
                             node.Kind() == SyntaxKind.EnumDeclaration ||
                             node.Kind() == SyntaxKind.InterfaceDeclaration ||
diff --git a/src/VisualStudio/CSharp/Impl/VSPackage.resx b/src/VisualStudio/CSharp/Impl/VSPackage.resx
index 767f94073b7db..0bb32ed9bbe78 100644
--- a/src/VisualStudio/CSharp/Impl/VSPackage.resx
+++ b/src/VisualStudio/CSharp/Impl/VSPackage.resx
@@ -142,7 +142,7 @@
     <comment>"C#" node help text in profile Import/Export.</comment>
   </data>
   <data name="306" xml:space="preserve">
-    <value>Display inline parameter name hints;
+    <value>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf
index 74ce3633e9e8c..83163b35b7f88 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="translated">Zobrazovat nápovědy k názvům vložených parametrů;
+        <target state="needs-review-translation">Zobrazovat nápovědy k názvům vložených parametrů;
 Zobrazit diagnostiku pro zavřené soubory;
 Vybarvit regulární výraz; 
 Zvýrazňovat související komponenty pod kurzorem; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf
index 7f9178b71e27c..9d0849c20149b 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf
index 8371ae8aef1ef..e6ea6e5edbd9a 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf
index c9c101eb44b46..8c5d2a7686a42 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf
index bf77c0bf61970..37870cd22824e 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf
index 6c8ecb99018ee..7d6a85e7ada9f 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf
index b4bf57da9b48f..6cc8a8443bfa1 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf
index 1af6e24183bda..4ec9e1473f742 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf
index 02dadfacae528..ef6768e3c6900 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf
index ce94ad6bf4864..c4e1d0e8930b3 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf
index 99dd88e2d332b..98f51608bf14b 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf
index 1ff009d5a91f1..cdef2b2edd32c 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="translated">显示内联参数名称提示；
+        <target state="needs-review-translation">显示内联参数名称提示；
 显示对已关闭文件的诊断；
 对正则表达式着色；
 突出显示游标下的相关组件；
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf
index b230082a731cf..82fe530845fde 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf
@@ -33,7 +33,7 @@
         <note>"C#" node help text in profile Import/Export.</note>
       </trans-unit>
       <trans-unit id="306">
-        <source>Display inline parameter name hints;
+        <source>Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
@@ -81,7 +81,7 @@ regex;
 regular expression;
 Use enhanced colors;
 Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;
+        <target state="new">Display inline hints;
 Show diagnostics for closed files;
 Colorize regular expression; 
 Highlight related components under cursor; 
diff --git a/src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs b/src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs
index 48a2dd6de7eda..79cc4e81b6b3f 100644
--- a/src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs
+++ b/src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs
@@ -817,5 +817,131 @@ bool goo(bool x)
     }
 }", "!");
         }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultSwitchCase()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    void M1(int parameter)
+    {
+        switch(parameter) {
+            defa[||]ult:
+                parameter = default;
+                break;
+        }
+    }
+}", "defaultcase");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultLiteralExpressionInsideSwitch()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    void M1(int parameter)
+    {
+        switch(parameter) {
+            default:
+                parameter = defa[||]ult;
+                break;
+        }
+    }
+}", "default");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultExpressionInsideSwitch()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    void M1(int parameter)
+    {
+        switch(parameter) {
+            default:
+                parameter = defa[||]ult(int);
+                break;
+        }
+    }
+}", "default");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultLiteralExpression()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    int field = defa[||]ult;
+}", "default");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultExpression()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    int field = defa[||]ult(int);
+}", "default");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultLiteralExpressionInOptionalParameter()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    void M1(int parameter = defa[||]ult) {
+    }
+}", "default");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultExpressionInOptionalParameter()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    void M1(int parameter = defa[||]ult(int)) {
+    }
+}", "default");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultLiteralExpressionInMethodCall()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    void M1() {
+        M2(defa[||]ult);
+    }
+}", "default");
+        }
+
+        [WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
+        [Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
+        public async Task TestDefaultExpressionInMethodCall()
+        {
+            await Test_KeywordAsync(
+@"class C
+{
+    void M1() {
+        M2(defa[||]ult(int));
+    }
+}", "default");
+        }
     }
 }
diff --git a/src/VisualStudio/CSharp/Test/PersistentStorage/AbstractPersistentStorageTests.cs b/src/VisualStudio/CSharp/Test/PersistentStorage/AbstractPersistentStorageTests.cs
index 8d6d5406d3014..b4e23c515bc69 100644
--- a/src/VisualStudio/CSharp/Test/PersistentStorage/AbstractPersistentStorageTests.cs
+++ b/src/VisualStudio/CSharp/Test/PersistentStorage/AbstractPersistentStorageTests.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Composition;
@@ -38,7 +36,7 @@ public enum Size
 
         private readonly Encoding _encoding = Encoding.UTF8;
 
-        private AbstractPersistentStorageService _storageService;
+        private AbstractPersistentStorageService? _storageService;
         private readonly DisposableDirectory _persistentFolderRoot;
         private readonly TempDirectory _persistentFolder;
 
@@ -90,10 +88,10 @@ private string GetData1(Size size)
         private string GetData2(Size size)
             => size == Size.Small ? SmallData2 : size == Size.Medium ? MediumData2 : LargeData2;
 
-        private Checksum GetChecksum1(bool withChecksum)
+        private Checksum? GetChecksum1(bool withChecksum)
             => withChecksum ? s_checksum1 : null;
 
-        private Checksum GetChecksum2(bool withChecksum)
+        private Checksum? GetChecksum2(bool withChecksum)
             => withChecksum ? s_checksum2 : null;
 
         [Fact]
@@ -797,9 +795,9 @@ public void CacheDirectoryShouldNotBeAtRoot()
             var workspace = new AdhocWorkspace(FeaturesTestCompositions.Features.AddParts(typeof(TestPersistentStorageLocationService)).GetHostServices());
             workspace.AddSolution(SolutionInfo.Create(SolutionId.CreateNewId(), new VersionStamp(), @"D:\git\PCLCrypto\PCLCrypto.sln"));
 
-            var locationService = workspace.Services.GetService<IPersistentStorageLocationService>();
+            var locationService = workspace.Services.GetRequiredService<IPersistentStorageLocationService>();
             var location = locationService.TryGetStorageLocation(workspace.CurrentSolution);
-            Assert.False(location.StartsWith("/"));
+            Assert.False(location?.StartsWith("/") ?? false);
         }
 
         [PartNotDiscoverable]
@@ -873,17 +871,17 @@ protected Solution CreateOrOpenSolution(bool nullPaths = false)
         }
 
         internal IChecksummedPersistentStorage GetStorage(
-            Solution solution, IPersistentStorageFaultInjector faultInjectorOpt = null)
+            Solution solution, IPersistentStorageFaultInjector? faultInjector = null)
         {
             // If we handed out one for a previous test, we need to shut that down first
             _storageService?.GetTestAccessor().Shutdown();
             var locationService = new MockPersistentStorageLocationService(solution.Id, _persistentFolder.Path);
 
-            _storageService = GetStorageService(locationService, faultInjectorOpt);
+            _storageService = GetStorageService(locationService, faultInjector);
             var storage = _storageService.GetStorage(solution, checkBranchId: true);
 
             // If we're injecting faults, we expect things to be strange
-            if (faultInjectorOpt == null)
+            if (faultInjector == null)
             {
                 Assert.NotEqual(NoOpPersistentStorage.Instance, storage);
             }
@@ -892,17 +890,17 @@ internal IChecksummedPersistentStorage GetStorage(
         }
 
         internal IChecksummedPersistentStorage GetStorageFromKey(
-            Workspace workspace, SolutionKey solutionKey, IPersistentStorageFaultInjector faultInjectorOpt = null)
+            Workspace workspace, SolutionKey solutionKey, IPersistentStorageFaultInjector? faultInjector = null)
         {
             // If we handed out one for a previous test, we need to shut that down first
             _storageService?.GetTestAccessor().Shutdown();
             var locationService = new MockPersistentStorageLocationService(solutionKey.Id, _persistentFolder.Path);
 
-            _storageService = GetStorageService(locationService, faultInjectorOpt);
+            _storageService = GetStorageService(locationService, faultInjector);
             var storage = _storageService.GetStorage(workspace, solutionKey, checkBranchId: true);
 
             // If we're injecting faults, we expect things to be strange
-            if (faultInjectorOpt == null)
+            if (faultInjector == null)
             {
                 Assert.NotEqual(NoOpPersistentStorage.Instance, storage);
             }
@@ -923,14 +921,14 @@ public MockPersistentStorageLocationService(SolutionId solutionId, string storag
 
             public bool IsSupported(Workspace workspace) => true;
 
-            public string TryGetStorageLocation(Solution solution)
+            public string? TryGetStorageLocation(Solution solution)
                 => solution.Id == _solutionId ? _storageLocation : null;
 
-            public string TryGetStorageLocation(Workspace workspace, SolutionKey solutionKey)
+            public string? TryGetStorageLocation(Workspace workspace, SolutionKey solutionKey)
                 => solutionKey.Id == _solutionId ? _storageLocation : null;
         }
 
-        internal abstract AbstractPersistentStorageService GetStorageService(IPersistentStorageLocationService locationService, IPersistentStorageFaultInjector faultInjector);
+        internal abstract AbstractPersistentStorageService GetStorageService(IPersistentStorageLocationService locationService, IPersistentStorageFaultInjector? faultInjector);
 
         protected Stream EncodeString(string text)
         {
diff --git a/src/VisualStudio/CSharp/Test/PersistentStorage/SQLiteV2PersistentStorageTests.cs b/src/VisualStudio/CSharp/Test/PersistentStorage/SQLiteV2PersistentStorageTests.cs
index 567fbcc162503..ead3586e4eff7 100644
--- a/src/VisualStudio/CSharp/Test/PersistentStorage/SQLiteV2PersistentStorageTests.cs
+++ b/src/VisualStudio/CSharp/Test/PersistentStorage/SQLiteV2PersistentStorageTests.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -21,7 +19,7 @@ namespace Microsoft.CodeAnalysis.UnitTests.WorkspaceServices
     /// </remarks>
     public class SQLiteV2PersistentStorageTests : AbstractPersistentStorageTests
     {
-        internal override AbstractPersistentStorageService GetStorageService(IPersistentStorageLocationService locationService, IPersistentStorageFaultInjector faultInjector)
+        internal override AbstractPersistentStorageService GetStorageService(IPersistentStorageLocationService locationService, IPersistentStorageFaultInjector? faultInjector)
             => new SQLitePersistentStorageService(locationService, faultInjector);
 
         [Fact]
@@ -68,12 +66,12 @@ public async Task TestCrashInNewConnection()
 
         private class PersistentStorageFaultInjector : IPersistentStorageFaultInjector
         {
-            private readonly Action _onNewConnection;
-            private readonly Action<Exception> _onFatalError;
+            private readonly Action? _onNewConnection;
+            private readonly Action<Exception>? _onFatalError;
 
             public PersistentStorageFaultInjector(
-                Action onNewConnection = null,
-                Action<Exception> onFatalError = null)
+                Action? onNewConnection = null,
+                Action<Exception>? onFatalError = null)
             {
                 _onNewConnection = onNewConnection;
                 _onFatalError = onFatalError;
diff --git a/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2017.xml b/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2017.xml
index a0b2568e93983..18e8bd5139c29 100644
--- a/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2017.xml
+++ b/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2017.xml
@@ -63,7 +63,7 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
+            <Color Name="inline hints">
                 <Background Type="CT_RAW" Source="FFE6E6FA" />
                 <Foreground Type="CT_RAW" Source="FF686868" />
             </Color>
@@ -218,7 +218,7 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
+            <Color Name="inline hints">
                 <Background Type="CT_RAW" Source="FFE6E6FA" />
                 <Foreground Type="CT_RAW" Source="FF686868" />
             </Color>
@@ -373,7 +373,7 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
+            <Color Name="inline hints">
                 <Background Type="CT_RAW" Source="FFE6E6FA" />
                 <Foreground Type="CT_RAW" Source="FF504848" />
             </Color>
@@ -528,9 +528,9 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
-                <Background Type="CT_RAW" Source="FF2D2C2C" />
-                <Foreground Type="CT_RAW" Source="FF959493" />
+            <Color Name="inline hints">
+                <Background Type="CT_RAW" Source="FF3E3E3E" />
+                <Foreground Type="CT_RAW" Source="FFA9A8A7" />
             </Color>
             <Color Name="xml doc comment - attribute name">
                 <Foreground Type="CT_RAW" Source="FFC8C8C8" />
@@ -697,7 +697,7 @@
             <Color Name="label name">
                 <Foreground Type="CT_SYSCOLOR" Source="00000008" />
             </Color>
-            <Color Name="inline parameter name hints">
+            <Color Name="inline hints">
                 <Foreground Type="CT_SYSCOLOR" Source="00000008" />
             </Color>
             <Color Name="xml doc comment - attribute name">
diff --git a/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2019.xml b/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2019.xml
index f8cace4c701bf..7525c9bf68ee4 100644
--- a/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2019.xml
+++ b/src/VisualStudio/Core/Def/ColorSchemes/VisualStudio2019.xml
@@ -69,7 +69,7 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
+            <Color Name="inline hints">
                 <Background Type="CT_RAW" Source="FFE6E6FA" />
                 <Foreground Type="CT_RAW" Source="FF686868" />
             </Color>
@@ -230,7 +230,7 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
+            <Color Name="inline hints">
                 <Background Type="CT_RAW" Source="FFE6E6FA" />
                 <Foreground Type="CT_RAW" Source="FF686868" />
             </Color>
@@ -391,7 +391,7 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
+            <Color Name="inline hints">
                 <Background Type="CT_RAW" Source="FFE6E6FA" />
                 <Foreground Type="CT_RAW" Source="FF504848" />
             </Color>
@@ -552,9 +552,9 @@
             </Color>
             <Color Name="label name">
             </Color>
-            <Color Name="inline parameter name hints">
-                <Background Type="CT_RAW" Source="FF2D2C2C" />
-                <Foreground Type="CT_RAW" Source="FF959493" />
+            <Color Name="inline hints">
+                <Background Type="CT_RAW" Source="FF3E3E3E" />
+                <Foreground Type="CT_RAW" Source="FFA9A8A7" />
             </Color>
             <Color Name="xml doc comment - attribute name">
                 <Foreground Type="CT_RAW" Source="FFC8C8C8" />
diff --git a/src/VisualStudio/Core/Def/Implementation/AbstractVsTextViewFilter.cs b/src/VisualStudio/Core/Def/Implementation/AbstractVsTextViewFilter.cs
index 789a268ee24c3..4cd19fa954375 100644
--- a/src/VisualStudio/Core/Def/Implementation/AbstractVsTextViewFilter.cs
+++ b/src/VisualStudio/Core/Def/Implementation/AbstractVsTextViewFilter.cs
@@ -48,7 +48,7 @@ int IVsTextViewFilter.GetDataTipText(TextSpan[] pSpan, out string pbstrText)
 
                 return GetDataTipTextImpl(pSpan, out pbstrText);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -149,7 +149,7 @@ int IVsTextViewFilter.GetPairExtents(int iLine, int iIndex, TextSpan[] pSpan)
 
                 return result;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/CallHierarchy/Finders/AbstractCallFinder.cs b/src/VisualStudio/Core/Def/Implementation/CallHierarchy/Finders/AbstractCallFinder.cs
index 2cf3b55257aa3..84518aadbb130 100644
--- a/src/VisualStudio/Core/Def/Implementation/CallHierarchy/Finders/AbstractCallFinder.cs
+++ b/src/VisualStudio/Core/Def/Implementation/CallHierarchy/Finders/AbstractCallFinder.cs
@@ -68,7 +68,7 @@ public void StartSearch(Workspace workspace, CallHierarchySearchScope searchScop
                 {
                     completionErrorMessage = EditorFeaturesResources.Canceled;
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+                catch (Exception e) when (FatalError.ReportAndCatch(e))
                 {
                     completionErrorMessage = e.Message;
                 }
diff --git a/src/VisualStudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.cs b/src/VisualStudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.cs
index b5245e4379cdf..5a1962bbd8acb 100644
--- a/src/VisualStudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.cs
@@ -6,6 +6,7 @@
 using System.Collections.Immutable;
 using System.ComponentModel;
 using System.ComponentModel.Composition;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -27,6 +28,9 @@ namespace Microsoft.VisualStudio.LanguageServices.ColorSchemes
     [Export(typeof(ColorSchemeApplier))]
     internal sealed partial class ColorSchemeApplier : ForegroundThreadAffinitizedObject, IDisposable
     {
+        private const string ColorThemeValueName = "Microsoft.VisualStudio.ColorTheme";
+        private const string ColorThemeNewValueName = "Microsoft.VisualStudio.ColorThemeNew";
+
         private readonly IServiceProvider _serviceProvider;
         private readonly ColorSchemeSettings _settings;
         private readonly ClassificationVerifier _classificationVerifier;
@@ -166,14 +170,21 @@ public Guid GetThemeId()
         {
             AssertIsForeground();
 
-            dynamic colorThemeService = _serviceProvider.GetService(typeof(SVsColorThemeService));
-            return (Guid)colorThemeService.CurrentTheme.ThemeId;
-        }
+            var settingsManager = (ISettingsManager)_serviceProvider.GetService(typeof(SVsSettingsPersistenceManager));
 
-        // NOTE: This service is not public or intended for use by teams/individuals outside of Microsoft. Any data stored is subject to deletion without warning.
-        [Guid("0d915b59-2ed7-472a-9de8-9161737ea1c5")]
-        private interface SVsColorThemeService
-        {
+            //  Look up the value from the new roamed theme property first
+            //  Fallback to the original roamed theme property if that fails
+            var currentThemeString = settingsManager.GetValueOrDefault<string?>(ColorThemeNewValueName, defaultValue: null) ??
+                settingsManager.GetValueOrDefault<string?>(ColorThemeValueName, defaultValue: null);
+
+            if (currentThemeString is null)
+            {
+                // The ColorTheme setting is unpopulated when it has never been changed from its default.
+                // The default VS ColorTheme is Blue
+                return KnownColorThemes.Blue;
+            }
+
+            return Guid.Parse(currentThemeString);
         }
 
         // NOTE: This service is not public or intended for use by teams/individuals outside of Microsoft. Any data stored is subject to deletion without warning.
diff --git a/src/VisualStudio/Core/Def/Implementation/DesignerAttribute/VisualStudioDesignerAttributeService.cs b/src/VisualStudio/Core/Def/Implementation/DesignerAttribute/VisualStudioDesignerAttributeService.cs
index 395ea7e7893c8..954f3917c2ee7 100644
--- a/src/VisualStudio/Core/Def/Implementation/DesignerAttribute/VisualStudioDesignerAttributeService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/DesignerAttribute/VisualStudioDesignerAttributeService.cs
@@ -101,7 +101,7 @@ private async Task StartAsync()
             {
                 // Cancellation is normal (during VS closing).  Just ignore.
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 // Otherwise report a watson for any other exception.  Don't bring down VS.  This is
                 // a BG service we don't want impacting the user experience.
diff --git a/src/VisualStudio/Core/Def/Implementation/Diagnostics/FxCopAnalyzersSuggestedActionCallback.cs b/src/VisualStudio/Core/Def/Implementation/Diagnostics/FxCopAnalyzersSuggestedActionCallback.cs
index a66f9de33ab05..a7167b4cddd19 100644
--- a/src/VisualStudio/Core/Def/Implementation/Diagnostics/FxCopAnalyzersSuggestedActionCallback.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Diagnostics/FxCopAnalyzersSuggestedActionCallback.cs
@@ -117,7 +117,7 @@ private bool IsVsixInstalled()
                 var hr = vsShell.IsPackageInstalled(FxCopAnalyzersPackageGuid, out var installed);
                 if (ErrorHandler.Failed(hr))
                 {
-                    FatalError.ReportWithoutCrash(Marshal.GetExceptionForHR(hr));
+                    FatalError.ReportAndCatch(Marshal.GetExceptionForHR(hr));
 
                     // We set installed to ensure we don't go through this again next time a
                     // suggested action is called, and we don't want to continue if the shell
diff --git a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs
index 3f6d5088e656d..f49caafb53fa7 100644
--- a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs
@@ -14,6 +14,7 @@
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
+using Roslyn.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.Diagnostics
 {
@@ -64,8 +65,9 @@ private async Task InitializeWorkspaceAsync(VisualStudioWorkspaceImpl workspace)
                     workspace.ApplyChangeToWorkspace(w =>
                         w.SetCurrentSolution(s => s.WithAnalyzerReferences(references), WorkspaceChangeKind.SolutionChanged));
                 }
-                catch (Exception e) when (FatalError.Report(e))
+                catch (Exception e) when (FatalError.ReportAndPropagate(e))
                 {
+                    throw ExceptionUtilities.Unreachable;
                 }
             }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/EditAndContinue/VisualStudioManagedModuleUpdateProvider.cs b/src/VisualStudio/Core/Def/Implementation/EditAndContinue/VisualStudioManagedModuleUpdateProvider.cs
index 9135793bb9674..ccfe7c7fced46 100644
--- a/src/VisualStudio/Core/Def/Implementation/EditAndContinue/VisualStudioManagedModuleUpdateProvider.cs
+++ b/src/VisualStudio/Core/Def/Implementation/EditAndContinue/VisualStudioManagedModuleUpdateProvider.cs
@@ -55,7 +55,7 @@ public async Task<bool> HasChangesAsync(string sourceFilePath, CancellationToken
                 var activeStatementSpanProvider = GetActiveStatementSpanProvider(solution);
                 return await _encService.HasChangesAsync(solution, activeStatementSpanProvider, sourceFilePath, cancellationToken).ConfigureAwait(false);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return true;
             }
@@ -71,7 +71,7 @@ public async Task<ManagedModuleUpdates> GetManagedModuleUpdatesAsync(Cancellatio
                 var (summary, deltas) = await _encService.EmitSolutionUpdateAsync(solution, activeStatementSpanProvider, cancellationToken).ConfigureAwait(false);
                 return new ManagedModuleUpdates(summary.ToModuleUpdateStatus(), deltas.SelectAsArray(ModuleUtilities.ToModuleUpdate).ToReadOnlyCollection());
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 _encService.ReportApplyChangesException(solution, e.Message);
                 return new ManagedModuleUpdates(ManagedModuleUpdateStatus.Blocked, ImmutableArray<DkmManagedModuleUpdate>.Empty.ToReadOnlyCollection());
@@ -84,7 +84,7 @@ public void CommitUpdates()
             {
                 _encService.CommitSolutionUpdate();
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
             }
         }
@@ -95,7 +95,7 @@ public void DiscardUpdates()
             {
                 _encService.DiscardSolutionUpdate();
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
             }
         }
diff --git a/src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs b/src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs
index 8b2e9c12c21ac..cbbe0b18105a9 100644
--- a/src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs
@@ -120,7 +120,7 @@ private void InitializeCore()
             var hr = vsShell.IsPackageInstalled(ReSharperPackageGuid, out var extensionEnabled);
             if (ErrorHandler.Failed(hr))
             {
-                FatalError.ReportWithoutCrash(Marshal.GetExceptionForHR(hr));
+                FatalError.ReportAndCatch(Marshal.GetExceptionForHR(hr));
                 return;
             }
 
@@ -137,7 +137,7 @@ private void InitializeCore()
 
                 if (ErrorHandler.Failed(hr))
                 {
-                    FatalError.ReportWithoutCrash(Marshal.GetExceptionForHR(hr));
+                    FatalError.ReportAndCatch(Marshal.GetExceptionForHR(hr));
                     return;
                 }
 
@@ -319,7 +319,7 @@ async Task<OLECMDF> QueryStatusAsync(uint cmdId)
                 var hr = _oleCommandTarget.QueryStatus(ReSharperCommandGroup, (uint)cmds.Length, cmds, IntPtr.Zero);
                 if (ErrorHandler.Failed(hr))
                 {
-                    FatalError.ReportWithoutCrash(Marshal.GetExceptionForHR(hr));
+                    FatalError.ReportAndCatch(Marshal.GetExceptionForHR(hr));
                     await ShutdownAsync().ConfigureAwait(false);
 
                     return 0;
@@ -441,7 +441,7 @@ private async Task ShutdownAsync()
 
                 if (ErrorHandler.Failed(hr))
                 {
-                    FatalError.ReportWithoutCrash(Marshal.GetExceptionForHR(hr));
+                    FatalError.ReportAndCatch(Marshal.GetExceptionForHR(hr));
                 }
             }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs b/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs
index 7f82f738886f5..87e4e1f6fdec4 100644
--- a/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs
+++ b/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs
@@ -137,7 +137,7 @@ public Task ExitAsync(CancellationToken _)
             {
                 _jsonRpc.Dispose();
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 // Swallow exceptions thrown by disposing our JsonRpc object. Disconnected events can potentially throw their own exceptions so
                 // we purposefully ignore all of those exceptions in an effort to shutdown gracefully.
diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs b/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs
index f5104cfe9ae48..53756a5d7b938 100644
--- a/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs
+++ b/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs
@@ -43,18 +43,5 @@ public ImmutableArray<Document> GetDocuments(Uri documentUri)
 
             return documents;
         }
-
-        public ImmutableArray<TextDocument> GetTextDocuments(Uri documentUri)
-        {
-            // First check the VS workspace for matching documents.
-            var documents = _visualStudioWorkspace.CurrentSolution.GetTextDocuments(documentUri);
-            if (documents.IsEmpty)
-            {
-                // If there's none in the VS workspace, then check the misc files workspace.
-                documents = _miscellaneousFilesWorkspace.CurrentSolution.GetTextDocuments(documentUri);
-            }
-
-            return documents;
-        }
     }
 }
diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsImmediateStatementCompletion2.cs b/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsImmediateStatementCompletion2.cs
index dd2cfa8ee5db6..8d7df4d8ac993 100644
--- a/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsImmediateStatementCompletion2.cs
+++ b/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsImmediateStatementCompletion2.cs
@@ -95,7 +95,7 @@ int IVsImmediateStatementCompletion2.SetCompletionContext(string filePath,
 
                 if (!contextBuffer.ContentType.IsOfType(this.ContentTypeName))
                 {
-                    FatalError.ReportWithoutCrash(
+                    FatalError.ReportAndCatch(
                         new ArgumentException($"Expected content type {this.ContentTypeName} " +
                         $"but got buffer of content type {contextBuffer.ContentType}"));
 
diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsLanguageDebugInfo.cs b/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsLanguageDebugInfo.cs
index b93206e05ee99..c95a196fef1e8 100644
--- a/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsLanguageDebugInfo.cs
+++ b/src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractLanguageService`2.IVsLanguageDebugInfo.cs
@@ -22,7 +22,7 @@ int IVsLanguageDebugInfo.GetLanguageID(IVsTextBuffer pBuffer, int iLine, int iCo
             {
                 return LanguageDebugInfo.GetLanguageID(pBuffer, iLine, iCol, out pguidLanguageID);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -34,7 +34,7 @@ int IVsLanguageDebugInfo.GetLocationOfName(string pszName, out string pbstrMkDoc
             {
                 return LanguageDebugInfo.GetLocationOfName(pszName, out pbstrMkDoc, out pspanLocation);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -46,7 +46,7 @@ int IVsLanguageDebugInfo.GetNameOfLocation(IVsTextBuffer pBuffer, int iLine, int
             {
                 return LanguageDebugInfo.GetNameOfLocation(pBuffer, iLine, iCol, out pbstrName, out piLineOffset);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -58,7 +58,7 @@ int IVsLanguageDebugInfo.GetProximityExpressions(IVsTextBuffer pBuffer, int iLin
             {
                 return LanguageDebugInfo.GetProximityExpressions(pBuffer, iLine, iCol, cLines, out ppEnum);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -70,7 +70,7 @@ int IVsLanguageDebugInfo.IsMappedLocation(IVsTextBuffer pBuffer, int iLine, int
             {
                 return LanguageDebugInfo.IsMappedLocation(pBuffer, iLine, iCol);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -82,7 +82,7 @@ int IVsLanguageDebugInfo.ResolveName(string pszName, uint dwFlags, out IVsEnumDe
             {
                 return LanguageDebugInfo.ResolveName(pszName, dwFlags, out ppNames);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -94,7 +94,7 @@ int IVsLanguageDebugInfo.ValidateBreakpointLocation(IVsTextBuffer pBuffer, int i
             {
                 return LanguageDebugInfo.ValidateBreakpointLocation(pBuffer, iLine, iCol, pCodeSpan);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e) && false)
+            catch (Exception e) when (FatalError.ReportAndCatch(e) && false)
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs
index 63398d244257d..787a7a83137e0 100644
--- a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs
@@ -125,7 +125,7 @@ private void UpdateDocument(Document oldDocument, Document newDocument)
 
                 UpdateClassAndMemberVersions();
             }
-            catch (Exception e) when (FatalError.Report(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 // make it crash VS on any exception
             }
@@ -535,7 +535,7 @@ await Task.Run(async () =>
             catch (OperationCanceledException)
             {
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
             }
         }
diff --git a/src/VisualStudio/Core/Def/Implementation/Log/VisualStudioErrorLogger.cs b/src/VisualStudio/Core/Def/Implementation/Log/VisualStudioErrorLogger.cs
index caa1a68908f41..12d5567ca97eb 100644
--- a/src/VisualStudio/Core/Def/Implementation/Log/VisualStudioErrorLogger.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Log/VisualStudioErrorLogger.cs
@@ -30,7 +30,7 @@ public void LogException(object source, Exception exception)
 
             if (ShouldReportCrashDumps(source))
             {
-                FatalError.ReportWithoutCrash(exception);
+                FatalError.ReportAndCatch(exception);
             }
         }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueryManager.cs b/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueryManager.cs
index deb8bc8fb0e24..5ef2e76226cf9 100644
--- a/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueryManager.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueryManager.cs
@@ -176,7 +176,7 @@ private static async Task PopulateContextGraphAsync(Solution solution, List<IGra
 
                 transaction.Complete();
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs
index 418be7d51e269..ff92d82793e5c 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs
@@ -143,7 +143,7 @@ private static bool ReportException(Exception e)
             // If we got a PathTooLongException there's really nothing we can do about it; we will fail to read the file later which is fine
             if (!(e is PathTooLongException))
             {
-                return FatalError.ReportWithoutCrash(e);
+                return FatalError.ReportAndCatch(e);
             }
 
             // We'll always capture all exceptions regardless. If we don't, then the exception is captured by our lazy and will be potentially rethrown from
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/InvisibleEditor.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/InvisibleEditor.cs
index 7ee73115333bf..b1cf92ff9a27c 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/InvisibleEditor.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/InvisibleEditor.cs
@@ -13,6 +13,7 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.TextManager.Interop;
+using Roslyn.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
 {
@@ -152,8 +153,9 @@ public void Dispose()
 
                 GC.SuppressFinalize(this);
             }
-            catch (Exception ex) when (FatalError.Report(ex))
+            catch (Exception ex) when (FatalError.ReportAndPropagate(ex))
             {
+                throw ExceptionUtilities.Unreachable;
             }
         }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
index 97faf547c9d6f..eae560e65cb29 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
@@ -1204,7 +1204,7 @@ protected override void ApplyDocumentInfoChanged(DocumentId documentId, Document
 
                 if (document.FilePath == null)
                 {
-                    FatalError.ReportWithoutCrash(new Exception("Attempting to change the information of a document without a file path."));
+                    FatalError.ReportAndCatch(new Exception("Attempting to change the information of a document without a file path."));
                     return;
                 }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/VisualStudioProjectTelemetryService.cs b/src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/VisualStudioProjectTelemetryService.cs
index 52daa40ad8531..4317435c40c3d 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/VisualStudioProjectTelemetryService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/VisualStudioProjectTelemetryService.cs
@@ -91,7 +91,7 @@ private async Task StartAsync()
             {
                 // Cancellation is normal (during VS closing).  Just ignore.
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 // Otherwise report a watson for any other exception.  Don't bring down VS.  This is
                 // a BG service we don't want impacting the user experience.
diff --git a/src/VisualStudio/Core/Def/Implementation/Remote/VisualStudioRemoteHostClientProvider.cs b/src/VisualStudio/Core/Def/Implementation/Remote/VisualStudioRemoteHostClientProvider.cs
index 77849ef821957..acaeee5c44e7e 100644
--- a/src/VisualStudio/Core/Def/Implementation/Remote/VisualStudioRemoteHostClientProvider.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Remote/VisualStudioRemoteHostClientProvider.cs
@@ -77,7 +77,7 @@ private VisualStudioRemoteHostClientProvider(HostWorkspaceServices services, IAs
 
                 return client;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return null;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/TodoComments/VisualStudioTodoCommentsService.cs b/src/VisualStudio/Core/Def/Implementation/TodoComments/VisualStudioTodoCommentsService.cs
index 6d56281a861ce..65025dbf0abdf 100644
--- a/src/VisualStudio/Core/Def/Implementation/TodoComments/VisualStudioTodoCommentsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TodoComments/VisualStudioTodoCommentsService.cs
@@ -92,7 +92,7 @@ private async Task StartAsync()
             {
                 // Cancellation is normal (during VS closing).  Just ignore.
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 // Otherwise report a watson for any other exception.  Don't bring down VS.  This is
                 // a BG service we don't want impacting the user experience.
@@ -219,7 +219,7 @@ public async ValueTask ReportTodoCommentDataAsync(DocumentId documentId, Immutab
                 var workQueue = await _workQueueSource.Task.ConfigureAwait(false);
                 workQueue.AddWork(new DocumentAndComments(documentId, infos));
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 // report NFW before returning back to the remote process
                 throw ExceptionUtilities.Unreachable;
diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs
index a4c17e4814488..26f6394560ed8 100644
--- a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs
@@ -97,7 +97,7 @@ public static string GetFilePathFromHierarchyAndItemId(IVsHierarchy hierarchy, u
                 Debug.Assert(false, "Could not get the document moniker for an item from its hierarchy.");
                 if (!hierarchy.TryGetItemName(itemid, out filePath!))
                 {
-                    FatalError.Report(new System.Exception("Failed to get document moniker for a contained document"));
+                    FatalError.ReportAndPropagate(new InvalidOperationException("Failed to get document moniker for a contained document"));
                 }
             }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/Watson/WatsonReporter.cs b/src/VisualStudio/Core/Def/Implementation/Watson/WatsonReporter.cs
index d8829f4b74c3a..75a9b182f3d25 100644
--- a/src/VisualStudio/Core/Def/Implementation/Watson/WatsonReporter.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Watson/WatsonReporter.cs
@@ -25,19 +25,21 @@ internal static class WatsonReporter
 
         public static void InitializeFatalErrorHandlers()
         {
-            var fatalReporter = new Action<Exception>(ReportFatal);
-            var nonFatalReporter = new Action<Exception>(ReportNonFatal);
+            // Set both handlers to non-fatal Watson. Never fail-fast the ServiceHub process.
+            // Any exception that is not recovered from shall be propagated and communicated to the client.
+            var nonFatalHandler = new Action<Exception>(ReportNonFatal);
+            var fatalHandler = nonFatalHandler;
 
-            FatalError.Handler = fatalReporter;
-            FatalError.NonFatalHandler = nonFatalReporter;
+            FatalError.Handler = fatalHandler;
+            FatalError.NonFatalHandler = nonFatalHandler;
 
-            // We also must set the FailFast handler for the compiler layer as well
+            // We also must set the handlers for the compiler layer as well.
             var compilerAssembly = typeof(Compilation).Assembly;
             var compilerFatalErrorType = compilerAssembly.GetType("Microsoft.CodeAnalysis.FatalError", throwOnError: true)!;
             var compilerFatalErrorHandlerProperty = compilerFatalErrorType.GetProperty(nameof(FatalError.Handler), BindingFlags.Static | BindingFlags.Public)!;
             var compilerNonFatalErrorHandlerProperty = compilerFatalErrorType.GetProperty(nameof(FatalError.NonFatalHandler), BindingFlags.Static | BindingFlags.Public)!;
-            compilerFatalErrorHandlerProperty.SetValue(null, fatalReporter);
-            compilerNonFatalErrorHandlerProperty.SetValue(null, nonFatalReporter);
+            compilerFatalErrorHandlerProperty.SetValue(null, fatalHandler);
+            compilerNonFatalErrorHandlerProperty.SetValue(null, nonFatalHandler);
         }
 
         public static void RegisterTelemetrySesssion(TelemetrySession session)
@@ -72,20 +74,6 @@ public static void UnregisterLogger(TraceSource logger)
             }
         }
 
-        public static void ReportFatal(Exception exception)
-        {
-            try
-            {
-                CaptureFilesInMemory(CollectServiceHubLogFilePaths());
-            }
-            catch
-            {
-                // ignore any exceptions (e.g. OOM)
-            }
-
-            FailFast.OnFatalException(exception);
-        }
-
         /// <summary>
         /// Report Non-Fatal Watson for a given unhandled exception.
         /// </summary>
diff --git a/src/VisualStudio/Core/Def/Implementation/Watson/WatsonTraceListener.cs b/src/VisualStudio/Core/Def/Implementation/Watson/WatsonTraceListener.cs
index 0306d5b4d9c8f..b8471fbad1d12 100644
--- a/src/VisualStudio/Core/Def/Implementation/Watson/WatsonTraceListener.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Watson/WatsonTraceListener.cs
@@ -93,7 +93,7 @@ public override void WriteLine(string message, string category)
 
         private static void Exit(string message)
         {
-            FatalError.Report(new Exception(message));
+            FatalError.ReportAndPropagate(new Exception(message));
         }
 
         internal static void Install()
diff --git a/src/VisualStudio/Core/Def/Implementation/Workspace/SourceGeneratedFileManager.cs b/src/VisualStudio/Core/Def/Implementation/Workspace/SourceGeneratedFileManager.cs
index 65494736f56ca..f0a0491463351 100644
--- a/src/VisualStudio/Core/Def/Implementation/Workspace/SourceGeneratedFileManager.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Workspace/SourceGeneratedFileManager.cs
@@ -93,14 +93,18 @@ public void NavigateToSourceGeneratedFile(Project project, ISourceGenerator gene
             // but most URIs are blocked other than file:// and http://; they also get extra handling to attempt to download the file so
             // those aren't really usable anyways.
 
-            // We put all the files related to the same project in a single directory
             var generatorType = generator.GetType();
-            var projectDirectory = Path.Combine(_temporaryDirectory, project.Id.Id.ToString());
-            Directory.CreateDirectory(projectDirectory);
 
             // The file name we generate here is chosen to match the compiler's choice, so the debugger can recognize the files should match.
             // This can only be changed if the compiler changes the algorithm as well.
-            var temporaryFilePath = Path.Combine(projectDirectory, generatorType.Assembly.GetName().Name ?? string.Empty, generatorType.FullName, generatedSourceHintName);
+            var temporaryFilePath = Path.Combine(
+                _temporaryDirectory,
+                project.Id.Id.ToString(),
+                generatorType.Assembly.GetName().Name ?? string.Empty,
+                generatorType.FullName,
+                generatedSourceHintName);
+
+            Directory.CreateDirectory(Path.GetDirectoryName(temporaryFilePath));
 
             // Don't write to the file if it's already there, as that potentially triggers a file reload
             if (!File.Exists(temporaryFilePath))
diff --git a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioDocumentNavigationService.cs b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioDocumentNavigationService.cs
index 261748263d80c..8fb579be342d4 100644
--- a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioDocumentNavigationService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioDocumentNavigationService.cs
@@ -78,7 +78,7 @@ public bool CanNavigateToSpan(Workspace workspace, DocumentId documentId, TextSp
                 {
                     throw new ArgumentOutOfRangeException();
                 }
-                catch (ArgumentOutOfRangeException e) when (FatalError.ReportWithoutCrash(e))
+                catch (ArgumentOutOfRangeException e) when (FatalError.ReportAndCatch(e))
                 {
                 }
 
@@ -127,7 +127,7 @@ public bool CanNavigateToPosition(Workspace workspace, DocumentId documentId, in
                 {
                     throw new ArgumentOutOfRangeException();
                 }
-                catch (ArgumentOutOfRangeException e) when (FatalError.ReportWithoutCrash(e))
+                catch (ArgumentOutOfRangeException e) when (FatalError.ReportAndCatch(e))
                 {
                 }
 
@@ -156,7 +156,7 @@ static VsTextSpan GetVsTextSpan(SourceText text, TextSpan textSpan)
                     {
                         throw new ArgumentOutOfRangeException();
                     }
-                    catch (ArgumentOutOfRangeException e) when (FatalError.ReportWithoutCrash(e))
+                    catch (ArgumentOutOfRangeException e) when (FatalError.ReportAndCatch(e))
                     {
                     }
                 }
@@ -215,7 +215,7 @@ static VsTextSpan GetVsTextSpan(SourceText text, int position, int virtualSpace)
                     {
                         throw new ArgumentOutOfRangeException();
                     }
-                    catch (ArgumentOutOfRangeException e) when (FatalError.ReportWithoutCrash(e))
+                    catch (ArgumentOutOfRangeException e) when (FatalError.ReportAndCatch(e))
                     {
                     }
                 }
diff --git a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioFormattingRuleFactoryServiceFactory.cs b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioFormattingRuleFactoryServiceFactory.cs
index 9c785e6948d2e..504977b6f1499 100644
--- a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioFormattingRuleFactoryServiceFactory.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioFormattingRuleFactoryServiceFactory.cs
@@ -101,7 +101,7 @@ public AbstractFormattingRule CreateRule(Document document, int position)
                     }
                 }
 
-                FatalError.ReportWithoutCrash(
+                FatalError.ReportAndCatch(
                     new InvalidOperationException($"Can't find an intersection. Visible spans count: {spans.Count}"));
 
                 return NoOpFormattingRule.Instance;
diff --git a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowPackage.cs b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowPackage.cs
index 669eff10fe6d9..f62327c0c741f 100644
--- a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowPackage.cs
+++ b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowPackage.cs
@@ -19,7 +19,7 @@
 using Microsoft.VisualStudio.InteractiveWindow.Shell;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using FatalError = InteractiveHost::Microsoft.CodeAnalysis.ErrorReporting.FatalError;
+using InteractiveHostFatalError = InteractiveHost::Microsoft.CodeAnalysis.ErrorReporting.FatalError;
 using Task = System.Threading.Tasks.Task;
 
 namespace Microsoft.VisualStudio.LanguageServices.Interactive
@@ -49,34 +49,35 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
             Assumes.Present(_componentModel);
             Assumes.Present(menuCommandService);
 
-            FatalError.Handler = WatsonReporter.ReportFatal;
-            FatalError.NonFatalHandler = WatsonReporter.ReportNonFatal;
+            // Set both handlers to non-fatal Watson. Never fail-fast the VS process.
+            // Any exception that is not recovered from shall be propagated.
+            var nonFatalHandler = new Action<Exception>(WatsonReporter.ReportNonFatal);
+            var fatalHandler = nonFatalHandler;
+
+            InteractiveHostFatalError.Handler = fatalHandler;
+            InteractiveHostFatalError.NonFatalHandler = nonFatalHandler;
 
             // Load the Roslyn package so that its FatalError handlers are hooked up.
             shell.LoadPackage(Guids.RoslynPackageId, out var roslynPackage);
 
             // Explicitly set up FatalError handlers for the InteractiveWindowPackage.
-            SetErrorHandlers(typeof(IInteractiveWindow).Assembly);
-            SetErrorHandlers(typeof(IVsInteractiveWindow).Assembly);
+            SetErrorHandlers(typeof(IInteractiveWindow).Assembly, fatalHandler, nonFatalHandler);
+            SetErrorHandlers(typeof(IVsInteractiveWindow).Assembly, fatalHandler, nonFatalHandler);
 
             _interactiveWindowProvider = _componentModel.DefaultExportProvider.GetExportedValue<TVsInteractiveWindowProvider>();
 
             InitializeMenuCommands(menuCommandService);
         }
 
-        private static void SetErrorHandlers(Assembly assembly)
+        private static void SetErrorHandlers(Assembly assembly, Action<Exception> fatalHandler, Action<Exception> nonFatalHandler)
         {
-            Debug.Assert(FatalError.Handler != null);
-            Debug.Assert(FatalError.NonFatalHandler != null);
-            Debug.Assert(Logger.GetLogger() != null);
-
             var type = assembly.GetType("Microsoft.VisualStudio.InteractiveWindow.FatalError", throwOnError: true).GetTypeInfo();
 
             var handlerSetter = type.GetDeclaredMethod("set_Handler");
             var nonFatalHandlerSetter = type.GetDeclaredMethod("set_NonFatalHandler");
 
-            handlerSetter.Invoke(null, new object[] { new Action<Exception>(FailFast.OnFatalException) });
-            nonFatalHandlerSetter.Invoke(null, new object[] { new Action<Exception>(WatsonReporter.ReportNonFatal) });
+            handlerSetter.Invoke(null, new object[] { fatalHandler });
+            nonFatalHandlerSetter.Invoke(null, new object[] { nonFatalHandler });
         }
 
         protected TVsInteractiveWindowProvider InteractiveWindowProvider
diff --git a/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs b/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs
index 7ee43ea0b724f..89955807b932d 100644
--- a/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs
+++ b/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs
@@ -171,7 +171,7 @@ private async Task<ImmutableArray<PackageSource>> GetPackageSourcesAsync()
             {
                 // These exceptions can happen when the nuget.config file is broken.
             }
-            catch (ArgumentException ae) when (FatalError.ReportWithoutCrash(ae))
+            catch (ArgumentException ae) when (FatalError.ReportAndCatch(ae))
             {
                 // This exception can happen when the nuget.config file is broken, e.g. invalid credentials.
                 // https://github.com/dotnet/roslyn/issues/40857
@@ -324,7 +324,7 @@ private bool TryInstallPackage(
 
                 // fall through.
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 dte.StatusBar.Text = string.Format(ServicesVSResources.Package_install_failed_colon_0, e.Message);
 
@@ -364,7 +364,7 @@ private bool TryUninstallPackage(
 
                 // fall through.
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
                 dte.StatusBar.Text = string.Format(ServicesVSResources.Package_uninstall_failed_colon_0, e.Message);
 
@@ -390,7 +390,7 @@ private bool TryUninstallPackage(
                 var metadata = installedPackages.FirstOrDefault(m => m.Id == packageName);
                 return metadata?.VersionString;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+            catch (Exception e) when (FatalError.ReportAndCatch(e))
             {
             }
 
@@ -552,7 +552,7 @@ private async Task ProcessProjectChangeAsync(
 
                 return new ProjectState(installedPackages.ToImmutableDictionary());
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return null;
             }
diff --git a/src/VisualStudio/Core/Def/RoslynPackage.cs b/src/VisualStudio/Core/Def/RoslynPackage.cs
index cfa8a23512cb3..8269895e599f1 100644
--- a/src/VisualStudio/Core/Def/RoslynPackage.cs
+++ b/src/VisualStudio/Core/Def/RoslynPackage.cs
@@ -326,7 +326,7 @@ void StartBulkFileOperationNotification()
                     // so guarding us from them
                     if (localRegistration != null)
                     {
-                        FatalError.ReportWithoutCrash(new InvalidOperationException("BulkFileOperation already exist"));
+                        FatalError.ReportAndCatch(new InvalidOperationException("BulkFileOperation already exist"));
                         return;
                     }
 
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index fd893726a5507..d9ed5df92e5d2 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1572,6 +1572,18 @@ I agree to all of the foregoing:</value>
   <data name="Suppress_hints_when_parameter_names_differ_only_by_suffix" xml:space="preserve">
     <value>Suppress hints when parameter names differ only by suffix</value>
   </data>
+  <data name="Display_inline_type_hints" xml:space="preserve">
+    <value>Display inline type hints</value>
+  </data>
+  <data name="Show_hints_for_lambda_parameter_types" xml:space="preserve">
+    <value>Show hints for lambda parameter types</value>
+  </data>
+  <data name="Show_hints_for_variables_with_inferred_types" xml:space="preserve">
+    <value>Show hints for variables with inferred types</value>
+  </data>
+  <data name="Color_hints" xml:space="preserve">
+    <value>Color hints</value>
+  </data>
   <data name="Display_all_hints_while_pressing_Ctrl_Alt" xml:space="preserve">
     <value>Display all hints while pressing Ctrl+Alt</value>
   </data>
diff --git a/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs b/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs
index b7d9afc79790a..aac7b9a018042 100644
--- a/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs
+++ b/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs
@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.VisualStudio.Telemetry;
+using Roslyn.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Telemetry
 {
@@ -89,8 +90,7 @@ public void LogBlockEnd(FunctionId functionId, LogMessage logMessage, int blockI
                         EndScope<UserTaskEvent>(functionId, blockId, kvLogMessage, cancellationToken);
                         return;
                     default:
-                        FatalError.Report(new Exception($"unknown type: {kind}"));
-                        break;
+                        throw ExceptionUtilities.UnexpectedValue(kind);
                 }
             }
             catch
@@ -123,7 +123,7 @@ private object CreateAndStartScope(LogType kind, FunctionId functionId)
             {
                 LogType.Trace => _session.StartOperation(eventName),
                 LogType.UserAction => _session.StartUserTask(eventName),
-                _ => (object)FatalError.Report(new Exception($"unknown type: {kind}")),
+                _ => throw ExceptionUtilities.UnexpectedValue(kind),
             };
         }
 
diff --git a/src/VisualStudio/Core/Def/Utilities/IVsEditorAdaptersFactoryServiceExtensions.cs b/src/VisualStudio/Core/Def/Utilities/IVsEditorAdaptersFactoryServiceExtensions.cs
index 3fd101fed4848..bac20313199a4 100644
--- a/src/VisualStudio/Core/Def/Utilities/IVsEditorAdaptersFactoryServiceExtensions.cs
+++ b/src/VisualStudio/Core/Def/Utilities/IVsEditorAdaptersFactoryServiceExtensions.cs
@@ -35,7 +35,7 @@ public static IOleUndoManager TryGetUndoManager(
                     ? $"{nameof(contextDocumentId)} was null."
                     : $"{nameof(contextDocumentId)} was not null.";
 
-                FatalError.ReportWithoutCrash(new InvalidOperationException("Could not retrieve document. " + message));
+                FatalError.ReportAndCatch(new InvalidOperationException("Could not retrieve document. " + message));
 
                 return null;
             }
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index b5604a5e46b95..d404bd54b66e5 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -147,6 +147,11 @@
         <target state="translated">Analýza kódu pro řešení se ukončila dříve, než se dokončila.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Obarvit regulární výrazy</target>
@@ -187,6 +192,11 @@
         <target state="needs-review-translation">Zobrazovat nápovědy k názvům v_ložených parametrů (experimentální)</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Upravit</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Některé barvy barevného schématu se přepsaly změnami na stránce možností Prostředí &gt; Písma a barvy. Pokud chcete zrušit všechna přizpůsobení, vyberte na stránce Písma a barvy možnost Použít výchozí.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index b6db768f482c9..44f606a44713e 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -147,6 +147,11 @@
         <target state="translated">Die Codeanalyse wurde für die Projektmappe vorzeitig beendet.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Reguläre Ausdrücke farbig hervorheben</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Bearbeiten</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Einige Farbschemafarben werden durch Änderungen überschrieben, die auf der Optionsseite "Umgebung" &gt; "Schriftarten und Farben" vorgenommen wurden. Wählen Sie auf der Seite "Schriftarten und Farben" die Option "Standardwerte verwenden" aus, um alle Anpassungen rückgängig zu machen.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index c4575eb754b34..7f538f23c3710 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -147,6 +147,11 @@
         <target state="translated">El análisis de código terminó antes de completarse para la solución.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Colorear expresiones regulares</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Editar</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Algunos de los colores de la combinación se reemplazan por los cambios realizados en la página de opciones de Entorno &gt; Fuentes y colores. Elija "Usar valores predeterminados" en la página Fuentes y colores para revertir todas las personalizaciones.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index 574eb196917e1..50228db4a5386 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -147,6 +147,11 @@
         <target state="translated">L'analyse du code s'est terminée avant la fin de la solution.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Coloriser les expressions régulières</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Modifier</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Certaines couleurs du modèle de couleurs sont substituées à la suite des changements apportés dans la page d'options Environnement &gt; Polices et couleurs. Choisissez Utiliser les valeurs par défaut dans la page Polices et couleurs pour restaurer toutes les personnalisations.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index 66a9435ecc579..c9373307fd587 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -147,6 +147,11 @@
         <target state="translated">L'esecuzione di Code Analysis è stata terminata prima del completamento per la soluzione.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Colora espressioni regolari</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Modifica</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Alcuni colori della combinazione colori sono sostituiti dalle modifiche apportate nella pagina di opzioni Ambiente &gt; Tipi di carattere e colori. Scegliere `Usa impostazioni predefinite` nella pagina Tipi di carattere e colori per ripristinare tutte le personalizzazioni.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index f3bcfd353d4a4..bd927e2639bd9 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -147,6 +147,11 @@
         <target state="translated">コード分析が、ソリューションでの完了前に終了しました。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">正規表現をカラー化</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">編集(_E)</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">一部の配色パターンの色は、[環境] &gt; [フォントおよび色] オプション ページで行われた変更によって上書きされます。[フォントおよび色] オプション ページで [既定値を使用] を選択すると、すべてのカスタマイズが元に戻ります。</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index 3ff9a0bcfd8a4..488a20465c683 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -147,6 +147,11 @@
         <target state="translated">솔루션 완료 전에 코드 분석이 종료되었습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">정규식 색 지정</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">편집(_E)</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">색 구성표의 일부 색이 [환경] &gt; [글꼴 및 색] 옵션 페이지에서 변경한 내용에 따라 재정의됩니다. 모든 사용자 지정을 되돌리려면 [글꼴 및 색] 페이지에서 '기본값 사용'을 선택하세요.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index fa5abba428835..3c46f6e52d967 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -147,6 +147,11 @@
         <target state="translated">Analiza kodu zakończyła się przed zakończeniem dla rozwiązania.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Koloruj wyrażenia regularne</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Edytuj</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Niektóre kolory w schemacie kolorów są przesłaniane przez zmiany wprowadzone na stronie opcji Środowisko &gt; Czcionki i kolory. Wybierz pozycję „Użyj ustawień domyślnych” na stronie Czcionki i kolory, aby wycofać wszystkie dostosowania.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index ca33875918121..64656cc66014a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -147,6 +147,11 @@
         <target state="translated">Análise de código terminada antes da conclusão da Solução.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Colorir expressões regulares</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Editar</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Algumas cores do esquema de cores estão sendo substituídas pelas alterações feitas na página de Ambiente &gt; Opções de Fontes e Cores. Escolha 'Usar Padrões' na página Fontes e Cores para reverter todas as personalizações.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index ecdccdae266a7..a6aa2ebdc90ed 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -147,6 +147,11 @@
         <target state="translated">Анализ кода прерван до завершения решения.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Выделить регулярные выражения цветом</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Изменить</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Некоторые цвета цветовой схемы переопределяются изменениями, сделанными на странице "Среда" &gt; "Шрифты и цвета". Выберите "Использовать значения по умолчанию" на странице "Шрифты и цвета", чтобы отменить все настройки.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index 47d08d467c373..708352976dfff 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -147,6 +147,11 @@
         <target state="translated">Kod analizi, Çözüm için tamamlanmadan önce sonlandırıldı.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">Normal ifadeleri renklendir</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Düzenle</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">Bazı renk düzeni renkleri, Ortam &gt; Yazı Tipleri ve Renkler seçenek sayfasında yapılan değişiklikler tarafından geçersiz kılınıyor. Tüm özelleştirmeleri geri döndürmek için Yazı Tipleri ve Renkler sayfasında `Varsayılanları Kullan` seçeneğini belirleyin.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index f13d9610b45b5..37c114cc6c96c 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -147,6 +147,11 @@
         <target state="translated">解决方案的代码分析在完成之前终止。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">为正规表达式着色</target>
@@ -187,6 +192,11 @@
         <target state="needs-review-translation">显示内联参数名称提示(实验)(_L)</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">编辑(_E)</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">在“环境”&gt;“字体和颜色”选项页中所做的更改将替代某些配色方案颜色。在“字体和颜色”页中选择“使用默认值”，还原所有自定义项。</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index ce5186f232d3d..108704fa0dff8 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -147,6 +147,11 @@
         <target state="translated">程式碼分析在解決方案完成前終止。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Color_hints">
+        <source>Color hints</source>
+        <target state="new">Color hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Colorize_regular_expressions">
         <source>Colorize regular expressions</source>
         <target state="translated">為規則運算式添加色彩</target>
@@ -187,6 +192,11 @@
         <target state="new">Disp_lay inline parameter name hints</target>
         <note />
       </trans-unit>
+      <trans-unit id="Display_inline_type_hints">
+        <source>Display inline type hints</source>
+        <target state="new">Display inline type hints</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">編輯(_E)</target>
@@ -787,11 +797,21 @@
         <target state="new">Show hints for everything else</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_lambda_parameter_types">
+        <source>Show hints for lambda parameter types</source>
+        <target state="new">Show hints for lambda parameter types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Show_hints_for_literals">
         <source>Show hints for literals</source>
         <target state="new">Show hints for literals</target>
         <note />
       </trans-unit>
+      <trans-unit id="Show_hints_for_variables_with_inferred_types">
+        <source>Show hints for variables with inferred types</source>
+        <target state="new">Show hints for variables with inferred types</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations">
         <source>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</source>
         <target state="translated">[環境] &gt; [字型和色彩選項] 頁面中所做的變更覆寫了某些色彩配置的色彩。請選擇 [字型和色彩] 頁面中的 [使用預設] 來還原所有自訂。</target>
diff --git a/src/VisualStudio/Core/Test/Progression/ContainsGraphQueryTests.vb b/src/VisualStudio/Core/Test/Progression/ContainsGraphQueryTests.vb
index 39a8085cb86cc..6c84ddc7fe5c8 100644
--- a/src/VisualStudio/Core/Test/Progression/ContainsGraphQueryTests.vb
+++ b/src/VisualStudio/Core/Test/Progression/ContainsGraphQueryTests.vb
@@ -21,6 +21,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
                                 enum E { }
                                 interface I { }
                                 struct S { }
+                                record R1 { }
+                                record R2;
                          </Document>
                         </Project>
                     </Workspace>)
@@ -36,12 +38,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
                             <Node Id="(@3 Type=C)" Category="CodeSchema_Class" CodeSchemaProperty_IsInternal="True" CommonLabel="C" Icon="Microsoft.VisualStudio.Class.Internal" Label="C"/>
                             <Node Id="(@3 Type=E)" Category="CodeSchema_Enum" CodeSchemaProperty_IsFinal="True" CodeSchemaProperty_IsInternal="True" CommonLabel="E" Icon="Microsoft.VisualStudio.Enum.Internal" Label="E"/>
                             <Node Id="(@3 Type=I)" Category="CodeSchema_Interface" CodeSchemaProperty_IsAbstract="True" CodeSchemaProperty_IsInternal="True" CommonLabel="I" Icon="Microsoft.VisualStudio.Interface.Internal" Label="I"/>
+                            <Node Id="(@3 Type=R1)" Category="CodeSchema_Class" CodeSchemaProperty_IsInternal="True" CommonLabel="R1" Icon="Microsoft.VisualStudio.Class.Internal" Label="R1"/>
+                            <Node Id="(@3 Type=R2)" Category="CodeSchema_Class" CodeSchemaProperty_IsInternal="True" CommonLabel="R2" Icon="Microsoft.VisualStudio.Class.Internal" Label="R2"/>
                             <Node Id="(@3 Type=S)" Category="CodeSchema_Struct" CodeSchemaProperty_IsFinal="True" CodeSchemaProperty_IsInternal="True" CommonLabel="S" Icon="Microsoft.VisualStudio.Struct.Internal" Label="S"/>
                         </Nodes>
                         <Links>
                             <Link Source="(@1 @2)" Target="(@3 Type=C)" Category="Contains"/>
                             <Link Source="(@1 @2)" Target="(@3 Type=E)" Category="Contains"/>
                             <Link Source="(@1 @2)" Target="(@3 Type=I)" Category="Contains"/>
+                            <Link Source="(@1 @2)" Target="(@3 Type=R1)" Category="Contains"/>
+                            <Link Source="(@1 @2)" Target="(@3 Type=R2)" Category="Contains"/>
                             <Link Source="(@1 @2)" Target="(@3 Type=S)" Category="Contains"/>
                         </Links>
                         <IdentifierAliases>
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListCommon.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListCommon.cs
index 2cbe47f23feac..7256d808dfd25 100644
--- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListCommon.cs
+++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListCommon.cs
@@ -4,10 +4,12 @@
 
 #nullable disable
 
+using System;
 using Microsoft.CodeAnalysis;
 using Microsoft.VisualStudio.IntegrationTest.Utilities;
 using Microsoft.VisualStudio.IntegrationTest.Utilities.Common;
 using Microsoft.VisualStudio.IntegrationTest.Utilities.Input;
+using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Roslyn.VisualStudio.IntegrationTests.CSharp
@@ -54,14 +56,19 @@ static void Main(string[] args)
                     column: 24)
             };
             var actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
+
             var target = VisualStudio.ErrorList.NavigateToErrorListItem(0);
             Assert.Equal(expectedContents[0], target);
             VisualStudio.Editor.Verify.CaretPosition(25);
             VisualStudio.SolutionExplorer.BuildSolution();
             VisualStudio.ErrorList.ShowErrorList();
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
         }
 
         public virtual void ErrorLevelWarning()
@@ -86,7 +93,9 @@ static void Main(string[] args)
                     column: 13)
             };
             var actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
         }
 
         public virtual void ErrorsDuringMethodBodyEditing()
@@ -104,7 +113,9 @@ static void Main(string[] args)
             VisualStudio.ErrorList.ShowErrorList();
             var expectedContents = new ErrorListItem[] { };
             var actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
 
             VisualStudio.Editor.Activate();
             VisualStudio.Editor.PlaceCaret("a = aa", charsOffset: -1);
@@ -120,7 +131,9 @@ static void Main(string[] args)
                     column: 13)
             };
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
 
             VisualStudio.Editor.Activate();
             VisualStudio.Editor.PlaceCaret("aa = aa", charsOffset: -1);
@@ -128,7 +141,9 @@ static void Main(string[] args)
             VisualStudio.ErrorList.ShowErrorList();
             expectedContents = new ErrorListItem[] { };
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
         }
 
         public virtual void ErrorsAfterClosingFile()
@@ -146,7 +161,9 @@ static void Main(string[] args)
             VisualStudio.ErrorList.ShowErrorList();
             var expectedContents = new ErrorListItem[] { };
             var actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
 
             VisualStudio.Editor.Activate();
             VisualStudio.Editor.PlaceCaret("a = aa", charsOffset: -1);
@@ -162,7 +179,9 @@ static void Main(string[] args)
                     column: 13)
             };
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
 
             // Close the current document and verify diagnostics for closed document are not removed from error list.
             VisualStudio.SolutionExplorer.SaveAll();
@@ -170,7 +189,9 @@ static void Main(string[] args)
             VisualStudio.Editor.SendKeys(new KeyPress(VirtualKey.F4, ShiftState.Ctrl));
             VisualStudio.ErrorList.ShowErrorList();
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
         }
     }
 }
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicErrorListCommon.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicErrorListCommon.cs
index ea6ab1ff29494..1049d4b3cb7b8 100644
--- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicErrorListCommon.cs
+++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicErrorListCommon.cs
@@ -4,11 +4,12 @@
 
 #nullable disable
 
+using System;
 using Microsoft.CodeAnalysis;
 using Microsoft.VisualStudio.IntegrationTest.Utilities;
 using Microsoft.VisualStudio.IntegrationTest.Utilities.Common;
 using Microsoft.VisualStudio.IntegrationTest.Utilities.Input;
-using Xunit;
+using Roslyn.Test.Utilities;
 
 namespace Roslyn.VisualStudio.IntegrationTests.VisualBasic
 {
@@ -54,13 +55,18 @@ End Module
                     column: 9)
             };
             var actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
+
             VisualStudio.ErrorList.NavigateToErrorListItem(0);
             VisualStudio.Editor.Verify.CaretPosition(43);
             VisualStudio.SolutionExplorer.BuildSolution();
             VisualStudio.ErrorList.ShowErrorList();
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
         }
 
         public virtual void ErrorsDuringMethodBodyEditing()
@@ -80,7 +86,9 @@ End Namespace
             VisualStudio.ErrorList.ShowErrorList();
             var expectedContents = new ErrorListItem[] { };
             var actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
 
             VisualStudio.Editor.Activate();
             VisualStudio.Editor.PlaceCaret("F = 0 ' Comment", charsOffset: -1);
@@ -96,7 +104,9 @@ End Namespace
                     column: 13)
             };
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
 
             VisualStudio.Editor.Activate();
             VisualStudio.Editor.PlaceCaret("FF = 0 ' Comment", charsOffset: -1);
@@ -104,7 +114,9 @@ End Namespace
             VisualStudio.ErrorList.ShowErrorList();
             expectedContents = new ErrorListItem[] { };
             actualContents = VisualStudio.ErrorList.GetErrorListContents();
-            Assert.Equal(expectedContents, actualContents);
+            AssertEx.EqualOrDiff(
+                string.Join<ErrorListItem>(Environment.NewLine, expectedContents),
+                string.Join<ErrorListItem>(Environment.NewLine, actualContents));
         }
     }
 }
diff --git a/src/VisualStudio/IntegrationTest/TestSetup/TestExtensionErrorHandler.cs b/src/VisualStudio/IntegrationTest/TestSetup/TestExtensionErrorHandler.cs
index ec8003ac184d2..e0f87226415ad 100644
--- a/src/VisualStudio/IntegrationTest/TestSetup/TestExtensionErrorHandler.cs
+++ b/src/VisualStudio/IntegrationTest/TestSetup/TestExtensionErrorHandler.cs
@@ -40,7 +40,7 @@ public void HandleError(object sender, Exception exception)
                 return;
             }
 
-            FatalError.Report(exception);
+            FatalError.ReportAndPropagate(exception);
         }
     }
 }
diff --git a/src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspace.cs b/src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspace.cs
index 20962fa2b11a2..829283c6afaeb 100644
--- a/src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspace.cs
+++ b/src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspace.cs
@@ -479,7 +479,7 @@ protected override void ApplyDocumentTextChanged(DocumentId documentId, SourceTe
                     if (textBuffer == null)
                     {
                         // Text buffer is missing for opened Live Share document.
-                        FatalError.ReportWithoutCrash(new LiveShareTextBufferMissingException());
+                        FatalError.ReportAndCatch(new LiveShareTextBufferMissingException());
                         return;
                     }
 
diff --git a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb
index e402c067346fa..ac568568a80d3 100644
--- a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb
+++ b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb
@@ -75,7 +75,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic
                         Await JoinableTaskFactory.SwitchToMainThreadAsync(ct)
                         Return New TempPECompilerFactory(workspace)
                     End Function)
-            Catch ex As Exception When FatalError.ReportUnlessCanceled(ex)
+            Catch ex As Exception When FatalError.ReportAndPropagateUnlessCanceled(ex)
+                Throw ExceptionUtilities.Unreachable
             End Try
         End Function
 
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
index 32c1f84371f91..ce1aa076580aa 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
@@ -197,7 +197,10 @@
                       Header="{x:Static local:AdvancedOptionPageStrings.Option_Inline_Hints_experimental}">
                 <StackPanel>
                     <CheckBox x:Name="DisplayAllHintsWhilePressingCtrlAlt"
-                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Display_all_hints_while_pressing_ctrl_alt}" />
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Display_all_hints_while_pressing_Ctrl_Alt}" />
+
+                    <CheckBox x:Name="ColorHints"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Color_hints}" />
 
                     <CheckBox x:Name="DisplayInlineParameterNameHints"
                               Content="{x:Static local:AdvancedOptionPageStrings.Option_Display_inline_parameter_name_hints}"
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
index 4d30e7dfaa93d..abbf22e027e7d 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
@@ -59,14 +59,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             BindToOption(GenerateXmlDocCommentsForTripleApostrophes, FeatureOnOffOptions.AutoXmlDocCommentGeneration, LanguageNames.VisualBasic)
             BindToOption(InsertApostropheAtTheStartOfNewLinesWhenWritingApostropheComments, SplitCommentOptions.Enabled, LanguageNames.VisualBasic)
 
-            BindToOption(DisplayAllHintsWhilePressingCtrlAlt, InlineHintsOptions.DisplayAllHintsWhilePressingCtrlAlt)
-            BindToOption(DisplayInlineParameterNameHints, InlineHintsOptions.EnabledForParameters, LanguageNames.VisualBasic)
-            BindToOption(ShowHintsForLiterals, InlineHintsOptions.ForLiteralParameters, LanguageNames.VisualBasic)
-            BindToOption(ShowHintsForNewExpressions, InlineHintsOptions.ForObjectCreationParameters, LanguageNames.VisualBasic)
-            BindToOption(ShowHintsForEverythingElse, InlineHintsOptions.ForOtherParameters, LanguageNames.VisualBasic)
-            BindToOption(SuppressHintsWhenParameterNameMatchesTheMethodsIntent, InlineHintsOptions.SuppressForParametersThatMatchMethodIntent, LanguageNames.VisualBasic)
-            BindToOption(SuppressHintsWhenParameterNamesDifferOnlyBySuffix, InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix, LanguageNames.VisualBasic)
-
             BindToOption(EnableEndConstruct, FeatureOnOffOptions.EndConstruct, LanguageNames.VisualBasic)
             BindToOption(EnableLineCommit, FeatureOnOffOptions.PrettyListing, LanguageNames.VisualBasic)
             BindToOption(AutomaticInsertionOfInterfaceAndMustOverrideMembers, FeatureOnOffOptions.AutomaticInsertionOfAbstractOrInterfaceMembers, LanguageNames.VisualBasic)
@@ -93,6 +85,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             BindToOption(Show_completion_list, RegularExpressionsOptions.ProvideRegexCompletions, LanguageNames.VisualBasic)
 
             BindToOption(Editor_color_scheme, ColorSchemeOptions.ColorScheme)
+
+            BindToOption(DisplayAllHintsWhilePressingCtrlAlt, InlineHintsOptions.DisplayAllHintsWhilePressingCtrlAlt)
+            BindToOption(ColorHints, InlineHintsOptions.ColorHints, LanguageNames.VisualBasic)
+
+            BindToOption(DisplayInlineParameterNameHints, InlineHintsOptions.EnabledForParameters, LanguageNames.VisualBasic)
+            BindToOption(ShowHintsForLiterals, InlineHintsOptions.ForLiteralParameters, LanguageNames.VisualBasic)
+            BindToOption(ShowHintsForNewExpressions, InlineHintsOptions.ForObjectCreationParameters, LanguageNames.VisualBasic)
+            BindToOption(ShowHintsForEverythingElse, InlineHintsOptions.ForOtherParameters, LanguageNames.VisualBasic)
+            BindToOption(SuppressHintsWhenParameterNameMatchesTheMethodsIntent, InlineHintsOptions.SuppressForParametersThatMatchMethodIntent, LanguageNames.VisualBasic)
+            BindToOption(SuppressHintsWhenParameterNamesDifferOnlyBySuffix, InlineHintsOptions.SuppressForParametersThatDifferOnlyBySuffix, LanguageNames.VisualBasic)
         End Sub
 
         ' Since this dialog is constructed once for the lifetime of the application and VS Theme can be changed after the application has started,
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb
index a171802f06065..1827d3ac32df6 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb
@@ -33,8 +33,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
         Public ReadOnly Property Option_DisplayLineSeparators As String =
             BasicVSResources.Show_procedure_line_separators
 
-        Public ReadOnly Property Option_Display_all_hints_while_pressing_ctrl_alt As String =
-            ServicesVSResources.Display_all_hints_while_pressing_ctrl_alt
+        Public ReadOnly Property Option_Display_all_hints_while_pressing_Ctrl_Alt As String =
+            ServicesVSResources.Display_all_hints_while_pressing_Ctrl_Alt
+
+        Public ReadOnly Property Option_Color_hints As String =
+            ServicesVSResources.Color_hints
 
         Public ReadOnly Property Option_Inline_Hints_experimental As String =
             ServicesVSResources.Inline_Hints_experimental
diff --git a/src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/VisualBasicProject.vb b/src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/VisualBasicProject.vb
index d15f148f17e35..76e32e491524a 100644
--- a/src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/VisualBasicProject.vb
+++ b/src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/VisualBasicProject.vb
@@ -144,8 +144,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ProjectSystemShim
                 End If
 
                 Return VSConstants.S_OK
-            Catch e As Exception When FatalError.Report(e)
-                Return VSConstants.S_OK
+            Catch e As Exception When FatalError.ReportAndPropagate(e)
+                Throw ExceptionUtilities.Unreachable
             End Try
         End Function
 
diff --git a/src/VisualStudio/VisualBasic/Impl/VSPackage.resx b/src/VisualStudio/VisualBasic/Impl/VSPackage.resx
index cbe26d88d7cca..fcb7042ca007c 100644
--- a/src/VisualStudio/VisualBasic/Impl/VSPackage.resx
+++ b/src/VisualStudio/VisualBasic/Impl/VSPackage.resx
@@ -128,7 +128,7 @@
     <value>Visual Basic Editor</value>
   </data>
   <data name="10160" xml:space="preserve">
-    <value>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</value>
+    <value>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</value>
     <comment>Advanced options page keywords</comment>
   </data>
   <data name="102" xml:space="preserve">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf
index a7f9fc11aba01..8fa341ccfeaf9 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="translated">Zobrazovat nápovědy k názvům vložených parametrů;Automatické vložení koncových konstruktorů;Změnit nastavení přehledného výpisu;Změnit režim sbalení;Automatické vkládání členů Interface a MustOverride;Zobrazit nebo skrýt oddělovače řádků procedur;Zapnout nebo vypnout návrhy oprav;Zapnout nebo vypnout zvýrazňování odkazů a klíčových slov;Regex;Obarvit regulární výrazy;Zvýrazňovat související komponenty pod kurzorem;Nahlásit neplatné regulární výrazy;reg. výr.;regulární výraz;Používat rozšířené barvy;Barevné schéma editoru;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="needs-review-translation">Zobrazovat nápovědy k názvům vložených parametrů;Automatické vložení koncových konstruktorů;Změnit nastavení přehledného výpisu;Změnit režim sbalení;Automatické vkládání členů Interface a MustOverride;Zobrazit nebo skrýt oddělovače řádků procedur;Zapnout nebo vypnout návrhy oprav;Zapnout nebo vypnout zvýrazňování odkazů a klíčových slov;Regex;Obarvit regulární výrazy;Zvýrazňovat související komponenty pod kurzorem;Nahlásit neplatné regulární výrazy;reg. výr.;regulární výraz;Používat rozšířené barvy;Barevné schéma editoru;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf
index ba869a31cd9aa..4f5b1f92cf7ab 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf
index 6a1f9d27d820b..0710c804d622e 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf
index 9eb69b129f2e5..eec726572e906 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf
index e35382f914f14..39ace602d6674 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf
index 29744b9181139..ee623db1f5ba1 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf
index 401af72647b04..27718e45189f3 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf
index dc251dd07694b..e4867ebc0ec0b 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf
index a1444e19554fe..fe122bfcf8c84 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf
index d70f2d52f0cc6..93f35c9239f93 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf
index 80554fdd07888..41ac1587168d3 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf
index f61fcc1477cdb..8666a8099d652 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="translated">显示内联参数名称提示；自动插入 End 构造；更改整齐排列设置；更改大纲模式；自动插入 Interface 和 MustOverride 成员；显示或隐藏过程行分隔符；打开或关闭错误纠正建议；打开或关闭引用和关键字的突出显示；正则表达式；对正则表达式着色；突出显示光标下的相关部分；报告无效正则表达式；regex；正则表达式；使用增强色；编辑器配色方案；</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="needs-review-translation">显示内联参数名称提示；自动插入 End 构造；更改整齐排列设置；更改大纲模式；自动插入 Interface 和 MustOverride 成员；显示或隐藏过程行分隔符；打开或关闭错误纠正建议；打开或关闭引用和关键字的突出显示；正则表达式；对正则表达式着色；突出显示光标下的相关部分；报告无效正则表达式；regex；正则表达式；使用增强色；编辑器配色方案；</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf
index f26086ccac5cb..8aa6fe3ca5148 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf
@@ -18,8 +18,8 @@
         <note />
       </trans-unit>
       <trans-unit id="10160">
-        <source>Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
-        <target state="new">Display inline parameter name hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
+        <source>Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</source>
+        <target state="new">Display inline hints;Automatic insertion of end constructs;Change pretty listing settings;Change outlining mode;Automatic insertion of Interface and MustOverride members;Show or hide procedure line separators;Turn error correction suggestions on or off;Turn highlighting of references and keywords on or off;Regex;Colorize regular expressions;Highlight related components under cursor;Report invalid regular expressions;regex;regular expression;Use enhanced colors;Editor Color Scheme;</target>
         <note>Advanced options page keywords</note>
       </trans-unit>
       <trans-unit id="102">
diff --git a/src/Workspaces/CSharp/Portable/Rename/CSharpRenameRewriterLanguageService.cs b/src/Workspaces/CSharp/Portable/Rename/CSharpRenameRewriterLanguageService.cs
index ed5de29329f69..bb15c4007997a 100644
--- a/src/Workspaces/CSharp/Portable/Rename/CSharpRenameRewriterLanguageService.cs
+++ b/src/Workspaces/CSharp/Portable/Rename/CSharpRenameRewriterLanguageService.cs
@@ -428,7 +428,7 @@ private async Task<SyntaxToken> RenameAndAnnotateAsync(SyntaxToken token, Syntax
 
                     return newToken;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -934,7 +934,7 @@ renamedSymbol.ContainingSymbol is IMethodSymbol methodSymbol &&
 
                 return conflicts.ToImmutableAndFree();
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -963,7 +963,7 @@ renamedSymbol.ContainingSymbol is IMethodSymbol methodSymbol &&
 
                 return null;
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Classification/SyntaxClassification/AbstractSyntaxClassificationService.cs b/src/Workspaces/Core/Portable/Classification/SyntaxClassification/AbstractSyntaxClassificationService.cs
index 1c2149ba4a3ed..3745565f27b34 100644
--- a/src/Workspaces/Core/Portable/Classification/SyntaxClassification/AbstractSyntaxClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/SyntaxClassification/AbstractSyntaxClassificationService.cs
@@ -38,7 +38,7 @@ public async Task AddSemanticClassificationsAsync(
                 var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
                 AddSemanticClassifications(semanticModel, textSpan, document.Project.Solution.Workspace, getNodeClassifiers, getTokenClassifiers, result, cancellationToken);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Diagnostics/DiagnosticDataSerializer.cs b/src/Workspaces/Core/Portable/Diagnostics/DiagnosticDataSerializer.cs
index 91d8576b0cc5b..b32970222ea9e 100644
--- a/src/Workspaces/Core/Portable/Diagnostics/DiagnosticDataSerializer.cs
+++ b/src/Workspaces/Core/Portable/Diagnostics/DiagnosticDataSerializer.cs
@@ -214,7 +214,7 @@ public bool TryReadDiagnosticData(
                 data = ReadDiagnosticDataArray(reader, project, document, cancellationToken);
                 return true;
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceled(ex))
+            catch (Exception ex) when (FatalError.ReportAndCatchUnlessCanceled(ex))
             {
                 return false;
             }
diff --git a/src/Workspaces/Core/Portable/ExternalAccess/UnitTesting/Api/UnitTestingFatalErrorAccessor.cs b/src/Workspaces/Core/Portable/ExternalAccess/UnitTesting/Api/UnitTestingFatalErrorAccessor.cs
index a119dfc65dbc9..2c4f0f78aa212 100644
--- a/src/Workspaces/Core/Portable/ExternalAccess/UnitTesting/Api/UnitTestingFatalErrorAccessor.cs
+++ b/src/Workspaces/Core/Portable/ExternalAccess/UnitTesting/Api/UnitTestingFatalErrorAccessor.cs
@@ -12,9 +12,9 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api
     internal static class UnitTestingFatalErrorAccessor
     {
         public static bool ReportWithoutCrash(this Exception e)
-            => FatalError.ReportWithoutCrash(e);
+            => FatalError.ReportAndCatch(e);
 
         public static bool ReportWithoutCrashUnlessCanceled(this Exception e)
-            => FatalError.ReportWithoutCrashUnlessCanceled(e);
+            => FatalError.ReportAndCatchUnlessCanceled(e);
     }
 }
diff --git a/src/Workspaces/Core/Portable/FindSymbols/DeclaredSymbolInfo.cs b/src/Workspaces/Core/Portable/FindSymbols/DeclaredSymbolInfo.cs
index 1088390a84b5c..bab9528f3fb72 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/DeclaredSymbolInfo.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/DeclaredSymbolInfo.cs
@@ -201,7 +201,7 @@ public ISymbol TryResolve(SemanticModel semanticModel, CancellationToken cancell
 {nameof(this.Span)} = {this.Span}
 {nameof(root.FullSpan)} = {root.FullSpan}";
 
-                FatalError.ReportWithoutCrash(new InvalidOperationException(message));
+                FatalError.ReportAndCatch(new InvalidOperationException(message));
 
                 return null;
             }
diff --git a/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Create.cs b/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Create.cs
index ea8bc32d34f72..0f47bb336186a 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Create.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Create.cs
@@ -181,7 +181,7 @@ private static async Task<SyntaxTreeIndex> CreateIndexAsync(
 {nameof(declaredSymbolInfo.Span)} = {declaredSymbolInfo.Span}
 {nameof(root.FullSpan)} = {root.FullSpan}";
 
-                                    FatalError.ReportWithoutCrash(new InvalidOperationException(message));
+                                    FatalError.ReportAndCatch(new InvalidOperationException(message));
                                 }
                             }
                         }
diff --git a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
index 5fb33c84ae3c9..db12c4cfddb00 100644
--- a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
+++ b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
@@ -45,7 +45,7 @@ public bool TryGetDocumentOption(OptionKey option, out object? value)
                     {
                         return editorConfigPersistence.TryGetOption(_options.AsNullable(), option.Option.Type, out value);
                     }
-                    catch (Exception e) when (FatalError.ReportWithoutCrash(e))
+                    catch (Exception e) when (FatalError.ReportAndCatch(e))
                     {
                         value = null;
                         return false;
diff --git a/src/Workspaces/Core/Portable/Remote/RemoteArguments.cs b/src/Workspaces/Core/Portable/Remote/RemoteArguments.cs
index 68a08a1c33d70..ee978a90e8820 100644
--- a/src/Workspaces/Core/Portable/Remote/RemoteArguments.cs
+++ b/src/Workspaces/Core/Portable/Remote/RemoteArguments.cs
@@ -99,7 +99,7 @@ public async Task<ISymbol> TryRehydrateAsync(
                     throw new InvalidOperationException(
                         $"We should always be able to resolve a symbol back on the host side:\r\n{project.Name}\r\n{SymbolKeyData}\r\n{failureReason}");
                 }
-                catch (Exception ex) when (FatalError.ReportWithoutCrash(ex))
+                catch (Exception ex) when (FatalError.ReportAndCatch(ex))
                 {
                     return null;
                 }
diff --git a/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.Session.cs b/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.Session.cs
index 4325cf4fd9a7e..83aaccba853f8 100644
--- a/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.Session.cs
+++ b/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.Session.cs
@@ -252,7 +252,7 @@ await conflictResolution.CurrentSolution.GetRequiredDocument(_documentIdOfRename
 
                     return conflictResolution;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -458,7 +458,7 @@ await AddDeclarationConflictsAsync(
 
                     return conflictResolution.RelatedLocations.Any(r => r.Type == RelatedLocationType.PossiblyResolvableConflict);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -638,7 +638,7 @@ private async Task<bool> CheckForConflictAsync(
 
                     return hasConflict;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -680,7 +680,7 @@ private async Task<ISymbol> GetRenamedSymbolInCurrentSolutionAsync(MutableConfli
                     var newSymbol = await SymbolFinder.FindSymbolAtPositionAsync(document, start, cancellationToken: _cancellationToken).ConfigureAwait(false);
                     return newSymbol;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -711,7 +711,7 @@ private async Task FindDocumentsAndPossibleNameConflictsAsync()
 
                     await AddDocumentsWithPotentialConflictsAsync(documentsFromAffectedProjects).ConfigureAwait(false);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -751,7 +751,7 @@ private async Task AddDocumentsWithPotentialConflictsAsync(IEnumerable<Document>
                         }
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -831,7 +831,7 @@ private async Task<Solution> AnnotateAndRename_WorkerAsync(
 
                     return partiallyRenamedSolution;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.cs b/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.cs
index 15e25f098e0ec..cccddacc7ddb2 100644
--- a/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.cs
+++ b/src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.cs
@@ -291,7 +291,7 @@ private static async Task AddDeclarationConflictsAsync(
                     }
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 // A NullReferenceException is happening in this method, but the dumps do not
                 // contain information about this stack frame because this method is async and
diff --git a/src/Workspaces/Core/Portable/Shared/Extensions/DocumentExtensions.cs b/src/Workspaces/Core/Portable/Shared/Extensions/DocumentExtensions.cs
index 9f17d75602e5b..e7e654b8b9048 100644
--- a/src/Workspaces/Core/Portable/Shared/Extensions/DocumentExtensions.cs
+++ b/src/Workspaces/Core/Portable/Shared/Extensions/DocumentExtensions.cs
@@ -37,7 +37,7 @@ public static async Task<bool> IsForkedDocumentWithSyntaxChangesAsync(this Docum
                 var currentDocumentVersion = await currentDocument.GetSyntaxVersionAsync(cancellationToken).ConfigureAwait(false);
                 return !documentVersion.Equals(currentDocumentVersion);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Storage/AbstractPersistentStorageService.cs b/src/Workspaces/Core/Portable/Storage/AbstractPersistentStorageService.cs
index a8347ed3ff8b5..bff2971e6787e 100644
--- a/src/Workspaces/Core/Portable/Storage/AbstractPersistentStorageService.cs
+++ b/src/Workspaces/Core/Portable/Storage/AbstractPersistentStorageService.cs
@@ -174,7 +174,7 @@ private IChecksummedPersistentStorage CreatePersistentStorage(SolutionKey soluti
                 {
                     // this was not a normal exception that we expected during DB open.
                     // Report this so we can try to address whatever is causing this.
-                    FatalError.ReportWithoutCrash(ex);
+                    FatalError.ReportAndCatch(ex);
                     IOUtilities.PerformIO(() => Directory.Delete(Path.GetDirectoryName(databaseFilePath), recursive: true));
                 }
 
diff --git a/src/Workspaces/Core/Portable/Storage/PersistenceStorageServiceFactory.cs b/src/Workspaces/Core/Portable/Storage/PersistenceStorageServiceFactory.cs
index 1a2e5fdbab01a..24acc50268947 100644
--- a/src/Workspaces/Core/Portable/Storage/PersistenceStorageServiceFactory.cs
+++ b/src/Workspaces/Core/Portable/Storage/PersistenceStorageServiceFactory.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Composition;
 using Microsoft.CodeAnalysis.Experiments;
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/AbstractSQLitePersistentStorageService.cs b/src/Workspaces/Core/Portable/Storage/SQLite/AbstractSQLitePersistentStorageService.cs
index eebd81107c3ca..d3e13fad2ff82 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/AbstractSQLitePersistentStorageService.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/AbstractSQLitePersistentStorageService.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/NativeMethods.cs b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/NativeMethods.cs
index 1ad14e5772b6f..1d5505bc11b32 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/NativeMethods.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/NativeMethods.cs
@@ -11,7 +11,7 @@ namespace Microsoft.CodeAnalysis.SQLite.Interop
     [SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Name chosen to match SQLitePCL.raw")]
     internal static class NativeMethods
     {
-        public static SafeSqliteHandle sqlite3_open_v2(string filename, int flags, string vfs, out Result result)
+        public static SafeSqliteHandle sqlite3_open_v2(string filename, int flags, string? vfs, out Result result)
         {
             result = (Result)raw.sqlite3_open_v2(filename, out var wrapper, flags, vfs);
             if (result != Result.OK)
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/OpenFlags.cs b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/OpenFlags.cs
index 552460c25b860..5be779c90a892 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/OpenFlags.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/OpenFlags.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace Microsoft.CodeAnalysis.SQLite.Interop
 {
     // From: https://sqlite.org/c3ref/c_open_autoproxy.html
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/Result.cs b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/Result.cs
index 8360bbe7519c3..3e09236ab30cc 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/Result.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/Result.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace Microsoft.CodeAnalysis.SQLite.Interop
 {
     // From https://sqlite.org/c3ref/c_abort.html
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/SqlException.cs b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/SqlException.cs
index bba86cd4b3d01..27dc41ad6970a 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/Interop/SqlException.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/Interop/SqlException.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 
 namespace Microsoft.CodeAnalysis.SQLite.Interop
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_DocumentSerialization.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_DocumentSerialization.cs
index 201ce244a997d..045d932f7c3df 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_DocumentSerialization.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_DocumentSerialization.cs
@@ -12,10 +12,10 @@ namespace Microsoft.CodeAnalysis.SQLite.v1
 {
     internal partial class SQLitePersistentStorage
     {
-        protected override Task<Checksum> ReadChecksumAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
+        protected override Task<Checksum?> ReadChecksumAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
             => _documentAccessor.ReadChecksumAsync((documentKey, bulkLoadSnapshot, name), cancellationToken);
 
-        protected override Task<Stream> ReadStreamAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
+        protected override Task<Stream?> ReadStreamAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
             => _documentAccessor.ReadStreamAsync((documentKey, bulkLoadSnapshot, name), checksum, cancellationToken);
 
         public override Task<bool> WriteStreamAsync(Document document, string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken)
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_ProjectSerialization.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_ProjectSerialization.cs
index d71d490d1e725..f44a64953434f 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_ProjectSerialization.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage_ProjectSerialization.cs
@@ -12,10 +12,10 @@ namespace Microsoft.CodeAnalysis.SQLite.v1
 {
     internal partial class SQLitePersistentStorage
     {
-        protected override Task<Checksum> ReadChecksumAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
+        protected override Task<Checksum?> ReadChecksumAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
             => _projectAccessor.ReadChecksumAsync((projectKey, bulkLoadSnapshot, name), cancellationToken);
 
-        protected override Task<Stream> ReadStreamAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
+        protected override Task<Stream?> ReadStreamAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
             => _projectAccessor.ReadStreamAsync((projectKey, bulkLoadSnapshot, name), checksum, cancellationToken);
 
         public override Task<bool> WriteStreamAsync(Project project, string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken)
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Database.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Database.cs
index 67e087849e76e..77b950a76fcb2 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Database.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Database.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.SQLite.v2
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/ResettableSqlStatement.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/ResettableSqlStatement.cs
index c09d114f1d59c..fede17c0776d1 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/ResettableSqlStatement.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/ResettableSqlStatement.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 
 namespace Microsoft.CodeAnalysis.SQLite.v2.Interop
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlConnection.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlConnection.cs
index 97da6650942d6..2c9cab3017a14 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlConnection.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlConnection.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -37,7 +35,7 @@ internal class SqlConnection
         /// <summary>
         /// For testing purposes to simulate failures during testing.
         /// </summary>
-        private readonly IPersistentStorageFaultInjector _faultInjector;
+        private readonly IPersistentStorageFaultInjector? _faultInjector;
 #pragma warning restore IDE0052 // Remove unread private members
 
         /// <summary>
@@ -52,7 +50,7 @@ internal class SqlConnection
         /// </summary>
         public bool IsInTransaction { get; private set; }
 
-        public static SqlConnection Create(IPersistentStorageFaultInjector faultInjector, string databasePath)
+        public static SqlConnection Create(IPersistentStorageFaultInjector? faultInjector, string databasePath)
         {
             faultInjector?.OnNewConnection();
 
@@ -112,7 +110,7 @@ public static SqlConnection Create(IPersistentStorageFaultInjector faultInjector
             }
         }
 
-        private SqlConnection(SafeSqliteHandle handle, IPersistentStorageFaultInjector faultInjector, Dictionary<string, SqlStatement> queryToStatement)
+        private SqlConnection(SafeSqliteHandle handle, IPersistentStorageFaultInjector? faultInjector, Dictionary<string, SqlStatement> queryToStatement)
         {
             _handle = handle;
             _faultInjector = faultInjector;
@@ -176,7 +174,7 @@ public void RunInTransaction<TState>(Action<TState> action, TState state)
                 state =>
                 {
                     state.action(state.state);
-                    return (object)null;
+                    return (object?)null;
                 },
                 (action, state));
         }
@@ -239,7 +237,7 @@ public int LastInsertRowId()
             => (int)NativeMethods.sqlite3_last_insert_rowid(_handle);
 
         [PerformanceSensitive("https://github.com/dotnet/roslyn/issues/36114", AllowCaptures = false)]
-        public Stream ReadBlob_MustRunInTransaction(Database database, string tableName, string columnName, long rowId)
+        public Stream? ReadBlob_MustRunInTransaction(Database database, string tableName, string columnName, long rowId)
         {
             // NOTE: we do need to do the blob reading in a transaction because of the
             // following: https://www.sqlite.org/c3ref/blob_open.html
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlStatement.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlStatement.cs
index aca482c445c41..291a05b1ed782 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlStatement.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/Interop/SqlStatement.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Runtime.InteropServices;
 using Microsoft.CodeAnalysis.SQLite.Interop;
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/PooledConnection.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/PooledConnection.cs
index 50d214542420b..d1cb487b52871 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/PooledConnection.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/PooledConnection.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.SQLite.v2.Interop;
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs
index 772ff7f04f188..37b6523d94a04 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Threading;
@@ -65,14 +63,14 @@ public Accessor(SQLitePersistentStorage storage)
             protected abstract TWriteQueueKey GetWriteQueueKey(TKey key);
 
             [PerformanceSensitive("https://github.com/dotnet/roslyn/issues/36114", AllowCaptures = false)]
-            public Task<Checksum> ReadChecksumAsync(TKey key, CancellationToken cancellationToken)
-                => Storage.PerformReadAsync(
+            public Task<Checksum?> ReadChecksumAsync(TKey key, CancellationToken cancellationToken)
+                => PerformReadAsync(
                     static t => t.self.ReadChecksum(t.key, t.cancellationToken),
                     (self: this, key, cancellationToken), cancellationToken);
 
-            private Checksum ReadChecksum(TKey key, CancellationToken cancellationToken)
+            private Checksum? ReadChecksum(TKey key, CancellationToken cancellationToken)
             {
-                using (var stream = ReadBlobColumn(key, ChecksumColumnName, checksumOpt: null, cancellationToken))
+                using (var stream = ReadBlobColumn(key, ChecksumColumnName, checksum: null, cancellationToken))
                 using (var reader = ObjectReader.TryGetReader(stream, leaveOpen: false, cancellationToken))
                 {
                     if (reader != null)
@@ -85,17 +83,17 @@ private Checksum ReadChecksum(TKey key, CancellationToken cancellationToken)
             }
 
             [PerformanceSensitive("https://github.com/dotnet/roslyn/issues/36114", AllowCaptures = false)]
-            public Task<Stream> ReadStreamAsync(TKey key, Checksum checksum, CancellationToken cancellationToken)
-                => Storage.PerformReadAsync(
+            public Task<Stream?> ReadStreamAsync(TKey key, Checksum? checksum, CancellationToken cancellationToken)
+                => PerformReadAsync(
                     static t => t.self.ReadStream(t.key, t.checksum, t.cancellationToken),
                     (self: this, key, checksum, cancellationToken), cancellationToken);
 
             [PerformanceSensitive("https://github.com/dotnet/roslyn/issues/36114", AllowCaptures = false)]
-            private Stream ReadStream(TKey key, Checksum checksum, CancellationToken cancellationToken)
+            private Stream? ReadStream(TKey key, Checksum? checksum, CancellationToken cancellationToken)
                 => ReadBlobColumn(key, DataColumnName, checksum, cancellationToken);
 
-            private Stream ReadBlobColumn(
-                TKey key, string columnName, Checksum checksumOpt, CancellationToken cancellationToken)
+            private Stream? ReadBlobColumn(
+                TKey key, string columnName, Checksum? checksum, CancellationToken cancellationToken)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
@@ -108,8 +106,8 @@ private Stream ReadBlobColumn(
                         {
                             // First, try to see if there was a write to this key in our in-memory db.
                             // If it wasn't in the in-memory write-cache.  Check the full on-disk file.
-                            return ReadBlob(connection, Database.WriteCache, dataId, columnName, checksumOpt, cancellationToken) ??
-                                   ReadBlob(connection, Database.Main, dataId, columnName, checksumOpt, cancellationToken);
+                            return ReadBlob(connection, Database.WriteCache, dataId, columnName, checksum, cancellationToken) ??
+                                   ReadBlob(connection, Database.Main, dataId, columnName, checksum, cancellationToken);
                         }
                         catch (Exception ex)
                         {
@@ -121,12 +119,12 @@ private Stream ReadBlobColumn(
                 return null;
             }
 
-            public Task<bool> WriteStreamAsync(TKey key, Stream stream, Checksum checksumOpt, CancellationToken cancellationToken)
-                => Storage.PerformWriteAsync(
-                    static t => t.self.WriteStream(t.key, t.stream, t.checksumOpt, t.cancellationToken),
-                    (self: this, key, stream, checksumOpt, cancellationToken), cancellationToken);
+            public Task<bool> WriteStreamAsync(TKey key, Stream stream, Checksum? checksum, CancellationToken cancellationToken)
+                => PerformWriteAsync(
+                    static t => t.self.WriteStream(t.key, t.stream, t.checksum, t.cancellationToken),
+                    (self: this, key, stream, checksum, cancellationToken), cancellationToken);
 
-            private bool WriteStream(TKey key, Stream stream, Checksum checksumOpt, CancellationToken cancellationToken)
+            private bool WriteStream(TKey key, Stream stream, Checksum? checksum, CancellationToken cancellationToken)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
@@ -137,7 +135,7 @@ private bool WriteStream(TKey key, Stream stream, Checksum checksumOpt, Cancella
                     // Determine the appropriate data-id to store this stream at.
                     if (TryGetDatabaseId(connection, key, out var dataId))
                     {
-                        var (checksumBytes, checksumLength, checksumPooled) = GetBytes(checksumOpt, cancellationToken);
+                        var (checksumBytes, checksumLength, checksumPooled) = GetBytes(checksum, cancellationToken);
                         var (dataBytes, dataLength, dataPooled) = GetBytes(stream);
 
                         // Write the information into the in-memory write-cache.  Later on a background task
@@ -162,10 +160,10 @@ private bool WriteStream(TKey key, Stream stream, Checksum checksumOpt, Cancella
                 return false;
             }
 
-            private Stream ReadBlob(
+            private Stream? ReadBlob(
                 SqlConnection connection, Database database,
                 TDatabaseId dataId, string columnName,
-                Checksum checksumOpt, CancellationToken cancellationToken)
+                Checksum? checksum, CancellationToken cancellationToken)
             {
                 // Note: it's possible that someone may write to this row between when we
                 // get the row ID above and now.  That's fine.  We'll just read the new
@@ -191,15 +189,15 @@ private Stream ReadBlob(
                         // If we were passed a checksum, make sure it matches what we have
                         // stored in the table already.  If they don't match, don't read
                         // out the data value at all.
-                        if (t.checksumOpt != null &&
-                            !t.self.ChecksumsMatch_MustRunInTransaction(t.connection, t.database, t.rowId, t.checksumOpt, t.cancellationToken))
+                        if (t.checksum != null &&
+                            !t.self.ChecksumsMatch_MustRunInTransaction(t.connection, t.database, t.rowId, t.checksum, t.cancellationToken))
                         {
                             return null;
                         }
 
                         return t.connection.ReadBlob_MustRunInTransaction(t.database, t.self.DataTableName, t.columnName, t.rowId);
                     },
-                    (self: this, connection, database, columnName, checksumOpt, rowId, cancellationToken));
+                    (self: this, connection, database, columnName, checksum, rowId, cancellationToken));
             }
 
             private bool ChecksumsMatch_MustRunInTransaction(
@@ -276,7 +274,7 @@ private void InsertOrReplaceBlobIntoWriteCache(
                 byte[] dataBytes, int dataLength)
             {
                 // We're writing.  This better always be under the exclusive scheduler.
-                Contract.ThrowIfFalse(TaskScheduler.Current == Storage._readerWriterLock.ExclusiveScheduler);
+                Contract.ThrowIfFalse(TaskScheduler.Current == s_readerWriterLock.ExclusiveScheduler);
 
                 using (var resettableStatement = connection.GetResettableStatement(_insert_or_replace_into_writecache_table_values_0_1_2))
                 {
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.cs
index ab5ab4ae774dc..eb6d06a87ca70 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.cs
@@ -105,7 +105,7 @@ internal partial class SQLitePersistentStorage : AbstractPersistentStorage
         private readonly CancellationTokenSource _shutdownTokenSource = new();
 
         private readonly IDisposable _dbOwnershipLock;
-        private readonly IPersistentStorageFaultInjector? _faultInjectorOpt;
+        private readonly IPersistentStorageFaultInjector? _faultInjector;
 
         // Accessors that allow us to retrieve/store data into specific DB tables.  The
         // core Accessor type has logic that we to share across all reading/writing, while
@@ -134,11 +134,11 @@ public SQLitePersistentStorage(
             string solutionFilePath,
             string databaseFile,
             IDisposable dbOwnershipLock,
-            IPersistentStorageFaultInjector? faultInjectorOpt)
+            IPersistentStorageFaultInjector? faultInjector)
             : base(workingFolderPath, solutionFilePath, databaseFile)
         {
             _dbOwnershipLock = dbOwnershipLock;
-            _faultInjectorOpt = faultInjectorOpt;
+            _faultInjector = faultInjector;
 
             _solutionAccessor = new SolutionAccessor(this);
             _projectAccessor = new ProjectAccessor(this);
@@ -168,7 +168,7 @@ private SqlConnection GetConnection()
             }
 
             // Otherwise create a new connection.
-            return SqlConnection.Create(_faultInjectorOpt, DatabaseFile);
+            return SqlConnection.Create(_faultInjector, DatabaseFile);
         }
 
         private void ReleaseConnection(SqlConnection connection)
@@ -259,7 +259,7 @@ private PooledConnection GetPooledConnection(bool checkScheduler, out SqlConnect
             if (checkScheduler)
             {
                 var scheduler = TaskScheduler.Current;
-                if (scheduler != _readerWriterLock.ConcurrentScheduler && scheduler != _readerWriterLock.ExclusiveScheduler)
+                if (scheduler != s_readerWriterLock.ConcurrentScheduler && scheduler != s_readerWriterLock.ExclusiveScheduler)
                     throw new InvalidOperationException("Cannot get a connection to the DB unless running on one of _readerWriterLock's schedulers");
             }
 
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_BulkPopulateIds.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_BulkPopulateIds.cs
index 9055f37712bbf..266f0c8f9e4f5 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_BulkPopulateIds.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_BulkPopulateIds.cs
@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.SQLite.Interop;
 using Microsoft.CodeAnalysis.SQLite.v2.Interop;
 using Microsoft.CodeAnalysis.Storage;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.SQLite.v2
 {
@@ -196,6 +197,8 @@ bool AddDocumentIds()
 
             string GetDocumentIdString(Document document)
             {
+                Contract.ThrowIfNull(document.FilePath);
+
                 // We should always be able to index directly into these maps.  This function is only
                 // ever called after we called AddIndividualProjectAndDocumentComponentIds.
                 var documentPathId = _stringToIdMap[document.FilePath];
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_DocumentSerialization.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_DocumentSerialization.cs
index 8fec7e2fb6143..0186cf321b2cd 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_DocumentSerialization.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_DocumentSerialization.cs
@@ -12,10 +12,10 @@ namespace Microsoft.CodeAnalysis.SQLite.v2
 {
     internal partial class SQLitePersistentStorage
     {
-        protected override Task<Checksum> ReadChecksumAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
+        protected override Task<Checksum?> ReadChecksumAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
             => _documentAccessor.ReadChecksumAsync((documentKey, bulkLoadSnapshot, name), cancellationToken);
 
-        protected override Task<Stream> ReadStreamAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
+        protected override Task<Stream?> ReadStreamAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
             => _documentAccessor.ReadStreamAsync((documentKey, bulkLoadSnapshot, name), checksum, cancellationToken);
 
         public override Task<bool> WriteStreamAsync(Document document, string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken)
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_FlushWrites.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_FlushWrites.cs
index f7905523c30ba..7da38c8499a46 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_FlushWrites.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_FlushWrites.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Threading;
@@ -30,7 +28,7 @@ private Task FlushInMemoryDataToDiskIfNotShutdownAsync(CancellationToken cancell
             // When we are asked to flush, go actually acquire the write-scheduler and perform the actual writes from
             // it. Note: this is only called max every FlushAllDelayMS.  So we don't bother trying to avoid the delegate
             // allocation here.
-            return this.PerformWriteAsync(FlushInMemoryDataToDisk, cancellationToken);
+            return PerformWriteAsync(FlushInMemoryDataToDisk, cancellationToken);
         }
 
         private void FlushWritesOnClose()
@@ -69,7 +67,7 @@ private void FlushWritesOnClose()
         private void FlushInMemoryDataToDisk()
         {
             // We're writing.  This better always be under the exclusive scheduler.
-            Contract.ThrowIfFalse(TaskScheduler.Current == _readerWriterLock.ExclusiveScheduler);
+            Contract.ThrowIfFalse(TaskScheduler.Current == s_readerWriterLock.ExclusiveScheduler);
 
             // Don't flush from a bg task if we've been asked to shutdown.  The shutdown logic in the storage service
             // will take care of the final writes to the main db.
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Helpers.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Helpers.cs
index b07c948160849..7ca499f7a5aa4 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Helpers.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Helpers.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -25,13 +23,13 @@ private static long CombineInt32ValuesToInt64(int v1, int v2)
             => ((long)v1 << 32) | (long)v2;
 
         private static (byte[] bytes, int length, bool fromPool) GetBytes(
-            Checksum checksumOpt, CancellationToken cancellationToken)
+            Checksum? checksum, CancellationToken cancellationToken)
         {
             // If we weren't passed a checksum, just pass the singleton empty byte array.
             // Note: we don't add this to/from our pool.  But it likely wouldn't be a problem
             // for us to do that as this instance can't actually be mutated since it's just
             // an empty array.
-            if (checksumOpt == null)
+            if (checksum == null)
             {
                 return (Array.Empty<byte>(), length: 0, fromPool: false);
             }
@@ -40,7 +38,7 @@ private static (byte[] bytes, int length, bool fromPool) GetBytes(
 
             using (var writer = new ObjectWriter(stream, leaveOpen: true, cancellationToken))
             {
-                checksumOpt.WriteTo(writer);
+                checksum.WriteTo(writer);
             }
 
             stream.Position = 0;
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_ProjectSerialization.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_ProjectSerialization.cs
index 3e74277ed2df8..6c5768725caca 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_ProjectSerialization.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_ProjectSerialization.cs
@@ -12,10 +12,10 @@ namespace Microsoft.CodeAnalysis.SQLite.v2
 {
     internal partial class SQLitePersistentStorage
     {
-        protected override Task<Checksum> ReadChecksumAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
+        protected override Task<Checksum?> ReadChecksumAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, CancellationToken cancellationToken)
             => _projectAccessor.ReadChecksumAsync((projectKey, bulkLoadSnapshot, name), cancellationToken);
 
-        protected override Task<Stream> ReadStreamAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
+        protected override Task<Stream?> ReadStreamAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken)
             => _projectAccessor.ReadStreamAsync((projectKey, bulkLoadSnapshot, name), checksum, cancellationToken);
 
         public override Task<bool> WriteStreamAsync(Project project, string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken)
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_SolutionSerialization.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_SolutionSerialization.cs
index ec06ced6fe087..6d8e733ae3ac8 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_SolutionSerialization.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_SolutionSerialization.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,13 +11,13 @@ namespace Microsoft.CodeAnalysis.SQLite.v2
 {
     internal partial class SQLitePersistentStorage
     {
-        public override Task<Checksum> ReadChecksumAsync(string name, CancellationToken cancellationToken)
+        public override Task<Checksum?> ReadChecksumAsync(string name, CancellationToken cancellationToken)
             => _solutionAccessor.ReadChecksumAsync(name, cancellationToken);
 
-        public override Task<Stream> ReadStreamAsync(string name, Checksum checksum, CancellationToken cancellationToken)
+        public override Task<Stream?> ReadStreamAsync(string name, Checksum? checksum, CancellationToken cancellationToken)
             => _solutionAccessor.ReadStreamAsync(name, checksum, cancellationToken);
 
-        public override Task<bool> WriteStreamAsync(string name, Stream stream, Checksum checksum, CancellationToken cancellationToken)
+        public override Task<bool> WriteStreamAsync(string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken)
             => _solutionAccessor.WriteStreamAsync(name, stream, checksum, cancellationToken);
 
         /// <summary>
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_StringIds.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_StringIds.cs
index 856b7576771cf..d3f39235bfe7c 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_StringIds.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_StringIds.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Concurrent;
 using Microsoft.CodeAnalysis.SQLite.Interop;
diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Threading.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Threading.cs
index 33314959e5d99..82188483a753f 100644
--- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Threading.cs
+++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage_Threading.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -17,11 +15,11 @@ internal partial class SQLitePersistentStorage
         /// Use a <see cref="ConcurrentExclusiveSchedulerPair"/> to simulate a reader-writer lock.
         /// Read operations are performed on the <see cref="ConcurrentExclusiveSchedulerPair.ConcurrentScheduler"/>
         /// and writes are performed on the <see cref="ConcurrentExclusiveSchedulerPair.ExclusiveScheduler"/>.
-        ///
+        /// <para/>
         /// We use this as a condition of using the in-memory shared-cache sqlite DB.  This DB
         /// doesn't busy-wait when attempts are made to lock the tables in it, which can lead to
         /// deadlocks.  Specifically, consider two threads doing the following:
-        ///
+        /// <para/>
         /// Thread A starts a transaction that starts as a reader, and later attempts to perform a
         /// write. Thread B is a writer (either started that way, or started as a reader and
         /// promoted to a writer first). B holds a RESERVED lock, waiting for readers to clear so it
@@ -29,13 +27,22 @@ internal partial class SQLitePersistentStorage
         /// lock (so it can start writing).  The only way to make progress in this situation is for
         /// one of the transactions to roll back. No amount of waiting will help, so when SQLite
         /// detects this situation, it doesn't honor the busy timeout.
-        ///
+        /// <para/>
         /// To prevent this scenario, we control our access to the db explicitly with operations that
         /// can concurrently read, and operations that exclusively write.
-        /// 
+        /// <para/>
         /// All code that reads or writes from the db should go through this.
+        /// <para/>
+        /// 
+        /// This field is static to workaround a current design limitation we have with workspaces and OOP.
+        /// Specifically, it is possible in OOP to have multiple "Remote Temporary" workspaces active around the same
+        /// solution.  These will all end up sharing the same DB file on disk.  That in itself is not an issue as sqlite
+        /// is fine with a DB file being opened multiple times.  However, we do need to coordinate with ourself to
+        /// ensure that no two threads collide trying to write to the same table at the same time (or one thread trying
+        /// to read, while another writes to a table).  By only allowing one write to happen across all DBs within a
+        /// single process, we eliminate that concern.
         /// </summary>
-        private readonly ConcurrentExclusiveSchedulerPair _readerWriterLock = new();
+        private static readonly ConcurrentExclusiveSchedulerPair s_readerWriterLock = new();
 
         private static async Task<TResult> PerformTaskAsync<TArg, TResult>(
             Func<TArg, TResult> func, TArg arg,
@@ -53,15 +60,15 @@ private static async Task<TResult> PerformTaskAsync<TArg, TResult>(
 
         // Read tasks go to the concurrent-scheduler where they can run concurrently with other read
         // tasks.
-        private Task<TResult> PerformReadAsync<TArg, TResult>(Func<TArg, TResult> func, TArg arg, CancellationToken cancellationToken) where TArg : struct
-            => PerformTaskAsync(func, arg, _readerWriterLock.ConcurrentScheduler, cancellationToken);
+        private static Task<TResult> PerformReadAsync<TArg, TResult>(Func<TArg, TResult> func, TArg arg, CancellationToken cancellationToken) where TArg : struct
+            => PerformTaskAsync(func, arg, s_readerWriterLock.ConcurrentScheduler, cancellationToken);
 
         // Write tasks go to the exclusive-scheduler so they run exclusively of all other threading
         // tasks we need to do.
-        public Task<bool> PerformWriteAsync<TArg>(Func<TArg, bool> func, TArg arg, CancellationToken cancellationToken) where TArg : struct
-            => PerformTaskAsync(func, arg, _readerWriterLock.ExclusiveScheduler, cancellationToken);
+        public static Task<bool> PerformWriteAsync<TArg>(Func<TArg, bool> func, TArg arg, CancellationToken cancellationToken) where TArg : struct
+            => PerformTaskAsync(func, arg, s_readerWriterLock.ExclusiveScheduler, cancellationToken);
 
-        public Task PerformWriteAsync(Action action, CancellationToken cancellationToken)
+        public static Task PerformWriteAsync(Action action, CancellationToken cancellationToken)
             => PerformWriteAsync(vt =>
             {
                 vt.Item1();
diff --git a/src/Workspaces/Core/Portable/Storage/StorageDatabase.cs b/src/Workspaces/Core/Portable/Storage/StorageDatabase.cs
index bf435225ac3d9..4587658fe8c46 100644
--- a/src/Workspaces/Core/Portable/Storage/StorageDatabase.cs
+++ b/src/Workspaces/Core/Portable/Storage/StorageDatabase.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace Microsoft.CodeAnalysis.Storage
 {
     internal enum StorageDatabase
diff --git a/src/Workspaces/Core/Portable/Storage/StorageDatabaseLogger.cs b/src/Workspaces/Core/Portable/Storage/StorageDatabaseLogger.cs
index 59e9673b72d37..b9d51f882a3cb 100644
--- a/src/Workspaces/Core/Portable/Storage/StorageDatabaseLogger.cs
+++ b/src/Workspaces/Core/Portable/Storage/StorageDatabaseLogger.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Concurrent;
 using Microsoft.CodeAnalysis.Internal.Log;
@@ -18,8 +16,8 @@ internal class StorageDatabaseLogger
         private static readonly StorageDatabaseLogger Instance = new();
 
 #pragma warning disable IDE0052 // Remove unread private members - hold onto last exception to make investigation easier
-        private Exception _reportedException;
-        private string _reportedExceptionMessage;
+        private Exception? _reportedException;
+        private string? _reportedExceptionMessage;
 #pragma warning restore IDE0052 // Remove unread private members
 
         private readonly ConcurrentDictionary<Type, Exception> _set = new(concurrencyLevel: 2, capacity: 10);
diff --git a/src/Workspaces/Core/Portable/Storage/StorageOptions.cs b/src/Workspaces/Core/Portable/Storage/StorageOptions.cs
index 72b630be1a117..6f8a157d8d263 100644
--- a/src/Workspaces/Core/Portable/Storage/StorageOptions.cs
+++ b/src/Workspaces/Core/Portable/Storage/StorageOptions.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Immutable;
 using System.Composition;
diff --git a/src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/AbstractPersistentStorage.cs b/src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/AbstractPersistentStorage.cs
index 2503d00092b90..124caa5935097 100644
--- a/src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/AbstractPersistentStorage.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Host/PersistentStorage/AbstractPersistentStorage.cs
@@ -35,51 +35,51 @@ protected AbstractPersistentStorage(
 
         public abstract void Dispose();
 
-        public abstract Task<Checksum> ReadChecksumAsync(string name, CancellationToken cancellationToken);
+        public abstract Task<Checksum?> ReadChecksumAsync(string name, CancellationToken cancellationToken);
 
-        protected abstract Task<Checksum> ReadChecksumAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, CancellationToken cancellationToken);
-        protected abstract Task<Checksum> ReadChecksumAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, CancellationToken cancellationToken);
+        protected abstract Task<Checksum?> ReadChecksumAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, CancellationToken cancellationToken);
+        protected abstract Task<Checksum?> ReadChecksumAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, CancellationToken cancellationToken);
 
-        public Task<Checksum> ReadChecksumAsync(ProjectKey projectKey, string name, CancellationToken cancellationToken)
+        public Task<Checksum?> ReadChecksumAsync(ProjectKey projectKey, string name, CancellationToken cancellationToken)
             => ReadChecksumAsync(projectKey, bulkLoadSnapshot: null, name, cancellationToken);
 
-        public Task<Checksum> ReadChecksumAsync(DocumentKey documentKey, string name, CancellationToken cancellationToken)
+        public Task<Checksum?> ReadChecksumAsync(DocumentKey documentKey, string name, CancellationToken cancellationToken)
             => ReadChecksumAsync(documentKey, bulkLoadSnapshot: null, name, cancellationToken);
 
-        public Task<Checksum> ReadChecksumAsync(Project project, string name, CancellationToken cancellationToken)
+        public Task<Checksum?> ReadChecksumAsync(Project project, string name, CancellationToken cancellationToken)
             => ReadChecksumAsync((ProjectKey)project, project, name, cancellationToken);
 
-        public Task<Checksum> ReadChecksumAsync(Document document, string name, CancellationToken cancellationToken)
+        public Task<Checksum?> ReadChecksumAsync(Document document, string name, CancellationToken cancellationToken)
             => ReadChecksumAsync((DocumentKey)document, document, name, cancellationToken);
 
-        public abstract Task<Stream> ReadStreamAsync(string name, Checksum? checksum, CancellationToken cancellationToken);
+        public abstract Task<Stream?> ReadStreamAsync(string name, Checksum? checksum, CancellationToken cancellationToken);
 
-        protected abstract Task<Stream> ReadStreamAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken);
-        protected abstract Task<Stream> ReadStreamAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken);
+        protected abstract Task<Stream?> ReadStreamAsync(ProjectKey projectKey, Project? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken);
+        protected abstract Task<Stream?> ReadStreamAsync(DocumentKey documentKey, Document? bulkLoadSnapshot, string name, Checksum? checksum, CancellationToken cancellationToken);
 
-        public Task<Stream> ReadStreamAsync(ProjectKey projectKey, string name, Checksum? checksum, CancellationToken cancellationToken)
+        public Task<Stream?> ReadStreamAsync(ProjectKey projectKey, string name, Checksum? checksum, CancellationToken cancellationToken)
             => ReadStreamAsync(projectKey, bulkLoadSnapshot: null, name, checksum, cancellationToken);
 
-        public Task<Stream> ReadStreamAsync(DocumentKey documentKey, string name, Checksum? checksum, CancellationToken cancellationToken)
+        public Task<Stream?> ReadStreamAsync(DocumentKey documentKey, string name, Checksum? checksum, CancellationToken cancellationToken)
             => ReadStreamAsync(documentKey, bulkLoadSnapshot: null, name, checksum, cancellationToken);
 
-        public Task<Stream> ReadStreamAsync(Project project, string name, Checksum? checksum, CancellationToken cancellationToken)
+        public Task<Stream?> ReadStreamAsync(Project project, string name, Checksum? checksum, CancellationToken cancellationToken)
             => ReadStreamAsync((ProjectKey)project, project, name, checksum, cancellationToken);
 
-        public Task<Stream> ReadStreamAsync(Document document, string name, Checksum? checksum, CancellationToken cancellationToken)
+        public Task<Stream?> ReadStreamAsync(Document document, string name, Checksum? checksum, CancellationToken cancellationToken)
             => ReadStreamAsync((DocumentKey)document, document, name, checksum, cancellationToken);
 
         public abstract Task<bool> WriteStreamAsync(string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken);
         public abstract Task<bool> WriteStreamAsync(Project project, string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken);
         public abstract Task<bool> WriteStreamAsync(Document document, string name, Stream stream, Checksum? checksum, CancellationToken cancellationToken);
 
-        public Task<Stream> ReadStreamAsync(string name, CancellationToken cancellationToken)
+        public Task<Stream?> ReadStreamAsync(string name, CancellationToken cancellationToken)
             => ReadStreamAsync(name, checksum: null, cancellationToken);
 
-        public Task<Stream> ReadStreamAsync(Project project, string name, CancellationToken cancellationToken)
+        public Task<Stream?> ReadStreamAsync(Project project, string name, CancellationToken cancellationToken)
             => ReadStreamAsync(project, name, checksum: null, cancellationToken);
 
-        public Task<Stream> ReadStreamAsync(Document document, string name, CancellationToken cancellationToken)
+        public Task<Stream?> ReadStreamAsync(Document document, string name, CancellationToken cancellationToken)
             => ReadStreamAsync(document, name, checksum: null, cancellationToken);
 
         public Task<bool> WriteStreamAsync(string name, Stream stream, CancellationToken cancellationToken)
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
index 9852083cdfb11..2bbfb8c673aa2 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
@@ -310,7 +310,7 @@ public bool TryGetSemanticModel([NotNullWhen(returnValue: true)] out SemanticMod
                     return result;
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -414,7 +414,7 @@ public async Task<IEnumerable<TextChange>> GetTextChangesAsync(Document oldDocum
                     return text.GetTextChanges(oldText).ToList();
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/DocumentState.cs b/src/Workspaces/Core/Portable/Workspace/Solution/DocumentState.cs
index 18ce8b7a6a4be..6c0cd73bb94ff 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/DocumentState.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/DocumentState.cs
@@ -206,7 +206,7 @@ private static async Task<TreeAndVersion> IncrementallyParseTreeAsync(
                     return IncrementallyParse(newTextAndVersion, oldTreeAndVersion, cancellationToken);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -227,7 +227,7 @@ private static TreeAndVersion IncrementallyParseTree(
                     return IncrementallyParse(newTextAndVersion, oldTreeAndVersion, cancellationToken);
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -715,7 +715,7 @@ private static void CheckTree(
 
             // we time to time see (incremental) parsing bug where text <-> tree round tripping is broken.
             // send NFW for those cases
-            FatalError.ReportWithoutCrash(new Exception($"tree and text has different length {newTree.Length} vs {newText.Length}"));
+            FatalError.ReportAndCatch(new Exception($"tree and text has different length {newTree.Length} vs {newText.Length}"));
 
             // this will make sure that these variables are not thrown away in the dump
             GC.KeepAlive(newTreeContent);
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState_Checksum.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState_Checksum.cs
index e056a30632316..91cec6acb0df8 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState_Checksum.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState_Checksum.cs
@@ -77,7 +77,7 @@ private async Task<ProjectStateChecksums> ComputeChecksumsAsync(CancellationToke
                         new AnalyzerConfigDocumentChecksumCollection(analyzerConfigDocumentChecksums));
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.cs
index cece4c6344331..bf4cf28bb6ae8 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.cs
@@ -443,7 +443,7 @@ private async Task<Compilation> GetOrBuildDeclarationCompilationAsync(SolutionSe
                         return compilation;
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -486,7 +486,7 @@ private async Task<CompilationInfo> GetOrBuildCompilationInfoAsync(
                         }
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -551,7 +551,7 @@ private async Task<CompilationInfo> BuildCompilationInfoFromScratchAsync(
                     // null and then we'll have to create a generator inside the finalization process.
                     return await FinalizeCompilationAsync(solution, compilation, new TrackedGeneratorDriver(null), cancellationToken).ConfigureAwait(false);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -581,7 +581,7 @@ private async Task<Compilation> BuildDeclarationCompilationFromScratchAsync(
                     WriteState(new FullDeclarationState(compilation, new TrackedGeneratorDriver(generatorDriver: null)), solutionServices);
                     return compilation;
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -614,7 +614,7 @@ private async Task<CompilationInfo> BuildFinalStateFromInProgressStateAsync(
                     var (compilation, generatorDriver) = await BuildDeclarationCompilationFromInProgressAsync(solution.Services, state, inProgressCompilation, cancellationToken).ConfigureAwait(false);
                     return await FinalizeCompilationAsync(solution, compilation, generatorDriver, cancellationToken).ConfigureAwait(false);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -642,7 +642,7 @@ private async Task<CompilationInfo> BuildFinalStateFromInProgressStateAsync(
 
                     return (inProgressCompilation, inProgressGeneratorDriver);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -766,7 +766,7 @@ private async Task<CompilationInfo> FinalizeCompilationAsync(
 
                     return new CompilationInfo(compilation, hasSuccessfullyLoaded, generatorDriver.GeneratorDriver?.GetRunResult());
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -822,7 +822,7 @@ public async Task<MetadataReference> GetMetadataReferenceAsync(
                         return await this.GetMetadataOnlyImageReferenceAsync(solution, projectReference, cancellationToken).ConfigureAwait(false);
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -886,7 +886,7 @@ private async Task<MetadataReference> GetMetadataOnlyImageReferenceAsync(
                         return reference;
                     }
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.SymbolToProjectId.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.SymbolToProjectId.cs
index 8e0406f46af46..48a2507e6a776 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.SymbolToProjectId.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.SymbolToProjectId.cs
@@ -45,7 +45,7 @@ internal partial class SolutionState
                         throw new InvalidOperationException(
                             $"We should always be able to map a body symbol back to a document:\r\n{symbol.Kind}\r\n{symbol.Name}\r\n{syntaxTree.FilePath}\r\n{projectId}");
                     }
-                    catch (Exception ex) when (FatalError.ReportWithoutCrash(ex))
+                    catch (Exception ex) when (FatalError.ReportAndCatch(ex))
                     {
                     }
                 }
@@ -56,7 +56,7 @@ internal partial class SolutionState
                         throw new InvalidOperationException(
                             $"Syntax tree for a body symbol should map to the same project as the body symbol's assembly:\r\n{symbol.Kind}\r\n{symbol.Name}\r\n{syntaxTree.FilePath}\r\n{projectId}\r\n{documentId.ProjectId}");
                     }
-                    catch (Exception ex) when (FatalError.ReportWithoutCrash(ex))
+                    catch (Exception ex) when (FatalError.ReportAndCatch(ex))
                     {
                     }
                 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs
index f49f59558ce52..134be5e611f0b 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs
@@ -1669,7 +1669,7 @@ public SolutionState WithFrozenPartialCompilationIncludingSpecificDocument(Docum
                     return currentPartialSolution;
                 }
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -1795,7 +1795,7 @@ public Task<MetadataReference> GetMetadataReferenceAsync(ProjectReference projec
                 var tracker = this.GetCompilationTracker(projectReference.ProjectId);
                 return tracker.GetMetadataReferenceAsync(this, fromProject, projectReference, cancellationToken);
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState_Checksum.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState_Checksum.cs
index 1aad7b6139faf..aa66e1488aa27 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState_Checksum.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState_Checksum.cs
@@ -54,7 +54,7 @@ private async Task<SolutionStateChecksums> ComputeChecksumsAsync(CancellationTok
                     return new SolutionStateChecksums(infoChecksum, optionsChecksum, new ProjectChecksumCollection(projectChecksums), analyzerReferenceChecksums);
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/TextDocumentState_Checksum.cs b/src/Workspaces/Core/Portable/Workspace/Solution/TextDocumentState_Checksum.cs
index 327b7e1236381..31bdfadcd0592 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/TextDocumentState_Checksum.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/TextDocumentState_Checksum.cs
@@ -42,7 +42,7 @@ private async Task<DocumentStateChecksums> ComputeChecksumsAsync(CancellationTok
                     return new DocumentStateChecksums(infoChecksum, textChecksum);
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Core/Portable/Workspace/Workspace_Editor.cs b/src/Workspaces/Core/Portable/Workspace/Workspace_Editor.cs
index 7606b605458ec..7df859eeaca12 100644
--- a/src/Workspaces/Core/Portable/Workspace/Workspace_Editor.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Workspace_Editor.cs
@@ -558,7 +558,7 @@ protected internal void OnDocumentClosed(DocumentId documentId, TextLoader reloa
                     this.RaiseDocumentClosedEventAsync(newDoc); // don't wait for this
                 }
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs b/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs
index 37f7252b4ceaf..132ba9de160bb 100644
--- a/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs
+++ b/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs
@@ -2033,13 +2033,16 @@ End Module
 
         [Fact]
         [WorkItem(14034, "https://github.com/dotnet/roslyn/issues/14034")]
+        [WorkItem(48492, "https://github.com/dotnet/roslyn/issues/48492")]
         [Trait(Traits.Feature, Traits.Features.ReduceTokens)]
-        public async Task ReduceIntegersWithDigitSeparators()
+        public async Task DoNotReduceDigitSeparators()
         {
             var source = @"
 Module Module1
     Sub Main()
         Dim x = 100_000
+        Dim y = 100_000.0F
+        Dim z = 100_000.0D
     End Sub
 End Module
 ";
diff --git a/src/Workspaces/CoreTest/UtilityTest/ExceptionHelpersTests.cs b/src/Workspaces/CoreTest/UtilityTest/ExceptionHelpersTests.cs
index 2d3f5e699eaf7..95e69447cd3f7 100644
--- a/src/Workspaces/CoreTest/UtilityTest/ExceptionHelpersTests.cs
+++ b/src/Workspaces/CoreTest/UtilityTest/ExceptionHelpersTests.cs
@@ -40,7 +40,7 @@ void a()
                 {
                     a();
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Workspaces/CoreTestUtilities/MEF/UseExportProviderAttribute.cs b/src/Workspaces/CoreTestUtilities/MEF/UseExportProviderAttribute.cs
index 987c60476ec00..d5a98c493913d 100644
--- a/src/Workspaces/CoreTestUtilities/MEF/UseExportProviderAttribute.cs
+++ b/src/Workspaces/CoreTestUtilities/MEF/UseExportProviderAttribute.cs
@@ -66,7 +66,7 @@ static UseExportProviderAttribute()
             RuntimeHelpers.RunModuleConstructor(typeof(TestBase).Module.ModuleHandle);
         }
 
-        public override void Before(MethodInfo methodUnderTest)
+        public override void Before(MethodInfo? methodUnderTest)
         {
             MefHostServices.TestAccessor.HookServiceCreation(CreateMefHostServices);
 
@@ -87,7 +87,7 @@ public override void Before(MethodInfo methodUnderTest)
         /// <item>Clearing static state variables related to the use of MEF during a test.</item>
         /// </list>
         /// </remarks>
-        public override void After(MethodInfo methodUnderTest)
+        public override void After(MethodInfo? methodUnderTest)
         {
             try
             {
diff --git a/src/Workspaces/Remote/Core/BrokeredServiceConnection.cs b/src/Workspaces/Remote/Core/BrokeredServiceConnection.cs
index 37894041cc360..f895002927d09 100644
--- a/src/Workspaces/Remote/Core/BrokeredServiceConnection.cs
+++ b/src/Workspaces/Remote/Core/BrokeredServiceConnection.cs
@@ -220,7 +220,7 @@ private bool ReportUnexpectedException(Exception exception, CancellationToken ca
             // report telemetry event:
             Logger.Log(FunctionId.FeatureNotAvailable, $"{ServiceDescriptors.GetServiceName(typeof(TService))}: {exception.GetType()}: {exception.Message}");
 
-            return FatalError.ReportWithoutCrash(exception);
+            return FatalError.ReportAndCatch(exception);
         }
 
         private bool IsHostShuttingDown
diff --git a/src/Workspaces/Remote/Core/RemoteCallback.cs b/src/Workspaces/Remote/Core/RemoteCallback.cs
index 128d1ede9d128..87caaca21bf3f 100644
--- a/src/Workspaces/Remote/Core/RemoteCallback.cs
+++ b/src/Workspaces/Remote/Core/RemoteCallback.cs
@@ -110,7 +110,7 @@ private static bool ReportUnexpectedException(Exception exception, CancellationT
             }
 
             // Indicates bug on client side or in serialization, report NFW and propagate the exception.
-            return FatalError.ReportWithoutCrashAndPropagate(exception);
+            return FatalError.ReportAndPropagate(exception);
         }
 
         private static Exception OnUnexpectedException(Exception exception, CancellationToken cancellationToken)
diff --git a/src/Workspaces/Remote/Core/RemoteEndPoint.cs b/src/Workspaces/Remote/Core/RemoteEndPoint.cs
index 26c59d2d00230..23f44e6420cc0 100644
--- a/src/Workspaces/Remote/Core/RemoteEndPoint.cs
+++ b/src/Workspaces/Remote/Core/RemoteEndPoint.cs
@@ -359,7 +359,7 @@ private static bool ReportUnlessCanceled(Exception ex, CancellationToken cancell
 
         private static void ReportNonFatalWatson(Exception exception)
         {
-            FatalError.ReportWithoutCrash(exception);
+            FatalError.ReportAndCatch(exception);
         }
 
         private SoftCrashException CreateSoftCrashException(Exception ex, CancellationToken cancellationToken)
diff --git a/src/Workspaces/Remote/Core/ServiceDescriptor.cs b/src/Workspaces/Remote/Core/ServiceDescriptor.cs
index 19212072a3e3b..fab36a6c1851a 100644
--- a/src/Workspaces/Remote/Core/ServiceDescriptor.cs
+++ b/src/Workspaces/Remote/Core/ServiceDescriptor.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.IO.Pipelines;
-using System.Reflection;
 using MessagePack;
 using MessagePack.Resolvers;
 using Microsoft.ServiceHub.Framework;
@@ -77,27 +76,6 @@ protected override JsonRpcConnection CreateConnection(JsonRpc jsonRpc)
             return connection;
         }
 
-        [Obsolete]
-        public override ServiceRpcDescriptor WithMultiplexingStream(MultiplexingStream? multiplexingStream)
-        {
-            var baseResult = base.WithMultiplexingStream(multiplexingStream);
-            if (baseResult is ServiceDescriptor)
-                return baseResult;
-
-            // work around incorrect implementation in 16.8 Preview 2
-            if (MultiplexingStream == multiplexingStream)
-                return this;
-
-            var result = (ServiceDescriptor)Clone();
-            typeof(ServiceRpcDescriptor).GetProperty(nameof(MultiplexingStream))!.SetValue(result, multiplexingStream);
-            if (result.MultiplexingStreamOptions is null)
-                return result;
-
-            result = (ServiceDescriptor)result.Clone();
-            typeof(ServiceJsonRpcDescriptor).GetProperty(nameof(MultiplexingStreamOptions))!.SetValue(result, value: null);
-            return result;
-        }
-
         internal static class TestAccessor
         {
             public static MessagePackSerializerOptions Options => s_options;
diff --git a/src/Workspaces/Remote/Core/ServiceHubRemoteHostClient.cs b/src/Workspaces/Remote/Core/ServiceHubRemoteHostClient.cs
index 88a7490ec4c75..f0fdaa635e245 100644
--- a/src/Workspaces/Remote/Core/ServiceHubRemoteHostClient.cs
+++ b/src/Workspaces/Remote/Core/ServiceHubRemoteHostClient.cs
@@ -146,7 +146,7 @@ static bool ReportNonFatalWatson(Exception e, CancellationToken cancellationToke
                 // even if our cancellation token is signaled. Do not report Watson in such cases to reduce noice.
                 if (!cancellationToken.IsCancellationRequested)
                 {
-                    FatalError.ReportWithoutCrash(e);
+                    FatalError.ReportAndCatch(e);
                 }
 
                 return true;
@@ -177,7 +177,7 @@ public override async ValueTask<RemoteServiceConnection<T>> CreateConnectionAsyn
 
                 return new BrokeredServiceConnection<T>(proxy, _assetStorage, _errorReportingService, _shutdownCancellationService);
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -240,7 +240,7 @@ await RemoteEndPoint.WriteDataToNamedPipeAsync(
                         cancellationToken).ConfigureAwait(false);
                 }
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -257,7 +257,7 @@ public Task<bool> IsExperimentEnabledAsync(string experimentName, CancellationTo
                     ? SpecializedTasks.True
                     : SpecializedTasks.False;
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Remote/Core/SolutionAssetProvider.cs b/src/Workspaces/Remote/Core/SolutionAssetProvider.cs
index 92d6ebd7f82a2..46e9bef292ea4 100644
--- a/src/Workspaces/Remote/Core/SolutionAssetProvider.cs
+++ b/src/Workspaces/Remote/Core/SolutionAssetProvider.cs
@@ -70,7 +70,7 @@ public async ValueTask GetAssetsAsync(PipeWriter pipeWriter, int scopeId, Checks
                     using var writer = new ObjectWriter(stream, leaveOpen: false, cancellationToken);
                     RemoteHostAssetSerialization.WriteData(writer, singleAsset, assetMap, serializer, scopeId, checksums, cancellationToken);
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceled(e, cancellationToken))
+                catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e, cancellationToken))
                 {
                     // no-op
                 }
@@ -92,7 +92,7 @@ async Task CopyPipeDataAsync()
                 }
                 catch (Exception e)
                 {
-                    FatalError.ReportWithoutCrashUnlessCanceled(e, cancellationToken);
+                    FatalError.ReportAndCatchUnlessCanceled(e, cancellationToken);
                     exception = e;
                 }
                 finally
diff --git a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs
index 984e663127b6c..f833ce352917c 100644
--- a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs
+++ b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs
@@ -91,7 +91,7 @@ public async Task<Solution> CreateSolutionAsync(Checksum newSolutionChecksum)
 
                     return solution;
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.cs b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.cs
index c7aeb8482f558..2fcad238869ca 100644
--- a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.cs
+++ b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.cs
@@ -163,7 +163,7 @@ private async Task<Solution> CreateSolution_NoLockAsync(
                 var workspace = new TemporaryWorkspace(Services.HostServices, WorkspaceKind.RemoteTemporaryWorkspace, solutionInfo, options);
                 return workspace.CurrentSolution;
             }
-            catch (Exception e) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.cs b/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.cs
index 3b178d952a2d5..ab613fdc3017c 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.cs
@@ -68,7 +68,7 @@ protected async ValueTask<T> RunServiceAsync<T>(Func<CancellationToken, ValueTas
             {
                 return await implementation(cancellationToken).ConfigureAwait(false);
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -82,7 +82,7 @@ protected async ValueTask RunServiceAsync(Func<CancellationToken, ValueTask> imp
             {
                 await implementation(cancellationToken).ConfigureAwait(false);
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/Remote/ServiceHub/Services/ServiceBase.cs b/src/Workspaces/Remote/ServiceHub/Services/ServiceBase.cs
index 1fffc0fcce216..d473bc270604b 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/ServiceBase.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/ServiceBase.cs
@@ -110,7 +110,7 @@ protected async Task<T> RunServiceAsync<T>(Func<Task<T>> callAsync, Cancellation
             {
                 return await callAsync().ConfigureAwait(false);
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -124,7 +124,7 @@ protected async Task RunServiceAsync(Func<Task> callAsync, CancellationToken can
             {
                 await callAsync().ConfigureAwait(false);
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -138,7 +138,7 @@ protected T RunService<T>(Func<T> call, CancellationToken cancellationToken)
             {
                 return call();
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
@@ -152,7 +152,7 @@ protected void RunService(Action call, CancellationToken cancellationToken)
             {
                 call();
             }
-            catch (Exception ex) when (FatalError.ReportWithoutCrashUnlessCanceledAndPropagate(ex, cancellationToken))
+            catch (Exception ex) when (FatalError.ReportAndPropagateUnlessCanceled(ex, cancellationToken))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AsyncLazy`1.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AsyncLazy`1.cs
index 1460f5093f487..cd8198df2ddcf 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AsyncLazy`1.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AsyncLazy`1.cs
@@ -382,52 +382,45 @@ private void StartAsynchronousComputation(AsynchronousComputationToStart computa
         {
             var cancellationToken = computationToStart.CancellationTokenSource.Token;
 
+            // DO NOT ACCESS ANY FIELDS OR STATE BEYOND THIS POINT. Since this function
+            // runs unsynchronized, it's possible that during this function this request
+            // might be cancelled, and then a whole additional request might start and
+            // complete inline, and cache the result. By grabbing state before we check
+            // the cancellation token, we can be assured that we are only operating on
+            // a state that was complete.
             try
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                // DO NOT ACCESS ANY FIELDS OR STATE BEYOND THIS POINT. Since this function
-                // runs unsynchronized, it's possible that during this function this request
-                // might be cancelled, and then a whole additional request might start and
-                // complete inline, and cache the result. By grabbing state before we check
-                // the cancellation token, we can be assured that we are only operating on
-                // a state that was complete.
-                try
+                var task = computationToStart.AsynchronousComputeFunction(cancellationToken);
+
+                // As an optimization, if the task is already completed, mark the 
+                // request as being completed as well.
+                //
+                // Note: we want to do this before we do the .ContinueWith below. That way, 
+                // when the async call to CompleteWithTask runs, it sees that we've already
+                // completed and can bail immediately. 
+                if (requestToCompleteSynchronously != null && task.IsCompleted)
                 {
-                    var task = computationToStart.AsynchronousComputeFunction(cancellationToken);
-
-                    // As an optimization, if the task is already completed, mark the 
-                    // request as being completed as well.
-                    //
-                    // Note: we want to do this before we do the .ContinueWith below. That way, 
-                    // when the async call to CompleteWithTask runs, it sees that we've already
-                    // completed and can bail immediately. 
-                    if (requestToCompleteSynchronously != null && task.IsCompleted)
+                    using (TakeLock(CancellationToken.None))
                     {
-                        using (TakeLock(CancellationToken.None))
-                        {
-                            task = GetCachedValueAndCacheThisValueIfNoneCached_NoLock(task);
-                        }
-
-                        requestToCompleteSynchronously.CompleteFromTask(task);
+                        task = GetCachedValueAndCacheThisValueIfNoneCached_NoLock(task);
                     }
 
-                    // We avoid creating a full closure just to pass the token along
-                    // Also, use TaskContinuationOptions.ExecuteSynchronously so that we inline 
-                    // the continuation if asynchronousComputeFunction completes synchronously
-                    task.ContinueWith(
-                        (t, s) => CompleteWithTask(t, ((CancellationTokenSource)s!).Token),
-                        computationToStart.CancellationTokenSource,
-                        cancellationToken,
-                        TaskContinuationOptions.ExecuteSynchronously,
-                        TaskScheduler.Default);
-                }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
-                {
-                    throw ExceptionUtilities.Unreachable;
+                    requestToCompleteSynchronously.CompleteFromTask(task);
                 }
+
+                // We avoid creating a full closure just to pass the token along
+                // Also, use TaskContinuationOptions.ExecuteSynchronously so that we inline 
+                // the continuation if asynchronousComputeFunction completes synchronously
+                task.ContinueWith(
+                    (t, s) => CompleteWithTask(t, ((CancellationTokenSource)s!).Token),
+                    computationToStart.CancellationTokenSource,
+                    cancellationToken,
+                    TaskContinuationOptions.ExecuteSynchronously,
+                    TaskScheduler.Default);
             }
-            catch (OperationCanceledException oce) when (CrashIfCanceledWithDifferentToken(oce, cancellationToken))
+            catch (OperationCanceledException e) when (e.CancellationToken == cancellationToken)
             {
                 // The underlying computation cancelled with the correct token, but we must ourselves ensure that the caller
                 // on our stack gets an OperationCanceledException thrown with the right token
@@ -438,16 +431,10 @@ private void StartAsynchronousComputation(AsynchronousComputationToStart computa
                 // because that token from the requester was cancelled.
                 throw ExceptionUtilities.Unreachable;
             }
-        }
-
-        private static bool CrashIfCanceledWithDifferentToken(OperationCanceledException exception, CancellationToken cancellationToken)
-        {
-            if (exception.CancellationToken != cancellationToken)
+            catch (Exception e) when (FatalError.ReportAndPropagate(e))
             {
-                FatalError.Report(exception);
+                throw ExceptionUtilities.Unreachable;
             }
-
-            return true;
         }
 
         private void CompleteWithTask(Task<T> task, CancellationToken cancellationToken)
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/EventMap.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/EventMap.cs
index efbfa4408cb0e..43cc6c2c8d081 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/EventMap.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/EventMap.cs
@@ -177,7 +177,7 @@ public void RaiseEvent(Action<TEventHandler> invoker)
                         }
                     }
                 }
-                catch (Exception e) when (FatalError.ReportWithoutCrashAndPropagate(e))
+                catch (Exception e) when (FatalError.ReportAndPropagate(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskExtensions.cs
index e2f687c1d9fae..7efd8fdfd0e15 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskExtensions.cs
@@ -205,7 +205,7 @@ TResult outerFunction(Task t)
                 {
                     return continuationFunction(t);
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -560,12 +560,12 @@ private static void ReportNonFatalErrorWorker(Task task, object continuationFunc
             //   ...
             // > ~67s     // switch to thread 67
             // > !dso     // dump stack objects
-            FatalError.ReportWithoutCrash(exception);
+            FatalError.ReportAndCatch(exception);
         }
 
         public static Task ReportNonFatalErrorAsync(this Task task)
         {
-            task.ContinueWith(p => FatalError.ReportWithoutCrashUnlessCanceled(p.Exception),
+            task.ContinueWith(p => FatalError.ReportAndCatchUnlessCanceled(p.Exception),
                 CancellationToken.None,
                 TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
                 TaskScheduler.Default);
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskFactoryExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskFactoryExtensions.cs
index b20f83bd980b6..9b6d90e7158d8 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskFactoryExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/TaskFactoryExtensions.cs
@@ -26,7 +26,7 @@ void wrapped()
                 {
                     action();
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
@@ -44,7 +44,7 @@ TResult wrapped()
                 {
                     return func();
                 }
-                catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
                 {
                     throw ExceptionUtilities.Unreachable;
                 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/CSharpSyntaxContext.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/CSharpSyntaxContext.cs
index 755d8ce5a5255..5fc0818b64cb1 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/CSharpSyntaxContext.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/CSharpSyntaxContext.cs
@@ -205,7 +205,7 @@ private static CSharpSyntaxContext CreateContextWorker(Workspace workspace, Sema
 
             var isDestructorTypeContext = targetToken.IsKind(SyntaxKind.TildeToken) &&
                                             targetToken.Parent.IsKind(SyntaxKind.DestructorDeclaration) &&
-                                            targetToken.Parent.Parent.IsKind(SyntaxKind.ClassDeclaration, SyntaxKind.StructDeclaration);
+                                            targetToken.Parent.Parent.IsKind(SyntaxKind.ClassDeclaration, SyntaxKind.StructDeclaration, SyntaxKind.RecordDeclaration);
 
             // Typing a dot after a numeric expression (numericExpression.) 
             // - maybe a start of MemberAccessExpression like numericExpression.Member.
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ITypeSymbolExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ITypeSymbolExtensions.cs
index 28975d8460141..7d4da3afe4980 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ITypeSymbolExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ITypeSymbolExtensions.cs
@@ -138,7 +138,7 @@ public static bool ContainingTypesOrSelfHasUnsafeKeyword(this ITypeSymbol contai
 
                 return null;
             }
-            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e))
             {
                 throw ExceptionUtilities.Unreachable;
             }
diff --git a/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/ReduceTokensCodeCleanupProvider.vb b/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/ReduceTokensCodeCleanupProvider.vb
index 1ebedf10ceff7..b92ec96f64a81 100644
--- a/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/ReduceTokensCodeCleanupProvider.vb
+++ b/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/ReduceTokensCodeCleanupProvider.vb
@@ -44,6 +44,7 @@ Namespace Microsoft.CodeAnalysis.CodeCleanup.Providers
             Public Overrides Function VisitLiteralExpression(node As LiteralExpressionSyntax) As SyntaxNode
                 Dim newNode = DirectCast(MyBase.VisitLiteralExpression(node), LiteralExpressionSyntax)
                 Dim literal As SyntaxToken = newNode.Token
+                Const digitSeparator = "_"c
 
                 ' Pretty list floating and decimal literals.
                 Select Case literal.Kind
@@ -55,7 +56,7 @@ Namespace Microsoft.CodeAnalysis.CodeCleanup.Providers
                         Dim value As Double = 0
                         Dim valueText As String = GetFloatLiteralValueString(literal, value) + GetTypeCharString(literal.GetTypeCharacter())
 
-                        If value = 0 Then
+                        If value = 0 OrElse idText.Contains(digitSeparator) Then
                             ' Overflow/underflow case or zero literal, skip pretty listing.
                             Return newNode
                         End If
@@ -70,7 +71,7 @@ Namespace Microsoft.CodeAnalysis.CodeCleanup.Providers
                         Dim idText = literal.GetIdentifierText()
                         Dim value = DirectCast(literal.Value, Decimal)
 
-                        If value = 0 Then
+                        If value = 0 OrElse idText.Contains(digitSeparator) Then
                             ' Overflow/underflow case or zero literal, skip pretty listing.
                             Return newNode
                         End If
@@ -96,7 +97,6 @@ Namespace Microsoft.CodeAnalysis.CodeCleanup.Providers
 
                         Dim base = literal.GetBase()
 
-                        Const digitSeparator = "_"c
                         If Not base.HasValue OrElse idText.Contains(digitSeparator) Then
                             Return newNode
                         End If