diff --git a/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF b/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
index 2e8c97948bad55e22f05f3ff412fec6068356a2a..9b8defe8bda1f3d85f28fc4ae3c03057f625cf1d 100644
--- a/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
+++ b/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
@@ -6,5 +6,6 @@ Bundle-Version: 2.0.145.qualifier
 Bundle-Release-Date: 20210301
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
 Export-Package: org.jkiss.wmi.service
 Automatic-Module-Name: org.jkiss.wmi
diff --git a/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
index 6d5c3aaceb4b16350ad52986867190362a293973..1e1db356754a654d6bac3f2a094378091ac7030f 100644
--- a/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.data.gis;singleton:=true
 Bundle-Version: 1.0.76.qualifier
 Bundle-Release-Date: 20210301
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.jkiss.dbeaver.model,
  org.eclipse.core.runtime,
  org.jkiss.bundle.gis;visibility:=reexport
diff --git a/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
index c594a9e36b10ff12aa9e1c57fa5bd8d7bc200ff2..1a51527d105a05b3e4d1e6acaa4413902875ef77 100644
--- a/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.data.office;singleton:=true
 Bundle-Version: 1.1.90.qualifier
 Bundle-Release-Date: 20210301
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.data.transfer,
  org.jkiss.bundle.apache.poi
diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml b/plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
index 9bb27efee23479f3f02b3c2f3c4404fc4e455f42..7e83e27bed6f1ceed232491b086419946565b0bb 100644
--- a/plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
@@ -310,6 +310,7 @@
                     defaultPort="1521"
                     defaultDatabase="ORCL"
                     defaultUser="system"
+                    customEndpoint="true"
                     webURL="https://www.oracle.com/technetwork/database/features/jdbc/"
                     icon="icons/oracle_icon.png"
                     iconBig="icons/oracle_icon_big.png"
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
index 5c39147feb39c3a5b9781a12140bf52c9acb8fc8..00ab98fd1597e9b4aaa21a865b687095351a9f28 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.81.qualifier
 Bundle-Release-Date: 20210301
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ext.postgresql,
  org.jkiss.dbeaver.core,
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
index 1e9e488e254cdd4c1391051d7571c35e67960907..1914134f9b087803f307840a595fe22ad147f28e 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.81.qualifier
 Bundle-Release-Date: 20210301
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.debug.core,
diff --git a/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
index 8bc2a109ab31ed54922addd1cd3226413bac620c..414dc0336d70a6f5c5c861936ee898a094891bdb 100644
--- a/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.72.qualifier
 Bundle-Release-Date: 20210301
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.model.sql;visibility:=reexport,
  org.jkiss.dbeaver.ext.generic;visibility:=reexport
diff --git a/plugins/org.jkiss.dbeaver.intro/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.intro/META-INF/MANIFEST.MF
index 7be78223035479100f986c4523831edf6aaf47b2..209a034ebf5acbc034d8292ab468588183864dc9 100644
--- a/plugins/org.jkiss.dbeaver.intro/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.intro/META-INF/MANIFEST.MF
@@ -6,5 +6,6 @@ Bundle-SymbolicName: org.jkiss.dbeaver.intro;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Release-Date: 20170101
 Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.intro
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriver.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriver.java
index 400e837eaea92702ea4d6a613aff70a3d3937634..b0dbbeffcfcebbe179d945ea3985995f39c003dd 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriver.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriver.java
@@ -110,6 +110,8 @@ public interface DBPDriver extends DBPNamedObject
     boolean isLicenseRequired();
     boolean isCustomDriverLoader();
     boolean isUseURL();
+    boolean isCustomEndpointInformation();
+
     // Can be created
     boolean isInstantiable();
     // Driver shipped along with JDK/DBeaver, doesn't need any additional libraries. Basically it is ODBC driver.
diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceUtils.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceUtils.java
index 65d5c4d278edbae44e9bf608364c055b81f8ceda..204991fc5e9ecc4ffce4aa2b0a8c1f5643767a8b 100644
--- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceUtils.java
+++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceUtils.java
@@ -403,11 +403,13 @@ public class DataSourceUtils {
 
     @NotNull
     public static String getDataSourceAddressText(DBPDataSourceContainer dataSourceContainer) {
-        DBPDataSourceProvider dataSourceProvider = dataSourceContainer.getDriver().getDataSourceProvider();
-        if (dataSourceProvider instanceof DBPInformationProvider) {
-            String objectInformation = ((DBPInformationProvider) dataSourceProvider).getObjectInformation(dataSourceContainer, DBPInformationProvider.INFO_TARGET_ADDRESS);
-            if (!CommonUtils.isEmpty(objectInformation)) {
-                return objectInformation;
+        if (dataSourceContainer.getDriver().isCustomEndpointInformation()) {
+            DBPDataSourceProvider dataSourceProvider = dataSourceContainer.getDriver().getDataSourceProvider();
+            if (dataSourceProvider instanceof DBPInformationProvider) {
+                String objectInformation = ((DBPInformationProvider) dataSourceProvider).getObjectInformation(dataSourceContainer, DBPInformationProvider.INFO_TARGET_ADDRESS);
+                if (!CommonUtils.isEmpty(objectInformation)) {
+                    return objectInformation;
+                }
             }
         }
         DBPConnectionConfiguration cfg = dataSourceContainer.getConnectionConfiguration();
diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/RegistryConstants.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/RegistryConstants.java
index 8dc3fffa1372351e79abdc25120977d882ddcc74..24de54da3dba689c2347c7ac791c352c6299121a 100644
--- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/RegistryConstants.java
+++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/RegistryConstants.java
@@ -90,6 +90,7 @@ public class RegistryConstants {
     public static final String ATTR_EMBEDDED = "embedded"; //$NON-NLS-1$
     public static final String ATTR_CUSTOM_DRIVER_LOADER = "customDriverLoader"; //$NON-NLS-1$
     public static final String ATTR_USE_URL_TEMPLATE = "useURL"; //$NON-NLS-1$
+    public static final String ATTR_CUSTOM_ENDPOINT = "customEndpoint"; //$NON-NLS-1$
     public static final String ATTR_INSTANTIABLE = "instantiable"; //$NON-NLS-1$
     public static final String ATTR_PROMOTED = "promoted"; //$NON-NLS-1$
 
diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
index 0e57140ac223a82d4816fd211792447f3dbd0d89..4321bb3fc713b140bf87d8bdae60c6a15dfbf206 100644
--- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
@@ -141,6 +141,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
     private boolean licenseRequired;
     private boolean customDriverLoader;
     private boolean useURLTemplate;
+    private boolean customEndpointInformation;
     private boolean instantiable, origInstantiable;
     private boolean custom;
     private boolean modified;
@@ -192,6 +193,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
         this.id = id;
         this.custom = true;
         this.useURLTemplate = true;
+        this.customEndpointInformation = false;
         this.instantiable = true;
         this.promoted = 0;
 
@@ -235,6 +237,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
             this.licenseRequired = copyFrom.licenseRequired;
             this.customDriverLoader = copyFrom.customDriverLoader;
             this.useURLTemplate = copyFrom.useURLTemplate;
+            this.customEndpointInformation = copyFrom.customEndpointInformation;
             this.instantiable = copyFrom.instantiable;
             this.promoted = copyFrom.promoted;
             this.nativeClientHomes.addAll(copyFrom.nativeClientHomes);
@@ -281,6 +284,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
         this.clientRequired = CommonUtils.getBoolean(config.getAttribute(RegistryConstants.ATTR_CLIENT_REQUIRED), false);
         this.customDriverLoader = CommonUtils.getBoolean(config.getAttribute(RegistryConstants.ATTR_CUSTOM_DRIVER_LOADER), false);
         this.useURLTemplate = CommonUtils.getBoolean(config.getAttribute(RegistryConstants.ATTR_USE_URL_TEMPLATE), true);
+        this.customEndpointInformation = CommonUtils.getBoolean(config.getAttribute(RegistryConstants.ATTR_CUSTOM_ENDPOINT), false);
         this.promoted = CommonUtils.toInt(config.getAttribute(RegistryConstants.ATTR_PROMOTED), 0);
         this.supportsDriverProperties = CommonUtils.getBoolean(config.getAttribute(RegistryConstants.ATTR_SUPPORTS_DRIVER_PROPERTIES), true);
         this.origInstantiable = this.instantiable = CommonUtils.getBoolean(config.getAttribute(RegistryConstants.ATTR_INSTANTIABLE), true);
@@ -747,7 +751,12 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
         return useURLTemplate;
     }
 
-    public void setUseURL(boolean useURLTemplate) {
+    @Override
+    public boolean isCustomEndpointInformation() {
+        return customEndpointInformation;
+    }
+
+    void setUseURL(boolean useURLTemplate) {
         this.useURLTemplate = useURLTemplate;
     }
 
diff --git a/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
index 1ddda926ea9f5138089d6c10b044061b61fca1a5..fee6f19391b685bb4ceae6967144248b375705ce 100644
--- a/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Version: 1.0.40.qualifier
 Bundle-Release-Date: 20210301
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.registry;visibility:=reexport,
diff --git a/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
index 2243a059056e079c083c5baeed09242cf97d0888..3c0a9f9f25140bc9a3109f61464f74d9ecadb4f6 100644
--- a/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Version: 1.0.40.qualifier
 Bundle-Release-Date: 20210301
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.registry;visibility:=reexport,
diff --git a/test/org.jkiss.dbeaver.ext.greenplum.test/META-INF/MANIFEST.MF b/test/org.jkiss.dbeaver.ext.greenplum.test/META-INF/MANIFEST.MF
index 2a164edb8dbc2e93d372d02d96513f7fc28f440a..e156e8b12cadfa1cded7a62b845436c77ee33347 100644
--- a/test/org.jkiss.dbeaver.ext.greenplum.test/META-INF/MANIFEST.MF
+++ b/test/org.jkiss.dbeaver.ext.greenplum.test/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: DBeaver Corp
 Bundle-ClassPath: .
 Fragment-Host: org.jkiss.dbeaver.ext.greenplum
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.junit,
  org.mockito.mockito-all,
  org.jkiss.dbeaver.headless,
diff --git a/test/org.jkiss.dbeaver.ext.postgresql.test/META-INF/MANIFEST.MF b/test/org.jkiss.dbeaver.ext.postgresql.test/META-INF/MANIFEST.MF
index e7a6fa2a302cdaeee92fa7209187c9fd10958e7d..754ba9f96e6a1c5f840f34201be953def955d2ef 100644
--- a/test/org.jkiss.dbeaver.ext.postgresql.test/META-INF/MANIFEST.MF
+++ b/test/org.jkiss.dbeaver.ext.postgresql.test/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: DBeaver Corp
 Bundle-ClassPath: .
 Fragment-Host: org.jkiss.dbeaver.ext.postgresql
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.junit,
diff --git a/test/org.jkiss.dbeaver.test.platform/META-INF/MANIFEST.MF b/test/org.jkiss.dbeaver.test.platform/META-INF/MANIFEST.MF
index ce4245a890a5968a80c25b5b32d616b79aaad330..4538b161401170a4266ba805bfba1b2e5f932639 100644
--- a/test/org.jkiss.dbeaver.test.platform/META-INF/MANIFEST.MF
+++ b/test/org.jkiss.dbeaver.test.platform/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.test.platform
 Bundle-Version: 1.0.9.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.junit,