foundation/sysdefs/system_model.xml
changeset 140 36d2f4dd48e8
parent 139 c797dcecacfa
child 141 d5e25758f840
--- a/foundation/sysdefs/system_model.xml	Fri Aug 07 10:58:45 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Fri Aug 07 11:18:52 2009 +0100
@@ -7480,2233 +7480,6 @@
      </component>
     </collection>
    </block>
-   <block name="ossrv" long-name="Generic OS Services" tech_domain="hb" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-    <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-     <component name="libutils" long-name="Utility Library" origin-model="foundation">
-      <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-      <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/group"/>
-      <!-- <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
-     </component>
-    </collection>
-    <collection name="ofdbus" long-name="OF Dbus" level="utilities">
-     <component name="dbus" long-name="Dbus" origin-model="foundation">
-      <unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-      <unit bldFile="os/ossrv/ofdbus/dbus/tsrc/group"/>
-     </component>
-     <component name="dbus-glib" long-name="Dbus glib" origin-model="foundation">
-      <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-      <unit bldFile="os/ossrv/ofdbus/dbus-glib/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="ofdbus_build" long-name="OF Dbus Build" origin-model="foundation">
-      <unit bldFile="os/ossrv/ofdbus/group"/>
-     </component>
-     <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
-     </component>
-    </collection>
-    <collection name="glib" long-name="Glib" level="utilities">
-     <component name="glibbackend" long-name="Glib Backend" origin-model="foundation">
-      <unit bldFile="os/ossrv/glib/glibbackend/group"/>
-     </component>
-     <component name="libglib" long-name="Libglib" origin-model="foundation">
-      <unit bldFile="os/ossrv/glib/libglib/group"/>
-     </component>
-     <component name="libgthread" long-name="Libg Thread" origin-model="foundation">
-      <unit bldFile="os/ossrv/glib/libgthread/group"/>
-     </component>
-     <component name="libgmodule" long-name="Libg Module" origin-model="foundation">
-      <unit bldFile="os/ossrv/glib/libgmodule/group"/>
-     </component>
-     <component name="libgobject" long-name="Libg Object" origin-model="foundation">
-      <unit bldFile="os/ossrv/glib/libgobject/group"/>
-     </component>
-     <component unofficial="yes" name="glib_test" long-name="Glib Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/glib/tsrc/bc/group"/> -->
-      <unit bldFile="os/ossrv/glib/tsrc/group"/>
-     </component>
-    </collection>
-    <collection name="ssl" long-name="SSL" level="data-services">
-     <component name="libcrypto" long-name="Libcrypto" origin-model="foundation">
-      <unit bldFile="os/ossrv/ssl/libcrypto/group"/>
-     </component>
-     <component name="libssl" long-name="Libssl" origin-model="foundation">
-      <unit bldFile="os/ossrv/ssl/libssl/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_test" long-name="SSL Test" origin-model="foundation">
-      <unit bldFile="os/ossrv/ssl/tsrc/group"/>
-      <!-- <unit bldFile="os/ossrv/ssl/tsrc/bc/group"/> -->
-     </component>
-    </collection>
-    <collection name="stdcpp" long-name="Stdcpp" level="translation">
-     <component unofficial="yes" name="stdcpp_build" long-name="Stdcpp Build" origin-model="foundation">
-      <unit bldFile="os/ossrv/stdcpp/group"/>
-     </component>
-     <component unofficial="yes" name="stdcpp_test" long-name="Stdcpp Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
-      <unit bldFile="os/ossrv/stdcpp/tsrc/group"/>
-     </component>
-    </collection>
-    <collection name="stdlibs" long-name="Stdlibs" level="translation">
-     <component name="libz" long-name="Libz" origin-model="foundation">
-      <unit bldFile="os/ossrv/stdlibs/libz/group"/>
-     </component>
-     <component name="libcrypt" long-name="Libcrypt" origin-model="foundation">
-      <unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
-     </component>
-    </collection>
-    <collection name="genericservices" long-name="Generic Services" level="utilities">
-     <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp" version="9.4"/>
-     </component>
-     <component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-     </component>
-     <component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-     </component>
-     <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-     </component>
-     <component name="activebackupclient" long-name="Active Backup Client" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-     </component>
-     <component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-     </component>
-     <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-     </component>
-    </collection>
-    <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
-     <component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-     <component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
-     </component>
-    </collection>
-    <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-     <component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-     </component>
-     <component name="openenvcore" long-name="Open Environment Core" introduced="tb91" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-     </component>
-    </collection>
-    <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-     <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp" version="2"/>
-     </component>
-     <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-     </component>
-    </collection>
-    <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-     <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-     </component>
-     <component unofficial="yes" name="ossrv_build" long-name="Generic OS Services Build" origin-model="foundation">
-      <unit bldFile="os/ossrv/group"/>
-     </component>
-     <component unofficial="yes" name="ossrv_pub" long-name="Generic OS Services Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_pub/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
-     </component>
-    <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-    <collection name="contentmgmt" long-name="Content Management" level="utilities">
-     <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-     </component>
-     <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/contentmgmt/cafrecogniserconfig" mrp="os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-     </component>
-    </collection>
-    <collection name="crypto" long-name="Crypto Libraries" level="libraries">
-     <component name="weakcrypto" long-name="Weak Cryptography Library" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/crypto/weakcrypto/group" mrp="os/security/crypto/weakcrypto/group/security_crypto_weak.mrp"/>
-     </component>
-     <component name="strongcrypto" long-name="Strong Cryptography Library" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/crypto/weakcrypto/strong" mrp="os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
-     </component>
-    </collection>
-    <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-     <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-     </component>
-     <component name="securitytestfw" long-name="Security Test Framework" introduced="7.0" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
-     </component>
-     <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-     </component>
-     <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-     </component>
-    </collection>
-    <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-     <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-     </component>
-     <component name="securitytools" long-name="Security Tools" introduced="tb92" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-     </component>
-    </collection>
-    <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-     <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-     </component>
-     <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-     </component>
-     <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
-     </component>
-     <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-     </component>
-    </collection>
-    <collection name="security_info" long-name="OS Security Info" level="utilities">
-     <component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="featuremgmt" long-name="Feature Management" level="framework">
-     <component name="featuremanager" long-name="Feature Manager" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
-      <unit bldFile="os/devicesrv/featuremgmt/featuremanager/group"/>
-      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="featuremgmt_build" long-name="Feature Management Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/featuremgmt/group"/>
-     </component>
-    <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-     </component>
-    </collection>
-   <collection name="loggingservices" long-name="Logging Services" level="server">
-     <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
-     </component>
-     <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
-     </component>
-     <component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-     </component>
-    </collection>
-    <collection name="traceservices" long-name="Trace Services" level="server">
-     <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-     </component>
-     <component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-     </component>
-     <component name="utrace" long-name="UTrace" introduced="9.3" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/traceservices/utrace/group" mrp="os/persistentdata/traceservices/utrace/group/testtools_utrace_api.mrp"/>
-     </component>
-    </collection>
-    <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-     <component name="store" long-name="Store" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-     </component>
-     <component name="dbms" long-name="DBMS" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-     </component>
-     <component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-     </component>
-     <component name="sql" long-name="SQL" introduced="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-     </component>
-    </collection>
-    <collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-     <component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="accessoryservices" long-name="Accessory Services" level="framework">
-     <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
-      <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
-     </component>
-     <component name="accessoryremotecontrol" long-name="Accessory Remote Control" origin-model="foundation">
-      <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
-     </component>
-     <component name="accessoryserver" long-name="Accessory Server" origin-model="foundation">
-      <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
-     </component>
-     <component name="headsetstatusapi" long-name="Headset Status Api" origin-model="foundation">
-      <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="tspclientmapper" long-name="TSP Client Mapper" origin-model="foundation">
-      <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="remotecontrolfw">
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/client"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/test"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
-     </component>-->
-     <component name="reftsp" origin-model="foundation"/>
-     <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/accessoryservices/group"/>
-     </component>
-    <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-     </component>
-    </collection>
-    <collection name="commonservices" long-name="Common Services" level="app-if">
-     <component name="commonengine" long-name="Common Engine" origin-model="foundation">
-      <unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
-      <!-- <unit bldFile="os/devicesrv/commonservices/commonengine/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="commonengineresources" long-name="Common Engine Resources" origin-model="foundation">
-      <unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
-     </component>
-     <component name="platformenv" long-name="Platform Env" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
-      <unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/platformver/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/sysversioninfo/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="sysutil" long-name="Sysutil" origin-model="foundation">
-      <unit bldFile="os/devicesrv/commonservices/sysutil/group"/>
-      <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/sysutiltests/group"/> -->
-     </component>
-     <component name="activitymanager" long-name="Activity Manager" origin-model="foundation">
-      <unit bldFile="os/devicesrv/commonservices/activitymanager/group"/>
-      <unit bldFile="os/devicesrv/commonservices/activitymanager/tsrc/public/basic/group"/>
-     </component>
-     <component unofficial="yes" name="commonservices_build" long-name="Common Services Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/commonservices/group"/>
-     </component>
-    </collection>
-    <collection name="dosservices" long-name="Dos Services" level="hw-if">
-     <component name="commondsy" long-name="Common DSY" origin-model="foundation">
-      <unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
-     </component>
-     <component name="dosserver" long-name="Dos Server" origin-model="foundation">
-      <unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
-     </component>
-     <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
-     </component>
-     <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/dosservices/group"/>
-     </component>
-    </collection>
-    <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="serverexe" long-name="Server Exe" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/serverexe/group"/> -->
-     </component>
-     <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
-     </component>
-     <component name="clientdll" long-name="Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/clientdll/group"/> -->
-     </component>
-     <component name="commondll" long-name="Common DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/commondll/group"/> -->
-     </component>
-     <component name="vibraclientdll" long-name="Vibra Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
-     </component>
-     <component name="extendedlightclientdll" long-name="Extended Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
-     </component>
-     <component name="lightclientdll" long-name="Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
-     </component>
-     <component name="fmtxclientdll" long-name="FM TX Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
-     </component>
-     <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
-     </component>
-     <component name="vibractrl" long-name="Vibra Control" origin-model="foundation">
-      <unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-     </component>
-     <component name="hwresourcesmgr" origin-model="foundation">
-      <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/group"/>
-      <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group"/>
-     </component>
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="powerandmemorynotificationservice"/>-->
-     <component unofficial="yes" name="resourcemgmt_build" long-name="Resource Management Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/resourcemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
-     </component>
-    <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-     </component>
-    </collection>
-    <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-     <component name="hapticseffectdatagetterfw" long-name="Haptics Effect Data Getter Framework" origin-model="foundation">
-      <unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-     </component>
-     <component name="hapticspluginservice" long-name="Haptics Plugin Service" origin-model="foundation">
-      <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-     </component>
-     <component name="hapticspacketizer" long-name="Haptics Packetizer" origin-model="foundation">
-      <unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-     </component>
-     <component name="hapticspluginmanager" long-name="Haptics Plugin Manager" origin-model="foundation">
-      <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-     </component>
-     <component name="hapticsserver" long-name="Haptics Server" origin-model="foundation">
-      <unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-     </component>
-     <component name="hapticsclient" long-name="Haptics Client" origin-model="foundation">
-      <unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-     </component>
-     <component unofficial="yes" name="hwrmhaptics_build" long-name="HWRM Haptics Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/hwrmhaptics/group"/>
-     </component>
-    </collection>
-    <collection name="mediator" long-name="Mediator" level="app-if">
-     <component unofficial="yes" name="mediator_test" long-name="Mediator Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
-     </component>
-     <component unofficial="yes" name="mediator_build" long-name="Mediator Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/mediator/group"/>
-     </component>
-    </collection>
-    <collection name="psmservices" long-name="PSM Services" level="app-if">
-     <component name="psmserver" long-name="PSM Server" origin-model="foundation">
-      <unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
-      <!-- <unit bldFile="os/devicesrv/psmservices/psmserver/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="psmservices_build" long-name="PSM Services Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/psmservices/group"/>
-     </component>
-    </collection>
-    <collection name="sensorservices" long-name="Sensor Services" level="framework">
-     <component name="sensorserver" long-name="Sensor Server" origin-model="foundation">
-      <unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
-     </component>
-     <component name="orientationssy" long-name="Orientation SSY" origin-model="foundation">
-      <unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
-     </component>
-     <component name="tiltcompensationssy" long-name="Tilt Compensation SSY" origin-model="foundation">
-      <unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-     </component>
-     <component name="sensordatacompensator" long-name="Sensor Data Compensator" origin-model="foundation">
-      <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
-     </component>
-     <component unofficial="yes" name="sensorservices_build" long-name="Sensor Services Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/sensorservices/group"/>
-     </component>
-    </collection>
-    <collection name="sysstatemgmt" long-name="System State Management" level="server">
-     <component name="starter" long-name="Starter" origin-model="foundation">
-      <unit bldFile="os/devicesrv/sysstatemgmt/starter/group"/>
-      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="systemstarter">
-       -  <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/>  -
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
-     </component>-->
-     <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/sysstatemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
-     </component>
-    <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-     </component>
-    </collection>
-    <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
-     <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="devicesrvapitest/accessorieshaitest/gropup/accessorieshai.mrp"/>
-	-->
-     </component>
-     <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhai.mrp"/>
-	-->
-     </component>
-    </collection>
-    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
-     </component>
-     <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build" origin-model="foundation">
-      <unit bldFile="os/devicesrv/group"/>
-     </component>
-     <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
-     </component>
-    <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-     <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-     </component>
-     <component name="locationsuplpsy" long-name="Location SUPL PSY" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-     </component>
-    <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-     </component>
-     <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-     </component>
-     <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-     </component>
-     <component name="n:agpsintegrationmodule" long-name="A-GPS Integration Module" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-     <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-     </component>
-    </collection>
-    <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-     <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/lbs/locationrequestmgmt/locationserver/group" mrp="os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-     </component>
-     <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-     </component>
-    </collection>
-    <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-     <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
-     </component>
-     <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-     </component>
-    </collection>
-    <collection name="locationmgmt" long-name="Location Management" level="management">
-     <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-     </component>
-     <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-     </component>
-     <component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-     </component>
-     <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-     <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-     </component>
-     <component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
-     <component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="lbsapitest/lbshaitest/group/lbshai.mrp"/>
-	-->
-     </component>
-    </collection>
-    <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-     <component unofficial="yes" name="lbs_build" long-name="Locating Services Build" origin-model="foundation">
-      <unit bldFile="os/lbs/group"/>
-     </component>
-    <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-    <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-     <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsprocess" long-name="Comms Process" level="process">
-     <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-     </component>
-     <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<collection name="commsconfig" long-name="Comms Config" level="process">
-	 <component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-	  <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-	 </component>
-	 <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-	  <unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-	 </component>
-	</collection>
-    <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-     <component name="esockserver" long-name="ESock Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="2"/>
-     </component>
-     <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" version="2"/>
-     </component>
-     <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp" version="1"/>
-     </component>
-     <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-     </component>
-     <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-     </component>
-     <component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-     </component>
-    </collection>
-    <collection name="serialserver" long-name="Serial Server" level="server">
-     <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y" class="placeholder" origin-model="Symbian">
-      <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
-     </component>
-     <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-     </component>
-     <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-     </component>
-     <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-     </component>
-     <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="baseconnectionproviders" long-name="Base Connection Providers" level="framework">
-     <component name="refcpr" long-name="Reference CPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/commsfw/baseconnectionproviders/refcpr/group" mrp="os/commsfw/baseconnectionproviders/refcpr/group/networking_ReferenceCPR.mrp"/>
-     </component>
-     <component name="refscpr" long-name="Reference SCPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/commsfw/baseconnectionproviders/refscpr/group" mrp="os/commsfw/baseconnectionproviders/refscpr/group/networking_ReferenceSCPR.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-     <component name="commfw" long-name="Comms Framework" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/commsfwutils/commfw/group" mrp="os/commsfw/commsfwutils/commfw/group/comms-infras_commsfw.mrp" priority="10"/>
-     </component>
-     <component name="mbufmgr" long-name="MBuf Manager" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/commsfwutils/mbufmgr/group" mrp="os/commsfw/commsfwutils/mbufmgr/group/comms-infras_mbufmgr.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-     <component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-     </component>
-     <component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-     <component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-     <!-- Removing GT commdb
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
--->
-     <!-- <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component> -->
-     <component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="commsdb" long-name="Comms DB" level="server">
-     <component name="s60_commsdb" long-name="S60 Commsdb" origin-model="foundation">
-      <unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/>
-     </component>
-     <component unofficial="yes" name="commsdb_build" long-name="Comms DB Build" origin-model="foundation">
-      <unit bldFile="os/networkingsrv/commsdb/group"/>
-     </component>
-    </collection>
-    <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-     <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
-     </component>
-    </collection>
-    <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-     <component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-     </component>
-     <component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
-     </component>
-     <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-     </component>
-     <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="tb91" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-     </component>
-    </collection>
-    <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-     <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-     </component>
-    </collection>
-    <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-     <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-     </component>
-     <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
-     </component>
-     <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="1"/>
-     </component>
-     <component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" version="1"/>
-     </component>
-     <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-     </component>
-     <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-     </component>
-    </collection>
-    <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-     <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkcontrol" long-name="Network Control" level="plugin">
-     <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
-     </component>
-     <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-     </component>
-     <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-     </component>
-     <component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-     </component>
-     <component name="ipcpr" long-name="IP CPR" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipcpr/group" mrp="os/networkingsrv/networkcontrol/ipcpr/group/networking_ipcpr.mrp"/>
-     </component>
-     <component name="ipscpr" long-name="IP SCPR" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipscpr/group" mrp="os/networkingsrv/networkcontrol/ipscpr/group/networking_ipscpr.mrp"/>
-     </component>
-     <component name="ipcprshim" long-name="IP CPR Shim" deprecated="Future" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipcprshim/group" mrp="os/networkingsrv/networkcontrol/ipcprshim/group/networking_shimcpr.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-     <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
-     </component>
-     <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-     </component>
-     <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-     </component>
-     <component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-     </component>
-     <component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-     </component>
-    </collection>
-    <collection name="networksecurity" long-name="Network Security" level="framework">
-     <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-     </component>
-     <component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-     </component>
-     <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-     </component>
-     <component name="ipsecvpn" long-name="IPsec VPN" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DEF140049"
-        <unit bldFile="networksecurity/ipsecvpn/group" mrp="networksecurity/ipsecvpn/group/networking_ipsecvpn.mrp"/>
-		-->
-     </component>
-    </collection>
-    <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-     <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
-     </component>
-     <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
-     </component>
-     <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
-     </component>
-     <component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
-     </component>
-     <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
-     </component>
-     <component name="ipanalyzer" long-name="IP Analyzer" introduced="7.0" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
-     </component>
-     <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
-     <component unofficial="yes" name="networkingsrv_build" long-name="Networking Services Build" origin-model="foundation">
-      <unit bldFile="os/networkingsrv/group"/>
-     </component>
-    <component name="networkingrom" long-name="Networking ROM" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <!--  production component: contains the IBY files -->
-      <unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-     </component>
-     <component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-     </component>
-     <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-     <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="wlan" long-name="WLAN" tech_domain="dc" level="services" levels="hw low mid high tools test">
-    <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-     <component name="wlanpsmplugin" long-name="WLAN PSM Plugin" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-     </component>
-     <component name="wlanagent" long-name="WLAN Agent" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
-     </component>
-     <component name="wlandbif_cd" long-name="WLAN CommsDat interface" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
-     </component>
-     <component name="wlanengine" long-name="WLAN Engine" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-     </component>
-     <component name="wlanldd" long-name="WLAN LDD" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-     </component>
-     <component name="wlannwif" long-name="WLAN Network Interface" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_bearer_build" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_bearer/group"/>
-     </component>
-    </collection>
-    <collection name="wlantools" long-name="WLAN Tools" level="tools">
-     <component name="dut" long-name="Dut" origin-model="foundation"/>
-     <component name="ping" long-name="Ping" origin-model="foundation"/>
-    </collection>
-    <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
-     <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="wlanapitest/wlanhaitest/group/wlanhai.mrp"/>
-	-->
-     </component>
-    </collection>
-    <collection name="wlan_info" long-name="WLAN Info" level="test">
-     <component unofficial="yes" name="wlan_pub" long-name="WLAN Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_pub/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_build" long-name="WLAN Build" origin-model="foundation">
-      <unit bldFile="os/wlan/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_plat" long-name="WLAN Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/wlan/wlan_plat/group"/>
-     </component>
-    <component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-     <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-     </component>
-    </collection>
-    <collection name="fax" long-name="Fax" level="server">
-     <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-     </component>
-    </collection>
-    <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-     <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-     </component>
-     <component name="n:cdmasmsstack" long-name="CDMA SMS Stack" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-     <component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-     </component>
-     <component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-     </component>
-     <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-     </component>
-     <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-     </component>
-     <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-     </component>
-     <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-     </component>
-     <component name="umtsgprsscpr" long-name="UMTS/GPRS SCPR" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group" mrp="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp"/>
-     </component>
-     <component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-     </component>
-     <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-     </component>
-    </collection>
-    <collection name="telephonyserver" long-name="Telephony Server" level="server">
-     <component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-     </component>
-     <component name="etelconfig" long-name="ETel Config" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
-     </component>
-     <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-     </component>
-     <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-     </component>
-     <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-     </component>
-     <component name="n:etelcdma" long-name="ETel CDMA" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-     <!--Component manually removed, already declared in OS-->
-     <!--<component name="common_tsy">
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/testsuites/group"/>  -
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="multimodetsy"/>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="cdmatsy"/>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="simtsy"/>-->
-    <component name="common_tsy" long-name="Common TSY" introduced="tb92" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-     </component>
-     <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
-     </component>
-     <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-     </component>
-     <component name="cdmatsy" long-name="CDMA TSY" introduced="7.0" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/cdmatsy/group" mrp="os/cellularsrv/telephonyserverplugins/cdmatsy/group/telephony_cdmatsy.mrp"/>
-     </component>
-     <component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-     </component>
-    </collection>
-    <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
-     <component name="gennif" long-name="Generic NIF" origin-model="foundation">
-      <unit bldFile="os/cellularsrv/commonnetworkinterface/gennif/group"/>
-     </component>
-     <component name="gprsumtsagent" long-name="GPRS UMTS Agent" origin-model="foundation">
-      <unit bldFile="os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
-     </component>
-     <component unofficial="yes" name="commonnetworkinterface_build" long-name="Common Network Interface Build" origin-model="foundation">
-      <unit bldFile="os/cellularsrv/commonnetworkinterface/group"/>
-     </component>
-    </collection>
-    <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-     <component name="isc_if" long-name="ISC Interface" origin-model="foundation">
-      <unit bldFile="os/cellularsrv/basebandabstraction/isc_if/group"/>
-     </component>
-     <!--Component manually removed and merged to OS, unit originately commented out by Bob's script-->
-     <!--<component name="basebandchanneladaptor">
-       -  <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/test/te_bca/group"/>  -
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="intersystemcomm"/>-->
-    <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
-     </component>
-     <component name="intersystemcomm" long-name="Inter-System Communication" filter="gt" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-	 <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-	  <unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-	 </component>
-	 <component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-	  <unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-	 </component>
-	 <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-	  <unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-	 </component>
-	</collection>
-    <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-     <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build" origin-model="foundation">
-      <unit bldFile="os/cellularsrv/group"/>
-     </component>
-     <component unofficial="yes" name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/cellularsrv/cellularsrv_plat/group"/>
-     </component>
-    <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-     </component>
-     <component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-     </component>
-     <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-     <component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-     </component>
-    </collection>
-    <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
-     <component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhai.mrp"/>
-	-->
-     </component>
-     <component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhai.mrp"/>
-	-->
-     </component>
-     <component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhai.mrp"/>
-	-->
-     </component>
-    </collection>
-   </block>
-   <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
-    <collection name="audio" long-name="Audio Codecs" level="middleware">
-     <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs" origin-model="foundation">
-      <unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
-     </component>
-     <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build" origin-model="foundation">
-      <unit bldFile="os/mm/audio/group"/>
-     </component>
-    </collection>
-    <collection name="video" long-name="Video Codecs" level="middleware">
-     <component name="arm_mdf_decoders" long-name="ARM MDF Decoders" origin-model="foundation">
-      <unit bldFile="os/mm/video/group"/>
-     </component>
-    </collection>
-    <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-     <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="foundation">
-      <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
-      <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
-     </component>
-     <component name="mmextfw" long-name="MM Ext Framework" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
-     </component>
-     <component name="audiorouting" long-name="Audio Routing" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
-     </component>
-     <component name="effects" long-name="Effects" origin-model="foundation">
-      <!-- <unit bldFile="os/mm/devsoundextensions/effects/effecttest"/> -->
-      <unit bldFile="os/mm/devsoundextensions/effects/group"/>
-     </component>
-     <component name="effectspresets" long-name="Effects Presets" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
-     </component>
-     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/server/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/session/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
-     </component>
-     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-     </component>
-     <component name="addeddevsoundcontrol" long-name="Added DevSound Control" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-     </component>
-     <component name="globalaudiosettings" long-name="Global Audio Settings" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
-     </component>
-     <component name="restrictedaudiooutput" long-name="Restricted Audio Output" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-     </component>
-     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-     </component>
-     <component unofficial="yes" name="devsoundextensions_build" long-name="Devsound Extensions Build" origin-model="foundation">
-      <unit bldFile="os/mm/devsoundextensions/group"/>
-     </component>
-    </collection>
-    <collection name="mdfdevvideoextensions" long-name="MDF devvideo Extensions" level="device-fw">
-     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor" origin-model="foundation">
-      <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
-     </component>
-     <component unofficial="yes" name="mdfdevvideoextensions_build" long-name="MDF devvideo Extensions Build" origin-model="foundation">
-      <unit bldFile="os/mm/mdfdevvideoextensions/group"/>
-     </component>
-    </collection>
-    <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
-     <component name="postingsurface" long-name="Posting Surface" origin-model="foundation">
-      <unit bldFile="os/mm/videoadaptationextensions/postingsurface/group"/>
-     </component>
-     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
-      <unit bldFile="os/mm/videoadaptationextensions/group"/>
-     </component>
-    </collection>
-    <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-     <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-     </component>
-     <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
-     </component>
-     <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
-     </component>
-     <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-     </component>
-     <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-     <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-     <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
-      <!-- PLACEHOLDER="DEF137831" REMOVE -->
-      <!-- PLACEHOLDER="DEF137831"
-		<unit bldFile="mmplugins/imagingplugins/plugins/group" mrp="mmplugins/imagingplugins/plugins/group/multimedia_icl_plugin.mrp"/>
-		-->
-     </component>
-     <component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-     </component>
-     <component name="3gplib" long-name="3GP Library" introduced="Future" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmplugins/3gplib/group" mrp="os/mm/mmplugins/3gplib/group/multimedia_3gplibrary.mrp"/>
-     </component>
-     <component name="3gpunittest" long-name="3GP Unit Tests" introduced="Future" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmplugins/3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="mm_info" long-name="Multimedia Info" level="app-if">
-     <component unofficial="yes" name="mm_pub" long-name="Multimedia Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/mm/mm_pub/audio_effects_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_pub/group"/>
-     </component>
-     <component unofficial="yes" name="mm_build" long-name="Multimedia Build" origin-model="foundation">
-      <unit bldFile="os/mm/group"/>
-     </component>
-     <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="foundation">
-      <!-- <unit bldFile="os/mm/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/audio_routing_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/audio_visualization_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/group"/>
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/tsrc/group"/>
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/tsrc/group"/>
-     </component>
-    <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-     </component>
-     <component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-     <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-     <component name="n:mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-     </component>
-     <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
-     </component>
-     <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
-     <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
-     </component>
-     <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
-     </component>
-     <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
-     </component>
-     <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-     <component name="openmax" long-name="OpenMAX" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/omxil/openmax/group" mrp="os/mm/omxil/openmax/group/multimedia_openmax.mrp"/>
-     </component>
-    </collection>
-    <collection name="devsound" long-name="Sound Device" level="devices">
-     <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
-     </component>
-     <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-     </component>
-     <component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-     </component>
-     <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
-     </component>
-     <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
-     </component>
-     <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-     </component>
-     <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-     </component>
-     <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
-     </component>
-     <component name="a3fcharacterisationtest" long-name="A3F Characterisation Tests" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/devsound/a3fcharacterisationtest/group/multimedia_a3f_devsound_char.mrp"/>
-     </component>
-     <component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb92" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-     <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
-     </component>
-     <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-     </component>
-     <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-     </component>
-     <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-     </component>
-     <component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
-     </component>
-     <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
-     </component>
-     <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-     <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
-     </component>
-     <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="mmapitest/devvideohaitest/group/devvideohai.mrp"/>
-	-->
-     </component>
-     <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="mmapitest/devsoundhaitest/group/devsoundhai.mrp"/>
-	-->
-     </component>
-     <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthai.mrp"/>
-	-->
-     </component>
-    </collection>
-   </block>
-   <block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-     <component name="iclextjpegapi" long-name="ICL Ext JPEG API" origin-model="foundation">
-      <unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-     </component>
-     <component unofficial="yes" name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
-      <unit bldFile="os/imagingext/imageadaptationextensions/group"/>
-     </component>
-    </collection>
-    <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-     <component name="exiflib" long-name="Exif Lib" origin-model="foundation">
-      <unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
-     </component>
-     <component name="jp2kcodec" long-name="JP2K Codec" origin-model="foundation">
-      <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
-     </component>
-     <component name="h264avcvideoencarm" long-name="H264AVC VideoEnc ARM" origin-model="foundation"/>
-     <component name="videoencpluginarm" long-name="VideoEnc Plugin ARM" origin-model="foundation"/>
-    </collection>
-    <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
-     <component unofficial="yes" name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/imagingext/imagingext_plat/group"/>
-     </component>
-     <component unofficial="yes" name="imagingext_build" long-name="Imaging Extensions Build" origin-model="foundation">
-      <unit bldFile="os/imagingext/group"/>
-     </component>
-     <component unofficial="yes" name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
-      <unit bldFile="os/imagingext/imagingext_pub/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
-     <component name="vgi" long-name="VGI" origin-model="foundation">
-      <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
-     </component>
-     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
-     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
-    </collection>
-    <collection name="m3g" long-name="M3G" level="internal-adaptations">
-     <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
-      <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
-     </component>
-    </collection>
-    <collection name="graphicstest" long-name="Graphics Test" level="app-if">
-     <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
-     </component>
-     <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-     <component unofficial="yes" name="graphicssvs" origin-model="foundation">
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
-	  <unit mrp="os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
-     </component>
-     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
-     </component>
-     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="foundation">
-      <unit bldFile="os/graphics/group"/>
-     </component>
-     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/graphics/graphics_plat/group"/>
-     </component>
-    <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-     </component>
-     <component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="windowing" long-name="Windowing" level="app-if">
-     <component name="windowserver" long-name="Window Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-     </component>
-    </collection>
-    <collection name="printingservices" long-name="Printing Services" level="app-if">
-     <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-     </component>
-     <component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-     </component>
-    </collection>
-    <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-     <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-     </component>
-    </collection>
-    <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
-     <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-     </component>
-     <component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
-     </component>
-     <component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-     <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-     </component>
-	 <component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
-      <unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
-     </component>
-    </collection>
-    <collection name="egl" long-name="EGL" level="internal-adaptations">
-     <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
-     </component>
-     <component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-     <component name="gdi" long-name="GDI" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-     </component>
-     <component name="bitgdi" long-name="BitGDI" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-     </component>
-     <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-     </component>
-     <component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
-<!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-     </component>
--->
-    </collection>
-    <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
-     <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhai.mrp"/>
-	-->
-     </component>
-    </collection>
-   </block>
-   <block name="textandloc" long-name="Text and Localisation" tech_domain="ui" level="services" levels="encoding util fonts tools text">
-    <collection name="charconvfw" long-name="Character Conversion FW" level="encoding">
-     <component name="charconv" long-name="Charconv" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/charconv/ongoing/group"/>
-     </component>
-     <component name="charconvplugin" long-name="Charconv Plugin" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/charconvplugin/group"/>
-     </component>
-     <component name="charconv_fw" origin-model="foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
-      <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="charconvplugins"/>-->
-    <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-     </component>
-     <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-     </component>
-    </collection>
-    <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-     <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-     </component>
-     <component name="fontstore" long-name="Font Store" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-     </component>
-     <component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- placeholder for text code from GDI -->
-     </component>
-     <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-     </component>
-     <component name="n:itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb92" purpose="development" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
-     </component>
-     <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-     </component>
-     <component name="n:testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="textlayout" long-name="Text Layout" level="text">
-     <component name="texthandling" long-name="Text Handling" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-     </component>
-     <component name="textformatting" long-name="Text Formatting" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-     </component>
-     <component name="word" long-name="Word" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
-     </component>
-    </collection>
-    <collection name="textandlocutils" level="util" long-name="Text and Localisation Utils">
-     <component name="localizer" long-name="Localizer" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/localizer/group"/>
-     </component>
-     <component name="findutil" long-name="Find Util" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/findutil/group"/>
-     </component>
-     <component name="numbergrouping" long-name="Number Grouping" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-     </component>
-     <component name="gamerecognizer" long-name="Game Recognizer" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/gamerecognizer/group"/>
-     </component>
-     <component name="jplangutil" long-name="JP Lang Util" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
-     </component>
-     <component name="sortutil" long-name="Sort Util" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
-     </component>
-     <component name="aknjapanesereading" long-name="Akn Japanese Reading" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/aknjapanesereading/group"/>
-     </component>
-     <component name="inlinetext" long-name="Inline Text" origin-model="foundation">
-      <unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-     </component>
-    <component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- placeholder for split from bafl -->
-     </component>
-     <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-     </component>
-    </collection>
-    <collection name="localesupport" long-name="Locale Support" level="util">
-     <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-     </component>
-     <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- placeholder for split from bafl -->
-     </component>
-    </collection>
-    <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-     <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC" plugin="N" origin-model="Symbian">
-      <!-- placeholder for split from GDI Tools -->
-     </component>
-     <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-     </component>
-    </collection>
-    <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-     <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_pub/group"/>
-     </component>
-     <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="foundation">
-      <unit bldFile="os/textandloc/group"/>
-     </component>
-     <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_plat/group"/>
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
-     </component>
-    <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="xmlsrv" long-name="XML Services" tech_domain="rt" level="services" levels="plugin server framework generic specific">
-    <collection name="xmlengine" long-name="XML Engine" level="server">
-     <component name="libxml2" long-name="Libxml2" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlengine/libxml2/group"/>
-     </component>
-     <component name="xmlengineutils" long-name="XML Engine Utils" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlengine/xmlengineutils/group"/>
-     </component>
-     <component name="domxpathwrapper" long-name="DOM XPath Wrapper" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlengine/domxpathwrapper/group"/>
-     </component>
-     <component name="xmlengineserializer" long-name="XML Engines Erializer" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlengine/xmlengineserializer/group"/>
-     </component>
-     <component name="xmlenginesaxplugin" long-name="XML Engine SAX Plugin" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlengine/xmlenginesaxplugin/group"/>
-     </component>
-     <component unofficial="yes" name="xmlengine_build" long-name="XML Engine Build" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlengine/group"/>
-     </component>
-    </collection>
-    <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-     <component name="xmlseccertman" long-name="XML Security Certman" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-     </component>
-     <component name="xmlsec" long-name="XML Security" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-     </component>
-     <component name="xmlseccrypto" long-name="XML Security Crypto" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-     </component>
-     <component name="xmlsecwrapper" long-name="XML Security Wrapper" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-     </component>
-     <component unofficial="yes" name="xmlsecurityengine_build" long-name="XML Security Engine Build" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlsecurityengine/group"/>
-     </component>
-    </collection>
-    <collection name="xml" long-name="XML" level="generic">
-     <component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-     </component>
-     <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-     </component>
-     <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-     </component>
-    </collection>
-    <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-     <component unofficial="yes" name="xmlsrv_plat" long-name="XML Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/group"/>
-     </component>
-     <component unofficial="yes" name="xmlsrv_pub" long-name="XML Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
-     </component>
-    <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="deviceplatformrelease" long-name="Device Platform Release" tech_domain="to" level="services" levels="bld mid top">
-    <collection name="s60extras" long-name="S60 Extras" level="mid">
-     <component name="s60extras_build" long-name="S60 Extras Component" origin-model="foundation">
-      <unit bldFile="os/deviceplatformrelease/s60extras/group"/>
-     </component>
-    </collection>
-    <collection name="s60locfiles" long-name="S60 Loc Files" level="mid">
-     <component name="s60locfiles_build" long-name="S60 Loc Files Component" origin-model="foundation">
-      <unit bldFile="os/deviceplatformrelease/s60locfiles/group"/>
-     </component>
-    </collection>
-    <collection name="version" long-name="Version" level="top">
-     <component name="version_build" long-name="Version Component" origin-model="foundation">
-      <unit bldFile="os/deviceplatformrelease/version/group"/>
-     </component>
-    </collection>
-    <collection name="sf_config" long-name="SF Config" level="mid">
-     <component name="config" origin-model="foundation">
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/apac/group"/> -->
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/group"/> -->
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/japan/group"/> -->
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/western/group"/> -->
-     </component>
-    </collection>
-    <collection name="s60bld">
-     <component unofficial="yes" name="buildplatforms" origin-model="foundation">
-      <unit bldFile="tools/buildplatforms/group"/>
-     </component>
-    </collection>
-   <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-     <component name="cedarutils" long-name="Cedar Utils" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-     </component>
-     <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-     </component>
-    </collection>
-    <collection name="foundation_system" long-name="Foundation System" level="top">
-     <component name="systemdocs" long-name="System Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
-     </component>
-     <component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-     </component>
-    </collection>
-    <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-     <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
-    <collection name="stif" long-name="STIF" level="fw">
-     <component name="testinterface" long-name="Test Interface" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testinterface/group"/>
-     </component>
-     <component name="testserver" long-name="Test Server" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testserver/group"/>
-     </component>
-     <component name="testengine" long-name="Test Engine" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testengine/group"/>
-     </component>
-     <component name="testserverstarter" long-name="Test Server Starter" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testserverstarter/group"/>
-     </component>
-     <component name="stiftfwif" long-name="STIF TFwIf" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/stiftfwif/group"/>
-     </component>
-     <component name="consoleui" long-name="Console UI" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/consoleui/group"/>
-     </component>
-     <component name="testcombiner" long-name="Test Combiner" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testcombiner/group"/>
-     </component>
-     <component name="demomodule" long-name="Demo Module" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/demomodule/group"/>
-     </component>
-     <component name="atslogger" long-name="ATS Logger" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/atslogger/group"/>
-     </component>
-     <component name="atsinterface" long-name="ATS Interface" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/atsinterface/group"/>
-     </component>
-     <component name="testscripter" long-name="Test Scripter" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testscripter/group"/>
-     </component>
-     <component name="suevent" long-name="SU Event" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/suevent/group"/>
-     </component>
-     <component name="stifkerneltestclassbase" long-name="STIF Kernel Test Class Base" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
-     </component>
-     <component name="examples" long-name="Examples" origin-model="foundation">
-      <!-- <unit bldFile="ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
-     </component>
-     <component name="testmoduletemplates" long-name="Test Module Templates" origin-model="foundation">
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
-     </component>
-     <component unofficial="yes" name="stif_build" long-name="STIF Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/group"/>
-     </component>
-    </collection>
-    <collection name="memspy" long-name="Memspy" level="trace">
-     <component name="driver" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/driver/group"/>
-     </component>
-     <component name="memspy_engine" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/engine/group"/>
-     </component>
-     <component name="commandline" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/commandline/group"/>
-     </component>
-     <component name="console" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/console/group"/>
-     </component>
-     <component unofficial="yes" name="memspy_build" long-name="Memspy Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/group"/>
-     </component>
-    </collection>
-    <collection name="hti" long-name="HTI" level="trace">
-     <component name="hticfg" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/hticfg/group"/>
-     </component>
-     <component name="htiautostart" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htiautostart/group"/>
-     </component>
-     <component name="htiframework" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htiframework/group"/>
-     </component>
-     <!-- Empty duplicate component HtiCommPlugins removed -->
-     <!-- Empty duplicate component HtiServicePlugins removed -->
-     <component name="htifilehlp" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htifilehlp/group"/>
-     </component>
-     <component name="htiwatchdog" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htiwatchdog/group"/>
-     </component>
-     <component unofficial="yes" name="hti_build" long-name="HTI Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/group"/>
-     </component>
-    </collection>
-    <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
-     <component name="cinidata" long-name="CINI Data" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/> -->
-     </component>
-     <component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
-     <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/group"/>
-     </component>
-    <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-     </component>
-    </collection>
-	<collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
-     <component unofficial="yes" name="memspy_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
-     </component>
-     <component unofficial="yes" name="stif_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/stif_api/group"/>
-     </component>
-     <component unofficial="yes" name="hti_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/hti_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_system_trace_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
-    <collection name="gid_pc_tool" long-name="GID PC Tool">
-     <component name="dbimporter" long-name="DB Importer" origin-model="foundation">
-      <unit bldFile="tools/swconfigtools/gid_pc_tool/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-    <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
-     <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
-     </component>
-    </collection>
-    <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-     <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-     </component>
-    </collection>
-    <collection name="n:unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
-     <component name="n:uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
-     </component>
-     <component name="n:uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
-     </component>
-     <component name="n:uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
-     </component>
-     <component name="n:uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
-     <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
-     </component>
-    </collection>
-    <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
-     <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
-     </component>
-    </collection>
-    <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
-     <component name="e32test" long-name="E32 Tests" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-     </component>
-     <component name="n:sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
-     </component>
-     <component name="n:e32utils" long-name="E32 Utilities" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/> -->
-     </component>
-     <component name="n:f32test" long-name="File Server Tests" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
-     <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
-     </component>
-     <component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/esound" mrp="os/kernelhwsrv/kernel/eka/drivers/esound/base_e32_drivers_sound.mrp"/>
-     </component>
-     <component name="serialldd" long-name="Serial Port Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-     </component>
-     <component name="legacydrivers" long-name="Legacy Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-     </component>
-     <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <!-- these are LDDs for storage media-->
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-     </component>
-     <component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/base_e32_drivers_debug.mrp"/>
-     </component>
-     <component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-     </component>
-    </collection>
-    <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-     <component name="n:sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
-     </component>
-     <component name="n:sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
-     </component>
-     <component name="mediadrivers" long-name="Media Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- these are for storage media-->
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-     </component>
-     <component name="genericboardsupport" long-name="Generic Board Support" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-     </component>
-    </collection>
-    <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-     <component name="euser" long-name="User Library" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-     </component>
-     <component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-     </component>
-     <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-     </component>
-     <component name="n:nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
-     </component>
-     <component name="estart" long-name="Base Starter" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-     </component>
-     <component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-     </component>
-     <component name="basedocs" long-name="Base Documentation" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/kernelhwsrv/userlibandfileserver/basedocs/base_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="filesystems" long-name="File Systems" level="framework">
-     <component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-     </component>
-     <component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-     </component>
-     <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-     </component>
-     <component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-     </component>
-     <component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-     </component>
-     <component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-     </component>
-     <component name="n:ntfs" long-name="NTFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
-     </component>
-     <component name="n:iso9660fs" long-name="ISO9660 File System" filter="gt" introduced="8.1b" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="halservices" long-name="HAL Services" level="framework">
-     <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-     </component>
-    </collection>
-    <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-     <component name="e32wsrv" long-name="Text Window Server" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-     </component>
-     <component name="textshell" long-name="Text Shell" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-     </component>
-    </collection>
-    <collection name="baseapitest" long-name="Base API Tests" level="test">
-     <component name="basesvs" long-name="Base Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-     <component unofficial="yes" name="localesupport" origin-model="foundation">
-      <!-- <unit bldFile="os/kernelhwsrv/localisation/localesupport/mmpfiles"/> -->
-     </component>
-    <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="shortlinksrv" level="services" long-name="Short Link Services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
-     <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="usbldd" long-name="Shortlink Logical Device Drivers" level="hw-if">
-     <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetooth" long-name="Bluetooth" level="framework">
-     <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetooth/btstack" mrp="os/shortlinksrv/bluetooth/btstack/bluetooth_stack.mrp"/>
-     </component>
-     <component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetooth/btcomm" mrp="os/shortlinksrv/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-     </component>
-     <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetooth/btsdp" mrp="os/shortlinksrv/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-     </component>
-     <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetooth/btextnotifiers" mrp="os/shortlinksrv/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-     </component>
-     <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetooth/gavdp/group" mrp="os/shortlinksrv/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-     </component>
-     <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/shortlinksrv/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
-     </component>
-     <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetooth/btlogger/group" mrp="os/shortlinksrv/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-     </component>
-     <component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/shortlinksrv/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-     <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btmgr" mrp="os/shortlinksrv/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-     </component>
-     <component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btconfig" mrp="os/shortlinksrv/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-     </component>
-     <component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btrom" mrp="os/shortlinksrv/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-     </component>
-     <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib" mrp="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-     </component>
-     <component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="os/shortlinksrv/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-     <component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bluetoothcommsprofiles/btpan/group" mrp="os/shortlinksrv/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-     </component>
-    </collection>
-    <collection name="bthci" long-name="Host Controller Interface" level="server">
-     <component name="bthci1" long-name="Bluetooth HCI Framework 1" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bthci/bthci1" mrp="os/shortlinksrv/bthci/bthci1/bluetooth_hci.mrp"/>
-     </component>
-     <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bthci/bthci2/group" mrp="os/shortlinksrv/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-     </component>
-     <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bthci/hciextensioninterface" mrp="os/shortlinksrv/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-     </component>
-     <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/bthci/hci2implementations/group" mrp="os/shortlinksrv/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-     </component>
-    </collection>
-    <collection name="usbmgmt" long-name="USB Management" level="server">
-     <component name="usbmgr" long-name="USB Manager" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/usbmgmt/usbmgr/group" mrp="os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-     </component>
-     <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="os/shortlinksrv/usbmgmt/usbmgrtest/group/usb_test.mrp" version="2"/>
-     </component>
-     <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="os/shortlinksrv/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="irda" long-name="IrDA" level="plugin">
-     <component name="irdastack" long-name="IrDA Stack" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/shortlinksrv/irda/irdastack/group" mrp="os/shortlinksrv/irda/irdastack/group/infra-red_irda.mrp"/>
-     </component>
-    </collection>
-    <collection name="shortlinksrv_info" long-name="Short Link Services Info" level="app-if">
-     <component unofficial="yes" name="shortlinksrv_build" origin-model="foundation">
-      <unit bldFile="os/shortlinksrv/group"/>
-     </component>
-     <component unofficial="yes" name="shortlinksrv_plat" class="api" origin-model="foundation">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/group"/>
-     </component>
-    <component name="shortlinksrv_metadata" long-name="Short Link Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/shortlinksrv/shortlinksrv_info/shortlinksrv_metadata/shortlinksrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
    <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
     <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
      <component name="buildsystemtools" long-name="Build System Tools" purpose="development" plugin="N" origin-model="Symbian">
