--- a/sf_config/config/inc/PublicStaticFeatures.hrh	Fri Apr 02 11:47:01 2010 +0100
+++ b/sf_config/config/inc/PublicStaticFeatures.hrh	Tue Apr 13 17:59:35 2010 +0100
@@ -40,6 +40,14 @@
 KFeatureIdFfAiWlansnifferWidget,
 #endif
 
+#ifdef FF_ALTERNATIVE_CALL_WAITING_TONE
+KFeatureIdFfAlternativeCallWaitingTone,
+#endif
+
+#ifdef FF_ARABIC_HANDWRITING_RECOGNITION_INPUT
+KFeatureIdArabicHandwritingRecognitionInput,
+#endif
+
 #ifdef FF_ASYNCH_FILE_SAVE_QUEUE
 KFeatureIdAsynchFileSaveQueue,
 #endif
@@ -48,6 +56,10 @@
 KFeatureIdFfAudt,
 #endif
 
+#ifdef FF_AUTOMOTIVESTACK
+KFeatureIdFfAutomotivestack,
+#endif
+
 #ifdef FF_AUTO_REDIAL_FOR_VIDEO_CALL
 KFeatureIdAutoRedialForVideoCall,
 #endif
@@ -72,6 +84,14 @@
 KFeatureIdBrowserProgressiveDownload,
 #endif
 
+#ifdef FF_CALENDAR_DAY_VIEW
+KFeatureIdFfCalDayView,
+#endif
+
+#ifdef FF_CALENDAR_SCROLLABLE_PREVIEW
+KFeatureIdFfCalScrollablePreview,
+#endif
+
 #ifdef FF_CAL_MEETING_REQUEST_UI
 KFeatureIdFfCalMeetingRequestUi,
 #endif
@@ -164,6 +184,10 @@
 KFeatureIdFfEmailFramework,
 #endif
 
+#ifdef FF_EMAIL_FULLSCREENVIEWER
+KFeatureIdFfEmailFullscreenviewer,
+#endif
+
 #ifdef FF_EMAIL_IPS_SERVICES
 KFeatureIdFfEmailIpsServices,
 #endif
@@ -172,6 +196,10 @@
 KFeatureIdEmailMceIntegration,
 #endif
 
+#ifdef FF_EMAIL_PREDICTIVESEARCH
+KFeatureIdFfEmailPredictivesearch,
+#endif
+
 #ifdef FF_EMAIL_PROTOCOL_PLUGINS
 KFeatureIdFfEmailProtocolPlugins,
 #endif
@@ -180,8 +208,12 @@
 KFeatureIdFfEmailUi,
 #endif
 
+#ifdef FF_EMAIL_UI_SPLITSCREEN
+KFeatureIdFfEmailUiSplitscreen,
+#endif
+
 #ifdef FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE
-KFeatureIdCertificationTesting,
+KFeatureIdEnableIsiCommunicationInUsbChargingMode,
 #endif
 
 #ifdef FF_ENHANCED_CALENDAR_EVENT_UI
@@ -200,6 +232,10 @@
 KFeatureIdFfFmtxRdsText,
 #endif
 
+#ifdef FF_FOTA_CHECK_LIMITATION
+KFeatureIdFfFotaCheckLimitation,
+#endif
+
 #ifdef FF_FULLSCR_HWR_INPUT
 KFeatureIdFullscrHwrInput,
 #endif
@@ -240,6 +276,10 @@
 KFeatureIdFfIaupdatePhase2,
 #endif
 
+#ifdef FF_IMAGE_EDITOR
+KFeatureIdFfImageEditor,
+#endif
+
 #ifdef FF_INPUTS_PER_ORIENTATION
 KFeatureIdFfInputsPerOrientation,
 #endif
@@ -248,6 +288,10 @@
 KFeatureIdFfIntelligentTextInput,
 #endif
 
+#ifdef FF_IPSEC_UMA_SUPPORT_ENABLE
+KFeatureIdFfIpsecUmaSupportEnable,
+#endif
+
 #ifdef FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT
 KFeatureIdFfItiVirtualTouchFirstGenerationSupport,
 #endif
