diff --git a/protofiles/BaseConfMsg.proto b/protofiles/BaseConfMsg.proto
index 2ee9cf6018f50..47589fcef7379 100644
--- a/protofiles/BaseConfMsg.proto
+++ b/protofiles/BaseConfMsg.proto
@@ -11,51 +11,49 @@ message BaseConf {
   optional string pcapETimeout = 8;
   optional string pcapBufferSize = 9;
   optional string pcapInterface = 10;
-  optional string enableHighThroughput = 11;
-  optional string dpiHalfSessions = 12;
-  optional string packetSendQueueSize = 13;
-  optional string packetRecvQueueSize = 14;
-  optional string dpiMsgSendQueueSize = 15;
-  optional string dpiMsgRecvQueueSize = 16;
-  optional string syslogSendQueueSize = 17;
-  optional string syslogRecvQueueSize = 18;
-  optional string qosmosDebugModeEnabled = 19;
-  optional string qosmos64BytePool = 20;
-  optional string qosmos128BytePool = 21;
-  optional string qosmos256BytePool = 22;
-  optional string qosmos512BytePool = 23;
-  optional string statsAccumulatorQueue = 24;
-  optional string sendStatsQueue = 25;
-  optional string qosmosExpirePerCallback = 26;
-  optional string dbClusterName = 27;
-  optional string dbUrl = 28;
-  optional string statsAggregationQueue = 29;
-  optional string commandQueue = 30;
-  optional string enableIntermediateFlows = 31;
-  //optional string enablePacketCapture = 32;
-  //optional string captureLocation = 33;
-  //optional string captureFileLimit = 34;
-  optional string captureSizeLimit = 35;
-  optional string captureMemoryLimit = 36;
-  optional string captureMaxPackets = 37;
-  optional string captureIndividualFileLimit = 38;
-  optional string dpiMaxFree = 39;
-  optional string dpiMinFree = 40;
-  optional string dpiFreeThreshold = 41;
-  optional string dpiRecycleThreshold = 42;
-  optional string pcapRecordsToClearPerCycle = 43;
-  optional string flowReportInterval = 44;
-  optional string esIndexerQueueSize = 45;
-  optional string maxRepeatedFieldCount = 46;
-  optional string syslogQueue = 47;
-  optional string diskpacketwriterQueueSize = 48;
-  optional string diskpacketwriterFeedbackQueueSize = 49;
-  optional string pCapFlushInterval = 50;
-  optional string sizeOfPcapChunks = 51;
-  optional string numberOfPcapChunks = 52;
-  optional string pCapRemovalNotifyQueue = 53;
-  optional string enableThreadAffinity = 54;
-  optional string currentThreadAffinityStatus = 55;
+  optional string dpiHalfSessions = 11;
+  optional string packetSendQueueSize = 12;
+  optional string packetRecvQueueSize = 13;
+  optional string dpiMsgSendQueueSize = 14;
+  optional string dpiMsgRecvQueueSize = 15;
+  optional string syslogSendQueueSize = 16;
+  optional string syslogRecvQueueSize = 17;
+  optional string qosmosDebugModeEnabled = 18;
+  optional string qosmos64BytePool = 19;
+  optional string qosmos128BytePool = 20;
+  optional string qosmos256BytePool = 21;
+  optional string qosmos512BytePool = 22;
+  optional string statsAccumulatorQueue = 23;
+  optional string sendStatsQueue = 24;
+  optional string qosmosExpirePerCallback = 25;
+  optional string dbClusterName = 30;
+  optional string dbUrl = 31;
+  optional string statsAggregationQueue = 32;
+  optional string commandQueue = 33;
+  optional string enableIntermediateFlows = 34;
+  //optional string enablePacketCapture = 35;
+  //optional string captureLocation = 36;
+  //optional string captureFileLimit = 37;
+  optional string captureSizeLimit = 38;
+  optional string captureMemoryLimit = 39;
+  optional string captureMaxPackets = 41;
+  optional string captureIndividualFileLimit = 42;
+  optional string dpiMaxFree = 43;
+  optional string dpiMinFree = 44;
+  optional string dpiFreeThreshold = 45;
+  optional string dpiRecycleThreshold = 46;
+  optional string pcapRecordsToClearPerCycle = 47;
+  optional string flowReportInterval = 48;
+  optional string esIndexerQueueSize = 49;
+  optional string maxRepeatedFieldCount = 50;
+  optional string syslogQueue = 51;
+  optional string diskpacketwriterQueueSize = 52;
+  optional string diskpacketwriterFeedbackQueueSize = 53;
+  optional string pCapFlushInterval = 54;
+  optional string sizeOfPcapChunks = 55;
+  optional string numberOfPcapChunks = 56;
+  optional string pCapRemovalNotifyQueue = 57;
+  optional string enableHighThroughput = 58;