Synchronised with the version currently running on beta after fixing the namespace prefix for RSF, innoviris and RIF
integrated latest changes from dnet40