diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 5c2b0f9f6..52f03a717 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -51,10 +51,15 @@ $::POWER_STATE_RESET        = "reset";
 $::POWER_STATE_REBOOT       = "reboot";
 $::UPLOAD_FILE              = "";
 $::UPLOAD_FILE_VERSION      = "";
+$::UPLOAD_PNOR              = "";
+$::UPLOAD_PNOR_VERSION      = "";
 $::UPLOAD_FILE_HASH_ID      = "";
+$::UPLOAD_PNOR_HASH_ID      = "";
 $::RSETBOOT_URL_PATH        = "boot";
 # To improve the output to users, store this value as a global
 $::UPLOAD_AND_ACTIVATE      = 0;
+$::UPLOAD_ACTIVATE_STREAM   = 0;
+$::RFLASH_STREAM_NO_HOST_REBOOT = 0;
 
 $::NO_ATTRIBUTES_RETURNED   = "No attributes returned from the BMC.";
 
@@ -120,7 +125,7 @@ my %sensor_units = (
     "$prefix.Sensor.Value.Unit.Joules" => "Joules"
 );
 my %child_node_map;   # pid => node
-
+my %fw_tar_files;
 my $http_protocol="https";
 my $openbmc_url = "/org/openbmc";
 my $openbmc_project_url = "/xyz/openbmc_project";
@@ -136,10 +141,16 @@ my %status_info = (
         method         => "POST",
         init_url       => "/login",
     },
+    LOGIN_REQUEST_GENERAL  => {
+        method         => "POST",
+        init_url       => "/login",
+    },
     LOGIN_RESPONSE     => {
         process        => \&login_response,
     },
-
+    LOGIN_RESPONSE_GENERAL => {
+        process        => \&login_response,
+    },
     RBEACON_ON_REQUEST  => {
         method         => "PUT",
         init_url       => "$openbmc_project_url/led/groups/enclosure_identify/attr/Asserted", 
@@ -191,9 +202,17 @@ my %status_info = (
         init_url       => "$openbmc_project_url/software",
         data           => "xyz.openbmc_project.Software.Activation.RequestedActivations.Active",
     },
+    RFLASH_UPDATE_HOST_ACTIVATE_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/software",
+        data           => "xyz.openbmc_project.Software.Activation.RequestedActivations.Active",
+    },
     RFLASH_UPDATE_ACTIVATE_RESPONSE => {
         process        => \&rflash_response,
     },
+    RFLASH_UPDATE_HOST_ACTIVATE_RESPONSE => {
+        process        => \&rflash_response,
+    },
     RFLASH_UPDATE_CHECK_STATE_REQUEST  => {
         method         => "GET",
         init_url       => "$openbmc_project_url/software",
@@ -284,6 +303,20 @@ my %status_info = (
         method         => "GET",
         init_url       => "$openbmc_project_url/state/enumerate",
     },
+    RPOWER_BMC_STATUS_REQUEST  => {
+        method         => "GET",
+        init_url       => "$openbmc_project_url/state/enumerate",
+    },
+    RPOWER_BMC_CHECK_REQUEST  => {
+        method         => "GET",
+        init_url       => "$openbmc_project_url/state/enumerate",
+    },
+    RPOWER_BMC_STATUS_RESPONSE => {
+        process        => \&rpower_response,
+    }, 
+    RPOWER_BMC_CHECK_RESPONSE => {
+        process        => \&rpower_response,
+    },
     RPOWER_CHECK_RESPONSE => {
         process        => \&rpower_response,
     },
@@ -596,6 +629,42 @@ sub retry_after {
     $node_wait{$node} = time() + $timeout;
 }
 
+#-------------------------------------------------------
+
+=head3  retry_check_times
+
+    The request will be delayed for the given time and then
+    send the reqeust based on the BMC status after BMCreboot.
+
+=cut
+
+#-------------------------------------------------------
+sub retry_check_times {
+    my ($node, $request_status, $check_type, $wait_time, $msg, $response_status) = @_;
+    if ($node_info{$node}{$check_type} > 0) {
+        $node_info{$node}{$check_type}--;
+        my $retry_msg = "Retry BMC state, wait for seconds ...";
+        xCAT::MsgUtils->message("I", { data => ["$node: $retry_msg"] }, $callback);
+ 
+        if ($response_status ne $::RESPONSE_SERVICE_UNAVAILABLE) {
+            my $login_url = "$http_protocol://$node_info{$node}{bmc}/login";
+            my $content = '[ "' . $node_info{$node}{username} .'", "' . $node_info{$node}{password} . '" ]';
+            $status_info{LOGIN_REQUEST_GENERAL}{data} = $content;
+            $node_info{$node}{cur_status} = "LOGIN_REQUEST_GENERAL";
+            $node_wait{$node} = time() + $wait_time;
+            return;
+        }
+ 
+        $node_info{$node}{cur_status} = $request_status;
+        $node_wait{$node} = time() + $wait_time;
+        return;
+   } else {
+        xCAT::SvrUtils::sendmsg([1, $msg], $callback, $node);
+        $node_info{$node}{cur_status} = "";
+        $wait_node_num--;
+        return;
+   }
+}
 
 #-------------------------------------------------------
 
@@ -953,8 +1022,10 @@ sub parse_args {
     } elsif ($command eq "rflash") {
         my $filename_passed = 0;
         my $updateid_passed = 0;
+        my $filepath_passed = 0;
         my $option_flag;
 
+        my $tarball_path;
         my $invalid_options = "";
         my @flash_arguments;
 
@@ -982,6 +1053,10 @@ sub parse_args {
                     }
                 }
             }
