diff --git a/data/boot_table.json b/data/boot_table.json
index 3bd9b16..27f61fe 100644
--- a/data/boot_table.json
+++ b/data/boot_table.json
@@ -6,15 +6,13 @@
         "start": {
             "rest": "^1$",
             "chassis": "^Off$",
-# TO-DO: There is a known product code bug where boot_progress does not go to
-# 'Off'.  Once that bug is fixed, this code may be commented back in.
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$"
         },
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -30,13 +28,13 @@
         "start": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$"
         },
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -59,7 +57,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -79,7 +77,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -99,7 +97,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -115,7 +113,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -124,7 +122,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -144,7 +142,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -153,7 +151,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -169,7 +167,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -178,7 +176,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -197,7 +195,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -209,7 +207,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -218,7 +216,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -238,7 +236,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -252,7 +250,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -261,7 +259,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -282,7 +280,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-#           "boot_progress": "^Off$",
+            "boot_progress": "^Off|Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -298,7 +296,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -307,7 +305,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -324,7 +322,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -333,7 +331,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -349,7 +347,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -358,7 +356,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -374,7 +372,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -383,7 +381,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-#           "boot_progress": "^FW Progress, Starting OS|OSStart$",
+            "boot_progress": "^FW Progress, Starting OS|OSStart$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",