@@ -10023,6 +7796,2233 @@
      </component>
     </collection>
    </block>
+   <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+     <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+     </component>
+    </collection>
+    <collection name="fax" long-name="Fax" level="server">
+     <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
+     </component>
+    </collection>
+    <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
+     <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+     </component>
+     <component name="n:cdmasmsstack" long-name="CDMA SMS Stack" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
+     <component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+     </component>
+     <component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+     </component>
+     <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+     </component>
+     <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+     </component>
+     <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+     </component>
+     <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+     </component>
+     <component name="umtsgprsscpr" long-name="UMTS/GPRS SCPR" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group" mrp="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp"/>
+     </component>
+     <component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+     </component>
+     <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+     </component>
+    </collection>
+    <collection name="telephonyserver" long-name="Telephony Server" level="server">
+     <component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+     </component>
+     <component name="etelconfig" long-name="ETel Config" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
+      <unit mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
+     </component>
+     <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+     </component>
+     <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+     </component>
+     <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+     </component>
+     <component name="n:etelcdma" long-name="ETel CDMA" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
+     <!--Component manually removed, already declared in OS-->
+     <!--<component name="common_tsy">
+       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/group"/>  -
+       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/group"/>  -
+       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group"/>  -
+       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group"/>  -
+       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/group"/>  -
+       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/testsuites/group"/>  -
+     </component>-->
+     <!--Component manually removed as empty and name conflicts with an OS component-->
+     <!--<component name="multimodetsy"/>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="cdmatsy"/>-->
+     <!--Component manually removed as empty and name conflicts with an OS component-->
+     <!--<component name="simtsy"/>-->
+    <component name="common_tsy" long-name="Common TSY" introduced="tb92" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+     </component>
+     <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
+     </component>
+     <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+     </component>
+     <component name="cdmatsy" long-name="CDMA TSY" introduced="7.0" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserverplugins/cdmatsy/group" mrp="os/cellularsrv/telephonyserverplugins/cdmatsy/group/telephony_cdmatsy.mrp"/>
+     </component>
+     <component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+     </component>
+    </collection>
+    <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
+     <component name="gennif" long-name="Generic NIF" origin-model="foundation">
+      <unit bldFile="os/cellularsrv/commonnetworkinterface/gennif/group"/>
+     </component>
+     <component name="gprsumtsagent" long-name="GPRS UMTS Agent" origin-model="foundation">
+      <unit bldFile="os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
+     </component>
+     <component unofficial="yes" name="commonnetworkinterface_build" long-name="Common Network Interface Build" origin-model="foundation">
+      <unit bldFile="os/cellularsrv/commonnetworkinterface/group"/>
+     </component>
+    </collection>
+    <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
+     <component name="isc_if" long-name="ISC Interface" origin-model="foundation">
+      <unit bldFile="os/cellularsrv/basebandabstraction/isc_if/group"/>
+     </component>
+     <!--Component manually removed and merged to OS, unit originately commented out by Bob's script-->
+     <!--<component name="basebandchanneladaptor">
+       -  <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/test/te_bca/group"/>  -
+     </component>-->
+     <!--Component manually removed as empty and name conflicts with an OS component-->
+     <!--<component name="intersystemcomm"/>-->
+    <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+     </component>
+     <component name="intersystemcomm" long-name="Inter-System Communication" filter="gt" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
+     </component>
+    </collection>
+	<!-- Collection manually added due to faulty merge XSLT -->
+	<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
+	 <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
+	  <unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+	 </component>
+	 <component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
+	  <unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+	 </component>
+	 <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+	  <unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+	 </component>
+	</collection>
+    <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
+     <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build" origin-model="foundation">
+      <unit bldFile="os/cellularsrv/group"/>
+     </component>
+     <component unofficial="yes" name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/cellularsrv/cellularsrv_plat/group"/>
+     </component>
+    <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+     </component>
+     <component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+     </component>
+     <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+     </component>
+    </collection>
+   <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+     <component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+     </component>
+    </collection>
+    <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
+     <component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhai.mrp"/>
+	-->
+     </component>
+     <component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhai.mrp"/>
+	-->
+     </component>
+     <component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhai.mrp"/>
+	-->
+     </component>
+    </collection>
+   </block>
+   <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+    <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+     <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+     </component>
+    </collection>
+    <collection name="commsprocess" long-name="Comms Process" level="process">
+     <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+     </component>
+     <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
+      <unit mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
+     </component>
+    </collection>
+	<!-- Collection manually added due to faulty merge XSLT -->
+	<collection name="commsconfig" long-name="Comms Config" level="process">
+	 <component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
+	  <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+	 </component>
+	 <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+	  <unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+	 </component>
+	</collection>
+    <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
+     <component name="esockserver" long-name="ESock Server" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="2"/>
+     </component>
+     <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
+      <unit mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" version="2"/>
+     </component>
+     <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp" version="1"/>
+     </component>
+     <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+     </component>
+     <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+     </component>
+     <component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+     </component>
+    </collection>
+    <collection name="serialserver" long-name="Serial Server" level="server">
+     <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y" class="placeholder" origin-model="Symbian">
+      <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
+     </component>
+     <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+     </component>
+     <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+     </component>
+     <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+     </component>
+     <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="baseconnectionproviders" long-name="Base Connection Providers" level="framework">
+     <component name="refcpr" long-name="Reference CPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/commsfw/baseconnectionproviders/refcpr/group" mrp="os/commsfw/baseconnectionproviders/refcpr/group/networking_ReferenceCPR.mrp"/>
+     </component>
+     <component name="refscpr" long-name="Reference SCPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/commsfw/baseconnectionproviders/refscpr/group" mrp="os/commsfw/baseconnectionproviders/refscpr/group/networking_ReferenceSCPR.mrp"/>
+     </component>
+    </collection>
+    <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
+     <component name="commfw" long-name="Comms Framework" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/commsfwutils/commfw/group" mrp="os/commsfw/commsfwutils/commfw/group/comms-infras_commsfw.mrp" priority="10"/>
+     </component>
+     <component name="mbufmgr" long-name="MBuf Manager" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/commsfwutils/mbufmgr/group" mrp="os/commsfw/commsfwutils/mbufmgr/group/comms-infras_mbufmgr.mrp"/>
+     </component>
+    </collection>
+    <collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
+     <component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+     </component>
+     <component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
+     <component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+     </component>
+    </collection>
+    <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
+     <!-- Removing GT commdb
+<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+-->
+     <!-- <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+</component> -->
+     <component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="deviceplatformrelease" long-name="Device Platform Release" tech_domain="to" level="services" levels="bld mid top">
+    <collection name="s60extras" long-name="S60 Extras" level="mid">
+     <component name="s60extras_build" long-name="S60 Extras Component" origin-model="foundation">
+      <unit bldFile="os/deviceplatformrelease/s60extras/group"/>
+     </component>
+    </collection>
+    <collection name="s60locfiles" long-name="S60 Loc Files" level="mid">
+     <component name="s60locfiles_build" long-name="S60 Loc Files Component" origin-model="foundation">
+      <unit bldFile="os/deviceplatformrelease/s60locfiles/group"/>
+     </component>
+    </collection>
+    <collection name="version" long-name="Version" level="top">
+     <component name="version_build" long-name="Version Component" origin-model="foundation">
+      <unit bldFile="os/deviceplatformrelease/version/group"/>
+     </component>
+    </collection>
+    <collection name="sf_config" long-name="SF Config" level="mid">
+     <component name="config" origin-model="foundation">
+      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/apac/group"/> -->
+      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/group"/> -->
+      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/japan/group"/> -->
+      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/western/group"/> -->
+     </component>
+    </collection>
+    <collection name="s60bld">
+     <component unofficial="yes" name="buildplatforms" origin-model="foundation">
+      <unit bldFile="tools/buildplatforms/group"/>
+     </component>
+    </collection>
+   <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+     <component name="cedarutils" long-name="Cedar Utils" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+     </component>
+     <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config" plugin="N" origin-model="Symbian">
+      <unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+     </component>
+    </collection>
+    <collection name="foundation_system" long-name="Foundation System" level="top">
+     <component name="systemdocs" long-name="System Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
+     </component>
+     <component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+     </component>
+    </collection>
+    <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
+     <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="accessoryservices" long-name="Accessory Services" level="framework">
+     <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
+      <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
+     </component>
+     <component name="accessoryremotecontrol" long-name="Accessory Remote Control" origin-model="foundation">
+      <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
+     </component>
+     <component name="accessoryserver" long-name="Accessory Server" origin-model="foundation">
+      <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
+     </component>
+     <component name="headsetstatusapi" long-name="Headset Status Api" origin-model="foundation">
+      <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
+     </component>
+     <component name="tspclientmapper" long-name="TSP Client Mapper" origin-model="foundation">
+      <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
+      <!-- <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
+     </component>
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="remotecontrolfw">
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/client"/>
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/test"/>
+       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
+     </component>-->
+     <component name="reftsp" origin-model="foundation"/>
+     <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/accessoryservices/group"/>
+     </component>
+    <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+     </component>
+    </collection>
+    <collection name="commonservices" long-name="Common Services" level="app-if">
+     <component name="commonengine" long-name="Common Engine" origin-model="foundation">
+      <unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
+      <!-- <unit bldFile="os/devicesrv/commonservices/commonengine/tsrc/public/basic/group"/> -->
+     </component>
+     <component name="commonengineresources" long-name="Common Engine Resources" origin-model="foundation">
+      <unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
+     </component>
+     <component name="platformenv" long-name="Platform Env" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
+      <unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
+      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/platformver/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/sysversioninfo/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/tsrc/public/basic/group"/> -->
+     </component>
+     <component name="sysutil" long-name="Sysutil" origin-model="foundation">
+      <unit bldFile="os/devicesrv/commonservices/sysutil/group"/>
+      <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/sysutiltests/group"/> -->
+     </component>
+     <component name="activitymanager" long-name="Activity Manager" origin-model="foundation">
+      <unit bldFile="os/devicesrv/commonservices/activitymanager/group"/>
+      <unit bldFile="os/devicesrv/commonservices/activitymanager/tsrc/public/basic/group"/>
+     </component>
+     <component unofficial="yes" name="commonservices_build" long-name="Common Services Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/commonservices/group"/>
+     </component>
+    </collection>
+    <collection name="dosservices" long-name="Dos Services" level="hw-if">
+     <component name="commondsy" long-name="Common DSY" origin-model="foundation">
+      <unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
+     </component>
+     <component name="dosserver" long-name="Dos Server" origin-model="foundation">
+      <unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
+     </component>
+     <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
+     </component>
+     <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/dosservices/group"/>
+     </component>
+    </collection>
+    <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+     <component name="serverexe" long-name="Server Exe" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/serverexe/group"/> -->
+     </component>
+     <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
+     </component>
+     <component name="clientdll" long-name="Client DLL" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/clientdll/group"/> -->
+     </component>
+     <component name="commondll" long-name="Common DLL" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/commondll/group"/> -->
+     </component>
+     <component name="vibraclientdll" long-name="Vibra Client DLL" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
+     </component>
+     <component name="extendedlightclientdll" long-name="Extended Light Client DLL" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
+     </component>
+     <component name="lightclientdll" long-name="Light Client DLL" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
+     </component>
+     <component name="fmtxclientdll" long-name="FM TX Client DLL" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
+     </component>
+     <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
+     </component>
+     <component name="vibractrl" long-name="Vibra Control" origin-model="foundation">
+      <unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
+     </component>
+     <component name="hwresourcesmgr" origin-model="foundation">
+      <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/group"/>
+      <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group"/>
+     </component>
+     <!--Component manually removed as empty and name conflicts with an OS component-->
+     <!--<component name="powerandmemorynotificationservice"/>-->
+     <component unofficial="yes" name="resourcemgmt_build" long-name="Resource Management Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/resourcemgmt/group"/>
+     </component>
+     <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
+     </component>
+    <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+     </component>
+    </collection>
+    <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
+     <component name="hapticseffectdatagetterfw" long-name="Haptics Effect Data Getter Framework" origin-model="foundation">
+      <unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+     </component>
+     <component name="hapticspluginservice" long-name="Haptics Plugin Service" origin-model="foundation">
+      <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+     </component>
+     <component name="hapticspacketizer" long-name="Haptics Packetizer" origin-model="foundation">
+      <unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+     </component>
+     <component name="hapticspluginmanager" long-name="Haptics Plugin Manager" origin-model="foundation">
+      <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+     </component>
+     <component name="hapticsserver" long-name="Haptics Server" origin-model="foundation">
+      <unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+     </component>
+     <component name="hapticsclient" long-name="Haptics Client" origin-model="foundation">
+      <unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+     </component>
+     <component unofficial="yes" name="hwrmhaptics_build" long-name="HWRM Haptics Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/hwrmhaptics/group"/>
+     </component>
+    </collection>
+    <collection name="mediator" long-name="Mediator" level="app-if">
+     <component unofficial="yes" name="mediator_test" long-name="Mediator Test" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
+     </component>
+     <component unofficial="yes" name="mediator_build" long-name="Mediator Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/mediator/group"/>
+     </component>
+    </collection>
+    <collection name="psmservices" long-name="PSM Services" level="app-if">
+     <component name="psmserver" long-name="PSM Server" origin-model="foundation">
+      <unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
+      <!-- <unit bldFile="os/devicesrv/psmservices/psmserver/tsrc/public/basic/group"/> -->
+     </component>
+     <component unofficial="yes" name="psmservices_build" long-name="PSM Services Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/psmservices/group"/>
+     </component>
+    </collection>
+    <collection name="sensorservices" long-name="Sensor Services" level="framework">
+     <component name="sensorserver" long-name="Sensor Server" origin-model="foundation">
+      <unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
+     </component>
+     <component name="orientationssy" long-name="Orientation SSY" origin-model="foundation">
+      <unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
+     </component>
+     <component name="tiltcompensationssy" long-name="Tilt Compensation SSY" origin-model="foundation">
+      <unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+     </component>
+     <component name="sensordatacompensator" long-name="Sensor Data Compensator" origin-model="foundation">
+      <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
+     </component>
+     <component unofficial="yes" name="sensorservices_build" long-name="Sensor Services Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/sensorservices/group"/>
+     </component>
+    </collection>
+    <collection name="sysstatemgmt" long-name="System State Management" level="server">
+     <component name="starter" long-name="Starter" origin-model="foundation">
+      <unit bldFile="os/devicesrv/sysstatemgmt/starter/group"/>
+      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
+     </component>
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="systemstarter">
+       -  <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/>  -
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
+       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
+     </component>-->
+     <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/sysstatemgmt/group"/>
+     </component>
+     <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
+     </component>
+    <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+     </component>
+    </collection>
+    <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
+     <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="devicesrvapitest/accessorieshaitest/gropup/accessorieshai.mrp"/>
+	-->
+     </component>
+     <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhai.mrp"/>
+	-->
+     </component>
+    </collection>
+    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+     <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
+      <unit bldFile="os/devicesrv/devicesrv_pub/group"/>
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
+     </component>
+     <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/group"/>
+     </component>
+     <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
+      <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
+     </component>
+    <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+    <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
+     <component name="vgi" long-name="VGI" origin-model="foundation">
+      <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
+     </component>
+     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
+     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
+    </collection>
+    <collection name="m3g" long-name="M3G" level="internal-adaptations">
+     <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
+      <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
+     </component>
+    </collection>
+    <collection name="graphicstest" long-name="Graphics Test" level="app-if">
+     <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
+     </component>
+     <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+     </component>
+    </collection>
+    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
+     <component unofficial="yes" name="graphicssvs" origin-model="foundation">
+      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
+      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
+	  <unit mrp="os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
+     </component>
+     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
+     </component>
+     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="foundation">
+      <unit bldFile="os/graphics/group"/>
+     </component>
+     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/graphics/graphics_plat/group"/>
+     </component>
+    <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+     </component>
+     <component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+     </component>
+    </collection>
+   <collection name="windowing" long-name="Windowing" level="app-if">
+     <component name="windowserver" long-name="Window Server" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+     </component>
+    </collection>
+    <collection name="printingservices" long-name="Printing Services" level="app-if">
+     <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+     </component>
+     <component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+     </component>
+    </collection>
+    <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
+     <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+     </component>
+    </collection>
+    <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+     <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+     </component>
+     <component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
+     </component>
+     <component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+     <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+     </component>
+	 <component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
+      <unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
+     </component>
+    </collection>
+    <collection name="egl" long-name="EGL" level="internal-adaptations">
+     <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+     </component>
+     <component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
+     <component name="gdi" long-name="GDI" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+     </component>
+     <component name="bitgdi" long-name="BitGDI" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+     </component>
+     <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+     </component>
+     <component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+     </component>
+    </collection>
+    <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
+<!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+     </component>
+-->
+    </collection>
+    <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
+     <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+      <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhai.mrp"/>
+	-->
+     </component>
+    </collection>
+   </block>
+   <block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+     <component name="iclextjpegapi" long-name="ICL Ext JPEG API" origin-model="foundation">
+      <unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+     </component>
+     <component unofficial="yes" name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
+      <unit bldFile="os/imagingext/imageadaptationextensions/group"/>
+     </component>
+    </collection>
+    <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
+     <component name="exiflib" long-name="Exif Lib" origin-model="foundation">
+      <unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
+     </component>
+     <component name="jp2kcodec" long-name="JP2K Codec" origin-model="foundation">
+      <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
+     </component>
+     <component name="h264avcvideoencarm" long-name="H264AVC VideoEnc ARM" origin-model="foundation"/>
+     <component name="videoencpluginarm" long-name="VideoEnc Plugin ARM" origin-model="foundation"/>
+    </collection>
+    <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
+     <component unofficial="yes" name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/imagingext/imagingext_plat/group"/>
+     </component>
+     <component unofficial="yes" name="imagingext_build" long-name="Imaging Extensions Build" origin-model="foundation">
+      <unit bldFile="os/imagingext/group"/>
+     </component>
+     <component unofficial="yes" name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
+      <unit bldFile="os/imagingext/imagingext_pub/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+    <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
+     <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
+     </component>
+    </collection>
+    <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
+     <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+     </component>
+    </collection>
+    <collection name="n:unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
+     <component name="n:uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
+     </component>
+     <component name="n:uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
+     </component>
+     <component name="n:uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
+     </component>
+     <component name="n:uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
+     <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
+     </component>
+    </collection>
+    <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+     <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
+     </component>
+    </collection>
+    <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
+     <component name="e32test" long-name="E32 Tests" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+     </component>
+     <component name="n:sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
+     </component>
+     <component name="n:e32utils" long-name="E32 Utilities" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/> -->
+     </component>
+     <component name="n:f32test" long-name="File Server Tests" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+     <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+     </component>
+     <component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/esound" mrp="os/kernelhwsrv/kernel/eka/drivers/esound/base_e32_drivers_sound.mrp"/>
+     </component>
+     <component name="serialldd" long-name="Serial Port Drivers" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+     </component>
+     <component name="legacydrivers" long-name="Legacy Drivers" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+     </component>
+     <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <!-- these are LDDs for storage media-->
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+     </component>
+     <component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/base_e32_drivers_debug.mrp"/>
+     </component>
+     <component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+     </component>
+    </collection>
+    <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
+     <component name="n:sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
+     </component>
+     <component name="n:sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
+     </component>
+     <component name="mediadrivers" long-name="Media Drivers" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- these are for storage media-->
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+     </component>
+     <component name="genericboardsupport" long-name="Generic Board Support" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+     </component>
+    </collection>
+    <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
+     <component name="euser" long-name="User Library" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+     </component>
+     <component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+     </component>
+     <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+     </component>
+     <component name="n:nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
+     </component>
+     <component name="estart" long-name="Base Starter" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+     </component>
+     <component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+     </component>
+     <component name="basedocs" long-name="Base Documentation" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/kernelhwsrv/userlibandfileserver/basedocs/base_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="filesystems" long-name="File Systems" level="framework">
+     <component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+     </component>
+     <component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+     </component>
+     <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+     </component>
+     <component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+     </component>
+     <component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+     </component>
+     <component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+     </component>
+     <component name="n:ntfs" long-name="NTFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
+     </component>
+     <component name="n:iso9660fs" long-name="ISO9660 File System" filter="gt" introduced="8.1b" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="halservices" long-name="HAL Services" level="framework">
+     <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+     </component>
+    </collection>
+    <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
+     <component name="e32wsrv" long-name="Text Window Server" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+     </component>
+     <component name="textshell" long-name="Text Shell" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+     </component>
+    </collection>
+    <collection name="baseapitest" long-name="Base API Tests" level="test">
+     <component name="basesvs" long-name="Base Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp"/>
+     </component>
+    </collection>
+    <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
+     <component unofficial="yes" name="localesupport" origin-model="foundation">
+      <!-- <unit bldFile="os/kernelhwsrv/localisation/localesupport/mmpfiles"/> -->
+     </component>
+    <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
+    <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+     <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+     </component>
+     <component name="locationsuplpsy" long-name="Location SUPL PSY" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+     </component>
+    <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+     </component>
+     <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+     </component>
+     <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+     </component>
+     <component name="n:agpsintegrationmodule" long-name="A-GPS Integration Module" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+     <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+     </component>
+    </collection>
+    <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
+     <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/lbs/locationrequestmgmt/locationserver/group" mrp="os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+     </component>
+     <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+     </component>
+    </collection>
+    <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
+     <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
+     </component>
+     <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+     </component>
+    </collection>
+    <collection name="locationmgmt" long-name="Location Management" level="management">
+     <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+     </component>
+     <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+     </component>
+     <component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+     </component>
+     <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+     <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+     </component>
+     <component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
+     <component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+      <unit mrp="lbsapitest/lbshaitest/group/lbshai.mrp"/>
+	-->
+     </component>
+    </collection>
+    <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
+     <component unofficial="yes" name="lbs_build" long-name="Locating Services Build" origin-model="foundation">
+      <unit bldFile="os/lbs/group"/>
+     </component>
+    <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
+    <collection name="audio" long-name="Audio Codecs" level="middleware">
+     <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs" origin-model="foundation">
+      <unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
+     </component>
+     <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build" origin-model="foundation">
+      <unit bldFile="os/mm/audio/group"/>
+     </component>
+    </collection>
+    <collection name="video" long-name="Video Codecs" level="middleware">
+     <component name="arm_mdf_decoders" long-name="ARM MDF Decoders" origin-model="foundation">
+      <unit bldFile="os/mm/video/group"/>
+     </component>
+    </collection>
+    <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
+     <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="foundation">
+      <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
+      <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
+      <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
+     </component>
+     <component name="mmextfw" long-name="MM Ext Framework" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
+     </component>
+     <component name="audiorouting" long-name="Audio Routing" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
+     </component>
+     <component name="effects" long-name="Effects" origin-model="foundation">
+      <!-- <unit bldFile="os/mm/devsoundextensions/effects/effecttest"/> -->
+      <unit bldFile="os/mm/devsoundextensions/effects/group"/>
+     </component>
+     <component name="effectspresets" long-name="Effects Presets" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
+     </component>
+     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/server/group"/> -->
+      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/session/group"/> -->
+      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
+      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
+     </component>
+     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+     </component>
+     <component name="addeddevsoundcontrol" long-name="Added DevSound Control" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+     </component>
+     <component name="globalaudiosettings" long-name="Global Audio Settings" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
+     </component>
+     <component name="restrictedaudiooutput" long-name="Restricted Audio Output" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+     </component>
+     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+     </component>
+     <component unofficial="yes" name="devsoundextensions_build" long-name="Devsound Extensions Build" origin-model="foundation">
+      <unit bldFile="os/mm/devsoundextensions/group"/>
+     </component>
+    </collection>
+    <collection name="mdfdevvideoextensions" long-name="MDF devvideo Extensions" level="device-fw">
+     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor" origin-model="foundation">
+      <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
+     </component>
+     <component unofficial="yes" name="mdfdevvideoextensions_build" long-name="MDF devvideo Extensions Build" origin-model="foundation">
+      <unit bldFile="os/mm/mdfdevvideoextensions/group"/>
+     </component>
+    </collection>
+    <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
+     <component name="postingsurface" long-name="Posting Surface" origin-model="foundation">
+      <unit bldFile="os/mm/videoadaptationextensions/postingsurface/group"/>
+     </component>
+     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
+      <unit bldFile="os/mm/videoadaptationextensions/group"/>
+     </component>
+    </collection>
+    <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+     <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+     </component>
+     <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
+     </component>
+     <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
+     </component>
+     <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+     </component>
+     <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
+     <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
+     <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
+      <!-- PLACEHOLDER="DEF137831" REMOVE -->
+      <!-- PLACEHOLDER="DEF137831"
+		<unit bldFile="mmplugins/imagingplugins/plugins/group" mrp="mmplugins/imagingplugins/plugins/group/multimedia_icl_plugin.mrp"/>
+		-->
+     </component>
+     <component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+     </component>
+     <component name="3gplib" long-name="3GP Library" introduced="Future" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmplugins/3gplib/group" mrp="os/mm/mmplugins/3gplib/group/multimedia_3gplibrary.mrp"/>
+     </component>
+     <component name="3gpunittest" long-name="3GP Unit Tests" introduced="Future" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmplugins/3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
+     </component>
+    </collection>
+    <collection name="mm_info" long-name="Multimedia Info" level="app-if">
+     <component unofficial="yes" name="mm_pub" long-name="Multimedia Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/mm/mm_pub/audio_effects_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/group"/>
+     </component>
+     <component unofficial="yes" name="mm_build" long-name="Multimedia Build" origin-model="foundation">
+      <unit bldFile="os/mm/group"/>
+     </component>
+     <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="foundation">
+      <!-- <unit bldFile="os/mm/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_routing_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_visualization_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/tsrc/group"/>
+     </component>
+    <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+     </component>
+     <component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+     </component>
+    </collection>
+   <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
+     <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
+     <component name="n:mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+     </component>
+     <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
+     </component>
+     <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
+     <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
+     </component>
+     <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
+     </component>
+     <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
+     </component>
+     <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
+     </component>
+    </collection>
+    <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
+     <component name="openmax" long-name="OpenMAX" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/omxil/openmax/group" mrp="os/mm/omxil/openmax/group/multimedia_openmax.mrp"/>
+     </component>
+    </collection>
+    <collection name="devsound" long-name="Sound Device" level="devices">
+     <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
+     </component>
+     <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+     </component>
+     <component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+     </component>
+     <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
+     </component>
+     <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
+     </component>
+     <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+     </component>
+     <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+     </component>
+     <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
+     </component>
+     <component name="a3fcharacterisationtest" long-name="A3F Characterisation Tests" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/devsound/a3fcharacterisationtest/group/multimedia_a3f_devsound_char.mrp"/>
+     </component>
+     <component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb92" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+     <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
+     </component>
+     <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+     </component>
+     <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+     </component>
+     <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+     </component>
+     <component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
+     </component>
+     <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+     </component>
+     <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
+     <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
+     </component>
+     <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+      <unit mrp="mmapitest/devvideohaitest/group/devvideohai.mrp"/>
+	-->
+     </component>
+     <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+      <unit mrp="mmapitest/devsoundhaitest/group/devsoundhai.mrp"/>
+	-->
+     </component>
+     <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+      <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthai.mrp"/>
+	-->
+     </component>
+    </collection>
+   </block>
+   <block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="commsdb" long-name="Comms DB" level="server">
+     <component name="s60_commsdb" long-name="S60 Commsdb" origin-model="foundation">
+      <unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/>
+     </component>
+     <component unofficial="yes" name="commsdb_build" long-name="Comms DB Build" origin-model="foundation">
+      <unit bldFile="os/networkingsrv/commsdb/group"/>
+     </component>
+    </collection>
+    <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
+     <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+     </component>
+    </collection>
+    <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+     <component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+     </component>
+     <component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
+     </component>
+     <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+     </component>
+     <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="tb91" purpose="mandatory" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+     </component>
+    </collection>
+    <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
+     <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+     </component>
+    </collection>
+    <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
+     <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+     </component>
+     <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
+     </component>
+     <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="1"/>
+     </component>
+     <component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" version="1"/>
+     </component>
+     <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+     </component>
+     <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+     </component>
+    </collection>
+    <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
+     <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkcontrol" long-name="Network Control" level="plugin">
+     <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
+     </component>
+     <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+     </component>
+     <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+     </component>
+     <component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+     </component>
+     <component name="ipcpr" long-name="IP CPR" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkcontrol/ipcpr/group" mrp="os/networkingsrv/networkcontrol/ipcpr/group/networking_ipcpr.mrp"/>
+     </component>
+     <component name="ipscpr" long-name="IP SCPR" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkcontrol/ipscpr/group" mrp="os/networkingsrv/networkcontrol/ipscpr/group/networking_ipscpr.mrp"/>
+     </component>
+     <component name="ipcprshim" long-name="IP CPR Shim" deprecated="Future" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkcontrol/ipcprshim/group" mrp="os/networkingsrv/networkcontrol/ipcprshim/group/networking_shimcpr.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+     <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
+     </component>
+     <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+     </component>
+     <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+     </component>
+     <component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+     </component>
+     <component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+     </component>
+    </collection>
+    <collection name="networksecurity" long-name="Network Security" level="framework">
+     <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+     </component>
+     <component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+     </component>
+     <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+     </component>
+     <component name="ipsecvpn" long-name="IPsec VPN" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DEF140049"
+        <unit bldFile="networksecurity/ipsecvpn/group" mrp="networksecurity/ipsecvpn/group/networking_ipsecvpn.mrp"/>
+		-->
+     </component>
+    </collection>
+    <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
+     <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
+     </component>
+     <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+     </component>
+     <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
+     </component>
+     <component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
+     </component>
+     <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" plugin="Y" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
+     </component>
+     <component name="ipanalyzer" long-name="IP Analyzer" introduced="7.0" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
+     </component>
+     <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
+     <component unofficial="yes" name="networkingsrv_build" long-name="Networking Services Build" origin-model="foundation">
+      <unit bldFile="os/networkingsrv/group"/>
+     </component>
+    <component name="networkingrom" long-name="Networking ROM" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <!--  production component: contains the IBY files -->
+      <unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+     </component>
+     <component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+     </component>
+     <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+     </component>
+    </collection>
+   <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
+     <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="ossrv" long-name="Generic OS Services" tech_domain="hb" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+    <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
+     <component name="libutils" long-name="Utility Library" origin-model="foundation">
+      <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
+      <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/group"/>
+      <!-- <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
+     </component>
+    </collection>
+    <collection name="ofdbus" long-name="OF Dbus" level="utilities">
+     <component name="dbus" long-name="Dbus" origin-model="foundation">
+      <unit bldFile="os/ossrv/ofdbus/dbus/group"/>
+      <unit bldFile="os/ossrv/ofdbus/dbus/tsrc/group"/>
+     </component>
+     <component name="dbus-glib" long-name="Dbus glib" origin-model="foundation">
+      <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
+      <unit bldFile="os/ossrv/ofdbus/dbus-glib/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="ofdbus_build" long-name="OF Dbus Build" origin-model="foundation">
+      <unit bldFile="os/ossrv/ofdbus/group"/>
+     </component>
+     <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test" origin-model="foundation">
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
+     </component>
+    </collection>
+    <collection name="glib" long-name="Glib" level="utilities">
+     <component name="glibbackend" long-name="Glib Backend" origin-model="foundation">
+      <unit bldFile="os/ossrv/glib/glibbackend/group"/>
+     </component>
+     <component name="libglib" long-name="Libglib" origin-model="foundation">
+      <unit bldFile="os/ossrv/glib/libglib/group"/>
+     </component>
+     <component name="libgthread" long-name="Libg Thread" origin-model="foundation">
+      <unit bldFile="os/ossrv/glib/libgthread/group"/>
+     </component>
+     <component name="libgmodule" long-name="Libg Module" origin-model="foundation">
+      <unit bldFile="os/ossrv/glib/libgmodule/group"/>
+     </component>
+     <component name="libgobject" long-name="Libg Object" origin-model="foundation">
+      <unit bldFile="os/ossrv/glib/libgobject/group"/>
+     </component>
+     <component unofficial="yes" name="glib_test" long-name="Glib Test" origin-model="foundation">
+      <!-- <unit bldFile="os/ossrv/glib/tsrc/bc/group"/> -->
+      <unit bldFile="os/ossrv/glib/tsrc/group"/>
+     </component>
+    </collection>
+    <collection name="ssl" long-name="SSL" level="data-services">
+     <component name="libcrypto" long-name="Libcrypto" origin-model="foundation">
+      <unit bldFile="os/ossrv/ssl/libcrypto/group"/>
+     </component>
+     <component name="libssl" long-name="Libssl" origin-model="foundation">
+      <unit bldFile="os/ossrv/ssl/libssl/group"/>
+     </component>
+     <component unofficial="yes" name="ssl_test" long-name="SSL Test" origin-model="foundation">
+      <unit bldFile="os/ossrv/ssl/tsrc/group"/>
+      <!-- <unit bldFile="os/ossrv/ssl/tsrc/bc/group"/> -->
+     </component>
+    </collection>
+    <collection name="stdcpp" long-name="Stdcpp" level="translation">
+     <component unofficial="yes" name="stdcpp_build" long-name="Stdcpp Build" origin-model="foundation">
+      <unit bldFile="os/ossrv/stdcpp/group"/>
+     </component>
+     <component unofficial="yes" name="stdcpp_test" long-name="Stdcpp Test" origin-model="foundation">
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
+      <unit bldFile="os/ossrv/stdcpp/tsrc/group"/>
+     </component>
+    </collection>
+    <collection name="stdlibs" long-name="Stdlibs" level="translation">
+     <component name="libz" long-name="Libz" origin-model="foundation">
+      <unit bldFile="os/ossrv/stdlibs/libz/group"/>
+     </component>
+     <component name="libcrypt" long-name="Libcrypt" origin-model="foundation">
+      <unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
+     </component>
+    </collection>
+    <collection name="genericservices" long-name="Generic Services" level="utilities">
+     <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp" version="9.4"/>
+     </component>
+     <component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+     </component>
+     <component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+     </component>
+     <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+     </component>
+     <component name="activebackupclient" long-name="Active Backup Client" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+     </component>
+     <component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+     </component>
+     <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+     </component>
+    </collection>
+    <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
+     <component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp"/>
+     </component>
+    </collection>
+    <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
+     <component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
+     </component>
+    </collection>
+    <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
+     <component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+     </component>
+     <component name="openenvcore" long-name="Open Environment Core" introduced="tb91" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+     </component>
+    </collection>
+    <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
+     <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp" version="2"/>
+     </component>
+     <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+     </component>
+    </collection>
+    <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
+     <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test" origin-model="foundation">
+      <!-- <unit bldFile="os/ossrv/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+     </component>
+     <component unofficial="yes" name="ossrv_build" long-name="Generic OS Services Build" origin-model="foundation">
+      <unit bldFile="os/ossrv/group"/>
+     </component>
+     <component unofficial="yes" name="ossrv_pub" long-name="Generic OS Services Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
+      <unit bldFile="os/ossrv/ossrv_pub/group"/>
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
+     </component>
+    <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="featuremgmt" long-name="Feature Management" level="framework">
+     <component name="featuremanager" long-name="Feature Manager" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
+      <unit bldFile="os/devicesrv/featuremgmt/featuremanager/group"/>
+      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
+     </component>
+     <component unofficial="yes" name="featuremgmt_build" long-name="Feature Management Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/featuremgmt/group"/>
+     </component>
+    <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+     </component>
+    </collection>
+   <collection name="loggingservices" long-name="Logging Services" level="server">
+     <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+     </component>
+     <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+     </component>
+     <component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+     </component>
+    </collection>
+    <collection name="traceservices" long-name="Trace Services" level="server">
+     <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+     </component>
+     <component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+     </component>
+     <component name="utrace" long-name="UTrace" introduced="9.3" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/traceservices/utrace/group" mrp="os/persistentdata/traceservices/utrace/group/testtools_utrace_api.mrp"/>
+     </component>
+    </collection>
+    <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+     <component name="store" long-name="Store" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+     </component>
+     <component name="dbms" long-name="DBMS" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+     </component>
+     <component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+     </component>
+     <component name="sql" long-name="SQL" introduced="9.3" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+     </component>
+    </collection>
+    <collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
+     <component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+    <collection name="contentmgmt" long-name="Content Management" level="utilities">
+     <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+     </component>
+     <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/contentmgmt/cafrecogniserconfig" mrp="os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+     </component>
+    </collection>
+    <collection name="crypto" long-name="Crypto Libraries" level="libraries">
+     <component name="weakcrypto" long-name="Weak Cryptography Library" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/crypto/weakcrypto/group" mrp="os/security/crypto/weakcrypto/group/security_crypto_weak.mrp"/>
+     </component>
+     <component name="strongcrypto" long-name="Strong Cryptography Library" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/crypto/weakcrypto/strong" mrp="os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
+     </component>
+    </collection>
+    <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
+     <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+     </component>
+     <component name="securitytestfw" long-name="Security Test Framework" introduced="7.0" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
+     </component>
+     <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+     </component>
+     <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+     </component>
+    </collection>
+    <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
+     <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+     </component>
+     <component name="securitytools" long-name="Security Tools" introduced="tb92" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+     </component>
+    </collection>
+    <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+     <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+     </component>
+     <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+     </component>
+     <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
+     </component>
+     <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+     </component>
+    </collection>
+    <collection name="security_info" long-name="OS Security Info" level="utilities">
+     <component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="shortlinksrv" level="services" long-name="Short Link Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
+     <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
+     </component>
+    </collection>
+    <collection name="usbldd" long-name="Shortlink Logical Device Drivers" level="hw-if">
+     <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+     </component>
+    </collection>
+    <collection name="bluetooth" long-name="Bluetooth" level="framework">
+     <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetooth/btstack" mrp="os/shortlinksrv/bluetooth/btstack/bluetooth_stack.mrp"/>
+     </component>
+     <component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetooth/btcomm" mrp="os/shortlinksrv/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+     </component>
+     <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetooth/btsdp" mrp="os/shortlinksrv/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+     </component>
+     <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetooth/btextnotifiers" mrp="os/shortlinksrv/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+     </component>
+     <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetooth/gavdp/group" mrp="os/shortlinksrv/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+     </component>
+     <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/shortlinksrv/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
+     </component>
+     <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetooth/btlogger/group" mrp="os/shortlinksrv/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+     </component>
+     <component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/shortlinksrv/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
+     <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btmgr" mrp="os/shortlinksrv/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+     </component>
+     <component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btconfig" mrp="os/shortlinksrv/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+     </component>
+     <component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btrom" mrp="os/shortlinksrv/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+     </component>
+     <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib" mrp="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+     </component>
+     <component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit mrp="os/shortlinksrv/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
+     </component>
+    </collection>
+    <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
+     <component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bluetoothcommsprofiles/btpan/group" mrp="os/shortlinksrv/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+     </component>
+    </collection>
+    <collection name="bthci" long-name="Host Controller Interface" level="server">
+     <component name="bthci1" long-name="Bluetooth HCI Framework 1" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bthci/bthci1" mrp="os/shortlinksrv/bthci/bthci1/bluetooth_hci.mrp"/>
+     </component>
+     <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bthci/bthci2/group" mrp="os/shortlinksrv/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+     </component>
+     <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bthci/hciextensioninterface" mrp="os/shortlinksrv/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+     </component>
+     <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/bthci/hci2implementations/group" mrp="os/shortlinksrv/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+     </component>
+    </collection>
+    <collection name="usbmgmt" long-name="USB Management" level="server">
+     <component name="usbmgr" long-name="USB Manager" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/usbmgmt/usbmgr/group" mrp="os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
+     </component>
+     <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/shortlinksrv/usbmgmt/usbmgrtest/group/usb_test.mrp" version="2"/>
+     </component>
+     <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="os/shortlinksrv/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="irda" long-name="IrDA" level="plugin">
+     <component name="irdastack" long-name="IrDA Stack" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/shortlinksrv/irda/irdastack/group" mrp="os/shortlinksrv/irda/irdastack/group/infra-red_irda.mrp"/>
+     </component>
+    </collection>
+    <collection name="shortlinksrv_info" long-name="Short Link Services Info" level="app-if">
+     <component unofficial="yes" name="shortlinksrv_build" origin-model="foundation">
+      <unit bldFile="os/shortlinksrv/group"/>
+     </component>
+     <component unofficial="yes" name="shortlinksrv_plat" class="api" origin-model="foundation">
+      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/group"/>
+     </component>
+    <component name="shortlinksrv_metadata" long-name="Short Link Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/shortlinksrv/shortlinksrv_info/shortlinksrv_metadata/shortlinksrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="textandloc" long-name="Text and Localisation" tech_domain="ui" level="services" levels="encoding util fonts tools text">
+    <collection name="charconvfw" long-name="Character Conversion FW" level="encoding">
+     <component name="charconv" long-name="Charconv" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/charconv/ongoing/group"/>
+     </component>
+     <component name="charconvplugin" long-name="Charconv Plugin" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/charconvplugin/group"/>
+     </component>
+     <component name="charconv_fw" origin-model="foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
+      <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+     </component>
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="charconvplugins"/>-->
+    <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+     </component>
+     <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+     </component>
+    </collection>
+    <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
+     <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+     </component>
+     <component name="fontstore" long-name="Font Store" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+     </component>
+     <component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- placeholder for text code from GDI -->
+     </component>
+     <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+     </component>
+     <component name="n:itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb92" purpose="development" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
+     </component>
+     <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+     </component>
+     <component name="n:testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="textlayout" long-name="Text Layout" level="text">
+     <component name="texthandling" long-name="Text Handling" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+     </component>
+     <component name="textformatting" long-name="Text Formatting" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+     </component>
+     <component name="word" long-name="Word" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
+     </component>
+    </collection>
+    <collection name="textandlocutils" level="util" long-name="Text and Localisation Utils">
+     <component name="localizer" long-name="Localizer" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/localizer/group"/>
+     </component>
+     <component name="findutil" long-name="Find Util" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/findutil/group"/>
+     </component>
+     <component name="numbergrouping" long-name="Number Grouping" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
+     </component>
+     <component name="gamerecognizer" long-name="Game Recognizer" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/gamerecognizer/group"/>
+     </component>
+     <component name="jplangutil" long-name="JP Lang Util" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
+     </component>
+     <component name="sortutil" long-name="Sort Util" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
+     </component>
+     <component name="aknjapanesereading" long-name="Akn Japanese Reading" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/aknjapanesereading/group"/>
+     </component>
+     <component name="inlinetext" long-name="Inline Text" origin-model="foundation">
+      <unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
+     </component>
+    <component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- placeholder for split from bafl -->
+     </component>
+     <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+     </component>
+    </collection>
+    <collection name="localesupport" long-name="Locale Support" level="util">
+     <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+     </component>
+     <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- placeholder for split from bafl -->
+     </component>
+    </collection>
+    <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+     <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC" plugin="N" origin-model="Symbian">
+      <!-- placeholder for split from GDI Tools -->
+     </component>
+     <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+     </component>
+    </collection>
+    <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+     <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
+      <unit bldFile="os/textandloc/textandloc_pub/group"/>
+     </component>
+     <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="foundation">
+      <unit bldFile="os/textandloc/group"/>
+     </component>
+     <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
+      <unit bldFile="os/textandloc/textandloc_plat/group"/>
+      <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
+     </component>
+    <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="wlan" long-name="WLAN" tech_domain="dc" level="services" levels="hw low mid high tools test">
+    <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
+     <component name="wlanpsmplugin" long-name="WLAN PSM Plugin" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+     </component>
+     <component name="wlanagent" long-name="WLAN Agent" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
+     </component>
+     <component name="wlandbif_cd" long-name="WLAN CommsDat interface" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
+     </component>
+     <component name="wlanengine" long-name="WLAN Engine" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+     </component>
+     <component name="wlanldd" long-name="WLAN LDD" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+     </component>
+     <component name="wlannwif" long-name="WLAN Network Interface" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
+     </component>
+     <component unofficial="yes" name="wlan_bearer_build" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_bearer/group"/>
+     </component>
+    </collection>
+    <collection name="wlantools" long-name="WLAN Tools" level="tools">
+     <component name="dut" long-name="Dut" origin-model="foundation"/>
+     <component name="ping" long-name="Ping" origin-model="foundation"/>
+    </collection>
+    <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
+     <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="wlanapitest/wlanhaitest/group/wlanhai.mrp"/>
+	-->
+     </component>
+    </collection>
+    <collection name="wlan_info" long-name="WLAN Info" level="test">
+     <component unofficial="yes" name="wlan_pub" long-name="WLAN Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_pub/group"/>
+     </component>
+     <component unofficial="yes" name="wlan_build" long-name="WLAN Build" origin-model="foundation">
+      <unit bldFile="os/wlan/group"/>
+     </component>
+     <component unofficial="yes" name="wlan_plat" long-name="WLAN Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_plat/group"/>
+     </component>
+    <component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="xmlsrv" long-name="XML Services" tech_domain="rt" level="services" levels="plugin server framework generic specific">
+    <collection name="xmlengine" long-name="XML Engine" level="server">
+     <component name="libxml2" long-name="Libxml2" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlengine/libxml2/group"/>
+     </component>
+     <component name="xmlengineutils" long-name="XML Engine Utils" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlengine/xmlengineutils/group"/>
+     </component>
+     <component name="domxpathwrapper" long-name="DOM XPath Wrapper" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlengine/domxpathwrapper/group"/>
+     </component>
+     <component name="xmlengineserializer" long-name="XML Engines Erializer" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlengine/xmlengineserializer/group"/>
+     </component>
+     <component name="xmlenginesaxplugin" long-name="XML Engine SAX Plugin" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlengine/xmlenginesaxplugin/group"/>
+     </component>
+     <component unofficial="yes" name="xmlengine_build" long-name="XML Engine Build" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlengine/group"/>
+     </component>
+    </collection>
+    <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
+     <component name="xmlseccertman" long-name="XML Security Certman" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+     </component>
+     <component name="xmlsec" long-name="XML Security" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+     </component>
+     <component name="xmlseccrypto" long-name="XML Security Crypto" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+     </component>
+     <component name="xmlsecwrapper" long-name="XML Security Wrapper" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+     </component>
+     <component unofficial="yes" name="xmlsecurityengine_build" long-name="XML Security Engine Build" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsecurityengine/group"/>
+     </component>
+    </collection>
+    <collection name="xml" long-name="XML" level="generic">
+     <component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+     </component>
+     <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+     </component>
+     <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+     </component>
+    </collection>
+    <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+     <component unofficial="yes" name="xmlsrv_plat" long-name="XML Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/group"/>
+     </component>
+     <component unofficial="yes" name="xmlsrv_pub" long-name="XML Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
+     </component>
+    <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
+    <collection name="stif" long-name="STIF" level="fw">
+     <component name="testinterface" long-name="Test Interface" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/testinterface/group"/>
+     </component>
+     <component name="testserver" long-name="Test Server" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/testserver/group"/>
+     </component>
+     <component name="testengine" long-name="Test Engine" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/testengine/group"/>
+     </component>
+     <component name="testserverstarter" long-name="Test Server Starter" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/testserverstarter/group"/>
+     </component>
+     <component name="stiftfwif" long-name="STIF TFwIf" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/stiftfwif/group"/>
+     </component>
+     <component name="consoleui" long-name="Console UI" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/consoleui/group"/>
+     </component>
+     <component name="testcombiner" long-name="Test Combiner" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/testcombiner/group"/>
+     </component>
+     <component name="demomodule" long-name="Demo Module" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/demomodule/group"/>
+     </component>
+     <component name="atslogger" long-name="ATS Logger" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/atslogger/group"/>
+     </component>
+     <component name="atsinterface" long-name="ATS Interface" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/atsinterface/group"/>
+     </component>
+     <component name="testscripter" long-name="Test Scripter" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/testscripter/group"/>
+     </component>
+     <component name="suevent" long-name="SU Event" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/suevent/group"/>
+     </component>
+     <component name="stifkerneltestclassbase" long-name="STIF Kernel Test Class Base" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
+     </component>
+     <component name="examples" long-name="Examples" origin-model="foundation">
+      <!-- <unit bldFile="ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
+     </component>
+     <component name="testmoduletemplates" long-name="Test Module Templates" origin-model="foundation">
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
+     </component>
+     <component unofficial="yes" name="stif_build" long-name="STIF Build" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/stif/group"/>
+     </component>
+    </collection>
+    <collection name="memspy" long-name="Memspy" level="trace">
+     <component name="driver" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/memspy/driver/group"/>
+     </component>
+     <component name="memspy_engine" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/memspy/engine/group"/>
+     </component>
+     <component name="commandline" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/memspy/commandline/group"/>
+     </component>
+     <component name="console" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/memspy/console/group"/>
+     </component>
+     <component unofficial="yes" name="memspy_build" long-name="Memspy Build" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/memspy/group"/>
+     </component>
+    </collection>
+    <collection name="hti" long-name="HTI" level="trace">
+     <component name="hticfg" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/hti/hticfg/group"/>
+     </component>
+     <component name="htiautostart" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/hti/htiautostart/group"/>
+     </component>
+     <component name="htiframework" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/hti/htiframework/group"/>
+     </component>
+     <!-- Empty duplicate component HtiCommPlugins removed -->
+     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="htifilehlp" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/hti/htifilehlp/group"/>
+     </component>
+     <component name="htiwatchdog" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/hti/htiwatchdog/group"/>
+     </component>
+     <component unofficial="yes" name="hti_build" long-name="HTI Build" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/hti/group"/>
+     </component>
+    </collection>
+    <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
+     <component name="cinidata" long-name="CINI Data" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/> -->
+     </component>
+     <component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
+     <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/group"/>
+     </component>
+    <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+     </component>
+    </collection>
+	<collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
+     <component unofficial="yes" name="memspy_api" origin-model="Foundation">
+      <unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
+     </component>
+     <component unofficial="yes" name="stif_api" origin-model="Foundation">
+      <unit bldFile="ostools/osrndtools/osrndtools_plat/stif_api/group"/>
+     </component>
+     <component unofficial="yes" name="hti_api" origin-model="Foundation">
+      <unit bldFile="ostools/osrndtools/osrndtools_plat/hti_api/group"/>
+     </component>
+     <component unofficial="yes" name="open_system_trace_api" origin-model="Foundation">
+      <unit bldFile="ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
+    <collection name="gid_pc_tool" long-name="GID PC Tool">
+     <component name="dbimporter" long-name="DB Importer" origin-model="foundation">
+      <unit bldFile="tools/swconfigtools/gid_pc_tool/group"/>
+     </component>
+    </collection>
+   </block>
   </layer>
  </systemModel>
 </SystemDefinition>