Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r9121 -r9227
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 9121)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 9227)
@@ -342,7 +342,7 @@
 		 */
 		function dbBuild(&$object, &$event)
 		{
-			$object->Configure( $event->getEventParam('populate_ml_fields') );
+			$object->Configure( $event->getEventParam('populate_ml_fields') || $this->Application->getUnitOption($event->Prefix, 'PopulateMlFields') );
 			$this->PrepareObject($object, $event);
 
 			// force live table if specified or is original item
Index: branches/RC/core/kernel/utility/formatters/multilang_formatter.php
===================================================================
diff -u -N -r8929 -r9227
--- branches/RC/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 8929)
+++ branches/RC/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 9227)
@@ -12,6 +12,7 @@
 	 */
 	function LangFieldName($field_name, $from_primary = false)
 	{
+		if (preg_match('/^l[0-9]+_/', $field_name)) return $field_name;
 		$lang = $from_primary ? $this->Application->GetDefaultLanguageId() : $this->Application->GetVar('m_lang');
 		if (!$lang) $lang = $this->Application->GetDefaultLanguageId();
 		return 'l'.$lang.'_'.$field_name;