diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
index 46307f196..61a19223c 100644
--- a/generation/WinSDK/autoTypes.json
+++ b/generation/WinSDK/autoTypes.json
@@ -373,6 +373,12 @@
     "ValueType": "IntPtr",
     "InvalidHandleValues": [ 0 ]
   },
+  {
+    "Namespace": "Windows.Win32.System.Threading",
+    "Name": "PTP_CALLBACK_INSTANCE",
+    "ValueType": "IntPtr",
+    "InvalidHandleValues": [ 0 ]
+  },
   {
     "Name": "PTP_POOL",
     "ValueType": "IntPtr",
diff --git a/generation/WinSDK/requiredNamespacesForNames.rsp b/generation/WinSDK/requiredNamespacesForNames.rsp
index 74279db36..6096983f8 100644
--- a/generation/WinSDK/requiredNamespacesForNames.rsp
+++ b/generation/WinSDK/requiredNamespacesForNames.rsp
@@ -1908,7 +1908,6 @@ TOKEN_TYPE=Windows.Win32.Security
 TOKEN_USER_CLAIMS=Windows.Win32.Security
 TOKEN_USER=Windows.Win32.Security
 TP_CALLBACK_ENVIRON_V3=Windows.Win32.System.Threading
-TP_CALLBACK_INSTANCE=Windows.Win32.System.Threading
 TP_CALLBACK_PRIORITY=Windows.Win32.System.Threading
 TP_POOL_STACK_INFORMATION=Windows.Win32.System.Threading
 TRANSACTION_OUTCOME=Windows.Win32.Storage.FileSystem
diff --git a/generation/WinSDK/scraper.settings.rsp b/generation/WinSDK/scraper.settings.rsp
index 5a7fbb7b6..89f301659 100644
--- a/generation/WinSDK/scraper.settings.rsp
+++ b/generation/WinSDK/scraper.settings.rsp
@@ -139,6 +139,7 @@ TP_IO
 TP_TIMER
 TP_WAIT
 TP_WORK
+TP_CALLBACK_INSTANCE
 --remap
 ABI::Windows::Foundation::IActivatableClassRegistration=IActivatableClassRegistration
 adpcmcoef_tag=ADPCMCOEFSET
@@ -1699,7 +1700,6 @@ _TOKEN_TYPE=TOKEN_TYPE
 _TOKEN_USER=TOKEN_USER
 _TOKEN_USER_CLAIMS=TOKEN_USER_CLAIMS
 _TP_CALLBACK_ENVIRON_V3=TP_CALLBACK_ENVIRON_V3
-_TP_CALLBACK_INSTANCE*=IntPtr
 _TP_CALLBACK_PRIORITY=TP_CALLBACK_PRIORITY
 _TP_CLEANUP_GROUP*=IntPtr
 _TP_POOL_STACK_INFORMATION=TP_POOL_STACK_INFORMATION
@@ -1842,7 +1842,6 @@ _TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT=TRANSACTION_NOTIFICATION_MARSHAL_ARGU
 _KCRM_MARSHAL_HEADER=KCRM_MARSHAL_HEADER
 _KCRM_TRANSACTION_BLOB=KCRM_TRANSACTION_BLOB
 _KCRM_PROTOCOL_BLOB=KCRM_PROTOCOL_BLOB
-_TP_CALLBACK_INSTANCE=TP_CALLBACK_INSTANCE
 _TP_POOL=TP_POOL
 _TP_CLEANUP_GROUP=TP_CLEANUP_GROUP
 _MEMORY_RESOURCE_NOTIFICATION_TYPE=MEMORY_RESOURCE_NOTIFICATION_TYPE
@@ -5362,6 +5361,7 @@ PTP_IO=IntPtr
 PTP_TIMER=IntPtr
 PTP_WAIT=IntPtr
 PTP_WORK=IntPtr
+PTP_CALLBACK_INSTANCE=IntPtr
 PTP_POOL=IntPtr
 PTP_CLEANUP_GROUP=IntPtr
 tagVS_FIXEDFILEINFO=VS_FIXEDFILEINFO
@@ -12242,6 +12242,7 @@ _TP_IO=PTP_IO
 _TP_TIMER=PTP_TIMER
 _TP_WAIT=PTP_WAIT
 _TP_WORK=PTP_WORK
+_TP_CALLBACK_INSTANCE=PTP_CALLBACK_INSTANCE
 PDEVPROPTYPE=DEVPROPTYPE*
 PBSTR=BSTR*
 LPBSTR=BSTR*
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index 2b8fe219e..314814b3a 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -400,3 +400,30 @@ Windows.Win32.System.Mmc.View.get_CellContents : CellContents...UInt16** => BSTR
 Windows.Win32.System.Mmc.View.get_Memento : Memento...UInt16** => BSTR*
 Windows.Win32.System.Ole.Apis.QueryPathOfRegTypeLib : lpbstrPathName...UInt16** => BSTR*
 Windows.Win32.System.Ole.Apis.VarBstrCat : pbstrResult...UInt16** => BSTR*
+# Added PTP_CALLBACK_INSTANCE for #1404.
+Windows.Win32.System.Threading.Apis.CallbackMayRunLong : pci : [In,Out] => [In]
+Windows.Win32.System.Threading.Apis.CallbackMayRunLong : pci...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.Apis.DisassociateCurrentThreadFromCallback : pci : [In,Out] => [In]
+Windows.Win32.System.Threading.Apis.DisassociateCurrentThreadFromCallback : pci...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.Apis.FreeLibraryWhenCallbackReturns : pci : [In,Out] => [In]
+Windows.Win32.System.Threading.Apis.FreeLibraryWhenCallbackReturns : pci...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.Apis.LeaveCriticalSectionWhenCallbackReturns : pci : [In,Out] => [In]
+Windows.Win32.System.Threading.Apis.LeaveCriticalSectionWhenCallbackReturns : pci...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.Apis.ReleaseMutexWhenCallbackReturns : pci : [In,Out] => [In]
+Windows.Win32.System.Threading.Apis.ReleaseMutexWhenCallbackReturns : pci...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.Apis.ReleaseSemaphoreWhenCallbackReturns : pci : [In,Out] => [In]
+Windows.Win32.System.Threading.Apis.ReleaseSemaphoreWhenCallbackReturns : pci...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.Apis.SetEventWhenCallbackReturns : pci : [In,Out] => [In]
+Windows.Win32.System.Threading.Apis.SetEventWhenCallbackReturns : pci...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.PTP_CALLBACK_INSTANCE added
+Windows.Win32.System.Threading.PTP_SIMPLE_CALLBACK.Invoke : Instance : [In,Out] => [In]
+Windows.Win32.System.Threading.PTP_SIMPLE_CALLBACK.Invoke : Instance...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.PTP_TIMER_CALLBACK.Invoke : Instance : [In,Out] => [In]
+Windows.Win32.System.Threading.PTP_TIMER_CALLBACK.Invoke : Instance...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.PTP_WAIT_CALLBACK.Invoke : Instance : [In,Out] => [In]
+Windows.Win32.System.Threading.PTP_WAIT_CALLBACK.Invoke : Instance...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.PTP_WIN32_IO_CALLBACK.Invoke : Instance : [In,Out] => [In]
+Windows.Win32.System.Threading.PTP_WIN32_IO_CALLBACK.Invoke : Instance...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.PTP_WORK_CALLBACK.Invoke : Instance : [In,Out] => [In]
+Windows.Win32.System.Threading.PTP_WORK_CALLBACK.Invoke : Instance...TP_CALLBACK_INSTANCE* => PTP_CALLBACK_INSTANCE
+Windows.Win32.System.Threading.TP_CALLBACK_INSTANCE removed