diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.Generated.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.Generated.cs
index 89892a9052..452c7cff40 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.Generated.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.Generated.cs
@@ -196,6 +196,10 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
         {
             Extra[key] = feature;
 
+            // Altering only an individual bit of the long
+            // so need to make sure other concurrent changes are not overridden
+            // in a lock-free manner
+
             long currentFeatureFlags;
             long updatedFeatureFlags;
             do
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs b/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
index 7206ba8b4e..b22934c34a 100644
--- a/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
+++ b/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
@@ -93,6 +93,10 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
         {{
             Extra[key] = feature;
 
+            // Altering only an individual bit of the long
+            // so need to make sure other concurrent changes are not overridden
+            // in a lock-free manner
+
             long currentFeatureFlags;
             long updatedFeatureFlags;
             do