diff --git a/src/basic/vx_config/config_constants.h b/src/basic/vx_config/config_constants.h
index 7bba9e759e..802e37f28a 100644
--- a/src/basic/vx_config/config_constants.h
+++ b/src/basic/vx_config/config_constants.h
@@ -538,6 +538,7 @@ static const char conf_key_model[]             = "model";
 static const char conf_key_desc[]              = "desc";
 static const char conf_key_obtype[]            = "obtype";
 static const char conf_key_output_flag[]       = "output_flag";
+static const char conf_key_obtype_as_obs_message_type_flag[] = "obtype_as_obs_message_type_flag";
 static const char conf_key_obs_window[]        = "obs_window";
 static const char conf_key_beg[]               = "beg";
 static const char conf_key_end[]               = "end";
diff --git a/src/libcode/vx_stat_out/stat_columns.cc b/src/libcode/vx_stat_out/stat_columns.cc
index ac8530f6a5..c805d447fd 100644
--- a/src/libcode/vx_stat_out/stat_columns.cc
+++ b/src/libcode/vx_stat_out/stat_columns.cc
@@ -1548,6 +1548,7 @@ void write_mpr_row(StatHdrColumns &shc, const PairDataPoint *pd_ptr,
                    STATOutputType out_type,
                    AsciiTable &stat_at, int &stat_row,
                    AsciiTable &txt_at, int &txt_row,
+                   bool update_obtype,
                    bool update_thresh) {
 
    // MPR line type
@@ -1567,6 +1568,9 @@ void write_mpr_row(StatHdrColumns &shc, const PairDataPoint *pd_ptr,
    // Write a line for each matched pair
    for(int i=0; i<pd_ptr->n_obs; i++) {
 
+      // MET #2893 write individual obs message type
+      if(update_obtype) shc.set_obtype(pd_ptr->typ_sa[i].c_str());
+
       // Set the observation valid time
       shc.set_obs_valid_beg(pd_ptr->vld_ta[i]);
       shc.set_obs_valid_end(pd_ptr->vld_ta[i]);
@@ -1645,6 +1649,7 @@ void write_seeps_mpr_row(StatHdrColumns &shc, const PairDataPoint *pd_ptr,
                          STATOutputType out_type,
                          AsciiTable &stat_at, int &stat_row,
                          AsciiTable &txt_at, int &txt_row,
+                         bool update_obtype,
                          bool update_thresh) {
 
    // SEEPS line type
@@ -1668,6 +1673,9 @@ void write_seeps_mpr_row(StatHdrColumns &shc, const PairDataPoint *pd_ptr,
       if(!pd_ptr->seeps_mpr[i] ||
          is_bad_data(pd_ptr->seeps_mpr[i]->score)) continue;
 
+      // MET #2893 write individual obs message type
+      if(update_obtype) shc.set_obtype(pd_ptr->typ_sa[i].c_str());
+
       // Set the observation valid time
       shc.set_obs_valid_beg(pd_ptr->vld_ta[i]);
       shc.set_obs_valid_end(pd_ptr->vld_ta[i]);
@@ -1899,7 +1907,8 @@ void write_phist_row(StatHdrColumns &shc, const PairDataEnsemble *pd_ptr,
 void write_orank_row(StatHdrColumns &shc, const PairDataEnsemble *pd_ptr,
                      STATOutputType out_type,
                      AsciiTable &stat_at, int &stat_row,
-                     AsciiTable &txt_at, int &txt_row) {
+                     AsciiTable &txt_at, int &txt_row,
+                     bool update_obtype) {
 
    // Observation Rank line type
    shc.set_line_type(stat_orank_str);
@@ -1913,6 +1922,9 @@ void write_orank_row(StatHdrColumns &shc, const PairDataEnsemble *pd_ptr,
    // Write a line for each ensemble pair
    for(int i=0; i<pd_ptr->n_obs; i++) {
 
+      // MET #2893 write individual obs message type
+      if(update_obtype) shc.set_obtype(pd_ptr->typ_sa[i].c_str());
+
       // Set the observation valid time
       shc.set_obs_valid_beg(pd_ptr->vld_ta[i]);
       shc.set_obs_valid_end(pd_ptr->vld_ta[i]);
diff --git a/src/libcode/vx_stat_out/stat_columns.h b/src/libcode/vx_stat_out/stat_columns.h
index 7eb21c6fa0..6d2e0a15aa 100644
--- a/src/libcode/vx_stat_out/stat_columns.h
+++ b/src/libcode/vx_stat_out/stat_columns.h
@@ -106,13 +106,13 @@ extern void write_dmap_row  (StatHdrColumns &, const DMAPInfo &, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &);
 extern void write_mpr_row   (StatHdrColumns &, const PairDataPoint *, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &,
-                             bool update_thresh = true);
+                             bool update_obtype, bool update_thresh = true);
 extern void write_seeps_row (StatHdrColumns &, const SeepsAggScore *, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &,
-                             bool update_thresh = true);
+                             bool update_obtype, bool update_thresh = true);
 extern void write_seeps_mpr_row (StatHdrColumns &, const PairDataPoint *, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &,
-                             bool update_thresh = true);
+                             bool update_obtype, bool update_thresh = true);
 extern void write_isc_row   (StatHdrColumns &, const ISCInfo &, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &);
 extern void write_ecnt_row  (StatHdrColumns &, const ECNTInfo &, STATOutputType,
@@ -124,7 +124,8 @@ extern void write_rhist_row (StatHdrColumns &, const PairDataEnsemble *, STATOut
 extern void write_phist_row (StatHdrColumns &, const PairDataEnsemble *, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &);
 extern void write_orank_row (StatHdrColumns &, const PairDataEnsemble *, STATOutputType,
-                             AsciiTable &, int &, AsciiTable &, int &);
+                             AsciiTable &, int &, AsciiTable &, int &,
+                             bool update_obtype = false);
 extern void write_ssvar_row (StatHdrColumns &, const PairDataEnsemble *, double, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &);
 extern void write_relp_row  (StatHdrColumns &, const PairDataEnsemble *, STATOutputType,
diff --git a/src/libcode/vx_statistics/pair_base.cc b/src/libcode/vx_statistics/pair_base.cc
index c26d2d3459..9a18ee6b55 100644
--- a/src/libcode/vx_statistics/pair_base.cc
+++ b/src/libcode/vx_statistics/pair_base.cc
@@ -104,6 +104,7 @@ void PairBase::clear() {
    ocsd_na.clear();
    ocdf_na.clear();
 
+   typ_sa.clear();
    sid_sa.clear();
    lat_na.clear();
    lon_na.clear();
@@ -155,6 +156,7 @@ void PairBase::erase() {
    ocsd_na.erase();
    ocdf_na.erase();
 
+   typ_sa.clear();  // no erase option
    sid_sa.clear();  // no erase option
    lat_na.erase();
    lon_na.erase();
@@ -427,7 +429,7 @@ void PairBase::compute_climo_cdf() {
 
 ////////////////////////////////////////////////////////////////////////
 
-bool PairBase::add_point_obs(const char *sid,
+bool PairBase::add_point_obs(const char *typ, const char *sid,
                              double lat, double lon, double x, double y,
                              unixtime ut, double lvl, double elv,
                              double o, const char *qc,
@@ -476,6 +478,7 @@ bool PairBase::add_point_obs(const char *sid,
    }
    else {
       station_values_t val;
+      val.typ = string(typ);
       val.sid = string(sid);
       val.lat = lat;
       val.lon = lon;
@@ -497,6 +500,7 @@ bool PairBase::add_point_obs(const char *sid,
    }
 
    if(obs_summary == ObsSummary::None) {
+      typ_sa.add(typ);
       sid_sa.add(sid);
       lat_na.add(lat);
       lon_na.add(lon);
@@ -520,7 +524,7 @@ bool PairBase::add_point_obs(const char *sid,
 
 ////////////////////////////////////////////////////////////////////////
 
-void PairBase::set_point_obs(int i_obs, const char *sid,
+void PairBase::set_point_obs(int i_obs, const char *typ, const char *sid,
                              double lat, double lon, double x, double y,
                              unixtime ut, double lvl, double elv,
                              double o, const char *qc,
@@ -534,6 +538,7 @@ void PairBase::set_point_obs(int i_obs, const char *sid,
       exit(1);
    }
 
+   typ_sa.set(i_obs, typ);
    sid_sa.set(i_obs, sid);
    lat_na.set(i_obs, lat);
    lon_na.set(i_obs, lon);
@@ -751,6 +756,7 @@ void PairBase::calc_obs_summary(){
       // Store summarized value in the map
       svt.summary_val = ob.val;
 
+      typ_sa.add    (svt.typ.c_str());
       sid_sa.add    (svt.sid.c_str());
       lat_na.add    (svt.lat);
       lon_na.add    (svt.lon);
diff --git a/src/libcode/vx_statistics/pair_base.h b/src/libcode/vx_statistics/pair_base.h
index af92385f5c..9ad70e0266 100644
--- a/src/libcode/vx_statistics/pair_base.h
+++ b/src/libcode/vx_statistics/pair_base.h
@@ -36,6 +36,7 @@ struct station_values_t {
 
    void clear();
 
+   std::string typ;
    std::string sid;
    double lat;
    double lon;
@@ -110,6 +111,7 @@ class PairBase {
       NumArray    ocdf_na; // Observation climatology cumulative distribution function [n_obs]
 
       // Point Observation Information
+      StringArray typ_sa;  // Message type [n_obs]
       StringArray sid_sa;  // Station ID [n_obs]
       NumArray    lat_na;  // Latitude [n_obs]
       NumArray    lon_na;  // Longitude [n_obs]
@@ -168,11 +170,13 @@ class PairBase {
       ob_val_t compute_median(std::string sng_key);
       ob_val_t compute_percentile(std::string sng_key, int perc);
 
-      bool add_point_obs(const char *, double, double, double, double,
+      bool add_point_obs(const char *, const char *,
+                         double, double, double, double,
                          unixtime, double, double, double, const char *,
                          const ClimoPntInfo &, double);
 
-      void set_point_obs(int, const char *, double, double, double, double,
+      void set_point_obs(int, const char *, const char *,
+                         double, double, double, double,
                          unixtime, double, double, double,
                          const char *, const ClimoPntInfo &, double);
 
diff --git a/src/libcode/vx_statistics/pair_data_ensemble.cc b/src/libcode/vx_statistics/pair_data_ensemble.cc
index af9f80de15..9a2b0a7baf 100644
--- a/src/libcode/vx_statistics/pair_data_ensemble.cc
+++ b/src/libcode/vx_statistics/pair_data_ensemble.cc
@@ -1311,8 +1311,9 @@ void VxPairDataEnsemble::add_point_obs(float *hdr_arr, int *hdr_typ_arr,
             // Add the observation value
             // Weight is from the nearest grid point
             int n = three_to_one(i_msg_typ, i_mask, i_interp);
-            if(!pd[n].add_point_obs(hdr_sid_str, hdr_lat, hdr_lon,
-                  obs_x, obs_y, hdr_ut, obs_lvl, obs_hgt,
+            if(!pd[n].add_point_obs(hdr_typ_str, hdr_sid_str,
+                  hdr_lat, hdr_lon, obs_x, obs_y,
+                  hdr_ut, obs_lvl, obs_hgt,
                   obs_v, obs_qty, cpi, wgt_v)) {
 
                if(mlog.verbosity_level() >= REJECT_DEBUG_LEVEL) {
diff --git a/src/libcode/vx_statistics/pair_data_point.cc b/src/libcode/vx_statistics/pair_data_point.cc
index a22194a297..17a86703bc 100644
--- a/src/libcode/vx_statistics/pair_data_point.cc
+++ b/src/libcode/vx_statistics/pair_data_point.cc
@@ -156,7 +156,8 @@ void PairDataPoint::assign(const PairDataPoint &pd) {
          ClimoPntInfo cpi(pd.fcmn_na[i], pd.fcsd_na[i],
                           pd.ocmn_na[i], pd.ocsd_na[i]);
 
-         if(add_point_pair(pd.sid_sa[i].c_str(), pd.lat_na[i], pd.lon_na[i],
+         if(add_point_pair(pd.typ_sa[i].c_str(), pd.sid_sa[i].c_str(),
+               pd.lat_na[i], pd.lon_na[i],
                pd.x_na[i], pd.y_na[i], pd.vld_ta[i],
                pd.lvl_na[i], pd.elv_na[i],
                pd.f_na[i], pd.o_na[i], pd.o_qc_sa[i].c_str(),
@@ -176,13 +177,14 @@ void PairDataPoint::assign(const PairDataPoint &pd) {
 
 ////////////////////////////////////////////////////////////////////////
 
-bool PairDataPoint::add_point_pair(const char *sid, double lat, double lon,
+bool PairDataPoint::add_point_pair(const char *typ, const char *sid,
+                                   double lat, double lon,
                                    double x, double y, unixtime ut,
                                    double lvl, double elv,
                                    double f, double o, const char *qc,
                                    const ClimoPntInfo &cpi, double wgt) {
 
-   if(!add_point_obs(sid, lat, lon, x, y, ut, lvl, elv, o, qc,
+   if(!add_point_obs(typ, sid, lat, lon, x, y, ut, lvl, elv, o, qc,
                      cpi, wgt)) return false;
 
    f_na.add(f);
@@ -233,7 +235,8 @@ void PairDataPoint::set_seeps_score(SeepsScore *seeps, int index) {
 
 ////////////////////////////////////////////////////////////////////////
 
-void PairDataPoint::set_point_pair(int i_obs, const char *sid,
+void PairDataPoint::set_point_pair(int i_obs,
+                                   const char *typ, const char *sid,
                                    double lat, double lon,
                                    double x, double y, unixtime ut,
                                    double lvl, double elv,
@@ -248,7 +251,7 @@ void PairDataPoint::set_point_pair(int i_obs, const char *sid,
       exit(1);
    }
 
-   set_point_obs(i_obs, sid, lat, lon, x, y, ut, lvl, elv,
+   set_point_obs(i_obs, typ, sid, lat, lon, x, y, ut, lvl, elv,
                  o, qc, cpi, wgt);
 
    f_na.set(i_obs, f);
@@ -380,8 +383,8 @@ PairDataPoint PairDataPoint::subset_pairs_cnt_thresh(
 
          // Handle point data
          if(is_point_vx()) {
-            if(out_pd.add_point_pair(sid_sa[i].c_str(), lat_na[i],
-                         lon_na[i], x_na[i], y_na[i],
+            if(out_pd.add_point_pair(typ_sa[i].c_str(), sid_sa[i].c_str(),
+                         lat_na[i], lon_na[i], x_na[i], y_na[i],
                          vld_ta[i], lvl_na[i], elv_na[i],
                          f_na[i], o_na[i], o_qc_sa[i].c_str(),
                          cpi, wgt_na[i])) {
@@ -631,7 +634,7 @@ void VxPairDataPoint::add_point_obs(float *hdr_arr, const char *hdr_typ_str,
             // Add the forecast, climatological, and observation data
             // Weight is from the nearest grid point
             int n = three_to_one(i_msg_typ, i_mask, i_interp);
-            if(!pd[n].add_point_pair(hdr_sid_str,
+            if(!pd[n].add_point_pair(hdr_typ_str, hdr_sid_str,
                          hdr_lat, hdr_lon, obs_x, obs_y, hdr_ut, obs_lvl,
                          obs_hgt, fcst_v, obs_v, obs_qty, cpi, wgt_v)) {
 
@@ -996,14 +999,14 @@ void subset_wind_pairs(const PairDataPoint &pd_u, const PairDataPoint &pd_v,
          // Handle point data
          if(pd_u.is_point_vx()) {
 
-            out_pd_u.add_point_pair(pd_u.sid_sa[i].c_str(),
+            out_pd_u.add_point_pair(pd_u.typ_sa[i].c_str(), pd_u.sid_sa[i].c_str(),
                         pd_u.lat_na[i], pd_u.lon_na[i],
                         pd_u.x_na[i], pd_u.y_na[i], pd_u.vld_ta[i],
                         pd_u.lvl_na[i], pd_u.elv_na[i],
                         pd_u.f_na[i], pd_u.o_na[i],
                         pd_u.o_qc_sa[i].c_str(),
                         u_cpi, pd_u.wgt_na[i]);
-            out_pd_v.add_point_pair(pd_v.sid_sa[i].c_str(),
+            out_pd_v.add_point_pair(pd_v.typ_sa[i].c_str(), pd_v.sid_sa[i].c_str(),
                         pd_v.lat_na[i], pd_v.lon_na[i],
                         pd_v.x_na[i], pd_v.y_na[i], pd_v.vld_ta[i],
                         pd_v.lvl_na[i], pd_v.elv_na[i],
@@ -1074,8 +1077,8 @@ PairDataPoint subset_climo_cdf_bin(const PairDataPoint &pd,
 
          // Handle point data
          if(pd.is_point_vx()) {
-            out_pd.add_point_pair(pd.sid_sa[i].c_str(), pd.lat_na[i],
-                      pd.lon_na[i], pd.x_na[i], pd.y_na[i],
+            out_pd.add_point_pair(pd.typ_sa[i].c_str(), pd.sid_sa[i].c_str(),
+                      pd.lat_na[i], pd.lon_na[i], pd.x_na[i], pd.y_na[i],
                       pd.vld_ta[i], pd.lvl_na[i], pd.elv_na[i],
                       pd.f_na[i], pd.o_na[i], pd.o_qc_sa[i].c_str(),
                       cpi, pd.wgt_na[i]);
diff --git a/src/libcode/vx_statistics/pair_data_point.h b/src/libcode/vx_statistics/pair_data_point.h
index 7669e122b2..b6a84579d9 100644
--- a/src/libcode/vx_statistics/pair_data_point.h
+++ b/src/libcode/vx_statistics/pair_data_point.h
@@ -56,14 +56,16 @@ class PairDataPoint : public PairBase {
 
       void extend(int);
 
-      bool add_point_pair(const char *, double, double, double, double,
+      bool add_point_pair(const char *, const char *,
+                          double, double, double, double,
                           unixtime, double, double, double, double,
                           const char *, const ClimoPntInfo &, double);
       void load_seeps_climo(const ConcatString &seeps_climo_name);
       void set_seeps_thresh(const SingleThresh &p1_thresh);
       void set_seeps_score(SeepsScore *, int index=-1);
 
-      void set_point_pair(int, const char *, double, double, double, double,
+      void set_point_pair(int, const char *, const char *,
+                          double, double, double, double,
                           unixtime, double, double, double, double,
                           const char *, const ClimoPntInfo &,
                           double, const SeepsScore *);
diff --git a/src/tools/core/ensemble_stat/ensemble_stat.cc b/src/tools/core/ensemble_stat/ensemble_stat.cc
index 38abd51a3b..30ea808ee9 100644
--- a/src/tools/core/ensemble_stat/ensemble_stat.cc
+++ b/src/tools/core/ensemble_stat/ensemble_stat.cc
@@ -2236,10 +2236,17 @@ void write_txt_files(const EnsembleStatVxOpt &vx_opt,
       // Set the header column
       shc.set_obs_thresh(na_str);
 
+      // Store current obtype value
+      string cur_obtype = shc.get_obtype();
+
       write_orank_row(shc, &pd_all,
          vx_opt.output_flag[i_orank],
          stat_at, i_stat_row,
-         txt_at[i_orank], i_txt_row[i_orank]);
+         txt_at[i_orank], i_txt_row[i_orank],
+         conf_info.obtype_as_obs_message_type_flag);
+
+      // Reset the obtype column
+      shc.set_obtype(cur_obtype.c_str());
 
       // Reset the observation valid time
       shc.set_obs_valid_beg(vx_opt.vx_pd.beg_ut);
diff --git a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
index de3af1256b..23460be1a6 100644
--- a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
+++ b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
@@ -70,6 +70,7 @@ void EnsembleStatConfInfo::clear() {
    vld_ens_thresh = bad_data_double;
    vld_data_thresh = bad_data_double;
    msg_typ_group_map.clear();
+   obtype_as_obs_message_type = false;
    msg_typ_sfc.clear();
    mask_area_map.clear();
    mask_sid_map.clear();
@@ -173,6 +174,10 @@ void EnsembleStatConfInfo::process_config(GrdFileType etype,
       msg_typ_sfc.parse_css(default_msg_typ_group_surface);
    }
 
+   // Conf: obtype_as_obs_message_type_flag
+   obtype_as_obs_message_type_flag =
+   conf.lookup_bool(conf_key_obtype_as_obs_message_type_flag);
+
    // Conf: ens_member_ids
    ens_member_ids = parse_conf_ens_member_ids(&conf);
 
diff --git a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h
index 9d9177cdab..9b5cbf3bc3 100644
--- a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h
+++ b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h
@@ -221,6 +221,7 @@ class EnsembleStatConfInfo {
       // Message type groups that should be processed together
       std::map<ConcatString,StringArray> msg_typ_group_map;
       StringArray                        msg_typ_sfc;
+      bool                               obtype_as_obs_message_type;
 
       // Mapping of mask names to MaskPlanes
       std::map<ConcatString,MaskPlane>   mask_area_map;
diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc
index fcd67962b0..3d651274ba 100644
--- a/src/tools/core/point_stat/point_stat.cc
+++ b/src/tools/core/point_stat/point_stat.cc
@@ -1108,7 +1108,11 @@ void process_scores() {
                   write_mpr_row(shc, pd_ptr,
                      conf_info.vx_opt[i_vx].output_flag[i_mpr],
                      stat_at, i_stat_row,
-                     txt_at[i_mpr], i_txt_row[i_mpr]);
+                     txt_at[i_mpr], i_txt_row[i_mpr],
+                     conf_info.obtype_as_obs_message_type_flag);
+
+                  // Reset the obtype column
+                  shc.set_obtype(conf_info.vx_opt[i_vx].msg_typ[i_msg_typ].c_str());
 
                   // Reset the observation valid time
                   shc.set_obs_valid_beg(conf_info.vx_opt[i_vx].vx_pd.beg_ut);
@@ -1120,7 +1124,11 @@ void process_scores() {
                   write_seeps_mpr_row(shc, pd_ptr,
                      conf_info.vx_opt[i_vx].output_flag[i_seeps_mpr],
                      stat_at, i_stat_row,
-                     txt_at[i_seeps_mpr], i_txt_row[i_seeps_mpr]);
+                     txt_at[i_seeps_mpr], i_txt_row[i_seeps_mpr],
+                     conf_info.obtype_as_obs_message_type_flag);
+
+                  // Reset the obtype column
+                  shc.set_obtype(conf_info.vx_opt[i_vx].msg_typ[i_msg_typ].c_str());
 
                   // Reset the observation valid time
                   shc.set_obs_valid_beg(conf_info.vx_opt[i_vx].vx_pd.beg_ut);
@@ -1910,7 +1918,8 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) {
                           pd_ptr->ocmn_na[j], pd_ptr->ocsd_na[j]);
 
          // Store the observation value
-         hira_pd.add_point_obs(pd_ptr->sid_sa[j].c_str(),
+         hira_pd.add_point_obs(
+            pd_ptr->typ_sa[j].c_str(), pd_ptr->sid_sa[j].c_str(),
             pd_ptr->lat_na[j], pd_ptr->lon_na[j],
             pd_ptr->x_na[j], pd_ptr->y_na[j], pd_ptr->vld_ta[j],
             pd_ptr->lvl_na[j], pd_ptr->elv_na[j],
@@ -1965,7 +1974,8 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) {
          write_orank_row(shc, &hira_pd,
             conf_info.vx_opt[i_vx].output_flag[i_orank],
             stat_at, i_stat_row,
-            txt_at[i_orank], i_txt_row[i_orank]);
+            txt_at[i_orank], i_txt_row[i_orank],
+            conf_info.obtype_as_obs_message_type_flag);
 
          // Reset the observation valid time
          shc.set_obs_valid_beg(conf_info.vx_opt[i_vx].vx_pd.beg_ut);
@@ -2107,7 +2117,9 @@ void do_hira_prob(int i_vx, const PairDataPoint *pd_ptr) {
             }
 
             // Store the fractional coverage pair
-            hira_pd.add_point_pair(pd_ptr->sid_sa[k].c_str(),
+            hira_pd.add_point_pair(
+               pd_ptr->typ_sa[k].c_str(),
+               pd_ptr->sid_sa[k].c_str(),
                pd_ptr->lat_na[k], pd_ptr->lon_na[k],
                pd_ptr->x_na[k], pd_ptr->y_na[k], pd_ptr->vld_ta[k],
                pd_ptr->lvl_na[k], pd_ptr->elv_na[k],
@@ -2155,7 +2167,9 @@ void do_hira_prob(int i_vx, const PairDataPoint *pd_ptr) {
             write_mpr_row(shc, &hira_pd,
                conf_info.vx_opt[i_vx].output_flag[i_mpr],
                stat_at, i_stat_row,
-               txt_at[i_mpr], i_txt_row[i_mpr], false);
+               txt_at[i_mpr], i_txt_row[i_mpr],
+               conf_info.obtype_as_obs_message_type_flag,
+               false);
 
             // Reset the observation valid time
             shc.set_obs_valid_beg(conf_info.vx_opt[i_vx].vx_pd.beg_ut);
diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc
index c8ea7c4f70..6cfa7b3914 100644
--- a/src/tools/core/point_stat/point_stat_conf_info.cc
+++ b/src/tools/core/point_stat/point_stat_conf_info.cc
@@ -69,6 +69,7 @@ void PointStatConfInfo::clear() {
    topo_use_obs_thresh.clear();
    topo_interp_fcst_thresh.clear();
    msg_typ_group_map.clear();
+   obtype_as_obs_message_type_flag = false;
    mask_area_map.clear();
    mask_sid_map.clear();
    tmp_dir.clear();
@@ -174,6 +175,10 @@ void PointStatConfInfo::process_config(GrdFileType ftype) {
    // Conf: message_type_group_map
    msg_typ_group_map = parse_conf_message_type_group_map(&conf);
 
+   // Conf: obtype_as_obs_message_type_flag
+   obtype_as_obs_message_type_flag =
+      conf.lookup_bool(conf_key_obtype_as_obs_message_type_flag);
+
    // Conf: fcst.field and obs.field
    fdict = conf.lookup_array(conf_key_fcst_field);
    odict = conf.lookup_array(conf_key_obs_field);
diff --git a/src/tools/core/point_stat/point_stat_conf_info.h b/src/tools/core/point_stat/point_stat_conf_info.h
index 95bf59a7a7..0b123b950b 100644
--- a/src/tools/core/point_stat/point_stat_conf_info.h
+++ b/src/tools/core/point_stat/point_stat_conf_info.h
@@ -235,6 +235,7 @@ class PointStatConfInfo {
 
       // Message type groups that should be processed together
       std::map<ConcatString,StringArray> msg_typ_group_map;
+      bool                               obtype_as_obs_message_type_flag;
 
       // Mapping of mask names to DataPlanes
       std::map<ConcatString,MaskPlane>   mask_area_map;
diff --git a/src/tools/other/gsi_tools/gsidens2orank.cc b/src/tools/other/gsi_tools/gsidens2orank.cc
index 39edb87cc5..5bf48aeff3 100644
--- a/src/tools/other/gsi_tools/gsidens2orank.cc
+++ b/src/tools/other/gsi_tools/gsidens2orank.cc
@@ -269,7 +269,7 @@ void process_conv_data(ConvData &d, int i_mem) {
       // Store the current observation info
       ClimoPntInfo cpi(bad_data_double, bad_data_double,
                        bad_data_double, bad_data_double);
-      ens_pd.add_point_obs(d.sid.c_str(), d.lat, d.lon,
+      ens_pd.add_point_obs(d.obtype.c_str(), d.sid.c_str(), d.lat, d.lon,
                 bad_data_double, bad_data_double, d.obs_ut, d.prs,
                 d.elv, d.obs, na_str, cpi, default_grid_weight);
 
@@ -429,7 +429,7 @@ void process_rad_data(RadData &d, int i_mem) {
       // Store the current observation info
       ClimoPntInfo cpi(bad_data_double, bad_data_double,
                        bad_data_double, bad_data_double);
-      ens_pd.add_point_obs(na_str, d.lat, d.lon,
+      ens_pd.add_point_obs(na_str, na_str, d.lat, d.lon,
                 bad_data_double, bad_data_double, d.obs_ut,
                 bad_data_double, d.elv, d.obs, na_str,
                 cpi, default_grid_weight);