diff --git a/gxweb/src/main/java/com/genexus/webpanels/GXWebObjectBase.java b/gxweb/src/main/java/com/genexus/webpanels/GXWebObjectBase.java
index 5ea48d087..e25735061 100644
--- a/gxweb/src/main/java/com/genexus/webpanels/GXWebObjectBase.java
+++ b/gxweb/src/main/java/com/genexus/webpanels/GXWebObjectBase.java
@@ -6,8 +6,6 @@
 import com.genexus.configuration.ConfigurationManager;
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.diagnostics.core.LogManager;
-import com.genexus.diagnostics.GXDebugInfo;
-import com.genexus.diagnostics.GXDebugManager;
 import com.genexus.internet.HttpAjaxContext;
 import com.genexus.internet.GXInternetConstants;
 import com.genexus.internet.HttpContext;
@@ -217,41 +215,6 @@ protected String getPgmInstanceId(String cmpCtx)
          return String.format("%s%s", cmpCtx, this.getPgmname().toUpperCase());
      }
 
-	private GXDebugInfo dbgInfo = null;
-	protected void trkCleanup()
-	{
-		if(dbgInfo != null)
-			dbgInfo.onCleanup();
-	}
-
-	protected void initialize(int objClass, int objId, int dbgLines, long hash)
-	{
-		dbgInfo = GXDebugManager.getInstance().getDbgInfo(context, objClass, objId, dbgLines, hash);
-	}
-
-	protected void trk(int lineNro)
-	{
-		if(dbgInfo != null)
-			dbgInfo.trk(lineNro);
-	}
-
-	protected void trk(int lineNro, int lineNro2)
-	{
-		if(dbgInfo != null)
-			dbgInfo.trk(lineNro, lineNro2);
-	}
-
-	protected void trkrng(int lineNro, int lineNro2)
-	{
-		trkrng(lineNro, 0, lineNro2, 0);
-	}
-
-	protected void trkrng(int lineNro, int colNro, int lineNro2, int colNro2)
-	{
-		if(dbgInfo != null)
-			dbgInfo.trkRng(lineNro, colNro, lineNro2, colNro2);
-	}
-
 	protected void callWebObject(String url)
 	{
 		httpContext.wjLoc = url;
diff --git a/java/src/main/java/com/genexus/GXObjectBase.java b/java/src/main/java/com/genexus/GXObjectBase.java
index 82b359be8..8948e7bc1 100644
--- a/java/src/main/java/com/genexus/GXObjectBase.java
+++ b/java/src/main/java/com/genexus/GXObjectBase.java
@@ -2,6 +2,8 @@
 
 import com.genexus.db.Namespace;
 import com.genexus.db.UserInformation;
+import com.genexus.diagnostics.GXDebugInfo;
+import com.genexus.diagnostics.GXDebugManager;
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.diagnostics.core.LogManager;
 import com.genexus.internet.HttpContext;
@@ -224,4 +226,39 @@ public void submit(int id, Object [] submitParms){
 	}
 	public void submitReorg(int id, Object [] submitParms) throws SQLException {
 	}
+
+	private GXDebugInfo dbgInfo = null;
+	protected void trkCleanup()
+	{
+		if(dbgInfo != null)
+			dbgInfo.onCleanup();
+	}
+
+	protected void initialize(int objClass, int objId, int dbgLines, long hash)
+	{
+		dbgInfo = GXDebugManager.getInstance().getDbgInfo(context, objClass, objId, dbgLines, hash);
+	}
+
+	protected void trk(int lineNro)
+	{
+		if(dbgInfo != null)
+			dbgInfo.trk(lineNro);
+	}
+
+	protected void trk(int lineNro, int lineNro2)
+	{
+		if(dbgInfo != null)
+			dbgInfo.trk(lineNro, lineNro2);
+	}
+
+	protected void trkrng(int lineNro, int lineNro2)
+	{
+		trkrng(lineNro, 0, lineNro2, 0);
+	}
+
+	protected void trkrng(int lineNro, int colNro, int lineNro2, int colNro2)
+	{
+		if(dbgInfo != null)
+			dbgInfo.trkRng(lineNro, colNro, lineNro2, colNro2);
+	}
 }