+            elsif ($opt =~ /.*\//) {
+                $filepath_passed = 1;
+                $tarball_path=$opt;
+            }
             else {
                 push (@flash_arguments, $opt);
                 $invalid_options .= $opt . " ";
@@ -991,8 +1066,8 @@ sub parse_args {
         print "DEBUG filename=$filename_passed, updateid=$updateid_passed, options=$option_flag, invalid=$invalid_options rflash_arguments=@flash_arguments\n";
 
         if ($option_flag =~ tr{ }{ } > 0) { 
-            unless ($verbose) {
-                return ([ 1, "Multiple options are not supported. Options specified: $option_flag"]);
+            unless ($verbose or $option_flag =~/^-d --no-host-reboot$/) {
+                return ([ 1, "These multiple options are not supported. Options specified: $option_flag"]);
             }
         }
         
@@ -1010,7 +1085,7 @@ sub parse_args {
         else {
             if ($updateid_passed) {
                 # Updateid was passed, check flags allowed with update id
-                if ($option_flag !~ /^-d$|^--delete$|^-a$|^--activate$/) {
+                if ($option_flag !~ /^--delete$|^-a$|^--activate$/) {
                     return ([ 1, "Invalid option specified when an update id is provided: $option_flag" ]);
                 }
                 my $action = "activate";
@@ -1023,7 +1098,7 @@ sub parse_args {
                 # Neither Filename nor updateid was not passed, check flags allowed without file or updateid
                 if ($option_flag !~ /^-c$|^--check$|^-l$|^--list$/) {
                     return ([ 1, "Invalid option specified with $option_flag: $invalid_options" ]);
-               }
+                }
             }  
         }
     } else {
@@ -1366,18 +1441,24 @@ sub parse_command_status {
         my $upload = 0;
         my $activate = 0;
         my $update_file;
+        my $streamline = 0;
+        my $nohost_reboot = 0;
 
         foreach $subcommand (@$subcommands) {
             if ($subcommand =~ /-c|--check/) {
                 $check_version = 1;
             } elsif ($subcommand =~ /-l|--list/) {
                 $list = 1;
-            } elsif ($subcommand =~ /-d|--delete/) {
+            } elsif ($subcommand =~ /--delete/) {
                 $delete = 1;
             } elsif ($subcommand =~ /-u|--upload/) {
                 $upload = 1;
             } elsif ($subcommand =~ /-a|--activate/) {
                 $activate = 1;
+            } elsif ($subcommand =~ /-d/) {
+                $streamline = 1;
+            } elsif ($subcommand =~ /--no-host-reboot/) {
+                $nohost_reboot = 1;
             } else {
                 $update_file = $subcommand;
             }
@@ -1444,6 +1525,60 @@ sub parse_command_status {
                     # Display firmware version of the specified .tar file
                     xCAT::SvrUtils::sendmsg("TAR $purpose_value Firmware Product Version\: $version_value", $callback);
                 }
+            } elsif (opendir(DIR, $update_file)) {
+                my @tar_files = readdir(DIR);
+                foreach my $file (@tar_files) {
+                    if ($file !~ /^obmc-phosphor-image-witherspoon.ubi.mtd.tar$|^witherspoon.pnor.squashfs.tar$/) {
+                        next;
+                    } else {
+                        my $full_path_file = $update_file."/".$file;
+                        $full_path_file=~s/\/\//\//g;
+                        my $firmware_version_in_file = `$grep_cmd $version_tag $full_path_file`;
+                        my $purpose_version_in_file = `$grep_cmd $purpose_tag $full_path_file`;
+                        chomp($firmware_version_in_file);
+                        chomp($purpose_version_in_file);
+                        (my $purpose_string,$purpose_value) = split("=", $purpose_version_in_file);
+                        (my $version_string,$version_value) = split("=", $firmware_version_in_file);
+                        if ($file =~ /^obmc-phosphor-image-witherspoon.ubi.mtd.tar$/){
+                            $::UPLOAD_FILE = $full_path_file;
+                            $::UPLOAD_FILE_VERSION = $version_value;
+                        } elsif ($file =~ /^witherspoon.pnor.squashfs.tar$/) {
+                            $::UPLOAD_PNOR = $full_path_file;
+                            $::UPLOAD_PNOR_VERSION = $version_value;
+                        }
+                    }
+                }
+                my $return_code = 0;
+                if (!$::UPLOAD_FILE) {
+                    xCAT::SvrUtils::sendmsg([1,"no BMC tar ball found in $update_file"], $callback);
+                    $return_code = 1;
+                }
+                if (!$::UPLOAD_PNOR) {
+                    xCAT::SvrUtils::sendmsg([1,"no PNOR tar ball found in $update_file"], $callback);
+                    $return_code = 1;
+                }
+                if ($return_code) {
+                    return 1;
+                }
+                if ($streamline) {
+                    $::UPLOAD_ACTIVATE_STREAM = 1;
+                    if ($nohost_reboot) {
+                        $::RFLASH_STREAM_NO_HOST_REBOOT = 1; 
+                        $nohost_reboot = 0;
+                    }
+                    $streamline = 0;
+                    if (-x $sha512sum_cmd && -x $tr_cmd) {
+                        # Save hash id this firmware version should resolve to:
+                        $::UPLOAD_FILE_HASH_ID = substr(`echo $::UPLOAD_FILE_VERSION | $tr_cmd -d '\n' | $sha512sum_cmd`, 0,8);
+                        $::UPLOAD_PNOR_HASH_ID = substr(`echo $::UPLOAD_PNOR_VERSION | $tr_cmd -d '\n' | $sha512sum_cmd`, 0,8);
+                    }
+                    else {
+                        if ($::VERBOSE) {
+                            xCAT::SvrUtils::sendmsg("WARN: No hashing check being done. ($sha512sum_cmd or $tr_cmd commands not found)
+", $callback);
+                        }
+                    }
+                }
             }
             else {
                 # Check if hex number for the updateid is passed
@@ -1495,11 +1630,46 @@ sub parse_command_status {
             $next_status{"RFLASH_FILE_UPLOAD_REQUEST"} = "RFLASH_FILE_UPLOAD_RESPONSE";
             $next_status{"RFLASH_FILE_UPLOAD_RESPONSE"} = "RFLASH_UPDATE_CHECK_ID_REQUEST";
             $next_status{"RFLASH_UPDATE_CHECK_ID_REQUEST"} = "RFLASH_UPDATE_CHECK_ID_RESPONSE";
-            # 
-            # This code is different from the "activate" flow above because the CHECK_ID_RESPONSE contains
-            # the activation flow after we successfully obtain the ID for the firmware piece that was uploaded.  
-            #
+            $next_status{"RFLASH_UPDATE_CHECK_ID_RESPONSE"} = "RFLASH_UPDATE_ACTIVATE_REQUEST";
+            $next_status{"RFLASH_UPDATE_ACTIVATE_REQUEST"} = "RFLASH_UPDATE_ACTIVATE_RESPONSE";
+            $next_status{"RFLASH_SET_PRIORITY_REQUEST"} = "RFLASH_SET_PRIORITY_RESPONSE";
+            $next_status{"RFLASH_SET_PRIORITY_RESPONSE"} = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
         }
+        if ($::UPLOAD_ACTIVATE_STREAM) {
+            $next_status{LOGIN_RESPONSE} = "RFLASH_FILE_UPLOAD_REQUEST";
+            $next_status{"RFLASH_FILE_UPLOAD_REQUEST"} = "RFLASH_FILE_UPLOAD_RESPONSE";
+            $next_status{"RFLASH_FILE_UPLOAD_RESPONSE"} = "RFLASH_UPDATE_CHECK_ID_REQUEST";
+            $next_status{"RFLASH_UPDATE_CHECK_ID_REQUEST"} = "RFLASH_UPDATE_CHECK_ID_RESPONSE";
+            $next_status{"RFLASH_UPDATE_CHECK_ID_RESPONSE"} = "RFLASH_UPDATE_ACTIVATE_REQUEST";
+            $next_status{"RFLASH_UPDATE_ACTIVATE_REQUEST"} = "RFLASH_UPDATE_ACTIVATE_RESPONSE";
+            $next_status{"RFLASH_UPDATE_ACTIVATE_RESPONSE"} = "RFLASH_UPDATE_HOST_ACTIVATE_REQUEST";
+            $next_status{"RFLASH_UPDATE_HOST_ACTIVATE_REQUEST"} = "RFLASH_UPDATE_HOST_ACTIVATE_RESPONSE";
+            $next_status{"RFLASH_UPDATE_HOST_ACTIVATE_RESPONSE"} = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
+            $next_status{"RFLASH_UPDATE_CHECK_STATE_REQUEST"} = "RFLASH_UPDATE_CHECK_STATE_RESPONSE";
+            $next_status{"RFLASH_SET_PRIORITY_REQUEST"} = "RFLASH_SET_PRIORITY_RESPONSE";
+            $next_status{"RFLASH_SET_PRIORITY_RESPONSE"} = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
+            $next_status{"RFLASH_UPDATE_CHECK_STATE_RESPONSE"} = "RPOWER_BMCREBOOT_REQUEST";
+            $next_status{"RPOWER_BMCREBOOT_REQUEST"} = "RPOWER_RESET_RESPONSE";
+            $status_info{RPOWER_RESET_RESPONSE}{argv} = "bmcreboot";
+            $next_status{"RPOWER_RESET_RESPONSE"} = "RPOWER_BMC_CHECK_REQUEST";
+            $next_status{"RPOWER_BMC_CHECK_REQUEST"} = "RPOWER_BMC_STATUS_RESPONSE";
+            $next_status{"LOGIN_REQUEST_GENERAL"} = "LOGIN_RESPONSE_GENERAL";
+            $next_status{"LOGIN_RESPONSE_GENERAL"} = "RPOWER_BMC_STATUS_REQUEST";
+            $next_status{"RPOWER_BMC_STATUS_REQUEST"} = "RPOWER_BMC_STATUS_RESPONSE";
+            $status_info{RPOWER_BMC_STATUS_RESPONSE}{argv} = "bmcstate";
+            if (!$::RFLASH_STREAM_NO_HOST_REBOOT) {
+                $next_status{"RPOWER_BMC_STATUS_RESPONSE"} = "RPOWER_STATUS_REQUEST";
+                $next_status{RPOWER_STATUS_REQUEST} = "RPOWER_STATUS_RESPONSE";
+                $next_status{RPOWER_STATUS_RESPONSE}{ON} = "RPOWER_OFF_REQUEST";
+                $next_status{RPOWER_OFF_REQUEST} = "RPOWER_OFF_RESPONSE";
+                $next_status{RPOWER_OFF_RESPONSE} = "RPOWER_CHECK_REQUEST";
+                $next_status{RPOWER_CHECK_REQUEST} = "RPOWER_CHECK_RESPONSE";
+                $next_status{RPOWER_CHECK_RESPONSE}{ON} = "RPOWER_CHECK_REQUEST";
+                $next_status{RPOWER_CHECK_RESPONSE}{OFF} = "RPOWER_ON_REQUEST";
+                $next_status{RPOWER_ON_REQUEST} = "RPOWER_ON_RESPONSE";
+                $status_info{RPOWER_ON_RESPONSE}{argv} = "reset";
+            }
+        } 
     }
 
     return;
@@ -1618,6 +1788,8 @@ sub parse_node_info {
 
             $node_info{$node}{cur_status} = "LOGIN_REQUEST";
             $node_info{$node}{rpower_check_times} = $::RPOWER_MAX_RETRY;
+            $node_info{$node}{bmc_conn_check_times} = $::BMC_MAX_RETRY;
+            $node_info{$node}{bmcstate_check_times} = $::BMC_MAX_RETRY;
         } else {
             xCAT::SvrUtils::sendmsg("Error: Unable to get information from openbmc table", $callback, $node);
             $rst = 1;
@@ -1688,7 +1860,7 @@ sub gen_send_request {
         if ($method eq "GET") {
             $debug_info = "curl -k -b cjar -X $method -H \"Content-Type: application/json\" $request_url";
         } else {
-            if ($::UPLOAD_FILE) {
+            if ($::UPLOAD_FILE and !$::UPLOAD_ACTIVATE_STREAM) {
                 # Slightly different debug message when doing a file upload
                 $debug_info = "curl -k -b cjar -X $method -H \"Content-Type: application/json\" -T $::UPLOAD_FILE $request_url";
             } else {
@@ -1738,6 +1910,12 @@ sub deal_with_response {
             $wait_node_num--;
             return;    
         }
+        if (defined $status_info{RPOWER_BMC_STATUS_RESPONSE}{argv} and $status_info{RPOWER_BMC_STATUS_RESPONSE}{argv} =~ /bmcstate$/) {
+            my $error_msg = "Sent reboot BMC but state did not change to BMCReady (State=BMC NotReady).";
+            retry_check_times($node, "RPOWER_BMC_STATUS_REQUEST", "bmc_conn_check_times", $::BMC_CHECK_INTERVAL, $error_msg, $response->status_line);
+            return;
+        }   
+      
         if ($response->status_line eq $::RESPONSE_SERVICE_UNAVAILABLE) {
             $error = $::RESPONSE_SERVICE_UNAVAILABLE;
         } elsif ($response->status_line eq $::RESPONSE_METHOD_NOT_ALLOWED) {
@@ -1764,7 +1942,7 @@ sub deal_with_response {
                 #
                 # For any invalid data that we can detect, provide a better response message
                 #
-                if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_ACTIVATE_RESPONSE") {
+                if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_ACTIVATE_RESPONSE" or $node_info{$node}{cur_status} eq "RFLASH_UPDATE_HOST_ACTIVATE_RESPONSE") {
                     # If 403 is received for an activation, that means the activation ID is incorrect
                     $error = "Invalid ID provided to activate. Use the -l option to view valid firmware IDs.";
                 } elsif ($node_info{$node}{cur_status} eq "RSETBOOT_ENABLE_RESPONSE" ) {
@@ -1943,6 +2121,10 @@ sub rpower_response {
         if ($response_info->{'message'} eq $::RESPONSE_OK) {
             if (defined $status_info{RPOWER_RESET_RESPONSE}{argv} and $status_info{RPOWER_RESET_RESPONSE}{argv} =~ /bmcreboot$/) {
                 xCAT::SvrUtils::sendmsg("BMC $::POWER_STATE_REBOOT", $callback, $node);
+                if ($::UPLOAD_ACTIVATE_STREAM) {
+                    retry_after($node, "RPOWER_BMC_CHECK_REQUEST", 15);
+                    return;
+                }
             }
             $new_status{$::STATUS_POWERING_ON} = [$node];
         }
@@ -1951,7 +2133,7 @@ sub rpower_response {
     xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%new_status, 1) if (%new_status);
 
     my $all_status;
-    if ($node_info{$node}{cur_status} eq "RPOWER_STATUS_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_CHECK_RESPONSE") {
+    if ($node_info{$node}{cur_status} eq "RPOWER_STATUS_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_CHECK_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_BMC_STATUS_RESPONSE") {
         my $bmc_state = "";
         my $bmc_transition_state = "";
         my $chassis_state = "";
@@ -1982,11 +2164,32 @@ sub rpower_response {
             print "$node: DEBUG State CurrentHostState=$host_state\n";
             print "$node: DEBUG State RequestedHostTransition=$host_transition_state\n";
         }
-
         if (defined $status_info{RPOWER_STATUS_RESPONSE}{argv} and $status_info{RPOWER_STATUS_RESPONSE}{argv} =~ /bmcstate$/) {
             my $bmc_short_state = (split(/\./, $bmc_state))[-1];
             xCAT::SvrUtils::sendmsg("BMC $bmc_short_state", $callback, $node);
-        } else {
+        } elsif ($node_info{$node}{cur_status} eq "RPOWER_BMC_STATUS_RESPONSE" and  (defined $status_info{RPOWER_BMC_STATUS_RESPONSE}{argv}) and $status_info{RPOWER_BMC_STATUS_RESPONSE}{argv} =~ /bmcstate$/) {
+                my $bmc_short_state = (split(/\./, $bmc_state))[-1];
+                if (defined($bmc_state) and $bmc_state ne "xyz.openbmc_project.State.BMC.BMCState.Ready") {
+                    if ($node_info{$node}{bmcstate_check_times} > 0) {
+                    $node_info{$node}{bmcstate_check_times}--;
+                    if ($node_info{$node}{wait_start}) {
+                        $node_info{$node}{wait_end} = time();
+                    } else {
+                        $node_info{$node}{wait_start} = time();
+                    }
+                    retry_after($node, $next_status{ $node_info{$node}{cur_status} }, $::BMC_CHECK_INTERVAL);
+                    return;
+                } else {
+                    my $wait_time_X = $node_info{$node}{wait_end} - $node_info{$node}{wait_start};
+                    xCAT::SvrUtils::sendmsg([1, "Error: Sent bmcreboot but state did not change to BMC Ready after waiting $wait_time_X seconds. (State=BMC $bmc_short_state)."], $callback, $node);
+                    $node_info{$node}{cur_status} = "";
+                    $wait_node_num--;
+                    return;
+                }
+                }
+                xCAT::SvrUtils::sendmsg("BMC $bmc_short_state", $callback, $node);
+
+        }else {
             if ($chassis_state =~ /Off$/) {
                 # Chassis state is Off, but check if we can detect transition states
                 if ((defined($::OPENBMC_PWR) and ($::OPENBMC_PWR eq "YES")) and
@@ -3111,7 +3314,13 @@ sub rflash_response {
         #
         # TODO: Remove this block when proper request can be generated
         #
-        if ($::UPLOAD_FILE) {
+        if ($::UPLOAD_FILE){
+            $fw_tar_files{$::UPLOAD_FILE}=$::UPLOAD_FILE_VERSION;
+        }
+        if ($::UPLOAD_PNOR){
+            $fw_tar_files{$::UPLOAD_PNOR}=$::UPLOAD_PNOR_VERSION;
+        }
+        if (%fw_tar_files) {
             my $child = xCAT::Utils->xfork;
             if (!defined($child)) {
                 xCAT::SvrUtils::sendmsg("Failed to fork child process to upload firmware image.", $callback, $node);
@@ -3135,24 +3344,46 @@ sub rflash_response {
         print "Update priority has been set";
     }
     if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_CHECK_STATE_RESPONSE") {
-        my $activation_state;
-        my $progress_state;
-        my $priority_state;
+        my %activation_state;
+        my %progress_state;
+        my %priority_state;
+        my $update_res=0;
+        my $version;
         foreach my $key_url (keys %{$response_info->{data}}) {
-            my $content = ${ $response_info->{data} }{$key_url};
-            # Get values of some attributes to determine activation status 
-            if ($key_url eq "Activation") {
-                $activation_state = ${ $response_info->{data} }{$key_url};
-            }
-            if ($key_url eq "Progress") {
-                $progress_state = ${ $response_info->{data} }{$key_url};
-            }
-            if ($key_url eq "Priority") {
-                $priority_state = ${ $response_info->{data} }{$key_url};
+            if ($::UPLOAD_ACTIVATE_STREAM) {
+                my %content = %{${$response_info->{data}}{$key_url}};
+                $version = $content{Version};
+                if (defined($version)) {
+                    if ($version ne $::UPLOAD_FILE_VERSION and $version ne $::UPLOAD_PNOR_VERSION) {
+                        next;
+                    } 
+                    # Get values of some attributes to determine activation status 
+                    $activation_state{$version} = $content{Activation};
+                    $progress_state{$version} = $content{Progress};
+                    $priority_state{$version} = $content{Priority};
+                }
+            } else {
+                # This is for -a <ID> option
+                $version = "default";
+                if ($key_url eq "Activation") {
+                    $activation_state{$version} = ${ $response_info->{data} }{$key_url};
+                }
+                if ($key_url eq "Progress") {
+                    $progress_state{$version} = ${ $response_info->{data} }{$key_url};
+                }
+                if ($key_url eq "Priority") {
+                    $priority_state{$version} = ${ $response_info->{data} }{$key_url};
+                }
             }
         }
-
-        if ($activation_state =~ /Software.Activation.Activations.Failed/) {
+        my $firm_msg;
+        foreach my $firm_version (keys %activation_state) {
+            if ($firm_version eq "default") {
+                $firm_msg = "Firmware";
+            } else {
+                $firm_msg = "Firmware $firm_version";
+            }
+        if ($activation_state{$firm_version} =~ /Software.Activation.Activations.Failed/) {
             # Activation failed. Report error and exit
             my $flash_failed_msg = "Firmware activation failed.";
             xCAT::SvrUtils::sendmsg([1,"$flash_failed_msg"], $callback, $node);
@@ -3162,8 +3393,8 @@ sub rflash_response {
             $wait_node_num--;
             return;
         } 
-        elsif ($activation_state =~ /Software.Activation.Activations.Active/) { 
-            if (scalar($priority_state) == 0) {
+        elsif ($activation_state{$firm_version} =~ /Software.Activation.Activations.Active/) { 
+            if (scalar($priority_state{$firm_version}) == 0) {
                 # Activation state of active and priority of 0 indicates the activation has been completed
                 my $flash_success_msg = "Firmware activation successful.";
                 xCAT::SvrUtils::sendmsg("$flash_success_msg", $callback, $node);
@@ -3191,6 +3422,11 @@ sub rflash_response {
             retry_after($node, "RFLASH_UPDATE_CHECK_STATE_REQUEST", 15);
             return;
         }
+        }
+        if ($update_res) {
+            $wait_node_num--;
+            return;
+        }      
     }
 
     if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_CHECK_ID_RESPONSE") {
@@ -3198,10 +3434,11 @@ sub rflash_response {
         my $progress_state;
         my $priority_state;
         my $found_match = 0;
+        my $found_pnor_match = 0;
         my $debugmsg;
 
         if ($xcatdebugmode) {
-            $debugmsg = "CHECK_ID_RESPONSE: Looking for software ID: $::UPLOAD_FILE_VERSION...";
+            $debugmsg = "CHECK_ID_RESPONSE: Looking for software ID: $::UPLOAD_FILE_VERSION $::UPLOAD_PNOR_VERSION...";
             process_debug_info($node, $debugmsg);
         }
         # Look through all the software entries and find the id of the one that matches
@@ -3231,7 +3468,7 @@ sub rflash_response {
                     $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} =
                        $::SOFTWARE_URL . "/$update_id/attr/RequestedActivation";
                     $status_info{RFLASH_UPDATE_CHECK_STATE_REQUEST}{init_url} =
-                       $::SOFTWARE_URL . "/$update_id";
+                       $::SOFTWARE_URL . "/enumerate";
                     $status_info{RFLASH_SET_PRIORITY_REQUEST}{init_url} =
                        $::SOFTWARE_URL . "/$update_id/attr/Priority";
 
@@ -3250,7 +3487,7 @@ sub rflash_response {
                 }
             }
         }
-        if (!$found_match) {
+        if ($::UPLOAD_ACTIVATE_STREAM and (!$found_match or !$found_pnor_match) or !$found_match) {
             if (!exists($node_info{$node}{upload_wait_attemp})) {
                 $node_info{$node}{upload_wait_attemp} = $::UPLOAD_WAIT_ATTEMPT;
             }
@@ -3271,7 +3508,7 @@ sub rflash_response {
                 close (RFLASH_LOG_FILE_HANDLE);
                 $node_info{$node}{rst} = "$no_firmware_msg";
                 $wait_node_num--;
-                return;
+  return;
             }
         }
     }
@@ -3299,6 +3536,7 @@ sub rflash_upload {
     my $content_login = '{ "data": [ "' . $node_info{$node}{username} .'", "' . $node_info{$node}{password} . '" ] }';
     my $content_logout = '{ "data": [ ] }';
     my $cjar_id = "/tmp/_xcat_cjar.$node";
+    my @curl_upload_cmds;
     # curl commands
     my $curl_login_cmd  = "curl -c $cjar_id -k -H 'Content-Type: application/json' -X POST $request_url/login -d '" . $content_login . "'";
     my $curl_logout_cmd = "curl -b $cjar_id -k -H 'Content-Type: application/json' -X POST $request_url/logout -d '" . $content_logout . "'";