@@ -332,6 +376,14 @@
 KFeatureIdFfOfnFeature,
 #endif
 
+#ifdef FF_OMADRM1_FULL_SUPPORT
+KFeatureIdFfOmadrm1FullSupport,
+#endif
+
+#ifdef FF_OMADRM2_SUPPORT
+KFeatureIdFfOmadrm2Support,
+#endif
+
 #ifdef FF_OMA_SCOMO_ADAPTER
 KFeatureIdFfOmaScomoAdapter,
 #endif
@@ -340,6 +392,10 @@
 KFeatureIdFfOssLegalNotice,
 #endif
 
+#ifdef FF_PLAYREADY_SUPPORT
+KFeatureIdFfPlayreadySupport,
+#endif
+
 #ifdef FF_PNPMS_PROV_FILTER
 KFeatureIdFfPnpmsProvFilter,
 #endif
@@ -380,6 +436,18 @@
 KFeatureIdSelectableEmail,
 #endif
 
+#ifdef FF_SIDESLIDER_SUPPORT
+KFeatureIdFfSidesliderSupport,
+#endif
+
+#ifdef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING
+KFeatureIdFfSimConsecutive6f00ErrorsHandling,
+#endif
+
+#ifdef FF_SIP_APN_SWITCHING
+KFeatureIdFfSipApnSwitching,
+#endif
+
 #ifdef FF_SIP_CUSTOM_PDP_HANDLING
 KFeatureIdFfSipCustomPdpHandling,
 #endif
@@ -428,10 +496,34 @@
 KFeatureIdFfTcpMyprofile,
 #endif
 
+#ifdef FF_TD_CLMContactReplicationFromPhonebookToUSIMCard
+KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard,
+#endif
+
+#ifdef FF_TD_CMCCATCommandsSupport
+KFeatureIdFfTdCmccatcommandssupport,
+#endif
+
+#ifdef FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer
+KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver,
+#endif
+
+#ifdef FF_TD_CMCCPIMSynchronizationProgressIndicatorUI 
+KFeatureIdFfTdCmccpimsynchronizationprogressindicatorui ,
+#endif
+
 #ifdef FF_TD_SCDMA
 KFeatureIdFfTdScdma,
 #endif
 
+#ifdef FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY
+KFeatureIdFfTdScdmaForbiddenoperatoricondisplay,
+#endif
+
+#ifdef FF_TD_SCDMA_VIDEOCALL_KEY
+KFeatureIdFfTdScdmaVideocallKey,
+#endif
+
 #ifdef FF_TOUCHSCREENCALIB_IN_STARTUP
 KFeatureIdTouchscreencalibInStartup,
 #endif
@@ -468,6 +560,10 @@
 KFeatureIdFfVideoAudioBranding,
 #endif
 
+#ifdef FF_VIDEO_EDITOR
+KFeatureIdFfVideoEditor,
+#endif
+
 #ifdef FF_VIRTUAL_FULLSCR_QWERTY_INPUT
 KFeatureIdVirtualFullscrQwertyInput,
 #endif
@@ -492,6 +588,10 @@
 KFeatureIdWebvideoPh2,
 #endif
 
+#ifdef FF_WLAN_AUTHENTICATION_ONLY_SUPPORT
+KFeatureIdFfWlanAuthenticationOnlySupport,
+#endif
+
 #ifdef FF_WLAN_EXTENSIONS
 KFeatureIdFfWlanExtensions,
 #endif
@@ -500,6 +600,10 @@
 KFeatureIdFfWlanWapi,
 #endif
 
+#ifdef FF_WMDRM_DLA_SUPPORT
+KFeatureIdFfWmdrmDlaSupport,
+#endif
+
 #ifdef SYMBIAN_INCLUDE_LOCATION_NPE_DSM
 KFeatureIdSymbianIncludeLocationNpeDsm,
 #endif