--- a/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist.rss	Thu Aug 19 11:09:10 2010 +0300
+++ b/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist.rss	Tue Aug 31 16:29:05 2010 +0300
@@ -77,8 +77,9 @@
         r_cmd_createswp_uiphase,
         r_cmd_createswp_rfstatus,
         r_cmd_waitforofflinequery,
-        r_cmd_setswp_uistart,   // After offline query has been made // prio 0xFFD7 
-        r_cmd_bsengine,					// prio 0xFFD3      
+        // prio 0xFFD7
+        r_cmd_setswp_uistart,   // After offline query has been made
+        r_cmd_bsengine,
         // prio 0xFFC7
         r_cmd_setswp_rfon,
         r_cmd_setswp_rfoff,
@@ -96,7 +97,7 @@
 //
 RESOURCE SSM_START_PROCESS_INFO r_cmd_bsengine
     {
-    priority = 0xFFD3;
+    priority = 0xFFD7;
     name = "z:\\sys\\bin\\bsengine.exe";
     execution_behaviour = ESsmWaitForSignal;
     timeout = 10000;
@@ -231,8 +232,6 @@
     }
 
 // ---------------------------------------------------------------------------
- 
-// ---------------------------------------------------------------------------
 // r_cmd_waitforofflinequery
 // ---------------------------------------------------------------------------
 //
@@ -310,6 +309,17 @@
     target2 = 102;          // EBootIntoOfflineMode
     }
 
+// ---------------------------------------------------------------------------
+// r_dlldata_waitphone
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_WAIT_PS r_dlldata_waitphone
+    {
+    category = 0x101F8766;  // KPSUidStartup
+    key = 0x00000044;       // KPSPhonePhase1Ok
+    target = 101;           // EPhonePhase1Ok
+    }
+	
 // ===========================================================================
 // Conditional blocks in alphabetical order
 // ===========================================================================
@@ -327,6 +337,69 @@
     }
 
 // ---------------------------------------------------------------------------
+// r_cond_feat_alwaysonline
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_alwaysonline
+    {
+    feature_id = KFeatureIdAlwaysOnLine;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_cellbroadcast
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_cellbroadcast
+    {
+    feature_id = KFeatureIdCellBroadcast;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_emailfw
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_emailfw
+    {
+    feature_id = KFeatureIdFfEmailFramework;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_iadv2
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_iadv2
+    {
+    feature_id = KFeatureIdFfIaupdatePhase2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_ippush
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_ippush
+    {
+    feature_id = KFeatureIdIpPush;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_omapoc
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_omapoc
+    {
+    feature_id = KFeatureIdOmaPoc;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_omasuplplugins
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_omasuplplugins
+    {
+    feature_id = KFeatureIdOmaSuplPlugins;
+    }
+
+// ---------------------------------------------------------------------------
 // r_cond_feat_pnp_mobile_services
 // ---------------------------------------------------------------------------
 //
@@ -336,6 +409,33 @@
     }
 
 // ---------------------------------------------------------------------------
+// r_cond_feat_remotestoragefw
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_remotestoragefw
+    {
+    feature_id = KFeatureIdRemoteStorageFw;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_runtime_dcmo;
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_runtime_dcmo
+    {
+    feature_id = KFeatureIdFfRuntimeDeviceCapabilityConfiguration;
+    }
+	
+// ---------------------------------------------------------------------------
+// r_cond_feat_sappolicymgmt
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_sappolicymgmt
+    {
+    feature_id = KFeatureIdSapPolicyManagement;
+    }
+
+// ---------------------------------------------------------------------------
 // r_cond_feat_sdnd
 // ---------------------------------------------------------------------------
 //
@@ -345,6 +445,15 @@
     }
 
 // ---------------------------------------------------------------------------
+// r_cond_feat_simcard
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_simcard
+    {
+    feature_id = KFeatureIdSimCard;
+    }
+
+// ---------------------------------------------------------------------------
 // r_cond_feat_sind
 // ---------------------------------------------------------------------------
 //
@@ -372,6 +481,35 @@
     }
 
 // ---------------------------------------------------------------------------
+// r_cond_feat_tvout
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_tvout
+    {
+    feature_id = KFeatureIdTvOut;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_firstboot_or_fotareset_or_deeprfsreset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_OR r_cond_firstboot_or_fotareset_or_deeprfsreset
+    {
+    lhs = r_cond_fotareset_or_deeprfsreset;
+    rhs = r_cond_ps_firstboot;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_fotareset_or_deeprfsreset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_OR r_cond_fotareset_or_deeprfsreset
+    {
+    lhs = r_cond_ps_fotareset;
+    rhs = r_cond_ps_deeprfsreset;
+    }
+
+// ---------------------------------------------------------------------------
 // r_cond_no_sdnd
 // ---------------------------------------------------------------------------
 //
@@ -381,6 +519,16 @@
     }
 
 // ---------------------------------------------------------------------------
+// r_cond_pnp_mobile_services_and_firstboot
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_AND r_cond_pnp_mobile_services_and_firstboot
+    {
+    lhs = r_cond_feat_pnp_mobile_services;
+    rhs = r_cond_ps_firstboot;
+    }
+
+// ---------------------------------------------------------------------------
 // r_cond_ps_bootoffline
 // ---------------------------------------------------------------------------
 //
@@ -403,6 +551,17 @@
     }
 
 // ---------------------------------------------------------------------------
+// r_cond_ps_deeprfsreset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_deeprfsreset
+    {
+    category = 0x101F8766; // KPSUidStartup
+    key = 0x00000045;      // KPSStartupReason
+    value = EDeepRFSReset;
+    }
+
+// ---------------------------------------------------------------------------
 // r_cond_ps_fotareset
 // ---------------------------------------------------------------------------
 //
@@ -414,6 +573,17 @@
     }
 
 // ---------------------------------------------------------------------------
+// r_cond_ps_normalboot
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_normalboot
+    {
+    category = 0x101F8766; // KPSUidStartup
+    key = 0x00000012;      // KStartupCleanBoot
+    value = 101;           // EStartupNormalBoot
+    }
+
+// ---------------------------------------------------------------------------
 // r_cond_ps_simusable
 // ---------------------------------------------------------------------------
 //