diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj
index 49a932e15..66268064b 100644
--- a/Frameworks/AppKit/Browser.environment/AppKit.sj
+++ b/Frameworks/AppKit/Browser.environment/AppKit.sj
@@ -39623,7 +39623,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_
 
 ,["void","CPCoder"])]);
 }
-p;13;CPTextField.jt;129078;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;128934;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate");
+p;13;CPTextField.jt;130055;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;129911;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate");
 var aProtocol = objj_getProtocol("CPControlTextEditingDelegate");
 if (!aProtocol) throw new SyntaxError("*** Could not find definition for protocol \"CPTextFieldDelegate\"");
 protocol_addProtocol(the_protocol, aProtocol);
@@ -39653,7 +39653,11 @@ var CPTextFieldDOMCurrentElement = nil,
     CPTextFieldCachedDragFunction = nil,
     CPTextFieldBlurHandler = nil,
     CPTextFieldInputFunction = nil,
-    CPTexFieldCurrentCSSSelectableField = nil;
+    CPTexFieldCurrentCSSSelectableField = nil,
+    CPTextFieldLastValidationFailureEvent = nil,
+    CPTextFieldLastValidationFailureString = nil,
+    CPTextFieldLastValidationFailureField = nil,
+    CPTextFieldLastValidationFailureResult = NO;
 var CPSecureTextFieldCharacter = "\u2022";
 CPTextFieldBlurFunction = function(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
 {
@@ -40195,7 +40199,21 @@ default:
     {
         var acceptInvalidValue = NO;
         if (self._implementedDelegateMethods & CPTextFieldDelegate_control_didFailToFormatString_errorDescription_)
-            acceptInvalidValue = ((___r1 = self._delegate), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["control:didFailToFormatString:errorDescription:"] || _objj_forward)(___r1, "control:didFailToFormatString:errorDescription:", self, aValue, error));
+        {
+            var currentEvent = (CPApp == null ? CPApp : (CPApp.isa.method_msgSend["currentEvent"] || _objj_forward)(CPApp, "currentEvent"));
+            if (currentEvent && CPTextFieldLastValidationFailureField === self && CPTextFieldLastValidationFailureString === aValue && CPTextFieldLastValidationFailureEvent === currentEvent)
+            {
+                acceptInvalidValue = CPTextFieldLastValidationFailureResult;
+            }
+            else
+            {
+                acceptInvalidValue = ((___r1 = self._delegate), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["control:didFailToFormatString:errorDescription:"] || _objj_forward)(___r1, "control:didFailToFormatString:errorDescription:", self, aValue, error));
+                CPTextFieldLastValidationFailureField = self;
+                CPTextFieldLastValidationFailureString = aValue;
+                CPTextFieldLastValidationFailureEvent = currentEvent;
+                CPTextFieldLastValidationFailureResult = acceptInvalidValue;
+            }
+        }
         if (acceptInvalidValue === NO)
             return NO;
     }
diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj
index c669d267d..c57ac20a4 100644
--- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj
+++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj
@@ -38754,7 +38754,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_
 
 ,["void","CPCoder"])]);
 }
-p;13;CPTextField.jt;106048;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;105904;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate");
+p;13;CPTextField.jt;106245;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;106101;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate");
 var aProtocol = objj_getProtocol("CPControlTextEditingDelegate");
 if (!aProtocol) throw new SyntaxError("*** Could not find definition for protocol \"CPTextFieldDelegate\"");
 protocol_addProtocol(the_protocol, aProtocol);
@@ -38784,7 +38784,11 @@ var CPTextFieldDOMCurrentElement = nil,
     CPTextFieldCachedDragFunction = nil,
     CPTextFieldBlurHandler = nil,
     CPTextFieldInputFunction = nil,
