diff --git a/CefSharp.Core/Internals/ClientAdapter.cpp b/CefSharp.Core/Internals/ClientAdapter.cpp
index d867d05cfd..c3d7d4e6d8 100644
--- a/CefSharp.Core/Internals/ClientAdapter.cpp
+++ b/CefSharp.Core/Internals/ClientAdapter.cpp
@@ -462,11 +462,10 @@ namespace CefSharp
             handled = handler->OnJSBeforeUnload(_browserControl, StringUtils::ToClr(message_text), is_reload, resultString);
             if (handled)
             {
-                callback->Continue(is_reload, StringUtils::ToNative(resultString));
+                callback->Continue(result, StringUtils::ToNative(resultString));
             }
 
             return handled;
-
         }
 
         bool ClientAdapter::OnFileDialog(CefRefPtr<CefBrowser> browser, FileDialogMode mode, const CefString& title,
diff --git a/CefSharp/IJsDialogHandler.cs b/CefSharp/IJsDialogHandler.cs
index 4a8b225342..267453cb00 100644
--- a/CefSharp/IJsDialogHandler.cs
+++ b/CefSharp/IJsDialogHandler.cs
@@ -9,6 +9,6 @@ public interface IJsDialogHandler
         bool OnJSAlert(IWebBrowser browser, string url, string message);
         bool OnJSConfirm(IWebBrowser browser, string url, string message, out bool retval);
         bool OnJSPrompt(IWebBrowser browser, string url, string message, string defaultValue, out bool retval, out string result);
-        bool OnJSBeforeUnload(IWebBrowser browser, string message, out bool is_reload, out string result);
+        bool OnJSBeforeUnload(IWebBrowser browser, string message, out bool isReload, out string result);
     }
 }
diff --git a/CefSharp3.sln.DotSettings b/CefSharp3.sln.DotSettings
index bb38958954..2555216ee7 100644
--- a/CefSharp3.sln.DotSettings
+++ b/CefSharp3.sln.DotSettings
@@ -98,6 +98,7 @@
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/GotoSingleUsageImmediately/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/SaveSessionState/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">VS</s:String>