diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a557b7874723..c2a25432986b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,6 +2,7 @@
 
 Greengage was launched and is maintained by a team of independent contributors to Greenplum. Currently, we own the [Greengage DB repository on GitHub](https://github.com/GreengageDB/greengage), appoint the members of the architectural committee and perform other work related to the organizational process in addition to software development. However, great open source projects cannot exist and last long without a strong community, **so community contributions to Greengage DB are very welcome**. In this section, you’ll find initial guidance on how to contribute to Greengage and links to additional resources that will help you get your code released as part of Greengage.
 
+
 ## Getting started
 
 To contribute to Greengage, you will need a [GitHub account](https://github.com/signup). If you haven’t used Git before, find a time to familiarize yourself with [Git tooling and workflow](https://wiki.postgresql.org/wiki/Working_with_Git) before you start.
diff --git a/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py b/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py
index 96770766f265..acc721b8bc8f 100644
--- a/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py
+++ b/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py
@@ -60,19 +60,12 @@ def get_port():
     return port if port else 5432
 
 def get_ip(hostname=None):
-    if hostname is None:
-        hostname = socket.gethostname()
-    else:
-        hostname = hostname
-    hostinfo = socket.getaddrinfo(hostname, None)
-    ipaddrlist = list(set([(ai[4][0]) for ai in hostinfo]))
-    for myip in ipaddrlist:
-        if myip.find(":") > 0:
-            ipv6 = myip
-            return ipv6
-        elif myip.find(".") > 0:
-            ipv4 = myip
-            return ipv4
+    hostname = hostname or socket.gethostname()
+    try:
+        hostinfo = socket.getaddrinfo(hostname, None, socket.AF_INET)
+    except socket.gaierror:
+        hostinfo = socket.getaddrinfo(hostname, None, socket.AF_INET6)
+    return hostinfo[0][4][0]
 
 
 def run(cmd):
diff --git a/gpcontrib/arenadata_toolkit/isolation2/Makefile b/gpcontrib/arenadata_toolkit/isolation2/Makefile
index eb8b5de7009f..33664ecc73fe 100644
--- a/gpcontrib/arenadata_toolkit/isolation2/Makefile
+++ b/gpcontrib/arenadata_toolkit/isolation2/Makefile
@@ -5,4 +5,4 @@ ISOLATION2_ROOT = $(top_builddir)/src/test/isolation2
 installcheck:
 	cd $(ISOLATION2_ROOT) && $(MAKE) install && ./pg_isolation2_regress $(EXTRA_REGRESS_OPTS) --psqldir='$(PSQLDIR)' \
 	--dbname=toolkitisolation --schedule=${CURDIR}/toolkit_schedule --inputdir=${CURDIR} --outputdir=${CURDIR} \
-	--load-extension=gp_inject_fault --load-extension=plpythonu
+	--load-extension=gp_inject_fault