-    CPTexFieldCurrentCSSSelectableField = nil;
+    CPTexFieldCurrentCSSSelectableField = nil,
+    CPTextFieldLastValidationFailureEvent = nil,
+    CPTextFieldLastValidationFailureString = nil,
+    CPTextFieldLastValidationFailureField = nil,
+    CPTextFieldLastValidationFailureResult = NO;
 var CPSecureTextFieldCharacter = "\u2022";
 CPTextFieldBlurFunction = function(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
 {
diff --git a/Resources/recipes.txt b/Resources/recipes.txt
index ab30fb34c..44ba57c79 100644
--- a/Resources/recipes.txt
+++ b/Resources/recipes.txt
@@ -1,144 +1,144 @@
-1773001729266|ArrayController1|
-1773001729281|ArrayControllerInitialSelectionTest|
-1773001729295|ArrayControllerRemovingFirstTest|
-1773001729308|AttachedSheet|
-1773001729322|AttachedSheet2|
-1773001729336|Bindings|
-1773001729349|CGCanvasContext|
-1773001729363|CGPath|
-1773001729377|CPAlertTest|
-1773001729390|CPAnimatablePropertyContainerTest|
-1773001729404|CPAnimationContextTest|
-1773001729417|CPAnimationTest|
-1773001729431|CPBinder-echo-bug|
-1773001729445|CPBoxCibTest|
-1773001729459|CPBoxTest|
-1773001729472|CPBrowserTest|
-1773001729486|CPButtonKeyEquivalentDefaultTest|
-1773001729500|CPButtonTest|
-1773001729513|CPByteCountFormatter|
-1773001729527|CPCollectionViewNibTest|
-1773001729541|CPColor-CPImage-description|
-1773001729555|CPColorWellBindings|
-1773001729569|CPComboBoxTest|
-1773001729583|CPControlPerformClickExceptionTest|
-1773001729597|CPControlSize|
-1773001729611|CPCursor|
-1773001729624|CPDateFormatterTest|
-1773001729638|CPDatePickerTest|
-1773001729652|CPDictionaryControllerTest|
-1773001729666|CPDocumentControllerTest|
-1773001729679|CPFormatterTest|
-1773001729693|CPGraphicsTest|
-1773001729707|CPImageAndTextViewImageScaling|
-1773001729720|CPImageViewAlignmentScaling|
-1773001729734|CPImageViewTest|
-1773001729748|CPImageViewbindingsTest|
-1773001729761|CPLevelIndicator|
-1773001729775|CPLocalizationTest|
-1773001729789|CPLogTest|
-1773001729803|CPMenuCALayerTest|
-1773001729816|CPMenuEnabledBindingsTest|
-1773001729830|CPMenuKeyEquivalents|
-1773001729844|CPMenuRemoveAllTest|
-1773001729858|CPMenuSubmenuPlacementConstraints|
-1773001729872|CPMenuTest|
-1773001729885|CPOutlineViewCibTest|
-1773001729899|CPOutlineViewTest|
-1773001729912|CPOutlineViewViewBasedCibTest|
-1773001729926|CPPanelTest|
-1773001729940|CPPlatformWindow|
-1773001729953|CPPlattformWindowMinSize|
-1773001729967|CPPopUpButtonBindings|
-1773001729981|CPPopUpButtonTest|
-1773001729994|CPPopover|
-1773001730008|CPPredicateEditorCibTest|
-1773001730022|CPProgressIndicator|
-1773001730035|CPPropertyListSerializationTest|
-1773001730049|CPRadioBindings|
-1773001730063|CPRuleEditorCibTest|
-1773001730077|CPScrollView|
-1773001730090|CPScrollView2|
-1773001730104|CPSearchField|
-1773001730118|CPSearchFieldPredicateBinding|
-1773001730131|CPSegmentedControlBindings|
-1773001730145|CPSegmentedControlTest|
-1773001730158|CPSoundTest|
-1773001730172|CPSplitViewDivider|
-1773001730186|CPSplitViewTest|
-1773001730199|CPStackViewTest|
-1773001730213|CPStepperBindings|
-1773001730227|CPStepperNibTest|
-1773001730241|CPTabView2|
-1773001730254|CPTabViewBindings|
-1773001730268|CPTabViewNib|
-1773001730282|CPTableViewGroupRows|
-1773001730296|CPTextField|
-1773001730309|CPTextFieldEditingStyleTest|
-1773001730323|CPTextFieldHeightTest|
-1773001730337|CPTextFieldMovementsTest|
-1773001730350|CPTextFieldMultiline|
-1773001730364|CPTextView|
-1773001730378|CPTextViewCibTest|
-1773001730391|CPTextViewDelegateAndNotifications|
-1773001730405|CPTimeZone|
-1773001730418|CPTokenFieldTest|
-1773001730432|CPToolTip|
-1773001730446|CPToolbarTest|
-1773001730460|CPTreeControllerTest|
-1773001730473|CPURLConnectionAsyncTest|
-1773001730487|CPURLConnectionSynchronousTest|
-1773001730501|CPUserDefaults|
-1773001730515|CPUserDefaultsControllerTest|
-1773001730528|CPUserNotificationTest|
-1773001730542|CPViewController|
-1773001730556|CPVisualEffectViewTest|
-1773001730569|CPWebViewTest|
-1773001730583|CPWebViewTest2|
-1773001730597|CPWindowLiveResizeTest|
-1773001730610|CPWindowMovableTest|
-1773001730624|CPWindowResizeStyle|
-1773001730638|ChildWindows|
-1773001730651|CompilationTests|
-1773001730665|ContinuouslyUpdatesValueBinding|
-1773001730679|CopyAndPaste|
-1773001730692|CrossOriginTest|
-1773001730706|FF4096Test|
-1773001730720|FontEnhancementTest|
-1773001730733|FontMetricsExplorer|
-1773001730747|KeyEquivalents|
-1773001730761|KeyViewLoopTest|
-1773001730774|KeyWindowInTheBackgroundActivation|
-1773001730788|LayoutTest|
-1773001730802|LoadTimeTest|
-1773001730816|LongBindings|
-1773001730829|MobileTest|
-1773001730843|MultipleValueBindings|
-1773001730857|NSBoxTest|
-1773001730870|NSBrowserTest|
-1773001730884|NewTextFieldBezel|
-1773001730898|Nib2CibAlignment|
-1773001730911|Nib2CibBaselineAlignementTest|
-1773001730925|Nib2CibSubviewsOrderTest|
-1773001730939|NibAppRemixed|
-1773001730953|PatternFillTest|
-1773001730966|PlatformWindows|
-1773001730980|PopUpButtonEscTest|
-1773001730994|ScalingTest|
-1773001731007|ScalingTest2|
-1773001731021|ScrollviewTheming|
-1773001731035|SheetWindowOrderFrontIssue|
-1773001731048|SimpleBindings2|
-1773001731062|SmartFoldersDemo|
-1773001731076|TableTest|
-1773001731089|ThemeBrowser|
-1773001731103|ThemeKitchenSink|
-1773001731117|TrackingArea|
-1773001731130|UndoRedoWithMenuUpdate|
-1773001731144|UserlandNSTest|
-1773001731158|layoutEphemeralSubviewTest|
-1773001731172|loadDynamicFrameworks|
-1773001731185|performKeyEquivalentTest|
-1773001731199|predicateWithFormat|
-1773001731213|resignFirstResponder-CPControlTextDidEndEditing|
-1773001731227|sizeToFitFix|
+1773001789938|ArrayController1|
+1773001789952|ArrayControllerInitialSelectionTest|
+1773001789966|ArrayControllerRemovingFirstTest|
+1773001789980|AttachedSheet|
+1773001789994|AttachedSheet2|
+1773001790008|Bindings|
+1773001790022|CGCanvasContext|
+1773001790036|CGPath|
+1773001790050|CPAlertTest|
+1773001790064|CPAnimatablePropertyContainerTest|
+1773001790078|CPAnimationContextTest|
+1773001790091|CPAnimationTest|
+1773001790105|CPBinder-echo-bug|
+1773001790119|CPBoxCibTest|
+1773001790134|CPBoxTest|
+1773001790148|CPBrowserTest|
+1773001790162|CPButtonKeyEquivalentDefaultTest|
+1773001790175|CPButtonTest|
+1773001790189|CPByteCountFormatter|
+1773001790203|CPCollectionViewNibTest|
+1773001790217|CPColor-CPImage-description|
+1773001790232|CPColorWellBindings|
+1773001790246|CPComboBoxTest|
+1773001790260|CPControlPerformClickExceptionTest|
+1773001790274|CPControlSize|
+1773001790288|CPCursor|
+1773001790302|CPDateFormatterTest|
+1773001790316|CPDatePickerTest|
+1773001790330|CPDictionaryControllerTest|
+1773001790344|CPDocumentControllerTest|
+1773001790358|CPFormatterTest|
+1773001790372|CPGraphicsTest|
+1773001790386|CPImageAndTextViewImageScaling|
+1773001790400|CPImageViewAlignmentScaling|
+1773001790414|CPImageViewTest|
+1773001790428|CPImageViewbindingsTest|
+1773001790442|CPLevelIndicator|
+1773001790456|CPLocalizationTest|
+1773001790470|CPLogTest|
+1773001790483|CPMenuCALayerTest|
+1773001790497|CPMenuEnabledBindingsTest|
+1773001790511|CPMenuKeyEquivalents|
+1773001790525|CPMenuRemoveAllTest|
+1773001790539|CPMenuSubmenuPlacementConstraints|
+1773001790553|CPMenuTest|
+1773001790567|CPOutlineViewCibTest|
+1773001790582|CPOutlineViewTest|
+1773001790596|CPOutlineViewViewBasedCibTest|
+1773001790611|CPPanelTest|
+1773001790625|CPPlatformWindow|
+1773001790639|CPPlattformWindowMinSize|
+1773001790653|CPPopUpButtonBindings|
+1773001790667|CPPopUpButtonTest|
+1773001790681|CPPopover|
+1773001790695|CPPredicateEditorCibTest|
+1773001790709|CPProgressIndicator|
+1773001790723|CPPropertyListSerializationTest|
+1773001790737|CPRadioBindings|
+1773001790751|CPRuleEditorCibTest|
+1773001790765|CPScrollView|
+1773001790779|CPScrollView2|
+1773001790793|CPSearchField|
+1773001790807|CPSearchFieldPredicateBinding|
+1773001790821|CPSegmentedControlBindings|
+1773001790835|CPSegmentedControlTest|
+1773001790849|CPSoundTest|
+1773001790863|CPSplitViewDivider|
+1773001790877|CPSplitViewTest|
+1773001790890|CPStackViewTest|
+1773001790904|CPStepperBindings|
+1773001790918|CPStepperNibTest|
+1773001790932|CPTabView2|
+1773001790946|CPTabViewBindings|
+1773001790959|CPTabViewNib|
+1773001790973|CPTableViewGroupRows|
+1773001790987|CPTextField|
+1773001791001|CPTextFieldEditingStyleTest|
+1773001791015|CPTextFieldHeightTest|
+1773001791029|CPTextFieldMovementsTest|
+1773001791043|CPTextFieldMultiline|
+1773001791057|CPTextView|
+1773001791070|CPTextViewCibTest|
+1773001791084|CPTextViewDelegateAndNotifications|
+1773001791098|CPTimeZone|
+1773001791112|CPTokenFieldTest|
+1773001791126|CPToolTip|
+1773001791140|CPToolbarTest|
+1773001791154|CPTreeControllerTest|
+1773001791168|CPURLConnectionAsyncTest|
+1773001791182|CPURLConnectionSynchronousTest|
+1773001791196|CPUserDefaults|
+1773001791210|CPUserDefaultsControllerTest|
+1773001791224|CPUserNotificationTest|
+1773001791238|CPViewController|
+1773001791252|CPVisualEffectViewTest|
+1773001791266|CPWebViewTest|
+1773001791280|CPWebViewTest2|
+1773001791294|CPWindowLiveResizeTest|
+1773001791308|CPWindowMovableTest|
+1773001791322|CPWindowResizeStyle|
+1773001791336|ChildWindows|
+1773001791350|CompilationTests|
+1773001791364|ContinuouslyUpdatesValueBinding|
+1773001791378|CopyAndPaste|
+1773001791392|CrossOriginTest|
+1773001791407|FF4096Test|
+1773001791421|FontEnhancementTest|
+1773001791435|FontMetricsExplorer|
+1773001791449|KeyEquivalents|
+1773001791463|KeyViewLoopTest|
+1773001791477|KeyWindowInTheBackgroundActivation|
+1773001791490|LayoutTest|
+1773001791504|LoadTimeTest|
+1773001791518|LongBindings|
+1773001791532|MobileTest|
+1773001791546|MultipleValueBindings|
+1773001791560|NSBoxTest|
+1773001791574|NSBrowserTest|
+1773001791588|NewTextFieldBezel|
+1773001791602|Nib2CibAlignment|
+1773001791616|Nib2CibBaselineAlignementTest|
+1773001791629|Nib2CibSubviewsOrderTest|
+1773001791643|NibAppRemixed|
+1773001791657|PatternFillTest|
+1773001791671|PlatformWindows|
+1773001791685|PopUpButtonEscTest|
+1773001791699|ScalingTest|
+1773001791713|ScalingTest2|
+1773001791727|ScrollviewTheming|
+1773001791741|SheetWindowOrderFrontIssue|
+1773001791755|SimpleBindings2|
+1773001791769|SmartFoldersDemo|
+1773001791783|TableTest|
+1773001791797|ThemeBrowser|
+1773001791811|ThemeKitchenSink|
+1773001791825|TrackingArea|
+1773001791839|UndoRedoWithMenuUpdate|
+1773001791853|UserlandNSTest|
+1773001791867|layoutEphemeralSubviewTest|
+1773001791881|loadDynamicFrameworks|
+1773001791895|performKeyEquivalentTest|
+1773001791909|predicateWithFormat|
+1773001791923|resignFirstResponder-CPControlTextDidEndEditing|
+1773001791937|sizeToFitFix|