Index: branches/RC/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -N -r11113 -r11168
--- branches/RC/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 11113)
+++ branches/RC/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 11168)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath module="in-portal"/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>')" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath module="core"/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>')" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -N -r11121 -r11168
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11121)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11168)
@@ -1089,4 +1089,5 @@
 INSERT INTO Counters VALUES (DEFAULT, 'guests_online', 'SELECT COUNT(*) FROM <%PREFIX%>UserSession WHERE PortalUserId <= 0', NULL , NULL , '3600', '0', '|UserSession|');
 INSERT INTO Counters VALUES (DEFAULT, 'users_online', 'SELECT COUNT(*) FROM <%PREFIX%>UserSession', NULL , NULL , '3600', '0', '|UserSession|');
 
-INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, '0');
\ No newline at end of file
+INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, '0');
+INSERT INTO Modules VALUES ('In-Portal', 'core/', 'm', '4.3.9', 1, 0, '', 0, '0');
\ No newline at end of file
Index: branches/RC/core/units/languages/languages_item.php
===================================================================
diff -u -N -r9363 -r11168
--- branches/RC/core/units/languages/languages_item.php	(.../languages_item.php)	(revision 9363)
+++ branches/RC/core/units/languages/languages_item.php	(.../languages_item.php)	(revision 11168)
@@ -21,6 +21,10 @@
 					SET '.$primary_field.' = 1, Enabled = 1
 					WHERE '.$this->IDField.' = '.$this->GetID();
 			$this->Conn->Query($sql);
+
+			// in case, when Update method is called for this langauge object
+			$this->SetDBField($primary_field, 1);
+			$this->SetDBField('Enabled', 1);
 		}
 
 		/**
Index: branches/RC/core/install.php
===================================================================
diff -u -N -r11121 -r11168
--- branches/RC/core/install.php	(.../install.php)	(revision 11121)
+++ branches/RC/core/install.php	(.../install.php)	(revision 11168)
@@ -448,6 +448,11 @@
 						$this->errorMessage = 'Please select module(-s) to ' . ($this->currentStep == 'choose_modules' ? 'install' : 'upgrade');
 					}
 
+					if ($this->currentStep == 'choose_modules') {
+						// don't check interface modules during install, only for during upgrade
+						break;
+					}
+
 					// check interface modules
 					$available_modules = $selected_modules = Array ();
 					$interface_modules = Array ('Core', 'Proj-Base');