diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3b0b7dccd5..d6ef0863ef 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,26 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-22 11:28 UTC+0200 Viktor Szakats (harbour syenar.net)
+  + contrib/hbide/xbpaddons/dbstruct.ui
+  + contrib/hbide/xbpaddons/fetchdate.ui
+  + contrib/hbide/xbpaddons/tables.ui
+  - contrib/hbide/xbpaddons/xbpdbstruct.ui
+  - contrib/hbide/xbpaddons/xbpfetchdate.ui
+  - contrib/hbide/xbpaddons/xbptables.ui
+    ! redone the naming scheme introduced few month ago
+      and added to this new component yesterday, which
+      was since undone by Pritpal.
+
+  * contrib/hbide/xbpaddons/xbpaddons.hbp
+  * contrib/hbide/hbide.hbp
+    ! deleted wrongly added -L option by Pritpal
+      .hbc should take care of it.
+
+  * utils/hbmk2/hbmk2.prg
+    ! hbshell_gtInteractive() will now create new GT only when necessary
+    + internal changes to support multiple initial commands
+
 2012-09-21 19:41 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/hbide.hbp
   - contrib/hbide/hbqreportsmanager.prg
@@ -30,14 +50,14 @@
   - contrib/hbide/tables.ui
   * contrib/hbide/hbide.hbp
   * contrib/hbide/misc.prg
-    - Deleted: two more resources which have already been moved to 
+    - Deleted: two more resources which have already been moved to
        xbpaddons library.
 
 2012-09-21 18:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   - contrib/hbide/idedbu/*
   + contrib/hbide/xbpaddons/*
     - Deleted xbpaddons consumed resources from hbide/resources.
- 
+
 2012-09-21 12:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/hbide.hbp
   * contrib/hbxbp/hbxbp.hbp
diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp
index 287352eaac..fd0071c987 100644
--- a/harbour/contrib/hbide/hbide.hbp
+++ b/harbour/contrib/hbide/hbide.hbp
@@ -25,7 +25,6 @@ hbformat.hbc
 
 xbpaddons/xbpaddons.hbp
 xbpaddons/xbpaddons.hbc
--Lxbpaddons
 
 -env:HB_DYNLOAD_RDDADS=yes
 rddads.hbc
diff --git a/harbour/contrib/hbide/xbpaddons/xbpdbstruct.ui b/harbour/contrib/hbide/xbpaddons/dbstruct.ui
similarity index 100%
rename from harbour/contrib/hbide/xbpaddons/xbpdbstruct.ui
rename to harbour/contrib/hbide/xbpaddons/dbstruct.ui
diff --git a/harbour/contrib/hbide/xbpaddons/xbpfetchdate.ui b/harbour/contrib/hbide/xbpaddons/fetchdate.ui
similarity index 100%
rename from harbour/contrib/hbide/xbpaddons/xbpfetchdate.ui
rename to harbour/contrib/hbide/xbpaddons/fetchdate.ui
diff --git a/harbour/contrib/hbide/xbpaddons/xbptables.ui b/harbour/contrib/hbide/xbpaddons/tables.ui
similarity index 100%
rename from harbour/contrib/hbide/xbpaddons/xbptables.ui
rename to harbour/contrib/hbide/xbpaddons/tables.ui
diff --git a/harbour/contrib/hbide/xbpaddons/xbpaddons.hbp b/harbour/contrib/hbide/xbpaddons/xbpaddons.hbp
index 984b794f2d..d478e041ee 100644
--- a/harbour/contrib/hbide/xbpaddons/xbpaddons.hbp
+++ b/harbour/contrib/hbide/xbpaddons/xbpaddons.hbp
@@ -16,6 +16,6 @@ reports.prg
 
 xbp.qrc
 
-xbpdbstruct.ui
-xbpfetchdate.ui
-xbptables.ui
+dbstruct.ui
+fetchdate.ui
+tables.ui
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b8801af7db..1e07bb9ec1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -569,6 +569,7 @@ STATIC s_nCol := 0
 STATIC s_aHistory := {}
 STATIC s_lPreserveHistory := .T.
 STATIC s_lWasLoad := .F.
+STATIC s_lInteractive := .T.
 
 PROCEDURE _APPMAIN( ... )
    LOCAL aArgsProc
@@ -12328,6 +12329,8 @@ STATIC PROCEDURE __hbshell( cFile, ... )
       SWITCH cExt
       CASE ".hb"
 
+         s_lInteractive := .F.
+
          /* NOTE: Assumptions:
                   - one dynamic lib belongs to one .hbc file (true for dynamic builds in contrib)
                   - dynamic libs will reference and automatically load all their dependencies
@@ -12370,13 +12373,14 @@ STATIC PROCEDURE __hbshell( cFile, ... )
          ENDIF
 
       CASE ".hrb"
+         s_lInteractive := .F.
          __hbshell_ext_init( aExtension )
          hb_argShift( .T. )
          hb_hrbRun( cFile, ... )
          EXIT
       CASE ".dbf"
          __hbshell_ext_init( aExtension )
-         __hbshell_prompt( hb_AParams(), "USE " + cFile + " SHARED" )
+         __hbshell_prompt( hb_AParams(), { "USE " + cFile + " SHARED" } )
          EXIT
       ENDSWITCH
    ELSE
@@ -12757,7 +12761,7 @@ STATIC PROCEDURE __hbshell_plugins_unload( plugins )
 #include "setcurs.ch"
 
 /* TODO: rewrite the full-screen shell to be a simple stdout/stdin shell */
-STATIC PROCEDURE __hbshell_prompt( aParams, cCommand )
+STATIC PROCEDURE __hbshell_prompt( aParams, aCommand )
    LOCAL GetList
    LOCAL cLine
    LOCAL nMaxRow, nMaxCol
@@ -12765,6 +12769,7 @@ STATIC PROCEDURE __hbshell_prompt( aParams, cCommand )
    LOCAL bKeyUP, bKeyDown, bKeyIns, bKeyResize
    LOCAL lResize := .F.
    LOCAL plugins
+   LOCAL cCommand
 
    LOCAL cDomain := ""
    LOCAL cPrompt
@@ -12798,10 +12803,14 @@ STATIC PROCEDURE __hbshell_prompt( aParams, cCommand )
 
    __hbshell_Exec( "?? hb_Version()" )
 
-   IF HB_ISSTRING( cCommand )
-      AAdd( s_aHistory, PadR( cCommand, HB_LINE_LEN ) )
-      __hbshell_Info( cCommand )
-      __hbshell_Exec( cCommand )
+   IF HB_ISARRAY( aCommand )
+      FOR EACH cCommand IN aCommand
+         IF HB_ISSTRING( cCommand )
+            AAdd( s_aHistory, PadR( cCommand, HB_LINE_LEN ) )
+            __hbshell_Info( cCommand )
+            __hbshell_Exec( cCommand )
+         ENDIF
+      NEXT
    ELSE
       cCommand := ""
    ENDIF
@@ -13150,7 +13159,9 @@ FUNCTION hbshell_ProgName()
    RETURN s_cProgName_hbshell
 
 FUNCTION hbshell_gtInteractive()
-   hb_gtSelect( hb_gtCreate( __hbshell_gtDefault() ) )
+   IF !( "GT" + hb_gtVersion( 0 ) == __hbshell_gtDefault() )
+      hb_gtSelect( hb_gtCreate( __hbshell_gtDefault() ) )
+   ENDIF
    RETURN NIL
 
 STATIC FUNCTION __hbshell_gtDefault()