Merge remote-tracking branch 'remotes/PGSQL/master' into XL_NEW_MASTER

Conflicts:
	.gitignore
	contrib/Makefile
	src/backend/access/common/heaptuple.c
	src/backend/access/transam/rmgr.c
	src/backend/access/transam/xact.c
	src/backend/catalog/Makefile
	src/backend/catalog/catalog.c
	src/backend/catalog/genbki.pl
	src/backend/catalog/namespace.c
	src/backend/commands/sequence.c
	src/backend/executor/execMain.c
	src/backend/executor/functions.c
	src/backend/executor/nodeAgg.c
	src/backend/executor/nodeModifyTable.c
	src/backend/nodes/copyfuncs.c
	src/backend/nodes/outfuncs.c
	src/backend/nodes/readfuncs.c
	src/backend/optimizer/plan/createplan.c
	src/backend/optimizer/plan/planner.c
	src/backend/optimizer/plan/setrefs.c
	src/backend/optimizer/util/pathnode.c
	src/backend/parser/gram.y
	src/backend/parser/parse_agg.c
	src/backend/parser/parse_utilcmd.c
	src/backend/postmaster/postmaster.c
	src/backend/replication/logical/decode.c
	src/backend/storage/file/fd.c
	src/backend/storage/ipc/procsignal.c
	src/backend/tcop/utility.c
	src/backend/utils/adt/lockfuncs.c
	src/backend/utils/adt/ruleutils.c
	src/backend/utils/sort/tuplesort.c
	src/backend/utils/time/snapmgr.c
	src/include/access/rmgrlist.h
	src/include/catalog/pg_aggregate.h
	src/include/catalog/pg_proc.h
	src/include/nodes/execnodes.h
	src/include/nodes/plannodes.h
	src/include/nodes/primnodes.h
	src/include/nodes/relation.h
	src/include/storage/lwlock.h
	src/include/storage/procsignal.h
	src/include/utils/plancache.h
	src/include/utils/snapshot.h
	src/test/regress/expected/foreign_key.out
	src/test/regress/expected/triggers.out
	src/test/regress/expected/with.out
	src/test/regress/input/constraints.source
	src/test/regress/output/constraints.source
	src/test/regress/pg_regress.c
	src/test/regress/serial_schedule
	src/test/regress/sql/returning.sql

1143 files changed, 86723 insertions, 142377 deletions

diff --git a/.gitignore b/.gitignore
index d42475b167..13c4bde5e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,4 +40,4 @@ lib*.pc
 /StormDB*
 /cscope*
 /.gitignore
-
+/tmp_install/
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 332ab7c36b..8bbd1cb83d 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -47,6 +47,7 @@ $(call recurse,distprep,doc-xc src config contrib)
 # it's not built by default
 $(call recurse,clean,doc-xc contrib src config)
 clean:
+	rm -rf tmp_install/
 # Garbage from autoconf:
 	@rm -rf autom4te.cache/
 
@@ -57,11 +58,10 @@ distclean maintainer-clean:
 	$(MAKE) -C contrib $@
 	$(MAKE) -C config $@
 	$(MAKE) -C src $@
-	rm -f config.cache config.log config.status GNUmakefile
+	rm -rf tmp_install/
 # Garbage from autoconf:
 	@rm -rf autom4te.cache/
-
-check check-tests: all
+	rm -f config.cache config.log config.status GNUmakefile
 
 check check-tests installcheck installcheck-parallel installcheck-tests:
 	$(MAKE) -C src/test/regress $@
diff --git a/config/python.m4 b/config/python.m4
index 7012c536d7..b95c8ed3b3 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -44,6 +44,9 @@ if a == b:
     print(a)
 else:
     print(a + ' ' + b)"`
+if test "$PORTNAME" = win32 ; then
+    python_includespec=`echo $python_includespec | sed 's,[[\]],/,g'`
+fi
 AC_MSG_RESULT([$python_includespec])
 
 AC_SUBST(python_majorversion)[]dnl
@@ -93,20 +96,5 @@ AC_MSG_RESULT([${python_libspec} ${python_additional_libs}])
 AC_SUBST(python_libdir)[]dnl
 AC_SUBST(python_libspec)[]dnl
 AC_SUBST(python_additional_libs)[]dnl
-AC_SUBST(python_enable_shared)[]dnl
-
-# threaded python is not supported on OpenBSD
-AC_MSG_CHECKING(whether Python is compiled with thread support)
-pythreads=`${PYTHON} -c "import sys; print(int('thread' in sys.builtin_module_names))"`
-if test "$pythreads" = "1"; then
-  AC_MSG_RESULT(yes)
-  case $host_os in
-  openbsd*)
-    AC_MSG_ERROR([threaded Python not supported on this platform])
-    ;;
-  esac
-else
-  AC_MSG_RESULT(no)
-fi
 
 ])# PGAC_CHECK_PYTHON_EMBED_SETUP
diff --git a/configure b/configure
index 7b9a6ed87b..01a31aaf76 100755
--- a/configure
+++ b/configure
@@ -642,7 +642,6 @@ TCL_SHLIB_LD_LIBS
 TCL_SHARED_BUILD
 TCL_LIB_SPEC
 TCL_LIBS
-TCL_LIB_FILE
 TCL_INCLUDE_SPEC
 TCL_CONFIG_SH
 TCLSH
@@ -663,7 +662,6 @@ HAVE_IPV6
 LIBOBJS
 UUID_LIBS
 ZIC
-python_enable_shared
 python_additional_libs
 python_libspec
 python_libdir
@@ -7396,6 +7394,12 @@ perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
 test "$PORTNAME" = "win32" && perl_useshrplib=`echo $perl_useshrplib | sed 's,\\\\,/,g'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_useshrplib" >&5
 $as_echo "$perl_useshrplib" >&6; }
+  if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
+    as_fn_error $? "cannot build PL/Perl because libperl is not a shared library
+You might have to rebuild your Perl installation.  Refer to the
+documentation for details.  Use --without-perl to disable building
+PL/Perl." "$LINENO" 5
+  fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl" >&5
 $as_echo_n "checking for flags to link embedded Perl... " >&6; }
@@ -7495,6 +7499,9 @@ if a == b:
     print(a)
 else:
     print(a + ' ' + b)"`
+if test "$PORTNAME" = win32 ; then
+    python_includespec=`echo $python_includespec | sed 's,[\],/,g'`
+fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_includespec" >&5
 $as_echo "$python_includespec" >&6; }
 
@@ -7531,24 +7538,41 @@ python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join
 $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
 
 
-# threaded python is not supported on OpenBSD
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python is compiled with thread support" >&5
-$as_echo_n "checking whether Python is compiled with thread support... " >&6; }
-pythreads=`${PYTHON} -c "import sys; print(int('thread' in sys.builtin_module_names))"`
-if test "$pythreads" = "1"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  case $host_os in
-  openbsd*)
-    as_fn_error $? "threaded Python not supported on this platform" "$LINENO" 5
-    ;;
-  esac
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
+  # We need libpython as a shared library.  With Python >=2.5, we
+  # check the Py_ENABLE_SHARED setting.  On Debian, the setting is not
+  # correct before the jessie release (http://bugs.debian.org/695979).
+  # We also want to support older Python versions.  So as a fallback
+  # we see if there is a file that is named like a shared library.
+
+  if test "$python_enable_shared" != 1; then
+    if test "$PORTNAME" = darwin; then
+      # OS X does supply a .dylib even though Py_ENABLE_SHARED does
+      # not get set.  The file detection logic below doesn't succeed
+      # on older OS X versions, so make it explicit.
+      python_enable_shared=1
+    elif test "$PORTNAME" = win32; then
+      # Windows also needs an explicit override.
+      python_enable_shared=1
+    else
+      # We don't know the platform shared library extension here yet,
+      # so we try some candidates.
+      for dlsuffix in .so .sl; do
+        if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
+          python_enable_shared=1
+          break
+        fi
+      done
+    fi
+  fi
+
+  if test "$python_enable_shared" != 1; then
+    as_fn_error $? "cannot build PL/Python because libpython is not a shared library
+You might have to rebuild your Python installation.  Refer to the
+documentation for details.  Use --without-python to disable building
+PL/Python." "$LINENO" 5
+  fi
 fi
 
 if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then
@@ -14748,12 +14772,15 @@ fi
 
     . "$TCL_CONFIG_SH"
 eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
-eval TCL_LIB_FILE=\"$TCL_LIB_FILE\"
 eval TCL_LIBS=\"$TCL_LIBS\"
 eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
 eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
 
-        # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
+        if test "$TCL_SHARED_BUILD" != 1; then
+      as_fn_error $? "cannot build PL/Tcl because Tcl is not a shared library
+Use --without-tcl to disable building PL/Tcl." "$LINENO" 5
+    fi
+    # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
     ac_save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"
     ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
diff --git a/configure.in b/configure.in
index 6de315e2b5..e0941e52bc 100644
--- a/configure.in
+++ b/configure.in
@@ -889,12 +889,52 @@ if test "$with_perl" = yes; then
     AC_MSG_ERROR([Perl not found])
   fi
   PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
+  if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
+    AC_MSG_ERROR([cannot build PL/Perl because libperl is not a shared library
+You might have to rebuild your Perl installation.  Refer to the
+documentation for details.  Use --without-perl to disable building
+PL/Perl.])
+  fi
   PGAC_CHECK_PERL_EMBED_LDFLAGS
 fi
 
 if test "$with_python" = yes; then
   PGAC_PATH_PYTHON
   PGAC_CHECK_PYTHON_EMBED_SETUP
+
+  # We need libpython as a shared library.  With Python >=2.5, we
+  # check the Py_ENABLE_SHARED setting.  On Debian, the setting is not
+  # correct before the jessie release (http://bugs.debian.org/695979).
+  # We also want to support older Python versions.  So as a fallback
+  # we see if there is a file that is named like a shared library.
+
+  if test "$python_enable_shared" != 1; then
+    if test "$PORTNAME" = darwin; then
+      # OS X does supply a .dylib even though Py_ENABLE_SHARED does
+      # not get set.  The file detection logic below doesn't succeed
+      # on older OS X versions, so make it explicit.
+      python_enable_shared=1
+    elif test "$PORTNAME" = win32; then
+      # Windows also needs an explicit override.
+      python_enable_shared=1
+    else
+      # We don't know the platform shared library extension here yet,
+      # so we try some candidates.
+      for dlsuffix in .so .sl; do
+        if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
+          python_enable_shared=1
+          break
+        fi
+      done
+    fi
+  fi
+
+  if test "$python_enable_shared" != 1; then
+    AC_MSG_ERROR([cannot build PL/Python because libpython is not a shared library
+You might have to rebuild your Python installation.  Refer to the
+documentation for details.  Use --without-python to disable building
+PL/Python.])
+  fi
 fi
 
 if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then
@@ -1942,8 +1982,12 @@ fi
 if test "$with_tcl" = yes; then
     PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
     PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
-                          [TCL_INCLUDE_SPEC,TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
+                          [TCL_INCLUDE_SPEC,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
     AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
+    if test "$TCL_SHARED_BUILD" != 1; then
+      AC_MSG_ERROR([cannot build PL/Tcl because Tcl is not a shared library
+Use --without-tcl to disable building PL/Tcl.])
+    fi
     # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
     ac_save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"
diff --git a/contrib/Makefile b/contrib/Makefile
index b8230aadf7..0eedf440a6 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -33,21 +33,20 @@ SUBDIRS = \
 		pg_prewarm	\
 		pg_standby	\
 		pg_stat_statements \
-		pg_test_fsync	\
-		pg_test_timing	\
 		pg_trgm		\
 		pgcrypto	\
 		pgrowlocks	\
 		pgstattuple	\
 		pgxc_clean	\
 		pgxc_ctl	\
-		pg_xlogdump	\
 		postgres_fdw	\
 		seg		\
 		spi		\
 		tablefunc	\
 		tcn		\
 		test_decoding	\
+		tsm_system_rows \
+		tsm_system_time \
 		tsearch2	\
 		unaccent	\
 		vacuumlo	\
@@ -77,6 +76,18 @@ else
 ALWAYS_SUBDIRS += sepgsql
 endif
 
+ifeq ($(with_perl),yes)
+SUBDIRS += hstore_plperl
+else
+ALWAYS_SUBDIRS += hstore_plperl
+endif
+
+ifeq ($(with_python),yes)
+SUBDIRS += hstore_plpython ltree_plpython
+else
+ALWAYS_SUBDIRS += hstore_plpython ltree_plpython
+endif
+
 # Missing:
 #		start-scripts	\ (does not have a makefile)
 
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 1a5bb3cdc6..f74e912ed7 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -5,7 +5,7 @@
 
 #include <limits.h>
 
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "utils/builtins.h"
 #include "utils/bytea.h"
 #include "utils/cash.h"
@@ -113,12 +113,12 @@ gin_btree_compare_prefix(FunctionCallInfo fcinfo)
 				cmp;
 
 	cmp = DatumGetInt32(DirectFunctionCall2Coll(
-				data->typecmp,
-				PG_GET_COLLATION(),
-				(data->strategy == BTLessStrategyNumber ||
-				 data->strategy == BTLessEqualStrategyNumber)
-				 ? data->datum : a,
-				b));
+												data->typecmp,
+												PG_GET_COLLATION(),
+								   (data->strategy == BTLessStrategyNumber ||
+								 data->strategy == BTLessEqualStrategyNumber)
+												? data->datum : a,
+												b));
 
 	switch (data->strategy)
 	{
@@ -186,14 +186,14 @@ Datum																		\
 gin_extract_value_##type(PG_FUNCTION_ARGS)									\
 {																			\
 	return gin_btree_extract_value(fcinfo, is_varlena);						\
-}																			\
+}	\
 PG_FUNCTION_INFO_V1(gin_extract_query_##type);								\
 Datum																		\
 gin_extract_query_##type(PG_FUNCTION_ARGS)									\
 {																			\
 	return gin_btree_extract_query(fcinfo,									\
 								   is_varlena, leftmostvalue, typecmp);		\
-}																			\
+}	\
 PG_FUNCTION_INFO_V1(gin_compare_prefix_##type);								\
 Datum																		\
 gin_compare_prefix_##type(PG_FUNCTION_ARGS)									\
@@ -209,6 +209,7 @@ leftmostvalue_int2(void)
 {
 	return Int16GetDatum(SHRT_MIN);
 }
+
 GIN_SUPPORT(int2, false, leftmostvalue_int2, btint2cmp)
 
 static Datum
@@ -216,6 +217,7 @@ leftmostvalue_int4(void)
 {
 	return Int32GetDatum(INT_MIN);
 }
+
 GIN_SUPPORT(int4, false, leftmostvalue_int4, btint4cmp)
 
 static Datum
@@ -226,6 +228,7 @@ leftmostvalue_int8(void)
 	 */
 	return Int64GetDatum(SEQ_MINVALUE);
 }
+
 GIN_SUPPORT(int8, false, leftmostvalue_int8, btint8cmp)
 
 static Datum
@@ -233,6 +236,7 @@ leftmostvalue_float4(void)
 {
 	return Float4GetDatum(-get_float4_infinity());
 }
+
 GIN_SUPPORT(float4, false, leftmostvalue_float4, btfloat4cmp)
 
 static Datum
@@ -240,6 +244,7 @@ leftmostvalue_float8(void)
 {
 	return Float8GetDatum(-get_float8_infinity());
 }
+
 GIN_SUPPORT(float8, false, leftmostvalue_float8, btfloat8cmp)
 
 static Datum
@@ -250,6 +255,7 @@ leftmostvalue_money(void)
 	 */
 	return Int64GetDatum(SEQ_MINVALUE);
 }
+
 GIN_SUPPORT(money, false, leftmostvalue_money, cash_cmp)
 
 static Datum
@@ -257,6 +263,7 @@ leftmostvalue_oid(void)
 {
 	return ObjectIdGetDatum(0);
 }
+
 GIN_SUPPORT(oid, false, leftmostvalue_oid, btoidcmp)
 
 static Datum
@@ -264,6 +271,7 @@ leftmostvalue_timestamp(void)
 {
 	return TimestampGetDatum(DT_NOBEGIN);
 }
+
 GIN_SUPPORT(timestamp, false, leftmostvalue_timestamp, timestamp_cmp)
 
 GIN_SUPPORT(timestamptz, false, leftmostvalue_timestamp, timestamp_cmp)
@@ -273,6 +281,7 @@ leftmostvalue_time(void)
 {
 	return TimeADTGetDatum(0);
 }
+
 GIN_SUPPORT(time, false, leftmostvalue_time, time_cmp)
 
 static Datum
@@ -285,6 +294,7 @@ leftmostvalue_timetz(void)
 
 	return TimeTzADTPGetDatum(v);
 }
+
 GIN_SUPPORT(timetz, false, leftmostvalue_timetz, timetz_cmp)
 
 static Datum
@@ -292,6 +302,7 @@ leftmostvalue_date(void)
 {
 	return DateADTGetDatum(DATEVAL_NOBEGIN);
 }
+
 GIN_SUPPORT(date, false, leftmostvalue_date, date_cmp)
 
 static Datum
@@ -304,6 +315,7 @@ leftmostvalue_interval(void)
 	v->month = 0;
 	return IntervalPGetDatum(v);
 }
+
 GIN_SUPPORT(interval, false, leftmostvalue_interval, interval_cmp)
 
 static Datum
@@ -313,6 +325,7 @@ leftmostvalue_macaddr(void)
 
 	return MacaddrPGetDatum(v);
 }
+
 GIN_SUPPORT(macaddr, false, leftmostvalue_macaddr, macaddr_cmp)
 
 static Datum
@@ -320,6 +333,7 @@ leftmostvalue_inet(void)
 {
 	return DirectFunctionCall1(inet_in, CStringGetDatum("0.0.0.0/0"));
 }
+
 GIN_SUPPORT(inet, true, leftmostvalue_inet, network_cmp)
 
 GIN_SUPPORT(cidr, true, leftmostvalue_inet, network_cmp)
@@ -329,6 +343,7 @@ leftmostvalue_text(void)
 {
 	return PointerGetDatum(cstring_to_text_with_len("", 0));
 }
+
 GIN_SUPPORT(text, true, leftmostvalue_text, bttextcmp)
 
 static Datum
@@ -336,6 +351,7 @@ leftmostvalue_char(void)
 {
 	return CharGetDatum(SCHAR_MIN);
 }
+
 GIN_SUPPORT(char, false, leftmostvalue_char, btcharcmp)
 
 GIN_SUPPORT(bytea, true, leftmostvalue_text, byteacmp)
@@ -348,6 +364,7 @@ leftmostvalue_bit(void)
 							   ObjectIdGetDatum(0),
 							   Int32GetDatum(-1));
 }
+
 GIN_SUPPORT(bit, true, leftmostvalue_bit, bitcmp)
 
 static Datum
@@ -358,6 +375,7 @@ leftmostvalue_varbit(void)
 							   ObjectIdGetDatum(0),
 							   Int32GetDatum(-1));
 }
+
 GIN_SUPPORT(varbit, true, leftmostvalue_varbit, bitcmp)
 
 /*
@@ -402,4 +420,5 @@ leftmostvalue_numeric(void)
 {
 	return PointerGetDatum(NULL);
 }
+
 GIN_SUPPORT(numeric, true, leftmostvalue_numeric, gin_numeric_cmp)
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c
index 5bfe659f91..99cb41f5f5 100644
--- a/contrib/btree_gist/btree_utils_num.c
+++ b/contrib/btree_gist/btree_utils_num.c
@@ -13,7 +13,7 @@
 GISTENTRY *
 gbt_num_compress(GISTENTRY *entry, const gbtree_ninfo *tinfo)
 {
-	GISTENTRY *retval;
+	GISTENTRY  *retval;
 
 	if (entry->leafkey)
 	{
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 78e8662add..8105a3b035 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -71,7 +71,7 @@ gbt_var_key_readable(const GBT_VARKEY *k)
  * Create a leaf-entry to store in the index, from a single Datum.
  */
 static GBT_VARKEY *
-gbt_var_key_from_datum(const struct varlena *u)
+gbt_var_key_from_datum(const struct varlena * u)
 {
 	int32		lowersize = VARSIZE(u);
 	GBT_VARKEY *r;
diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile
index 267854b5de..61e04bce7a 100644
--- a/contrib/citext/Makefile
+++ b/contrib/citext/Makefile
@@ -3,7 +3,7 @@
 MODULES = citext
 
 EXTENSION = citext
-DATA = citext--1.0.sql citext--unpackaged--1.0.sql
+DATA = citext--1.1.sql citext--1.0--1.1.sql citext--unpackaged--1.0.sql
 PGFILEDESC = "citext - case-insensitive character string data type"
 
 REGRESS = citext
diff --git a/contrib/citext/citext--1.0--1.1.sql b/contrib/citext/citext--1.0--1.1.sql
new file mode 100644
index 0000000000..e06627e025
--- /dev/null
+++ b/contrib/citext/citext--1.0--1.1.sql
@@ -0,0 +1,21 @@
+/* contrib/citext/citext--1.0--1.1.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION citext UPDATE TO '1.1'" to load this file. \quit
+
+/* First we have to remove them from the extension */
+ALTER EXTENSION citext DROP FUNCTION regexp_matches( citext, citext );
+ALTER EXTENSION citext DROP FUNCTION regexp_matches( citext, citext, text );
+
+/* Then we can drop them */
+DROP FUNCTION regexp_matches( citext, citext );
+DROP FUNCTION regexp_matches( citext, citext, text );
+
+/* Now redefine */
+CREATE FUNCTION regexp_matches( citext, citext ) RETURNS SETOF TEXT[] AS $$
+    SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' );
+$$ LANGUAGE SQL IMMUTABLE STRICT ROWS 1;
+
+CREATE FUNCTION regexp_matches( citext, citext, text ) RETURNS SETOF TEXT[] AS $$
+    SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN  $3 || 'i' ELSE $3 END );
+$$ LANGUAGE SQL IMMUTABLE STRICT ROWS 10;
diff --git a/contrib/citext/citext--1.0.sql b/contrib/citext/citext--1.1.sql
index 7db2e8d0ae..9ea7c64709 100644
--- a/contrib/citext/citext--1.0.sql
+++ b/contrib/citext/citext--1.1.sql
@@ -1,4 +1,4 @@
-/* contrib/citext/citext--1.0.sql */
+/* contrib/citext/citext--1.1.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION citext" to load this file. \quit
@@ -440,13 +440,13 @@ CREATE OPERATOR !~~* (
 -- XXX TODO Ideally these would be implemented in C.
 --
 
-CREATE FUNCTION regexp_matches( citext, citext ) RETURNS TEXT[] AS $$
+CREATE FUNCTION regexp_matches( citext, citext ) RETURNS SETOF TEXT[] AS $$
     SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' );
-$$ LANGUAGE SQL IMMUTABLE STRICT;
+$$ LANGUAGE SQL IMMUTABLE STRICT ROWS 1;
 
-CREATE FUNCTION regexp_matches( citext, citext, text ) RETURNS TEXT[] AS $$
+CREATE FUNCTION regexp_matches( citext, citext, text ) RETURNS SETOF TEXT[] AS $$
     SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN  $3 || 'i' ELSE $3 END );
-$$ LANGUAGE SQL IMMUTABLE STRICT;
+$$ LANGUAGE SQL IMMUTABLE STRICT ROWS 10;
 
 CREATE FUNCTION regexp_replace( citext, citext, text ) returns TEXT AS $$
     SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, 'i');
diff --git a/contrib/citext/citext.control b/contrib/citext/citext.control
index 3eb01a3360..ef90a97bc9 100644
--- a/contrib/citext/citext.control
+++ b/contrib/citext/citext.control
@@ -1,5 +1,5 @@
 # citext extension
 comment = 'data type for case-insensitive character strings'
-default_version = '1.0'
+default_version = '1.1'
 module_pathname = '$libdir/citext'
 relocatable = true
diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out
index 411b689b4b..373fe6da54 100644
--- a/contrib/citext/expected/citext.out
+++ b/contrib/citext/expected/citext.out
@@ -1846,11 +1846,18 @@ SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, ''::cite
 (1 row)
 
 -- c forces case-sensitive
-SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "null";
- null 
-------
- 
-(1 row)
+SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "no rows";
+ no rows 
+---------
+(0 rows)
+
+-- g allows multiple output rows
+SELECT regexp_matches('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g'::citext) AS "two rows";
+  two rows   
+-------------
+ {bar,beque}
+ {bar,beque}
+(2 rows)
 
 SELECT regexp_replace('Thomas'::citext, '.[mN]a.',         'M') = 'ThM' AS t;
  t 
diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out
index da3862f49b..fcadd8d392 100644
--- a/contrib/citext/expected/citext_1.out
+++ b/contrib/citext/expected/citext_1.out
@@ -1846,11 +1846,18 @@ SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, ''::cite
 (1 row)
 
 -- c forces case-sensitive
-SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "null";
- null 
-------
- 
-(1 row)
+SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "no rows";
+ no rows 
+---------
+(0 rows)
+
+-- g allows multiple output rows
+SELECT regexp_matches('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g'::citext) AS "two rows";
+  two rows   
+-------------
+ {bar,beque}
+ {bar,beque}
+(2 rows)
 
 SELECT regexp_replace('Thomas'::citext, '.[mN]a.',         'M') = 'ThM' AS t;
  t 
diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql
index 27678fab5d..950895baea 100644
--- a/contrib/citext/sql/citext.sql
+++ b/contrib/citext/sql/citext.sql
@@ -601,7 +601,9 @@ SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)', '') = ARRAY[ 'ba
 SELECT regexp_matches('foobarbequebaz', '(BAR)(BEQUE)'::citext, '') = ARRAY[ 'bar', 'beque' ] AS t;
 SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, ''::citext) = ARRAY[ 'bar', 'beque' ] AS t;
 -- c forces case-sensitive
-SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "null";
+SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "no rows";
+-- g allows multiple output rows
+SELECT regexp_matches('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g'::citext) AS "two rows";
 
 SELECT regexp_replace('Thomas'::citext, '.[mN]a.',         'M') = 'ThM' AS t;
 SELECT regexp_replace('Thomas'::citext, '.[MN]A.',         'M') = 'ThM' AS t;
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index b9ccad994a..113c66383a 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -12,7 +12,7 @@
 #include <math.h>
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
index 93dcbe3a31..cde1ae630f 100644
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
@@ -7,7 +7,7 @@ DATA = earthdistance--1.0.sql earthdistance--unpackaged--1.0.sql
 PGFILEDESC = "earthdistance - calculate distances on the surface of the Earth"
 
 REGRESS = earthdistance
-REGRESS_OPTS = --extra-install=contrib/cube
+EXTRA_INSTALL = contrib/cube
 
 LDFLAGS_SL += $(filter -lm, $(LIBS))
 
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index 4368897581..499f24ff28 100644
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -34,6 +34,7 @@
 #include "optimizer/var.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
+#include "utils/sampling.h"
 
 PG_MODULE_MAGIC;
 
@@ -561,7 +562,8 @@ fileGetForeignPlan(PlannerInfo *root,
 							scan_clauses,
 							scan_relid,
 							NIL,	/* no expressions to evaluate */
-							best_path->fdw_private);
+							best_path->fdw_private,
+							NIL /* no custom tlist */ );
 }
 
 /*
@@ -1005,7 +1007,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
 {
 	int			numrows = 0;
 	double		rowstoskip = -1;	/* -1 means not set yet */
-	double		rstate;
+	ReservoirStateData rstate;
 	TupleDesc	tupDesc;
 	Datum	   *values;
 	bool	   *nulls;
@@ -1043,7 +1045,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
 									   ALLOCSET_DEFAULT_MAXSIZE);
 
 	/* Prepare for sampling rows */
-	rstate = anl_init_selection_state(targrows);
+	reservoir_init_selection_state(&rstate, targrows);
 
 	/* Set up callback to identify error line number. */
 	errcallback.callback = CopyFromErrorCallback;
@@ -1087,7 +1089,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
 			 * not-yet-incremented value of totalrows as t.
 			 */
 			if (rowstoskip < 0)
-				rowstoskip = anl_get_next_S(*totalrows, targrows, &rstate);
+				rowstoskip = reservoir_get_next_S(&rstate, *totalrows, targrows);
 
 			if (rowstoskip <= 0)
 			{
@@ -1095,7 +1097,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
 				 * Found a suitable tuple, so save it, replacing one old tuple
 				 * at random
 				 */
-				int			k = (int) (targrows * anl_random_fract());
+				int			k = (int) (targrows * sampler_random_fract(rstate.randstate));
 
 				Assert(k >= 0 && k < targrows);
 				heap_freetuple(rows[k]);
diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
index 7c8457e734..147c8501ee 100644
--- a/contrib/fuzzystrmatch/dmetaphone.c
+++ b/contrib/fuzzystrmatch/dmetaphone.c
@@ -195,7 +195,7 @@ dmetaphone_alt(PG_FUNCTION_ARGS)
  * in a case like this.
  */
 
-#define META_FREE(x) ((void)true) /* pfree((x)) */
+#define META_FREE(x) ((void)true)		/* pfree((x)) */
 #else							/* not defined DMETAPHONE_MAIN */
 
 /* use the standard malloc library when not running in PostgreSQL */
diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c
index 68f9061db1..919181d375 100644
--- a/contrib/hstore/hstore_gin.c
+++ b/contrib/hstore/hstore_gin.c
@@ -4,7 +4,7 @@
 #include "postgres.h"
 
 #include "access/gin.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "catalog/pg_type.h"
 
 #include "hstore.h"
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 06f3c9359b..0fb769de7d 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -4,7 +4,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "catalog/pg_type.h"
 #include "utils/pg_crc.h"
 
@@ -72,7 +72,7 @@ typedef struct
 static pg_crc32
 crc32_sz(char *buf, int size)
 {
-	pg_crc32 crc;
+	pg_crc32	crc;
 
 	INIT_TRADITIONAL_CRC32(crc);
 	COMP_TRADITIONAL_CRC32(crc, buf, size);
diff --git a/contrib/hstore_plperl/.gitignore b/contrib/hstore_plperl/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/contrib/hstore_plperl/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/contrib/hstore_plperl/Makefile b/contrib/hstore_plperl/Makefile
new file mode 100644
index 0000000000..19a8ab4493
--- /dev/null
+++ b/contrib/hstore_plperl/Makefile
@@ -0,0 +1,37 @@
+# contrib/hstore_plperl/Makefile
+
+MODULE_big = hstore_plperl
+OBJS = hstore_plperl.o $(WIN32RES)
+PGFILEDESC = "hstore_plperl - hstore transform for plperl"
+
+PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore
+
+EXTENSION = hstore_plperl hstore_plperlu
+DATA = hstore_plperl--1.0.sql hstore_plperlu--1.0.sql
+
+REGRESS = hstore_plperl hstore_plperlu create_transform
+EXTRA_INSTALL = contrib/hstore
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/hstore_plperl
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+
+ifeq ($(PORTNAME), win32)
+# these settings are the same as for plperl
+override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
+# This means we need an in-tree build on Windows, not a pgxs build
+SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plperl/libperl*.a)
+endif
+
+# As with plperl we need to make sure that the CORE directory is included
+# last, probably because it sometimes contains some header files with names
+# that clash with some of ours, or with some that we include, notably on
+# Windows.
+override CPPFLAGS := $(CPPFLAGS) -I$(perl_archlibexp)/CORE
diff --git a/contrib/hstore_plperl/expected/create_transform.out b/contrib/hstore_plperl/expected/create_transform.out
new file mode 100644
index 0000000000..c588d33ab8
--- /dev/null
+++ b/contrib/hstore_plperl/expected/create_transform.out
@@ -0,0 +1,75 @@
+-- general regression test for transforms
+DROP EXTENSION IF EXISTS hstore CASCADE;
+NOTICE:  extension "hstore" does not exist, skipping
+DROP EXTENSION IF EXISTS plperl CASCADE;
+NOTICE:  extension "plperl" does not exist, skipping
+DROP EXTENSION IF EXISTS hstore_plperl CASCADE;
+NOTICE:  extension "hstore_plperl" does not exist, skipping
+CREATE EXTENSION hstore;
+CREATE EXTENSION plperl;
+CREATE FUNCTION hstore_to_plperl(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS '$libdir/hstore_plperl';
+CREATE FUNCTION plperl_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS '$libdir/hstore_plperl';
+CREATE TRANSFORM FOR foo LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+ERROR:  type "foo" does not exist
+CREATE TRANSFORM FOR hstore LANGUAGE foo (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+ERROR:  language "foo" does not exist
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_out(hstore), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+ERROR:  return data type of FROM SQL function must be "internal"
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION internal_in(cstring), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+ERROR:  first argument of transform function must be type "internal"
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- ok
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+ERROR:  transform for type hstore language "plperl" already exists
+CREATE OR REPLACE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- ok
+CREATE OR REPLACE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal));  -- ok
+CREATE OR REPLACE TRANSFORM FOR hstore LANGUAGE plperl (TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- ok
+COMMENT ON TRANSFORM FOR hstore LANGUAGE plperl IS 'test';
+DROP TRANSFORM IF EXISTS FOR fake_type LANGUAGE plperl;
+NOTICE:  type "fake_type" does not exist, skipping
+DROP TRANSFORM IF EXISTS FOR hstore LANGUAGE fake_lang;
+NOTICE:  transform for type hstore language "fake_lang" does not exist, skipping
+DROP TRANSFORM FOR foo LANGUAGE plperl;
+ERROR:  type "foo" does not exist
+DROP TRANSFORM FOR hstore LANGUAGE foo;
+ERROR:  language "foo" does not exist
+DROP TRANSFORM FOR hstore LANGUAGE plperl;
+DROP TRANSFORM IF EXISTS FOR hstore LANGUAGE plperl;
+NOTICE:  transform for type hstore language "plperl" does not exist, skipping
+DROP FUNCTION hstore_to_plperl(val internal);
+DROP FUNCTION plperl_to_hstore(val internal);
+CREATE EXTENSION hstore_plperl;
+\dx+ hstore_plperl
+ Objects in extension "hstore_plperl"
+          Object Description          
+--------------------------------------
+ function hstore_to_plperl(internal)
+ function plperl_to_hstore(internal)
+ transform for hstore language plperl
+(3 rows)
+
+ALTER EXTENSION hstore_plperl DROP TRANSFORM FOR hstore LANGUAGE plperl;
+\dx+ hstore_plperl
+Objects in extension "hstore_plperl"
+         Object Description          
+-------------------------------------
+ function hstore_to_plperl(internal)
+ function plperl_to_hstore(internal)
+(2 rows)
+
+ALTER EXTENSION hstore_plperl ADD TRANSFORM FOR hstore LANGUAGE plperl;
+\dx+ hstore_plperl
+ Objects in extension "hstore_plperl"
+          Object Description          
+--------------------------------------
+ function hstore_to_plperl(internal)
+ function plperl_to_hstore(internal)
+ transform for hstore language plperl
+(3 rows)
+
+DROP EXTENSION hstore CASCADE;
+NOTICE:  drop cascades to extension hstore_plperl
+DROP EXTENSION plperl CASCADE;
diff --git a/contrib/hstore_plperl/expected/hstore_plperl.out b/contrib/hstore_plperl/expected/hstore_plperl.out
new file mode 100644
index 0000000000..cf384eba64
--- /dev/null
+++ b/contrib/hstore_plperl/expected/hstore_plperl.out
@@ -0,0 +1,48 @@
+CREATE EXTENSION hstore;
+CREATE EXTENSION plperl;
+CREATE EXTENSION hstore_plperl;
+SELECT transforms.udt_schema, transforms.udt_name,
+       routine_schema, routine_name,
+       group_name, transform_type
+FROM information_schema.transforms JOIN information_schema.routines
+     USING (specific_catalog, specific_schema, specific_name)
+ORDER BY 1, 2, 5, 6;
+ udt_schema | udt_name | routine_schema |   routine_name   | group_name | transform_type 
+------------+----------+----------------+------------------+------------+----------------
+ public     | hstore   | public         | hstore_to_plperl | plperl     | FROM SQL
+ public     | hstore   | public         | plperl_to_hstore | plperl     | TO SQL
+(2 rows)
+
+-- test perl -> hstore
+CREATE FUNCTION test2() RETURNS hstore
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+$val = {a => 1, b => 'boo', c => undef};
+return $val;
+$$;
+SELECT test2();
+              test2              
+---------------------------------
+ "a"=>"1", "b"=>"boo", "c"=>NULL
+(1 row)
+
+-- test perl -> hstore[]
+CREATE FUNCTION test2arr() RETURNS hstore[]
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+$val = [{a => 1, b => 'boo', c => undef}, {d => 2}];
+return $val;
+$$;
+SELECT test2arr();
+                           test2arr                           
+--------------------------------------------------------------
+ {"\"a\"=>\"1\", \"b\"=>\"boo\", \"c\"=>NULL","\"d\"=>\"2\""}
+(1 row)
+
+DROP FUNCTION test2();
+DROP FUNCTION test2arr();
+DROP EXTENSION hstore_plperl;
+DROP EXTENSION hstore;
+DROP EXTENSION plperl;
diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out
new file mode 100644
index 0000000000..8c689ad3ad
--- /dev/null
+++ b/contrib/hstore_plperl/expected/hstore_plperlu.out
@@ -0,0 +1,180 @@
+CREATE EXTENSION hstore;
+CREATE EXTENSION plperlu;
+CREATE EXTENSION hstore_plperlu;
+SELECT transforms.udt_schema, transforms.udt_name,
+       routine_schema, routine_name,
+       group_name, transform_type
+FROM information_schema.transforms JOIN information_schema.routines
+     USING (specific_catalog, specific_schema, specific_name)
+ORDER BY 1, 2, 5, 6;
+ udt_schema | udt_name | routine_schema |   routine_name    | group_name | transform_type 
+------------+----------+----------------+-------------------+------------+----------------
+ public     | hstore   | public         | hstore_to_plperlu | plperlu    | FROM SQL
+ public     | hstore   | public         | plperlu_to_hstore | plperlu    | TO SQL
+(2 rows)
+
+-- test hstore -> perl
+CREATE FUNCTION test1(val hstore) RETURNS int
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]));
+return scalar(keys %{$_[0]});
+$$;
+SELECT test1('aa=>bb, cc=>NULL'::hstore);
+INFO:  $VAR1 = {
+          'aa' => 'bb',
+          'cc' => undef
+        };
+
+CONTEXT:  PL/Perl function "test1"
+ test1 
+-------
+     2
+(1 row)
+
+CREATE FUNCTION test1none(val hstore) RETURNS int
+LANGUAGE plperlu
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]));
+return scalar(keys %{$_[0]});
+$$;
+SELECT test1none('aa=>bb, cc=>NULL'::hstore);
+INFO:  $VAR1 = '"aa"=>"bb", "cc"=>NULL';
+
+CONTEXT:  PL/Perl function "test1none"
+ test1none 
+-----------
+         0
+(1 row)
+
+CREATE FUNCTION test1list(val hstore) RETURNS int
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]));
+return scalar(keys %{$_[0]});
+$$;
+SELECT test1list('aa=>bb, cc=>NULL'::hstore);
+INFO:  $VAR1 = {
+          'aa' => 'bb',
+          'cc' => undef
+        };
+
+CONTEXT:  PL/Perl function "test1list"
+ test1list 
+-----------
+         2
+(1 row)
+
+-- test hstore[] -> perl
+CREATE FUNCTION test1arr(val hstore[]) RETURNS int
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+return scalar(keys %{$_[0]});
+$$;
+SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
+INFO:  $VAR1 = {
+          'aa' => 'bb',
+          'cc' => undef
+        };
+$VAR2 = {
+          'dd' => 'ee'
+        };
+
+CONTEXT:  PL/Perl function "test1arr"
+ test1arr 
+----------
+        2
+(1 row)
+
+-- test as part of prepare/execute
+CREATE FUNCTION test3() RETURNS void
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+
+$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+
+$val = {a => 1, b => 'boo', c => undef};
+$plan = spi_prepare(q{SELECT $1::text AS col1}, "hstore");
+$rv = spi_exec_prepared($plan, {}, $val);
+elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+$$;
+SELECT test3();
+INFO:  $VAR1 = {
+          'aa' => 'bb',
+          'cc' => undef
+        };
+
+CONTEXT:  PL/Perl function "test3"
+INFO:  $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
+
+CONTEXT:  PL/Perl function "test3"
+ test3 
+-------
+ 
+(1 row)
+
+-- test trigger
+CREATE TABLE test1 (a int, b hstore);
+INSERT INTO test1 VALUES (1, 'aa=>bb, cc=>NULL');
+SELECT * FROM test1;
+ a |           b            
+---+------------------------
+ 1 | "aa"=>"bb", "cc"=>NULL
+(1 row)
+
+CREATE FUNCTION test4() RETURNS trigger
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_TD->{new}));
+if ($_TD->{new}{a} == 1) {
+    $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+}
+
+return "MODIFY";
+$$;
+CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
+UPDATE test1 SET a = a;
+INFO:  $VAR1 = {
+          'a' => '1',
+          'b' => {
+                 'aa' => 'bb',
+                 'cc' => undef
+               }
+        };
+
+CONTEXT:  PL/Perl function "test4"
+SELECT * FROM test1;
+ a |                b                
+---+---------------------------------
+ 1 | "a"=>"1", "b"=>"boo", "c"=>NULL
+(1 row)
+
+DROP TABLE test1;
+DROP FUNCTION test1(hstore);
+DROP FUNCTION test1none(hstore);
+DROP FUNCTION test1list(hstore);
+DROP FUNCTION test1arr(hstore[]);
+DROP FUNCTION test3();
+DROP FUNCTION test4();
+DROP EXTENSION hstore_plperlu;
+DROP EXTENSION hstore;
+DROP EXTENSION plperlu;
diff --git a/contrib/hstore_plperl/hstore_plperl--1.0.sql b/contrib/hstore_plperl/hstore_plperl--1.0.sql
new file mode 100644
index 0000000000..ea0ad7688d
--- /dev/null
+++ b/contrib/hstore_plperl/hstore_plperl--1.0.sql
@@ -0,0 +1,17 @@
+-- make sure the prerequisite libraries are loaded
+DO '' LANGUAGE plperl;
+SELECT NULL::hstore;
+
+
+CREATE FUNCTION hstore_to_plperl(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME';
+
+CREATE FUNCTION plperl_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME';
+
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (
+    FROM SQL WITH FUNCTION hstore_to_plperl(internal),
+    TO SQL WITH FUNCTION plperl_to_hstore(internal)
+);
diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c
new file mode 100644
index 0000000000..fbbb4c8e76
--- /dev/null
+++ b/contrib/hstore_plperl/hstore_plperl.c
@@ -0,0 +1,88 @@
+#include "postgres.h"
+#undef _
+#include "fmgr.h"
+#include "plperl.h"
+#include "plperl_helpers.h"
+#include "hstore.h"
+
+PG_MODULE_MAGIC;
+
+
+PG_FUNCTION_INFO_V1(hstore_to_plperl);
+
+Datum
+hstore_to_plperl(PG_FUNCTION_ARGS)
+{
+	HStore	   *in = PG_GETARG_HS(0);
+	int			i;
+	int			count = HS_COUNT(in);
+	char	   *base = STRPTR(in);
+	HEntry	   *entries = ARRPTR(in);
+	HV		   *hv;
+
+	hv = newHV();
+
+	for (i = 0; i < count; i++)
+	{
+		const char *key;
+		SV		   *value;
+
+		key = pnstrdup(HS_KEY(entries, base, i), HS_KEYLEN(entries, i));
+		value = HS_VALISNULL(entries, i) ? newSV(0) : cstr2sv(pnstrdup(HS_VAL(entries, base, i), HS_VALLEN(entries, i)));
+
+		(void) hv_store(hv, key, strlen(key), value, 0);
+	}
+
+	return PointerGetDatum(newRV((SV *) hv));
+}
+
+
+PG_FUNCTION_INFO_V1(plperl_to_hstore);
+
+Datum
+plperl_to_hstore(PG_FUNCTION_ARGS)
+{
+	HV		   *hv;
+	HE		   *he;
+	int32		buflen;
+	int32		i;
+	int32		pcount;
+	HStore	   *out;
+	Pairs	   *pairs;
+
+	hv = (HV *) SvRV((SV *) PG_GETARG_POINTER(0));
+
+	pcount = hv_iterinit(hv);
+
+	pairs = palloc(pcount * sizeof(Pairs));
+
+	i = 0;
+	while ((he = hv_iternext(hv)))
+	{
+		char	   *key = sv2cstr(HeSVKEY_force(he));
+		SV		   *value = HeVAL(he);
+
+		pairs[i].key = pstrdup(key);
+		pairs[i].keylen = hstoreCheckKeyLen(strlen(pairs[i].key));
+		pairs[i].needfree = true;
+
+		if (!SvOK(value))
+		{
+			pairs[i].val = NULL;
+			pairs[i].vallen = 0;
+			pairs[i].isnull = true;
+		}
+		else
+		{
+			pairs[i].val = pstrdup(sv2cstr(value));
+			pairs[i].vallen = hstoreCheckValLen(strlen(pairs[i].val));
+			pairs[i].isnull = false;
+		}
+
+		i++;
+	}
+
+	pcount = hstoreUniquePairs(pairs, pcount, &buflen);
+	out = hstorePairs(pairs, pcount, buflen);
+	PG_RETURN_POINTER(out);
+}
diff --git a/contrib/hstore_plperl/hstore_plperl.control b/contrib/hstore_plperl/hstore_plperl.control
new file mode 100644
index 0000000000..16277f68c1
--- /dev/null
+++ b/contrib/hstore_plperl/hstore_plperl.control
@@ -0,0 +1,6 @@
+# hstore_plperl extension
+comment = 'transform between hstore and plperl'
+default_version = '1.0'
+module_pathname = '$libdir/hstore_plperl'
+relocatable = true
+requires = 'hstore,plperl'
diff --git a/contrib/hstore_plperl/hstore_plperlu--1.0.sql b/contrib/hstore_plperl/hstore_plperlu--1.0.sql
new file mode 100644
index 0000000000..46ad35c487
--- /dev/null
+++ b/contrib/hstore_plperl/hstore_plperlu--1.0.sql
@@ -0,0 +1,17 @@
+-- make sure the prerequisite libraries are loaded
+DO '' LANGUAGE plperlu;
+SELECT NULL::hstore;
+
+
+CREATE FUNCTION hstore_to_plperlu(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'hstore_to_plperl';
+
+CREATE FUNCTION plperlu_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'plperl_to_hstore';
+
+CREATE TRANSFORM FOR hstore LANGUAGE plperlu (
+    FROM SQL WITH FUNCTION hstore_to_plperlu(internal),
+    TO SQL WITH FUNCTION plperlu_to_hstore(internal)
+);
diff --git a/contrib/hstore_plperl/hstore_plperlu.control b/contrib/hstore_plperl/hstore_plperlu.control
new file mode 100644
index 0000000000..c8d43b41a5
--- /dev/null
+++ b/contrib/hstore_plperl/hstore_plperlu.control
@@ -0,0 +1,6 @@
+# hstore_plperlu extension
+comment = 'transform between hstore and plperlu'
+default_version = '1.0'
+module_pathname = '$libdir/hstore_plperl'
+relocatable = true
+requires = 'hstore,plperlu'
diff --git a/contrib/hstore_plperl/sql/create_transform.sql b/contrib/hstore_plperl/sql/create_transform.sql
new file mode 100644
index 0000000000..d0a12ada9f
--- /dev/null
+++ b/contrib/hstore_plperl/sql/create_transform.sql
@@ -0,0 +1,49 @@
+-- general regression test for transforms
+
+DROP EXTENSION IF EXISTS hstore CASCADE;
+DROP EXTENSION IF EXISTS plperl CASCADE;
+DROP EXTENSION IF EXISTS hstore_plperl CASCADE;
+
+CREATE EXTENSION hstore;
+CREATE EXTENSION plperl;
+
+CREATE FUNCTION hstore_to_plperl(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS '$libdir/hstore_plperl';
+
+CREATE FUNCTION plperl_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS '$libdir/hstore_plperl';
+
+CREATE TRANSFORM FOR foo LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+CREATE TRANSFORM FOR hstore LANGUAGE foo (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_out(hstore), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION internal_in(cstring), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- ok
+CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- fail
+CREATE OR REPLACE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- ok
+CREATE OR REPLACE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal));  -- ok
+CREATE OR REPLACE TRANSFORM FOR hstore LANGUAGE plperl (TO SQL WITH FUNCTION plperl_to_hstore(internal));  -- ok
+
+COMMENT ON TRANSFORM FOR hstore LANGUAGE plperl IS 'test';
+
+DROP TRANSFORM IF EXISTS FOR fake_type LANGUAGE plperl;
+DROP TRANSFORM IF EXISTS FOR hstore LANGUAGE fake_lang;
+DROP TRANSFORM FOR foo LANGUAGE plperl;
+DROP TRANSFORM FOR hstore LANGUAGE foo;
+DROP TRANSFORM FOR hstore LANGUAGE plperl;
+DROP TRANSFORM IF EXISTS FOR hstore LANGUAGE plperl;
+
+DROP FUNCTION hstore_to_plperl(val internal);
+DROP FUNCTION plperl_to_hstore(val internal);
+
+CREATE EXTENSION hstore_plperl;
+\dx+ hstore_plperl
+ALTER EXTENSION hstore_plperl DROP TRANSFORM FOR hstore LANGUAGE plperl;
+\dx+ hstore_plperl
+ALTER EXTENSION hstore_plperl ADD TRANSFORM FOR hstore LANGUAGE plperl;
+\dx+ hstore_plperl
+
+DROP EXTENSION hstore CASCADE;
+DROP EXTENSION plperl CASCADE;
diff --git a/contrib/hstore_plperl/sql/hstore_plperl.sql b/contrib/hstore_plperl/sql/hstore_plperl.sql
new file mode 100644
index 0000000000..0f70f149f5
--- /dev/null
+++ b/contrib/hstore_plperl/sql/hstore_plperl.sql
@@ -0,0 +1,43 @@
+CREATE EXTENSION hstore;
+CREATE EXTENSION plperl;
+CREATE EXTENSION hstore_plperl;
+
+SELECT transforms.udt_schema, transforms.udt_name,
+       routine_schema, routine_name,
+       group_name, transform_type
+FROM information_schema.transforms JOIN information_schema.routines
+     USING (specific_catalog, specific_schema, specific_name)
+ORDER BY 1, 2, 5, 6;
+
+
+-- test perl -> hstore
+CREATE FUNCTION test2() RETURNS hstore
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+$val = {a => 1, b => 'boo', c => undef};
+return $val;
+$$;
+
+SELECT test2();
+
+
+-- test perl -> hstore[]
+CREATE FUNCTION test2arr() RETURNS hstore[]
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+$val = [{a => 1, b => 'boo', c => undef}, {d => 2}];
+return $val;
+$$;
+
+SELECT test2arr();
+
+
+DROP FUNCTION test2();
+DROP FUNCTION test2arr();
+
+
+DROP EXTENSION hstore_plperl;
+DROP EXTENSION hstore;
+DROP EXTENSION plperl;
diff --git a/contrib/hstore_plperl/sql/hstore_plperlu.sql b/contrib/hstore_plperl/sql/hstore_plperlu.sql
new file mode 100644
index 0000000000..3cfb2fdd77
--- /dev/null
+++ b/contrib/hstore_plperl/sql/hstore_plperlu.sql
@@ -0,0 +1,121 @@
+CREATE EXTENSION hstore;
+CREATE EXTENSION plperlu;
+CREATE EXTENSION hstore_plperlu;
+
+SELECT transforms.udt_schema, transforms.udt_name,
+       routine_schema, routine_name,
+       group_name, transform_type
+FROM information_schema.transforms JOIN information_schema.routines
+     USING (specific_catalog, specific_schema, specific_name)
+ORDER BY 1, 2, 5, 6;
+
+
+-- test hstore -> perl
+CREATE FUNCTION test1(val hstore) RETURNS int
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]));
+return scalar(keys %{$_[0]});
+$$;
+
+SELECT test1('aa=>bb, cc=>NULL'::hstore);
+
+CREATE FUNCTION test1none(val hstore) RETURNS int
+LANGUAGE plperlu
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]));
+return scalar(keys %{$_[0]});
+$$;
+
+SELECT test1none('aa=>bb, cc=>NULL'::hstore);
+
+CREATE FUNCTION test1list(val hstore) RETURNS int
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]));
+return scalar(keys %{$_[0]});
+$$;
+
+SELECT test1list('aa=>bb, cc=>NULL'::hstore);
+
+
+-- test hstore[] -> perl
+CREATE FUNCTION test1arr(val hstore[]) RETURNS int
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+return scalar(keys %{$_[0]});
+$$;
+
+SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
+
+
+-- test as part of prepare/execute
+CREATE FUNCTION test3() RETURNS void
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+
+$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+
+$val = {a => 1, b => 'boo', c => undef};
+$plan = spi_prepare(q{SELECT $1::text AS col1}, "hstore");
+$rv = spi_exec_prepared($plan, {}, $val);
+elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+$$;
+
+SELECT test3();
+
+
+-- test trigger
+CREATE TABLE test1 (a int, b hstore);
+INSERT INTO test1 VALUES (1, 'aa=>bb, cc=>NULL');
+SELECT * FROM test1;
+
+CREATE FUNCTION test4() RETURNS trigger
+LANGUAGE plperlu
+TRANSFORM FOR TYPE hstore
+AS $$
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+elog(INFO, Dumper($_TD->{new}));
+if ($_TD->{new}{a} == 1) {
+    $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+}
+
+return "MODIFY";
+$$;
+
+CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
+
+UPDATE test1 SET a = a;
+SELECT * FROM test1;
+
+
+DROP TABLE test1;
+
+DROP FUNCTION test1(hstore);
+DROP FUNCTION test1none(hstore);
+DROP FUNCTION test1list(hstore);
+DROP FUNCTION test1arr(hstore[]);
+DROP FUNCTION test3();
+DROP FUNCTION test4();
+
+
+DROP EXTENSION hstore_plperlu;
+DROP EXTENSION hstore;
+DROP EXTENSION plperlu;
diff --git a/contrib/hstore_plpython/.gitignore b/contrib/hstore_plpython/.gitignore
new file mode 100644
index 0000000000..ce6fab94a0
--- /dev/null
+++ b/contrib/hstore_plpython/.gitignore
@@ -0,0 +1,6 @@
+# Generated subdirectories
+/expected/python3/
+/log/
+/results/
+/sql/python3/
+/tmp_check/
diff --git a/contrib/hstore_plpython/Makefile b/contrib/hstore_plpython/Makefile
new file mode 100644
index 0000000000..6ee434bafa
--- /dev/null
+++ b/contrib/hstore_plpython/Makefile
@@ -0,0 +1,37 @@
+# contrib/hstore_plpython/Makefile
+
+MODULE_big = hstore_plpython$(python_majorversion)
+OBJS = hstore_plpython.o $(WIN32RES)
+PGFILEDESC = "hstore_plpython - hstore transform for plpython"
+
+PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -I$(top_srcdir)/contrib/hstore
+
+EXTENSION = hstore_plpythonu hstore_plpython2u hstore_plpython3u
+DATA = hstore_plpythonu--1.0.sql hstore_plpython2u--1.0.sql hstore_plpython3u--1.0.sql
+
+REGRESS = hstore_plpython
+REGRESS_PLPYTHON3_MANGLE := $(REGRESS)
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/hstore_plpython
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+
+ifeq ($(PORTNAME), win32)
+# This means we need an in-tree build on Windows, not a pgxs build
+SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
+endif
+
+REGRESS_OPTS += --load-extension=hstore
+ifeq ($(python_majorversion),2)
+REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu
+endif
+EXTRA_INSTALL += contrib/hstore
+
+include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk
diff --git a/contrib/hstore_plpython/expected/hstore_plpython.out b/contrib/hstore_plpython/expected/hstore_plpython.out
new file mode 100644
index 0000000000..b7a6a92ac6
--- /dev/null
+++ b/contrib/hstore_plpython/expected/hstore_plpython.out
@@ -0,0 +1,128 @@
+CREATE EXTENSION plpython2u;
+CREATE EXTENSION hstore_plpython2u;
+-- test hstore -> python
+CREATE FUNCTION test1(val hstore) RETURNS int
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+assert isinstance(val, dict)
+i = list(val.items())
+i.sort()
+plpy.info(i)
+return len(val)
+$$;
+SELECT test1('aa=>bb, cc=>NULL'::hstore);
+INFO:  [('aa', 'bb'), ('cc', None)]
+CONTEXT:  PL/Python function "test1"
+ test1 
+-------
+     2
+(1 row)
+
+-- the same with the versioned language name
+CREATE FUNCTION test1n(val hstore) RETURNS int
+LANGUAGE plpython2u
+TRANSFORM FOR TYPE hstore
+AS $$
+assert isinstance(val, dict)
+i = list(val.items())
+i.sort()
+plpy.info(i)
+return len(val)
+$$;
+SELECT test1n('aa=>bb, cc=>NULL'::hstore);
+INFO:  [('aa', 'bb'), ('cc', None)]
+CONTEXT:  PL/Python function "test1n"
+ test1n 
+--------
+      2
+(1 row)
+
+-- test hstore[] -> python
+CREATE FUNCTION test1arr(val hstore[]) RETURNS int
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+assert(val == [{'aa': 'bb', 'cc': None}, {'dd': 'ee'}])
+return len(val)
+$$;
+SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
+ test1arr 
+----------
+        2
+(1 row)
+
+-- test python -> hstore
+CREATE FUNCTION test2() RETURNS hstore
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+val = {'a': 1, 'b': 'boo', 'c': None}
+return val
+$$;
+SELECT test2();
+              test2              
+---------------------------------
+ "a"=>"1", "b"=>"boo", "c"=>NULL
+(1 row)
+
+-- test python -> hstore[]
+CREATE FUNCTION test2arr() RETURNS hstore[]
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+val = [{'a': 1, 'b': 'boo', 'c': None}, {'d': 2}]
+return val
+$$;
+ SELECT test2arr();
+                           test2arr                           
+--------------------------------------------------------------
+ {"\"a\"=>\"1\", \"b\"=>\"boo\", \"c\"=>NULL","\"d\"=>\"2\""}
+(1 row)
+
+-- test as part of prepare/execute
+CREATE FUNCTION test3() RETURNS void
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+rv = plpy.execute("SELECT 'aa=>bb, cc=>NULL'::hstore AS col1")
+assert(rv[0]["col1"] == {'aa': 'bb', 'cc': None})
+
+val = {'a': 1, 'b': 'boo', 'c': None}
+plan = plpy.prepare("SELECT $1::text AS col1", ["hstore"])
+rv = plpy.execute(plan, [val])
+assert(rv[0]["col1"] == '"a"=>"1", "b"=>"boo", "c"=>NULL')
+$$;
+SELECT test3();
+ test3 
+-------
+ 
+(1 row)
+
+-- test trigger
+CREATE TABLE test1 (a int, b hstore);
+INSERT INTO test1 VALUES (1, 'aa=>bb, cc=>NULL');
+SELECT * FROM test1;
+ a |           b            
+---+------------------------
+ 1 | "aa"=>"bb", "cc"=>NULL
+(1 row)
+
+CREATE FUNCTION test4() RETURNS trigger
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+assert(TD["new"] == {'a': 1, 'b': {'aa': 'bb', 'cc': None}})
+if TD["new"]["a"] == 1:
+    TD["new"]["b"] = {'a': 1, 'b': 'boo', 'c': None}
+
+return "MODIFY"
+$$;
+CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
+UPDATE test1 SET a = a;
+SELECT * FROM test1;
+ a |                b                
+---+---------------------------------
+ 1 | "a"=>"1", "b"=>"boo", "c"=>NULL
+(1 row)
+
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
new file mode 100644
index 0000000000..a3316dd9eb
--- /dev/null
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -0,0 +1,114 @@
+#include "postgres.h"
+#include "fmgr.h"
+#include "plpython.h"
+#include "plpy_typeio.h"
+#include "hstore.h"
+
+PG_MODULE_MAGIC;
+
+
+PG_FUNCTION_INFO_V1(hstore_to_plpython);
+
+Datum
+hstore_to_plpython(PG_FUNCTION_ARGS)
+{
+	HStore	   *in = PG_GETARG_HS(0);
+	int			i;
+	int			count = HS_COUNT(in);
+	char	   *base = STRPTR(in);
+	HEntry	   *entries = ARRPTR(in);
+	PyObject   *dict;
+
+	dict = PyDict_New();
+
+	for (i = 0; i < count; i++)
+	{
+		PyObject   *key;
+
+		key = PyString_FromStringAndSize(HS_KEY(entries, base, i), HS_KEYLEN(entries, i));
+		if (HS_VALISNULL(entries, i))
+			PyDict_SetItem(dict, key, Py_None);
+		else
+		{
+			PyObject   *value;
+
+			value = PyString_FromStringAndSize(HS_VAL(entries, base, i), HS_VALLEN(entries, i));
+			PyDict_SetItem(dict, key, value);
+			Py_XDECREF(value);
+		}
+		Py_XDECREF(key);
+	}
+
+	return PointerGetDatum(dict);
+}
+
+
+PG_FUNCTION_INFO_V1(plpython_to_hstore);
+
+Datum
+plpython_to_hstore(PG_FUNCTION_ARGS)
+{
+	PyObject   *dict;
+	volatile PyObject *items_v = NULL;
+	int32		pcount;
+	HStore	   *out;
+
+	dict = (PyObject *) PG_GETARG_POINTER(0);
+	if (!PyMapping_Check(dict))
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("not a Python mapping")));
+
+	pcount = PyMapping_Size(dict);
+	items_v = PyMapping_Items(dict);
+
+	PG_TRY();
+	{
+		int32		buflen;
+		int32		i;
+		Pairs	   *pairs;
+		PyObject   *items = (PyObject *) items_v;
+
+		pairs = palloc(pcount * sizeof(*pairs));
+
+		for (i = 0; i < pcount; i++)
+		{
+			PyObject   *tuple;
+			PyObject   *key;
+			PyObject   *value;
+
+			tuple = PyList_GetItem(items, i);
+			key = PyTuple_GetItem(tuple, 0);
+			value = PyTuple_GetItem(tuple, 1);
+
+			pairs[i].key = PLyObject_AsString(key);
+			pairs[i].keylen = hstoreCheckKeyLen(strlen(pairs[i].key));
+			pairs[i].needfree = true;
+
+			if (value == Py_None)
+			{
+				pairs[i].val = NULL;
+				pairs[i].vallen = 0;
+				pairs[i].isnull = true;
+			}
+			else
+			{
+				pairs[i].val = PLyObject_AsString(value);
+				pairs[i].vallen = hstoreCheckValLen(strlen(pairs[i].val));
+				pairs[i].isnull = false;
+			}
+		}
+		Py_DECREF(items_v);
+
+		pcount = hstoreUniquePairs(pairs, pcount, &buflen);
+		out = hstorePairs(pairs, pcount, buflen);
+	}
+	PG_CATCH();
+	{
+		Py_DECREF(items_v);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+
+	PG_RETURN_POINTER(out);
+}
diff --git a/contrib/hstore_plpython/hstore_plpython2u--1.0.sql b/contrib/hstore_plpython/hstore_plpython2u--1.0.sql
new file mode 100644
index 0000000000..c998de51c9
--- /dev/null
+++ b/contrib/hstore_plpython/hstore_plpython2u--1.0.sql
@@ -0,0 +1,19 @@
+-- make sure the prerequisite libraries are loaded
+DO '1' LANGUAGE plpython2u;
+SELECT NULL::hstore;
+
+
+CREATE FUNCTION hstore_to_plpython2(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'hstore_to_plpython';
+
+CREATE FUNCTION plpython2_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'plpython_to_hstore';
+
+CREATE TRANSFORM FOR hstore LANGUAGE plpython2u (
+    FROM SQL WITH FUNCTION hstore_to_plpython2(internal),
+    TO SQL WITH FUNCTION plpython2_to_hstore(internal)
+);
+
+COMMENT ON TRANSFORM FOR hstore LANGUAGE plpython2u IS 'transform between hstore and Python dict';
diff --git a/contrib/hstore_plpython/hstore_plpython2u.control b/contrib/hstore_plpython/hstore_plpython2u.control
new file mode 100644
index 0000000000..ed90567112
--- /dev/null
+++ b/contrib/hstore_plpython/hstore_plpython2u.control
@@ -0,0 +1,6 @@
+# hstore_plpython2u extension
+comment = 'transform between hstore and plpython2u'
+default_version = '1.0'
+module_pathname = '$libdir/hstore_plpython2'
+relocatable = true
+requires = 'hstore,plpython2u'
diff --git a/contrib/hstore_plpython/hstore_plpython3u--1.0.sql b/contrib/hstore_plpython/hstore_plpython3u--1.0.sql
new file mode 100644
index 0000000000..61d0e47793
--- /dev/null
+++ b/contrib/hstore_plpython/hstore_plpython3u--1.0.sql
@@ -0,0 +1,19 @@
+-- make sure the prerequisite libraries are loaded
+DO '1' LANGUAGE plpython3u;
+SELECT NULL::hstore;
+
+
+CREATE FUNCTION hstore_to_plpython3(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'hstore_to_plpython';
+
+CREATE FUNCTION plpython3_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'plpython_to_hstore';
+
+CREATE TRANSFORM FOR hstore LANGUAGE plpython3u (
+    FROM SQL WITH FUNCTION hstore_to_plpython3(internal),
+    TO SQL WITH FUNCTION plpython3_to_hstore(internal)
+);
+
+COMMENT ON TRANSFORM FOR hstore LANGUAGE plpython3u IS 'transform between hstore and Python dict';
diff --git a/contrib/hstore_plpython/hstore_plpython3u.control b/contrib/hstore_plpython/hstore_plpython3u.control
new file mode 100644
index 0000000000..d86f38e9a7
--- /dev/null
+++ b/contrib/hstore_plpython/hstore_plpython3u.control
@@ -0,0 +1,6 @@
+# hstore_plpython3u extension
+comment = 'transform between hstore and plpython3u'
+default_version = '1.0'
+module_pathname = '$libdir/hstore_plpython3'
+relocatable = true
+requires = 'hstore,plpython3u'
diff --git a/contrib/hstore_plpython/hstore_plpythonu--1.0.sql b/contrib/hstore_plpython/hstore_plpythonu--1.0.sql
new file mode 100644
index 0000000000..6acb97aab9
--- /dev/null
+++ b/contrib/hstore_plpython/hstore_plpythonu--1.0.sql
@@ -0,0 +1,19 @@
+-- make sure the prerequisite libraries are loaded
+DO '1' LANGUAGE plpythonu;
+SELECT NULL::hstore;
+
+
+CREATE FUNCTION hstore_to_plpython(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME';
+
+CREATE FUNCTION plpython_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME';
+
+CREATE TRANSFORM FOR hstore LANGUAGE plpythonu (
+    FROM SQL WITH FUNCTION hstore_to_plpython(internal),
+    TO SQL WITH FUNCTION plpython_to_hstore(internal)
+);
+
+COMMENT ON TRANSFORM FOR hstore LANGUAGE plpythonu IS 'transform between hstore and Python dict';
diff --git a/contrib/hstore_plpython/hstore_plpythonu.control b/contrib/hstore_plpython/hstore_plpythonu.control
new file mode 100644
index 0000000000..8e9b35e43b
--- /dev/null
+++ b/contrib/hstore_plpython/hstore_plpythonu.control
@@ -0,0 +1,6 @@
+# hstore_plpythonu extension
+comment = 'transform between hstore and plpythonu'
+default_version = '1.0'
+module_pathname = '$libdir/hstore_plpython2'
+relocatable = true
+requires = 'hstore,plpythonu'
diff --git a/contrib/hstore_plpython/sql/hstore_plpython.sql b/contrib/hstore_plpython/sql/hstore_plpython.sql
new file mode 100644
index 0000000000..9ff2ebcd83
--- /dev/null
+++ b/contrib/hstore_plpython/sql/hstore_plpython.sql
@@ -0,0 +1,107 @@
+CREATE EXTENSION plpython2u;
+CREATE EXTENSION hstore_plpython2u;
+
+
+-- test hstore -> python
+CREATE FUNCTION test1(val hstore) RETURNS int
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+assert isinstance(val, dict)
+i = list(val.items())
+i.sort()
+plpy.info(i)
+return len(val)
+$$;
+
+SELECT test1('aa=>bb, cc=>NULL'::hstore);
+
+
+-- the same with the versioned language name
+CREATE FUNCTION test1n(val hstore) RETURNS int
+LANGUAGE plpython2u
+TRANSFORM FOR TYPE hstore
+AS $$
+assert isinstance(val, dict)
+i = list(val.items())
+i.sort()
+plpy.info(i)
+return len(val)
+$$;
+
+SELECT test1n('aa=>bb, cc=>NULL'::hstore);
+
+
+-- test hstore[] -> python
+CREATE FUNCTION test1arr(val hstore[]) RETURNS int
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+assert(val == [{'aa': 'bb', 'cc': None}, {'dd': 'ee'}])
+return len(val)
+$$;
+
+SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
+
+
+-- test python -> hstore
+CREATE FUNCTION test2() RETURNS hstore
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+val = {'a': 1, 'b': 'boo', 'c': None}
+return val
+$$;
+
+SELECT test2();
+
+
+-- test python -> hstore[]
+CREATE FUNCTION test2arr() RETURNS hstore[]
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+val = [{'a': 1, 'b': 'boo', 'c': None}, {'d': 2}]
+return val
+$$;
+
+ SELECT test2arr();
+
+
+-- test as part of prepare/execute
+CREATE FUNCTION test3() RETURNS void
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+rv = plpy.execute("SELECT 'aa=>bb, cc=>NULL'::hstore AS col1")
+assert(rv[0]["col1"] == {'aa': 'bb', 'cc': None})
+
+val = {'a': 1, 'b': 'boo', 'c': None}
+plan = plpy.prepare("SELECT $1::text AS col1", ["hstore"])
+rv = plpy.execute(plan, [val])
+assert(rv[0]["col1"] == '"a"=>"1", "b"=>"boo", "c"=>NULL')
+$$;
+
+SELECT test3();
+
+
+-- test trigger
+CREATE TABLE test1 (a int, b hstore);
+INSERT INTO test1 VALUES (1, 'aa=>bb, cc=>NULL');
+SELECT * FROM test1;
+
+CREATE FUNCTION test4() RETURNS trigger
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+assert(TD["new"] == {'a': 1, 'b': {'aa': 'bb', 'cc': None}})
+if TD["new"]["a"] == 1:
+    TD["new"]["b"] = {'a': 1, 'b': 'boo', 'c': None}
+
+return "MODIFY"
+$$;
+
+CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
+
+UPDATE test1 SET a = a;
+SELECT * FROM test1;
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 58352cac80..fb16b66edb 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -4,8 +4,7 @@
 #include "postgres.h"
 
 #include "access/gin.h"
-#include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 
 #include "_int.h"
 
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index 07108eb15e..888c277e60 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -6,7 +6,7 @@
 #include <limits.h>
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 
 #include "_int.h"
 
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 235db38957..6dae7c91c1 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -4,7 +4,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 
 #include "_int.h"
 
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 5fbd253491..40398245f6 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -511,7 +511,7 @@ str2ean(const char *num)
 }
 
 /*
- * ean2string --- Try to convert an ean13 number to an hyphenated string.
+ * ean2string --- Try to convert an ean13 number to a hyphenated string.
  *				  Assumes there's enough space in result to hold
  *				  the string (maximum MAXEAN13LEN+1 bytes)
  *				  This doesn't verify for a valid check digit.
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index 41be68d7ee..37cd991694 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -8,7 +8,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "crc32.h"
 #include "ltree.h"
 
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 1c08d264f7..403dae0d7d 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -26,13 +26,14 @@
 unsigned int
 ltree_crc32_sz(char *buf, int size)
 {
-	pg_crc32 crc;
+	pg_crc32	crc;
 	char	   *p = buf;
 
 	INIT_TRADITIONAL_CRC32(crc);
 	while (size > 0)
 	{
-		char c = (char) TOLOWER(*p);
+		char		c = (char) TOLOWER(*p);
+
 		COMP_TRADITIONAL_CRC32(crc, &c, 1);
 		size--;
 		p++;
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 2d89f1aed4..83da62018e 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -6,7 +6,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "crc32.h"
 #include "ltree.h"
 
diff --git a/contrib/ltree_plpython/.gitignore b/contrib/ltree_plpython/.gitignore
new file mode 100644
index 0000000000..ce6fab94a0
--- /dev/null
+++ b/contrib/ltree_plpython/.gitignore
@@ -0,0 +1,6 @@
+# Generated subdirectories
+/expected/python3/
+/log/
+/results/
+/sql/python3/
+/tmp_check/
diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile
new file mode 100644
index 0000000000..64ca1275f1
--- /dev/null
+++ b/contrib/ltree_plpython/Makefile
@@ -0,0 +1,37 @@
+# contrib/ltree_plpython/Makefile
+
+MODULE_big = ltree_plpython$(python_majorversion)
+OBJS = ltree_plpython.o $(WIN32RES)
+PGFILEDESC = "ltree_plpython - ltree transform for plpython"
+
+PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -I$(top_srcdir)/contrib/ltree
+
+EXTENSION = ltree_plpythonu ltree_plpython2u ltree_plpython3u
+DATA = ltree_plpythonu--1.0.sql ltree_plpython2u--1.0.sql ltree_plpython3u--1.0.sql
+
+REGRESS = ltree_plpython
+REGRESS_PLPYTHON3_MANGLE := $(REGRESS)
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/ltree_plpython
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+
+ifeq ($(PORTNAME), win32)
+# This means we need an in-tree build on Windows, not a pgxs build
+SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a)
+endif
+
+REGRESS_OPTS += --load-extension=ltree
+ifeq ($(python_majorversion),2)
+REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu
+endif
+EXTRA_INSTALL += contrib/ltree
+
+include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk
diff --git a/contrib/ltree_plpython/expected/ltree_plpython.out b/contrib/ltree_plpython/expected/ltree_plpython.out
new file mode 100644
index 0000000000..934529ee0f
--- /dev/null
+++ b/contrib/ltree_plpython/expected/ltree_plpython.out
@@ -0,0 +1,45 @@
+CREATE EXTENSION plpython2u;
+CREATE EXTENSION ltree_plpython2u;
+CREATE FUNCTION test1(val ltree) RETURNS int
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE ltree
+AS $$
+plpy.info(repr(val))
+return len(val)
+$$;
+SELECT test1('aa.bb.cc'::ltree);
+INFO:  ['aa', 'bb', 'cc']
+CONTEXT:  PL/Python function "test1"
+ test1 
+-------
+     3
+(1 row)
+
+CREATE FUNCTION test1n(val ltree) RETURNS int
+LANGUAGE plpython2u
+TRANSFORM FOR TYPE ltree
+AS $$
+plpy.info(repr(val))
+return len(val)
+$$;
+SELECT test1n('aa.bb.cc'::ltree);
+INFO:  ['aa', 'bb', 'cc']
+CONTEXT:  PL/Python function "test1n"
+ test1n 
+--------
+      3
+(1 row)
+
+CREATE FUNCTION test2() RETURNS ltree
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE ltree
+AS $$
+return ['foo', 'bar', 'baz']
+$$;
+-- plpython to ltree is not yet implemented, so this will fail,
+-- because it will try to parse the Python list as an ltree input
+-- string.
+SELECT test2();
+ERROR:  syntax error at position 0
+CONTEXT:  while creating return value
+PL/Python function "test2"
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
new file mode 100644
index 0000000000..26b7b3c275
--- /dev/null
+++ b/contrib/ltree_plpython/ltree_plpython.c
@@ -0,0 +1,31 @@
+#include "postgres.h"
+#include "fmgr.h"
+#include "plpython.h"
+#include "ltree.h"
+
+PG_MODULE_MAGIC;
+
+
+PG_FUNCTION_INFO_V1(ltree_to_plpython);
+
+Datum
+ltree_to_plpython(PG_FUNCTION_ARGS)
+{
+	ltree	   *in = PG_GETARG_LTREE(0);
+	int			i;
+	PyObject   *list;
+	ltree_level *curlevel;
+
+	list = PyList_New(in->numlevel);
+
+	curlevel = LTREE_FIRST(in);
+	for (i = 0; i < in->numlevel; i++)
+	{
+		PyList_SetItem(list, i, PyString_FromStringAndSize(curlevel->name, curlevel->len));
+		curlevel = LEVEL_NEXT(curlevel);
+	}
+
+	PG_FREE_IF_COPY(in, 0);
+
+	return PointerGetDatum(list);
+}
diff --git a/contrib/ltree_plpython/ltree_plpython2u--1.0.sql b/contrib/ltree_plpython/ltree_plpython2u--1.0.sql
new file mode 100644
index 0000000000..29a12d45a2
--- /dev/null
+++ b/contrib/ltree_plpython/ltree_plpython2u--1.0.sql
@@ -0,0 +1,12 @@
+-- make sure the prerequisite libraries are loaded
+DO '1' LANGUAGE plpython2u;
+SELECT NULL::ltree;
+
+
+CREATE FUNCTION ltree_to_plpython2(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'ltree_to_plpython';
+
+CREATE TRANSFORM FOR ltree LANGUAGE plpython2u (
+    FROM SQL WITH FUNCTION ltree_to_plpython2(internal)
+);
diff --git a/contrib/ltree_plpython/ltree_plpython2u.control b/contrib/ltree_plpython/ltree_plpython2u.control
new file mode 100644
index 0000000000..bedfd0acba
--- /dev/null
+++ b/contrib/ltree_plpython/ltree_plpython2u.control
@@ -0,0 +1,6 @@
+# ltree_plpython2u extension
+comment = 'transform between ltree and plpython2u'
+default_version = '1.0'
+module_pathname = '$libdir/ltree_plpython2'
+relocatable = true
+requires = 'ltree,plpython2u'
diff --git a/contrib/ltree_plpython/ltree_plpython3u--1.0.sql b/contrib/ltree_plpython/ltree_plpython3u--1.0.sql
new file mode 100644
index 0000000000..1300a78c66
--- /dev/null
+++ b/contrib/ltree_plpython/ltree_plpython3u--1.0.sql
@@ -0,0 +1,12 @@
+-- make sure the prerequisite libraries are loaded
+DO '1' LANGUAGE plpython3u;
+SELECT NULL::ltree;
+
+
+CREATE FUNCTION ltree_to_plpython3(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME', 'ltree_to_plpython';
+
+CREATE TRANSFORM FOR ltree LANGUAGE plpython3u (
+    FROM SQL WITH FUNCTION ltree_to_plpython3(internal)
+);
diff --git a/contrib/ltree_plpython/ltree_plpython3u.control b/contrib/ltree_plpython/ltree_plpython3u.control
new file mode 100644
index 0000000000..96c9764331
--- /dev/null
+++ b/contrib/ltree_plpython/ltree_plpython3u.control
@@ -0,0 +1,6 @@
+# ltree_plpython3u extension
+comment = 'transform between ltree and plpython3u'
+default_version = '1.0'
+module_pathname = '$libdir/ltree_plpython3'
+relocatable = true
+requires = 'ltree,plpython3u'
diff --git a/contrib/ltree_plpython/ltree_plpythonu--1.0.sql b/contrib/ltree_plpython/ltree_plpythonu--1.0.sql
new file mode 100644
index 0000000000..1d1af28f4e
--- /dev/null
+++ b/contrib/ltree_plpython/ltree_plpythonu--1.0.sql
@@ -0,0 +1,12 @@
+-- make sure the prerequisite libraries are loaded
+DO '1' LANGUAGE plpythonu;
+SELECT NULL::ltree;
+
+
+CREATE FUNCTION ltree_to_plpython(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME';
+
+CREATE TRANSFORM FOR ltree LANGUAGE plpythonu (
+    FROM SQL WITH FUNCTION ltree_to_plpython(internal)
+);
diff --git a/contrib/ltree_plpython/ltree_plpythonu.control b/contrib/ltree_plpython/ltree_plpythonu.control
new file mode 100644
index 0000000000..b03c89a2e6
--- /dev/null
+++ b/contrib/ltree_plpython/ltree_plpythonu.control
@@ -0,0 +1,6 @@
+# ltree_plpythonu extension
+comment = 'transform between ltree and plpythonu'
+default_version = '1.0'
+module_pathname = '$libdir/ltree_plpython2'
+relocatable = true
+requires = 'ltree,plpythonu'
diff --git a/contrib/ltree_plpython/sql/ltree_plpython.sql b/contrib/ltree_plpython/sql/ltree_plpython.sql
new file mode 100644
index 0000000000..f08ff6a3f0
--- /dev/null
+++ b/contrib/ltree_plpython/sql/ltree_plpython.sql
@@ -0,0 +1,37 @@
+CREATE EXTENSION plpython2u;
+CREATE EXTENSION ltree_plpython2u;
+
+
+CREATE FUNCTION test1(val ltree) RETURNS int
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE ltree
+AS $$
+plpy.info(repr(val))
+return len(val)
+$$;
+
+SELECT test1('aa.bb.cc'::ltree);
+
+
+CREATE FUNCTION test1n(val ltree) RETURNS int
+LANGUAGE plpython2u
+TRANSFORM FOR TYPE ltree
+AS $$
+plpy.info(repr(val))
+return len(val)
+$$;
+
+SELECT test1n('aa.bb.cc'::ltree);
+
+
+CREATE FUNCTION test2() RETURNS ltree
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE ltree
+AS $$
+return ['foo', 'bar', 'baz']
+$$;
+
+-- plpython to ltree is not yet implemented, so this will fail,
+-- because it will try to parse the Python list as an ltree input
+-- string.
+SELECT test2();
diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index 1b15a7bdfe..7adcfa8937 100644
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -58,7 +58,7 @@ brin_page_type(PG_FUNCTION_ARGS)
 {
 	bytea	   *raw_page = PG_GETARG_BYTEA_P(0);
 	Page		page = VARDATA(raw_page);
-	char *type;
+	char	   *type;
 
 	switch (BrinPageType(page))
 	{
@@ -86,8 +86,8 @@ brin_page_type(PG_FUNCTION_ARGS)
 static Page
 verify_brin_page(bytea *raw_page, uint16 type, const char *strtype)
 {
-	Page	page;
-	int		raw_page_size;
+	Page		page;
+	int			raw_page_size;
 
 	raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
 
@@ -95,7 +95,7 @@ verify_brin_page(bytea *raw_page, uint16 type, const char *strtype)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("input page too small"),
-				 errdetail("Expected size %d, got %d", raw_page_size, BLCKSZ)));
+			  errdetail("Expected size %d, got %d", raw_page_size, BLCKSZ)));
 
 	page = VARDATA(raw_page);
 
@@ -153,7 +153,7 @@ brin_page_items(PG_FUNCTION_ARGS)
 		indexRel = index_open(indexRelid, AccessShareLock);
 
 		state = palloc(offsetof(brin_page_state, columns) +
-					   sizeof(brin_column_state) * RelationGetDescr(indexRel)->natts);
+			  sizeof(brin_column_state) * RelationGetDescr(indexRel)->natts);
 
 		state->bdesc = brin_build_desc(indexRel);
 		state->page = page;
@@ -168,10 +168,10 @@ brin_page_items(PG_FUNCTION_ARGS)
 		 */
 		for (attno = 1; attno <= state->bdesc->bd_tupdesc->natts; attno++)
 		{
-			Oid		output;
-			bool	isVarlena;
+			Oid			output;
+			bool		isVarlena;
 			BrinOpcInfo *opcinfo;
-			int		i;
+			int			i;
 			brin_column_state *column;
 
 			opcinfo = state->bdesc->bd_info[attno - 1];
@@ -181,7 +181,7 @@ brin_page_items(PG_FUNCTION_ARGS)
 			column->nstored = opcinfo->oi_nstored;
 			for (i = 0; i < opcinfo->oi_nstored; i++)
 			{
-				getTypeOutputInfo(opcinfo->oi_typids[i], &output, &isVarlena);
+				getTypeOutputInfo(opcinfo->oi_typcache[i]->type_id, &output, &isVarlena);
 				fmgr_info(output, &column->outputFn[i]);
 			}
 
@@ -213,7 +213,7 @@ brin_page_items(PG_FUNCTION_ARGS)
 		 */
 		if (state->dtup == NULL)
 		{
-			BrinTuple	   *tup;
+			BrinTuple  *tup;
 			MemoryContext mctx;
 			ItemId		itemId;
 
@@ -225,8 +225,8 @@ brin_page_items(PG_FUNCTION_ARGS)
 			if (ItemIdIsUsed(itemId))
 			{
 				tup = (BrinTuple *) PageGetItem(state->page,
-											  PageGetItemId(state->page,
-															state->offset));
+												PageGetItemId(state->page,
+															  state->offset));
 				state->dtup = brin_deform_tuple(state->bdesc, tup);
 				state->attno = 1;
 				state->unusedItem = false;
@@ -253,7 +253,7 @@ brin_page_items(PG_FUNCTION_ARGS)
 		}
 		else
 		{
-			int		att = state->attno - 1;
+			int			att = state->attno - 1;
 
 			values[0] = UInt16GetDatum(state->offset);
 			values[1] = UInt32GetDatum(state->dtup->bt_blkno);
@@ -263,8 +263,8 @@ brin_page_items(PG_FUNCTION_ARGS)
 			values[5] = BoolGetDatum(state->dtup->bt_placeholder);
 			if (!state->dtup->bt_columns[att].bv_allnulls)
 			{
-				BrinValues   *bvalues = &state->dtup->bt_columns[att];
-				StringInfoData	s;
+				BrinValues *bvalues = &state->dtup->bt_columns[att];
+				StringInfoData s;
 				bool		first;
 				int			i;
 
@@ -274,7 +274,7 @@ brin_page_items(PG_FUNCTION_ARGS)
 				first = true;
 				for (i = 0; i < state->columns[att]->nstored; i++)
 				{
-					char   *val;
+					char	   *val;
 
 					if (!first)
 						appendStringInfoString(&s, " .. ");
@@ -312,8 +312,8 @@ brin_page_items(PG_FUNCTION_ARGS)
 		}
 
 		/*
-		 * If we're beyond the end of the page, set flag to end the function in
-		 * the following iteration.
+		 * If we're beyond the end of the page, set flag to end the function
+		 * in the following iteration.
 		 */
 		if (state->offset > PageGetMaxOffsetNumber(state->page))
 			state->done = true;
@@ -366,8 +366,8 @@ brin_revmap_data(PG_FUNCTION_ARGS)
 	struct
 	{
 		ItemPointerData *tids;
-		int		idx;
-	} *state;
+		int			idx;
+	}		   *state;
 	FuncCallContext *fctx;
 
 	if (!superuser())
diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index 701b2ca763..c0de3be8df 100644
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -167,7 +167,7 @@ typedef struct gin_leafpage_items_state
 	TupleDesc	tupd;
 	GinPostingList *seg;
 	GinPostingList *lastseg;
-}	gin_leafpage_items_state;
+} gin_leafpage_items_state;
 
 Datum
 gin_leafpage_items(PG_FUNCTION_ARGS)
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index 98016fc365..6622d22f5f 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -34,6 +34,7 @@ typedef struct
 	bool		isvalid;
 	bool		isdirty;
 	uint16		usagecount;
+
 	/*
 	 * An int32 is sufficiently large, as MAX_BACKENDS prevents a buffer from
 	 * being pinned by too many backends and each backend will only pin once
@@ -142,7 +143,7 @@ pg_buffercache_pages(PG_FUNCTION_ARGS)
 			LWLockAcquire(BufMappingPartitionLockByIndex(i), LW_SHARED);
 
 		/*
-		 * Scan though all the buffers, saving the relevant fields in the
+		 * Scan through all the buffers, saving the relevant fields in the
 		 * fctx->record structure.
 		 */
 		for (i = 0; i < NBuffers; i++)
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 2963c58998..170b6f42c6 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -138,10 +138,10 @@ typedef struct Counters
 {
 	int64		calls;			/* # of times executed */
 	double		total_time;		/* total execution time, in msec */
-	double      min_time;       /* minimim execution time in msec */
-	double      max_time;       /* maximum execution time in msec */
-	double      mean_time;      /* mean execution time in msec */
-	double      sum_var_time;   /* sum of variances in execution time in msec */
+	double		min_time;		/* minimim execution time in msec */
+	double		max_time;		/* maximum execution time in msec */
+	double		mean_time;		/* mean execution time in msec */
+	double		sum_var_time;	/* sum of variances in execution time in msec */
 	int64		rows;			/* total # of retrieved or affected rows */
 	int64		shared_blks_hit;	/* # of shared buffer hits */
 	int64		shared_blks_read;		/* # of shared disk blocks read */
@@ -1255,10 +1255,10 @@ pgss_store(const char *query, uint32 queryId,
 		else
 		{
 			/*
-			 * Welford's method for accurately computing variance.
-			 * See <http://www.johndcook.com/blog/standard_deviation/>
+			 * Welford's method for accurately computing variance. See
+			 * <http://www.johndcook.com/blog/standard_deviation/>
 			 */
-			double old_mean = e->counters.mean_time;
+			double		old_mean = e->counters.mean_time;
 
 			e->counters.mean_time +=
 				(total_time - old_mean) / e->counters.calls;
@@ -1596,10 +1596,11 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
 			values[i++] = Float8GetDatumFast(tmp.min_time);
 			values[i++] = Float8GetDatumFast(tmp.max_time);
 			values[i++] = Float8GetDatumFast(tmp.mean_time);
+
 			/*
 			 * Note we are calculating the population variance here, not the
-			 * sample variance, as we have data for the whole population,
-			 * so Bessel's correction is not used, and we don't divide by
+			 * sample variance, as we have data for the whole population, so
+			 * Bessel's correction is not used, and we don't divide by
 			 * tmp.calls - 1.
 			 */
 			if (tmp.calls > 1)
@@ -2288,8 +2289,10 @@ JumbleQuery(pgssJumbleState *jstate, Query *query)
 	JumbleRangeTable(jstate, query->rtable);
 	JumbleExpr(jstate, (Node *) query->jointree);
 	JumbleExpr(jstate, (Node *) query->targetList);
+	JumbleExpr(jstate, (Node *) query->onConflict);
 	JumbleExpr(jstate, (Node *) query->returningList);
 	JumbleExpr(jstate, (Node *) query->groupClause);
+	JumbleExpr(jstate, (Node *) query->groupingSets);
 	JumbleExpr(jstate, query->havingQual);
 	JumbleExpr(jstate, (Node *) query->windowClause);
 	JumbleExpr(jstate, (Node *) query->distinctClause);
@@ -2420,6 +2423,13 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
 				JumbleExpr(jstate, (Node *) expr->aggfilter);
 			}
 			break;
+		case T_GroupingFunc:
+			{
+				GroupingFunc *grpnode = (GroupingFunc *) node;
+
+				JumbleExpr(jstate, (Node *) grpnode->refs);
+			}
+			break;
 		case T_WindowFunc:
 			{
 				WindowFunc *expr = (WindowFunc *) node;
@@ -2655,6 +2665,15 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
 				APP_JUMB(ce->cursor_param);
 			}
 			break;
+		case T_InferenceElem:
+			{
+				InferenceElem *ie = (InferenceElem *) node;
+
+				APP_JUMB(ie->infercollid);
+				APP_JUMB(ie->inferopclass);
+				JumbleExpr(jstate, ie->expr);
+			}
+			break;
 		case T_TargetEntry:
 			{
 				TargetEntry *tle = (TargetEntry *) node;
@@ -2691,12 +2710,32 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
 				JumbleExpr(jstate, from->quals);
 			}
 			break;
+		case T_OnConflictExpr:
+			{
+				OnConflictExpr *conf = (OnConflictExpr *) node;
+
+				APP_JUMB(conf->action);
+				JumbleExpr(jstate, (Node *) conf->arbiterElems);
+				JumbleExpr(jstate, conf->arbiterWhere);
+				JumbleExpr(jstate, (Node *) conf->onConflictSet);
+				JumbleExpr(jstate, conf->onConflictWhere);
+				APP_JUMB(conf->constraint);
+				APP_JUMB(conf->exclRelIndex);
+				JumbleExpr(jstate, (Node *) conf->exclRelTlist);
+			}
+			break;
 		case T_List:
 			foreach(temp, (List *) node)
 			{
 				JumbleExpr(jstate, (Node *) lfirst(temp));
 			}
 			break;
+		case T_IntList:
+			foreach(temp, (List *) node)
+			{
+				APP_JUMB(lfirst_int(temp));
+			}
+			break;
 		case T_SortGroupClause:
 			{
 				SortGroupClause *sgc = (SortGroupClause *) node;
@@ -2707,6 +2746,13 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
 				APP_JUMB(sgc->nulls_first);
 			}
 			break;
+		case T_GroupingSet:
+			{
+				GroupingSet *gsnode = (GroupingSet *) node;
+
+				JumbleExpr(jstate, (Node *) gsnode->content);
+			}
+			break;
 		case T_WindowClause:
 			{
 				WindowClause *wc = (WindowClause *) node;
diff --git a/contrib/pg_test_fsync/Makefile b/contrib/pg_test_fsync/Makefile
deleted file mode 100644
index 15afba7682..0000000000
--- a/contrib/pg_test_fsync/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# contrib/pg_test_fsync/Makefile
-
-PGFILEDESC = "pg_test_fsync - test various disk sync methods"
-PGAPPICON = win32
-
-PROGRAM  = pg_test_fsync
-OBJS = pg_test_fsync.o $(WIN32RES)
-
-ifdef USE_PGXS
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-else
-subdir = contrib/pg_test_fsync
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
diff --git a/contrib/pg_test_timing/Makefile b/contrib/pg_test_timing/Makefile
deleted file mode 100644
index 8b37aa8249..0000000000
--- a/contrib/pg_test_timing/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# contrib/pg_test_timing/Makefile
-
-PGFILEDESC = "pg_test_timing - test timing overhead"
-PGAPPICON = win32
-
-PROGRAM  = pg_test_timing
-OBJS = pg_test_timing.o $(WIN32RES)
-
-ifdef USE_PGXS
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-else
-subdir = contrib/pg_test_timing
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index c59925c575..d524ceaa19 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -6,7 +6,8 @@
 #include "trgm.h"
 
 #include "access/gin.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
+#include "fmgr.h"
 
 
 PG_FUNCTION_INFO_V1(gin_extract_trgm);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index 69dc7f71f0..07d1dc308b 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -5,7 +5,8 @@
 
 #include "trgm.h"
 
-#include "access/skey.h"
+#include "access/stratnum.h"
+#include "fmgr.h"
 
 
 typedef struct
diff --git a/contrib/pgcrypto/expected/pgp-decrypt.out b/contrib/pgcrypto/expected/pgp-decrypt.out
index 7193dca026..2dabfaf7b0 100644
--- a/contrib/pgcrypto/expected/pgp-decrypt.out
+++ b/contrib/pgcrypto/expected/pgp-decrypt.out
@@ -372,3 +372,54 @@ select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',
 (1 row)
 
 -- expected: true
+-- Negative tests
+-- Decryption with a certain incorrect key yields an apparent Literal Data
+-- packet reporting its content to be binary data.  Ciphertext source:
+-- iterative pgp_sym_encrypt('secret', 'key') until the random prefix gave
+-- rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMCxf8PTrQBmJdl0jcB6y2joE7GSLKRv7trbNsF5Z8ou5NISLUg31llVH/S0B2wl4bvzZjV
+VsxxqLSPzNLAeIspJk5G
+=mSd/
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+NOTICE:  dbg: prefix_init: corrupt prefix
+NOTICE:  dbg: parse_literal_data: data type=b
+NOTICE:  dbg: mdcbuf_finish: bad MDC pkt hdr
+ERROR:  Wrong key or corrupt data
+-- Routine text/binary mismatch.
+select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
+NOTICE:  dbg: parse_literal_data: data type=b
+ERROR:  Not text data
+-- Decryption with a certain incorrect key yields an apparent BZip2-compressed
+-- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
+-- until the random prefix gave rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMC9rK/dMkF5Zlt0jcBlzAQ1mQY2qYbKYbw8h3EZ5Jk0K2IiY92R82TRhWzBIF/8cmXDPtP
+GXsd65oYJZp3Khz0qfyn
+=Nmpq
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+NOTICE:  dbg: prefix_init: corrupt prefix
+NOTICE:  dbg: parse_compressed_data: bzip2 unsupported
+NOTICE:  dbg: mdcbuf_finish: bad MDC pkt hdr
+ERROR:  Wrong key or corrupt data
+-- Routine use of BZip2 compression.  Ciphertext source:
+-- echo x | gpg --homedir /nonexistent --personal-compress-preferences bzip2 \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCRhFrAKNcLVJg0mMBLJG1cCASNk/x/3dt1zJ+2eo7jHfjgg3N6wpB3XIe
+QCwkWJwlBG5pzbO5gu7xuPQN+TbPJ7aQ2sLx3bAHhtYb0i3vV9RO10Gw++yUyd4R
+UCAAw2JRIISttRHMfDpDuZJpvYo=
+=AZ9M
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+NOTICE:  dbg: parse_compressed_data: bzip2 unsupported
+ERROR:  Unsupported compression algorithm
diff --git a/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out b/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out
index d290a1349f..b4b6810a3c 100644
--- a/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out
+++ b/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out
@@ -625,7 +625,7 @@ ERROR:  No encryption key found
 -- rsa: password-protected secret key, wrong password
 select pgp_pub_decrypt(dearmor(data), dearmor(seckey), '123')
 from keytbl, encdata where keytbl.id=7 and encdata.id=4;
-ERROR:  Corrupt data
+ERROR:  Wrong key or corrupt data
 -- rsa: password-protected secret key, right password
 select pgp_pub_decrypt(dearmor(data), dearmor(seckey), 'parool')
 from keytbl, encdata where keytbl.id=7 and encdata.id=4;
@@ -641,7 +641,7 @@ ERROR:  Need password for secret key
 -- password-protected secret key, wrong password
 select pgp_pub_decrypt(dearmor(data), dearmor(seckey), 'foo')
 from keytbl, encdata where keytbl.id=5 and encdata.id=1;
-ERROR:  Corrupt data
+ERROR:  Wrong key or corrupt data
 -- password-protected secret key, right password
 select pgp_pub_decrypt(dearmor(data), dearmor(seckey), 'parool')
 from keytbl, encdata where keytbl.id=5 and encdata.id=1;
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index c59691ed2c..44d9adcd2a 100644
--- a/contrib/pgcrypto/mbuf.c
+++ b/contrib/pgcrypto/mbuf.c
@@ -325,7 +325,7 @@ pullf_read_fixed(PullFilter *src, int len, uint8 *dst)
 	if (res != len)
 	{
 		px_debug("pullf_read_fixed: need=%d got=%d", len, res);
-		return PXE_MBUF_SHORT_READ;
+		return PXE_PGP_CORRUPT_DATA;
 	}
 	if (p != dst)
 		memcpy(dst, p, len);
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index 24eb42fa89..5c8355808a 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -399,7 +399,7 @@ pgp_extract_armor_headers(const uint8 *src, unsigned len,
 	char	   *line;
 	char	   *nextline;
 	char	   *eol,
-				*colon;
+			   *colon;
 	int			hlen;
 	char	   *buf;
 	int			hdrlines;
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index c0c5773e66..5c69745156 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -236,6 +236,8 @@ pgp_create_pkt_reader(PullFilter **pf_p, PullFilter *src, int len,
 
 /*
  * Prefix check filter
+ * https://tools.ietf.org/html/rfc4880#section-5.7
+ * https://tools.ietf.org/html/rfc4880#section-5.13
  */
 
 static int
@@ -264,20 +266,7 @@ prefix_init(void **priv_p, void *arg, PullFilter *src)
 	if (buf[len - 2] != buf[len] || buf[len - 1] != buf[len + 1])
 	{
 		px_debug("prefix_init: corrupt prefix");
-
-		/*
-		 * The original purpose of the 2-byte check was to show user a
-		 * friendly "wrong key" message. This made following possible:
-		 *
-		 * "An Attack on CFB Mode Encryption As Used By OpenPGP" by Serge
-		 * Mister and Robert Zuccherato
-		 *
-		 * To avoid being 'oracle', we delay reporting, which basically means
-		 * we prefer to run into corrupt packet header.
-		 *
-		 * We _could_ throw PXE_PGP_CORRUPT_DATA here, but there is
-		 * possibility of attack via timing, so we don't.
-		 */
+		/* report error in pgp_decrypt() */
 		ctx->corrupt_prefix = 1;
 	}
 	px_memset(tmpbuf, 0, sizeof(tmpbuf));
@@ -788,12 +777,15 @@ parse_literal_data(PGP_Context *ctx, MBuf *dst, PullFilter *pkt)
 	}
 	px_memset(tmpbuf, 0, 4);
 
-	/* check if text */
+	/*
+	 * If called from an SQL function that returns text, pgp_decrypt() rejects
+	 * inputs not self-identifying as text.
+	 */
 	if (ctx->text_mode)
 		if (type != 't' && type != 'u')
 		{
 			px_debug("parse_literal_data: data type=%c", type);
-			return PXE_PGP_NOT_TEXT;
+			ctx->unexpected_binary = true;
 		}
 
 	ctx->unicode_mode = (type == 'u') ? 1 : 0;
@@ -827,6 +819,7 @@ parse_compressed_data(PGP_Context *ctx, MBuf *dst, PullFilter *pkt)
 	int			res;
 	uint8		type;
 	PullFilter *pf_decompr;
+	uint8	   *discard_buf;
 
 	GETBYTE(pkt, type);
 
@@ -850,7 +843,20 @@ parse_compressed_data(PGP_Context *ctx, MBuf *dst, PullFilter *pkt)
 
 		case PGP_COMPR_BZIP2:
 			px_debug("parse_compressed_data: bzip2 unsupported");
-			res = PXE_PGP_UNSUPPORTED_COMPR;
+			/* report error in pgp_decrypt() */
+			ctx->unsupported_compr = 1;
+
+			/*
+			 * Discard the compressed data, allowing it to first affect any
+			 * MDC digest computation.
+			 */
+			while (1)
+			{
+				res = pullf_read(pkt, 32 * 1024, &discard_buf);
+				if (res <= 0)
+					break;
+			}
+
 			break;
 
 		default:
@@ -1168,8 +1174,36 @@ pgp_decrypt(PGP_Context *ctx, MBuf *msrc, MBuf *mdst)
 	if (res < 0)
 		return res;
 
+	/*
+	 * Report a failure of the prefix_init() "quick check" now, rather than
+	 * upon detection, to hinder timing attacks.  pgcrypto is not generally
+	 * secure against timing attacks, but this helps.
+	 */
 	if (!got_data || ctx->corrupt_prefix)
-		res = PXE_PGP_CORRUPT_DATA;
+		return PXE_PGP_CORRUPT_DATA;
+
+	/*
+	 * Code interpreting purportedly-decrypted data prior to this stage shall
+	 * report no error other than PXE_PGP_CORRUPT_DATA.  (PXE_BUG is okay so
+	 * long as it remains unreachable.)  This ensures that an attacker able to
+	 * choose a ciphertext and receive a corresponding decryption error
+	 * message cannot use that oracle to gather clues about the decryption
+	 * key.  See "An Attack on CFB Mode Encryption As Used By OpenPGP" by
+	 * Serge Mister and Robert Zuccherato.
+	 *
+	 * A problematic value in the first octet of a Literal Data or Compressed
+	 * Data packet may indicate a simple user error, such as the need to call
+	 * pgp_sym_decrypt_bytea instead of pgp_sym_decrypt.  Occasionally,
+	 * though, it is the first symptom of the encryption key not matching the
+	 * decryption key.  When this was the only problem encountered, report a
+	 * specific error to guide the user; otherwise, we will have reported
+	 * PXE_PGP_CORRUPT_DATA before now.  A key mismatch makes the other errors
+	 * into red herrings, and this avoids leaking clues to attackers.
+	 */
+	if (ctx->unsupported_compr)
+		return PXE_PGP_UNSUPPORTED_COMPR;
+	if (ctx->unexpected_binary)
+		return PXE_PGP_NOT_TEXT;
 
 	return res;
 }
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index d0da05cd13..1842985e53 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -259,6 +259,7 @@ set_arg(PGP_Context *ctx, char *key, char *val,
 		res = pgp_set_convert_crlf(ctx, atoi(val));
 	else if (strcmp(key, "unicode-mode") == 0)
 		res = pgp_set_unicode_mode(ctx, atoi(val));
+
 	/*
 	 * The remaining options are for debugging/testing and are therefore not
 	 * documented in the user-facing docs.
@@ -834,22 +835,22 @@ static int
 parse_key_value_arrays(ArrayType *key_array, ArrayType *val_array,
 					   char ***p_keys, char ***p_values)
 {
-	int		nkdims = ARR_NDIM(key_array);
-	int		nvdims = ARR_NDIM(val_array);
-	char   **keys,
-		   **values;
-	Datum  *key_datums,
-		   *val_datums;
-	bool   *key_nulls,
-		   *val_nulls;
-	int		key_count,
-			val_count;
-	int		i;
+	int			nkdims = ARR_NDIM(key_array);
+	int			nvdims = ARR_NDIM(val_array);
+	char	  **keys,
+			  **values;
+	Datum	   *key_datums,
+			   *val_datums;
+	bool	   *key_nulls,
+			   *val_nulls;
+	int			key_count,
+				val_count;
+	int			i;
 
 	if (nkdims > 1 || nkdims != nvdims)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
-				errmsg("wrong number of array subscripts")));
+				 errmsg("wrong number of array subscripts")));
 	if (nkdims == 0)
 		return 0;
 
@@ -871,7 +872,7 @@ parse_key_value_arrays(ArrayType *key_array, ArrayType *val_array,
 
 	for (i = 0; i < key_count; i++)
 	{
-		char *v;
+		char	   *v;
 
 		/* Check that the key doesn't contain anything funny */
 		if (key_nulls[i])
@@ -884,7 +885,7 @@ parse_key_value_arrays(ArrayType *key_array, ArrayType *val_array,
 		if (!string_is_ascii(v))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("header key must not contain non-ASCII characters")));
+				errmsg("header key must not contain non-ASCII characters")));
 		if (strstr(v, ": "))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -906,7 +907,7 @@ parse_key_value_arrays(ArrayType *key_array, ArrayType *val_array,
 		if (!string_is_ascii(v))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("header value must not contain non-ASCII characters")));
+			  errmsg("header value must not contain non-ASCII characters")));
 		if (strchr(v, '\n'))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -1045,7 +1046,7 @@ pgp_armor_headers(PG_FUNCTION_ARGS)
 		SRF_RETURN_DONE(funcctx);
 	else
 	{
-		char	  *values[2];
+		char	   *values[2];
 
 		/* we assume that the keys (and values) are in UTF-8. */
 		utf8key = state->keys[funcctx->call_cntr];
diff --git a/contrib/pgcrypto/pgp.h b/contrib/pgcrypto/pgp.h
index 398f21bca2..62b8517c27 100644
--- a/contrib/pgcrypto/pgp.h
+++ b/contrib/pgcrypto/pgp.h
@@ -153,7 +153,9 @@ struct PGP_Context
 	 * internal variables
 	 */
 	int			mdc_checked;
-	int			corrupt_prefix;
+	int			corrupt_prefix; /* prefix failed RFC 4880 "quick check" */
+	int			unsupported_compr;		/* has bzip2 compression */
+	int			unexpected_binary;		/* binary data seen in text_mode */
 	int			in_mdc_pkt;
 	int			use_mdcbuf_filter;
 	PX_MD	   *mdc_ctx;
@@ -276,11 +278,11 @@ void		pgp_cfb_free(PGP_CFB *ctx);
 int			pgp_cfb_encrypt(PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
 int			pgp_cfb_decrypt(PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
 
-void		pgp_armor_encode(const uint8 *src, unsigned len, StringInfo dst,
-							 int num_headers, char **keys, char **values);
+void pgp_armor_encode(const uint8 *src, unsigned len, StringInfo dst,
+				 int num_headers, char **keys, char **values);
 int			pgp_armor_decode(const uint8 *src, int len, StringInfo dst);
-int			pgp_extract_armor_headers(const uint8 *src, unsigned len,
-									  int *nheaders, char ***keys, char ***values);
+int pgp_extract_armor_headers(const uint8 *src, unsigned len,
+						  int *nheaders, char ***keys, char ***values);
 
 int			pgp_compress_filter(PushFilter **res, PGP_Context *ctx, PushFilter *dst);
 int			pgp_decompress_filter(PullFilter **res, PGP_Context *ctx, PullFilter *src);
diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c
index 93c436daa0..cfb3b50985 100644
--- a/contrib/pgcrypto/px.c
+++ b/contrib/pgcrypto/px.c
@@ -87,9 +87,6 @@ static const struct error_desc px_err_list[] = {
 	{PXE_PGP_UNSUPPORTED_PUBALGO, "Unsupported public key algorithm"},
 	{PXE_PGP_MULTIPLE_SUBKEYS, "Several subkeys not supported"},
 
-	/* fake this as PXE_PGP_CORRUPT_DATA */
-	{PXE_MBUF_SHORT_READ, "Corrupt data"},
-
 	{0, NULL},
 };
 
diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
index 7255ebf04c..0f6bbd7a8d 100644
--- a/contrib/pgcrypto/px.h
+++ b/contrib/pgcrypto/px.h
@@ -80,8 +80,6 @@ void		px_free(void *p);
 #define PXE_NO_RANDOM				-17
 #define PXE_DECRYPT_FAILED			-18
 
-#define PXE_MBUF_SHORT_READ			-50
-
 #define PXE_PGP_CORRUPT_DATA		-100
 #define PXE_PGP_CORRUPT_ARMOR		-101
 #define PXE_PGP_UNSUPPORTED_COMPR	-102
diff --git a/contrib/pgcrypto/sql/pgp-decrypt.sql b/contrib/pgcrypto/sql/pgp-decrypt.sql
index 5457152ccf..f46a18f8cf 100644
--- a/contrib/pgcrypto/sql/pgp-decrypt.sql
+++ b/contrib/pgcrypto/sql/pgp-decrypt.sql
@@ -268,3 +268,48 @@ a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
 -- check BUG #11905, problem with messages 6 less than a power of 2.
 select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',65530);
 -- expected: true
+
+
+-- Negative tests
+
+-- Decryption with a certain incorrect key yields an apparent Literal Data
+-- packet reporting its content to be binary data.  Ciphertext source:
+-- iterative pgp_sym_encrypt('secret', 'key') until the random prefix gave
+-- rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMCxf8PTrQBmJdl0jcB6y2joE7GSLKRv7trbNsF5Z8ou5NISLUg31llVH/S0B2wl4bvzZjV
+VsxxqLSPzNLAeIspJk5G
+=mSd/
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+
+-- Routine text/binary mismatch.
+select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
+
+-- Decryption with a certain incorrect key yields an apparent BZip2-compressed
+-- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
+-- until the random prefix gave rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMC9rK/dMkF5Zlt0jcBlzAQ1mQY2qYbKYbw8h3EZ5Jk0K2IiY92R82TRhWzBIF/8cmXDPtP
+GXsd65oYJZp3Khz0qfyn
+=Nmpq
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+
+-- Routine use of BZip2 compression.  Ciphertext source:
+-- echo x | gpg --homedir /nonexistent --personal-compress-preferences bzip2 \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCRhFrAKNcLVJg0mMBLJG1cCASNk/x/3dt1zJ+2eo7jHfjgg3N6wpB3XIe
+QCwkWJwlBG5pzbO5gu7xuPQN+TbPJ7aQ2sLx3bAHhtYb0i3vV9RO10Gw++yUyd4R
+UCAAw2JRIISttRHMfDpDuZJpvYo=
+=AZ9M
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile
index 862585cc01..6083dabefd 100644
--- a/contrib/pgstattuple/Makefile
+++ b/contrib/pgstattuple/Makefile
@@ -1,10 +1,10 @@
 # contrib/pgstattuple/Makefile
 
 MODULE_big	= pgstattuple
-OBJS		= pgstattuple.o pgstatindex.o $(WIN32RES)
+OBJS		= pgstattuple.o pgstatindex.o pgstatapprox.o $(WIN32RES)
 
 EXTENSION = pgstattuple
-DATA = pgstattuple--1.2.sql pgstattuple--1.1--1.2.sql pgstattuple--1.0--1.1.sql pgstattuple--unpackaged--1.0.sql
+DATA = pgstattuple--1.3.sql pgstattuple--1.2--1.3.sql pgstattuple--1.1--1.2.sql pgstattuple--1.0--1.1.sql pgstattuple--unpackaged--1.0.sql
 PGFILEDESC = "pgstattuple - tuple-level statistics"
 
 REGRESS = pgstattuple
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
new file mode 100644
index 0000000000..22c5f7a9ee
--- /dev/null
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -0,0 +1,274 @@
+/*-------------------------------------------------------------------------
+ *
+ * pgstatapproc.c
+ *		  Bloat estimation functions
+ *
+ * Copyright (c) 2014-2015, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *		  contrib/pgstattuple/pgstatapprox.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/visibilitymap.h"
+#include "access/transam.h"
+#include "access/xact.h"
+#include "access/multixact.h"
+#include "access/htup_details.h"
+#include "catalog/namespace.h"
+#include "funcapi.h"
+#include "miscadmin.h"
+#include "storage/bufmgr.h"
+#include "storage/freespace.h"
+#include "storage/procarray.h"
+#include "storage/lmgr.h"
+#include "utils/builtins.h"
+#include "utils/tqual.h"
+#include "commands/vacuum.h"
+
+PG_FUNCTION_INFO_V1(pgstattuple_approx);
+
+typedef struct output_type
+{
+	uint64		table_len;
+	uint64		scanned_percent;
+	uint64		tuple_count;
+	uint64		tuple_len;
+	double		tuple_percent;
+	uint64		dead_tuple_count;
+	uint64		dead_tuple_len;
+	double		dead_tuple_percent;
+	uint64		free_space;
+	double		free_percent;
+} output_type;
+
+#define NUM_OUTPUT_COLUMNS 10
+
+/*
+ * This function takes an already open relation and scans its pages,
+ * skipping those that have the corresponding visibility map bit set.
+ * For pages we skip, we find the free space from the free space map
+ * and approximate tuple_len on that basis. For the others, we count
+ * the exact number of dead tuples etc.
+ *
+ * This scan is loosely based on vacuumlazy.c:lazy_scan_heap(), but
+ * we do not try to avoid skipping single pages.
+ */
+static void
+statapprox_heap(Relation rel, output_type *stat)
+{
+	BlockNumber scanned,
+				nblocks,
+				blkno;
+	Buffer		vmbuffer = InvalidBuffer;
+	BufferAccessStrategy bstrategy;
+	TransactionId OldestXmin;
+	uint64		misc_count = 0;
+
+	OldestXmin = GetOldestXmin(rel, true);
+	bstrategy = GetAccessStrategy(BAS_BULKREAD);
+
+	nblocks = RelationGetNumberOfBlocks(rel);
+	scanned = 0;
+
+	for (blkno = 0; blkno < nblocks; blkno++)
+	{
+		Buffer		buf;
+		Page		page;
+		OffsetNumber offnum,
+					maxoff;
+		Size		freespace;
+
+		CHECK_FOR_INTERRUPTS();
+
+		/*
+		 * If the page has only visible tuples, then we can find out the free
+		 * space from the FSM and move on.
+		 */
+		if (visibilitymap_test(rel, blkno, &vmbuffer))
+		{
+			freespace = GetRecordedFreeSpace(rel, blkno);
+			stat->tuple_len += BLCKSZ - freespace;
+			stat->free_space += freespace;
+			continue;
+		}
+
+		buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno,
+								 RBM_NORMAL, bstrategy);
+
+		LockBuffer(buf, BUFFER_LOCK_SHARE);
+
+		page = BufferGetPage(buf);
+
+		/*
+		 * It's not safe to call PageGetHeapFreeSpace() on new pages, so we
+		 * treat them as being free space for our purposes.
+		 */
+		if (!PageIsNew(page))
+			stat->free_space += PageGetHeapFreeSpace(page);
+		else
+			stat->free_space += BLCKSZ - SizeOfPageHeaderData;
+
+		if (PageIsNew(page) || PageIsEmpty(page))
+		{
+			UnlockReleaseBuffer(buf);
+			continue;
+		}
+
+		scanned++;
+
+		/*
+		 * Look at each tuple on the page and decide whether it's live or
+		 * dead, then count it and its size. Unlike lazy_scan_heap, we can
+		 * afford to ignore problems and special cases.
+		 */
+		maxoff = PageGetMaxOffsetNumber(page);
+
+		for (offnum = FirstOffsetNumber;
+			 offnum <= maxoff;
+			 offnum = OffsetNumberNext(offnum))
+		{
+			ItemId		itemid;
+			HeapTupleData tuple;
+
+			itemid = PageGetItemId(page, offnum);
+
+			if (!ItemIdIsUsed(itemid) || ItemIdIsRedirected(itemid) ||
+				ItemIdIsDead(itemid))
+			{
+				continue;
+			}
+
+			Assert(ItemIdIsNormal(itemid));
+
+			ItemPointerSet(&(tuple.t_self), blkno, offnum);
+
+			tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid);
+			tuple.t_len = ItemIdGetLength(itemid);
+			tuple.t_tableOid = RelationGetRelid(rel);
+
+			/*
+			 * We count live and dead tuples, but we also need to add up
+			 * others in order to feed vac_estimate_reltuples.
+			 */
+			switch (HeapTupleSatisfiesVacuum(&tuple, OldestXmin, buf))
+			{
+				case HEAPTUPLE_RECENTLY_DEAD:
+					misc_count++;
+					/* Fall through */
+				case HEAPTUPLE_DEAD:
+					stat->dead_tuple_len += tuple.t_len;
+					stat->dead_tuple_count++;
+					break;
+				case HEAPTUPLE_LIVE:
+					stat->tuple_len += tuple.t_len;
+					stat->tuple_count++;
+					break;
+				case HEAPTUPLE_INSERT_IN_PROGRESS:
+				case HEAPTUPLE_DELETE_IN_PROGRESS:
+					misc_count++;
+					break;
+				default:
+					elog(ERROR, "unexpected HeapTupleSatisfiesVacuum result");
+					break;
+			}
+		}
+
+		UnlockReleaseBuffer(buf);
+	}
+
+	stat->table_len = (uint64) nblocks *BLCKSZ;
+
+	stat->tuple_count = vac_estimate_reltuples(rel, false, nblocks, scanned,
+											 stat->tuple_count + misc_count);
+
+	/*
+	 * Calculate percentages if the relation has one or more pages.
+	 */
+	if (nblocks != 0)
+	{
+		stat->scanned_percent = 100 * scanned / nblocks;
+		stat->tuple_percent = 100.0 * stat->tuple_len / stat->table_len;
+		stat->dead_tuple_percent = 100.0 * stat->dead_tuple_len / stat->table_len;
+		stat->free_percent = 100.0 * stat->free_space / stat->table_len;
+	}
+
+	if (BufferIsValid(vmbuffer))
+	{
+		ReleaseBuffer(vmbuffer);
+		vmbuffer = InvalidBuffer;
+	}
+}
+
+/*
+ * Returns estimated live/dead tuple statistics for the given relid.
+ */
+Datum
+pgstattuple_approx(PG_FUNCTION_ARGS)
+{
+	Oid			relid = PG_GETARG_OID(0);
+	Relation	rel;
+	output_type stat = {0};
+	TupleDesc	tupdesc;
+	bool		nulls[NUM_OUTPUT_COLUMNS];
+	Datum		values[NUM_OUTPUT_COLUMNS];
+	HeapTuple	ret;
+	int			i = 0;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 (errmsg("must be superuser to use pgstattuple functions"))));
+
+	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
+	if (tupdesc->natts != NUM_OUTPUT_COLUMNS)
+		elog(ERROR, "incorrect number of output arguments");
+
+	rel = relation_open(relid, AccessShareLock);
+
+	/*
+	 * Reject attempts to read non-local temporary relations; we would be
+	 * likely to get wrong data since we have no visibility into the owning
+	 * session's local buffers.
+	 */
+	if (RELATION_IS_OTHER_TEMP(rel))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot access temporary tables of other sessions")));
+
+	/*
+	 * We support only ordinary relations and materialised views, because we
+	 * depend on the visibility map and free space map for our estimates about
+	 * unscanned pages.
+	 */
+	if (!(rel->rd_rel->relkind == RELKIND_RELATION ||
+		  rel->rd_rel->relkind == RELKIND_MATVIEW))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("\"%s\" is not a table or materialized view",
+						RelationGetRelationName(rel))));
+
+	statapprox_heap(rel, &stat);
+
+	relation_close(rel, AccessShareLock);
+
+	memset(nulls, 0, sizeof(nulls));
+
+	values[i++] = Int64GetDatum(stat.table_len);
+	values[i++] = Float8GetDatum(stat.scanned_percent);
+	values[i++] = Int64GetDatum(stat.tuple_count);
+	values[i++] = Int64GetDatum(stat.tuple_len);
+	values[i++] = Float8GetDatum(stat.tuple_percent);
+	values[i++] = Int64GetDatum(stat.dead_tuple_count);
+	values[i++] = Int64GetDatum(stat.dead_tuple_len);
+	values[i++] = Float8GetDatum(stat.dead_tuple_percent);
+	values[i++] = Int64GetDatum(stat.free_space);
+	values[i++] = Float8GetDatum(stat.free_percent);
+
+	ret = heap_form_tuple(tupdesc, values, nulls);
+	return HeapTupleGetDatum(ret);
+}
diff --git a/contrib/pgstattuple/pgstattuple--1.2--1.3.sql b/contrib/pgstattuple/pgstattuple--1.2--1.3.sql
new file mode 100644
index 0000000000..99301a27ca
--- /dev/null
+++ b/contrib/pgstattuple/pgstattuple--1.2--1.3.sql
@@ -0,0 +1,18 @@
+/* contrib/pgstattuple/pgstattuple--1.2--1.3.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION pgstattuple UPDATE TO '1.3'" to load this file. \quit
+
+CREATE FUNCTION pgstattuple_approx(IN reloid regclass,
+    OUT table_len BIGINT,               -- physical table length in bytes
+    OUT scanned_percent FLOAT8,         -- what percentage of the table's pages was scanned
+    OUT approx_tuple_count BIGINT,      -- estimated number of live tuples
+    OUT approx_tuple_len BIGINT,        -- estimated total length in bytes of live tuples
+    OUT approx_tuple_percent FLOAT8,    -- live tuples in % (based on estimate)
+    OUT dead_tuple_count BIGINT,        -- exact number of dead tuples
+    OUT dead_tuple_len BIGINT,          -- exact total length in bytes of dead tuples
+    OUT dead_tuple_percent FLOAT8,      -- dead tuples in % (based on estimate)
+    OUT approx_free_space BIGINT,       -- estimated free space in bytes
+    OUT approx_free_percent FLOAT8)     -- free space in % (based on estimate)
+AS 'MODULE_PATHNAME', 'pgstattuple_approx'
+LANGUAGE C STRICT;
diff --git a/contrib/pgstattuple/pgstattuple--1.2.sql b/contrib/pgstattuple/pgstattuple--1.3.sql
index e5fa2f58da..f3996e74a8 100644
--- a/contrib/pgstattuple/pgstattuple--1.2.sql
+++ b/contrib/pgstattuple/pgstattuple--1.3.sql
@@ -1,4 +1,4 @@
-/* contrib/pgstattuple/pgstattuple--1.2.sql */
+/* contrib/pgstattuple/pgstattuple--1.3.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pgstattuple" to load this file. \quit
@@ -77,3 +77,19 @@ CREATE FUNCTION pg_relpages(IN relname regclass)
 RETURNS BIGINT
 AS 'MODULE_PATHNAME', 'pg_relpagesbyid'
 LANGUAGE C STRICT;
+
+/* New stuff in 1.3 begins here */
+
+CREATE FUNCTION pgstattuple_approx(IN reloid regclass,
+    OUT table_len BIGINT,               -- physical table length in bytes
+    OUT scanned_percent FLOAT8,         -- what percentage of the table's pages was scanned
+    OUT approx_tuple_count BIGINT,      -- estimated number of live tuples
+    OUT approx_tuple_len BIGINT,        -- estimated total length in bytes of live tuples
+    OUT approx_tuple_percent FLOAT8,    -- live tuples in % (based on estimate)
+    OUT dead_tuple_count BIGINT,        -- exact number of dead tuples
+    OUT dead_tuple_len BIGINT,          -- exact total length in bytes of dead tuples
+    OUT dead_tuple_percent FLOAT8,      -- dead tuples in % (based on estimate)
+    OUT approx_free_space BIGINT,       -- estimated free space in bytes
+    OUT approx_free_percent FLOAT8)     -- free space in % (based on estimate)
+AS 'MODULE_PATHNAME', 'pgstattuple_approx'
+LANGUAGE C STRICT;
diff --git a/contrib/pgstattuple/pgstattuple.control b/contrib/pgstattuple/pgstattuple.control
index a7cf47fd92..c03b180143 100644
--- a/contrib/pgstattuple/pgstattuple.control
+++ b/contrib/pgstattuple/pgstattuple.control
@@ -1,5 +1,5 @@
 # pgstattuple extension
 comment = 'show tuple-level statistics'
-default_version = '1.2'
+default_version = '1.3'
 module_pathname = '$libdir/pgstattuple'
 relocatable = true
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 4e02cb289d..1a1e5b5eae 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -546,6 +546,7 @@ pgfdw_xact_callback(XactEvent event, void *arg)
 
 			switch (event)
 			{
+				case XACT_EVENT_PARALLEL_PRE_COMMIT:
 				case XACT_EVENT_PRE_COMMIT:
 					/* Commit all remote transactions during pre-commit */
 					do_sql_command(entry->conn, "COMMIT TRANSACTION");
@@ -588,11 +589,13 @@ pgfdw_xact_callback(XactEvent event, void *arg)
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("cannot prepare a transaction that modified remote tables")));
 					break;
+				case XACT_EVENT_PARALLEL_COMMIT:
 				case XACT_EVENT_COMMIT:
 				case XACT_EVENT_PREPARE:
 					/* Pre-commit should have closed the open transaction */
 					elog(ERROR, "missed cleaning up connection during pre-commit");
 					break;
+				case XACT_EVENT_PARALLEL_ABORT:
 				case XACT_EVENT_ABORT:
 					/* Assume we might have lost track of prepared statements */
 					entry->have_error = true;
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 94fab18c42..81cb2b447d 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -847,8 +847,8 @@ appendWhereClause(StringInfo buf,
 void
 deparseInsertSql(StringInfo buf, PlannerInfo *root,
 				 Index rtindex, Relation rel,
-				 List *targetAttrs, List *returningList,
-				 List **retrieved_attrs)
+				 List *targetAttrs, bool doNothing,
+				 List *returningList, List **retrieved_attrs)
 {
 	AttrNumber	pindex;
 	bool		first;
@@ -892,6 +892,9 @@ deparseInsertSql(StringInfo buf, PlannerInfo *root,
 	else
 		appendStringInfoString(buf, " DEFAULT VALUES");
 
+	if (doNothing)
+		appendStringInfoString(buf, " ON CONFLICT DO NOTHING");
+
 	deparseReturningList(buf, root, rtindex, rel,
 					   rel->trigdesc && rel->trigdesc->trig_insert_after_row,
 						 returningList, retrieved_attrs);
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 783cb41571..1f417b30be 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -2327,6 +2327,11 @@ INSERT INTO ft1(c1, c2) VALUES(11, 12);  -- duplicate key
 ERROR:  duplicate key value violates unique constraint "t1_pkey"
 DETAIL:  Key ("C 1")=(11) already exists.
 CONTEXT:  Remote SQL command: INSERT INTO "S 1"."T 1"("C 1", c2, c3, c4, c5, c6, c7, c8) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+INSERT INTO ft1(c1, c2) VALUES(11, 12) ON CONFLICT DO NOTHING; -- works
+INSERT INTO ft1(c1, c2) VALUES(11, 12) ON CONFLICT (c1, c2) DO NOTHING; -- unsupported
+ERROR:  there is no unique or exclusion constraint matching the ON CONFLICT specification
+INSERT INTO ft1(c1, c2) VALUES(11, 12) ON CONFLICT (c1, c2) DO UPDATE SET c3 = 'ffg'; -- unsupported
+ERROR:  there is no unique or exclusion constraint matching the ON CONFLICT specification
 INSERT INTO ft1(c1, c2) VALUES(1111, -2);  -- c2positive
 ERROR:  new row for relation "T 1" violates check constraint "c2positive"
 DETAIL:  Failing row contains (1111, -2, null, null, null, null, ft1       , null).
@@ -3193,26 +3198,26 @@ select * from bar where f1 in (select f1 from foo) for update;
                                           QUERY PLAN                                          
 ----------------------------------------------------------------------------------------------
  LockRows
-   Output: bar.f1, bar.f2, bar.ctid, bar.tableoid, bar.*, foo.ctid, foo.tableoid, foo.*
+   Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid
    ->  Hash Join
-         Output: bar.f1, bar.f2, bar.ctid, bar.tableoid, bar.*, foo.ctid, foo.tableoid, foo.*
+         Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid
          Hash Cond: (bar.f1 = foo.f1)
          ->  Append
                ->  Seq Scan on public.bar
-                     Output: bar.f1, bar.f2, bar.ctid, bar.tableoid, bar.*
+                     Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid
                ->  Foreign Scan on public.bar2
-                     Output: bar2.f1, bar2.f2, bar2.ctid, bar2.tableoid, bar2.*
+                     Output: bar2.f1, bar2.f2, bar2.ctid, bar2.*, bar2.tableoid
                      Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE
          ->  Hash
-               Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+               Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                ->  HashAggregate
-                     Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                     Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                      Group Key: foo.f1
                      ->  Append
                            ->  Seq Scan on public.foo
-                                 Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                                 Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                            ->  Foreign Scan on public.foo2
-                                 Output: foo2.ctid, foo2.tableoid, foo2.*, foo2.f1
+                                 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1
                                  Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
 (22 rows)
 
@@ -3230,26 +3235,26 @@ select * from bar where f1 in (select f1 from foo) for share;
                                           QUERY PLAN                                          
 ----------------------------------------------------------------------------------------------
  LockRows
-   Output: bar.f1, bar.f2, bar.ctid, bar.tableoid, bar.*, foo.ctid, foo.tableoid, foo.*
+   Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid
    ->  Hash Join
-         Output: bar.f1, bar.f2, bar.ctid, bar.tableoid, bar.*, foo.ctid, foo.tableoid, foo.*
+         Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid
          Hash Cond: (bar.f1 = foo.f1)
          ->  Append
                ->  Seq Scan on public.bar
-                     Output: bar.f1, bar.f2, bar.ctid, bar.tableoid, bar.*
+                     Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid
                ->  Foreign Scan on public.bar2
-                     Output: bar2.f1, bar2.f2, bar2.ctid, bar2.tableoid, bar2.*
+                     Output: bar2.f1, bar2.f2, bar2.ctid, bar2.*, bar2.tableoid
                      Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR SHARE
          ->  Hash
-               Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+               Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                ->  HashAggregate
-                     Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                     Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                      Group Key: foo.f1
                      ->  Append
                            ->  Seq Scan on public.foo
-                                 Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                                 Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                            ->  Foreign Scan on public.foo2
-                                 Output: foo2.ctid, foo2.tableoid, foo2.*, foo2.f1
+                                 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1
                                  Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
 (22 rows)
 
@@ -3272,37 +3277,37 @@ update bar set f2 = f2 + 100 where f1 in (select f1 from foo);
    Foreign Update on public.bar2
      Remote SQL: UPDATE public.loct2 SET f2 = $2 WHERE ctid = $1
    ->  Hash Join
-         Output: bar.f1, (bar.f2 + 100), bar.ctid, foo.ctid, foo.tableoid, foo.*
+         Output: bar.f1, (bar.f2 + 100), bar.ctid, foo.ctid, foo.*, foo.tableoid
          Hash Cond: (bar.f1 = foo.f1)
          ->  Seq Scan on public.bar
                Output: bar.f1, bar.f2, bar.ctid
          ->  Hash
-               Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+               Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                ->  HashAggregate
-                     Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                     Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                      Group Key: foo.f1
                      ->  Append
                            ->  Seq Scan on public.foo
-                                 Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                                 Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                            ->  Foreign Scan on public.foo2
-                                 Output: foo2.ctid, foo2.tableoid, foo2.*, foo2.f1
+                                 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1
                                  Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
    ->  Hash Join
-         Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, foo.ctid, foo.tableoid, foo.*
+         Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, foo.ctid, foo.*, foo.tableoid
          Hash Cond: (bar2.f1 = foo.f1)
          ->  Foreign Scan on public.bar2
                Output: bar2.f1, bar2.f2, bar2.f3, bar2.ctid
                Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE
          ->  Hash
-               Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+               Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                ->  HashAggregate
-                     Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                     Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                      Group Key: foo.f1
                      ->  Append
                            ->  Seq Scan on public.foo
-                                 Output: foo.ctid, foo.tableoid, foo.*, foo.f1
+                                 Output: foo.ctid, foo.*, foo.tableoid, foo.f1
                            ->  Foreign Scan on public.foo2
-                                 Output: foo2.ctid, foo2.tableoid, foo2.*, foo2.f1
+                                 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1
                                  Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
 (37 rows)
 
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 478e12484b..6da01e1d6f 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -37,6 +37,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
+#include "utils/sampling.h"
 
 PG_MODULE_MAGIC;
 
@@ -202,7 +203,7 @@ typedef struct PgFdwAnalyzeState
 	/* for random sampling */
 	double		samplerows;		/* # of rows fetched */
 	double		rowstoskip;		/* # of rows to skip before next sample */
-	double		rstate;			/* random state */
+	ReservoirStateData rstate;	/* state for reservoir sampling */
 
 	/* working memory contexts */
 	MemoryContext anl_cxt;		/* context for per-analyze lifespan data */
@@ -872,7 +873,8 @@ postgresGetForeignPlan(PlannerInfo *root,
 							local_exprs,
 							scan_relid,
 							params_list,
-							fdw_private);
+							fdw_private,
+							NIL /* no custom tlist */ );
 }
 
 /*
@@ -1171,6 +1173,7 @@ postgresPlanForeignModify(PlannerInfo *root,
 	List	   *targetAttrs = NIL;
 	List	   *returningList = NIL;
 	List	   *retrieved_attrs = NIL;
+	bool		doNothing = false;
 
 	initStringInfo(&sql);
 
@@ -1205,7 +1208,7 @@ postgresPlanForeignModify(PlannerInfo *root,
 		int			col;
 
 		col = -1;
-		while ((col = bms_next_member(rte->modifiedCols, col)) >= 0)
+		while ((col = bms_next_member(rte->updatedCols, col)) >= 0)
 		{
 			/* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */
 			AttrNumber	attno = col + FirstLowInvalidHeapAttributeNumber;
@@ -1223,13 +1226,25 @@ postgresPlanForeignModify(PlannerInfo *root,
 		returningList = (List *) list_nth(plan->returningLists, subplan_index);
 
 	/*
+	 * ON CONFLICT DO UPDATE and DO NOTHING case with inference specification
+	 * should have already been rejected in the optimizer, as presently there
+	 * is no way to recognize an arbiter index on a foreign table.  Only DO
+	 * NOTHING is supported without an inference specification.
+	 */
+	if (plan->onConflictAction == ONCONFLICT_NOTHING)
+		doNothing = true;
+	else if (plan->onConflictAction != ONCONFLICT_NONE)
+		elog(ERROR, "unexpected ON CONFLICT specification: %d",
+			 (int) plan->onConflictAction);
+
+	/*
 	 * Construct the SQL command string.
 	 */
 	switch (operation)
 	{
 		case CMD_INSERT:
 			deparseInsertSql(&sql, root, resultRelation, rel,
-							 targetAttrs, returningList,
+							 targetAttrs, doNothing, returningList,
 							 &retrieved_attrs);
 			break;
 		case CMD_UPDATE:
@@ -2397,7 +2412,7 @@ postgresAcquireSampleRowsFunc(Relation relation, int elevel,
 	astate.numrows = 0;
 	astate.samplerows = 0;
 	astate.rowstoskip = -1;		/* -1 means not set yet */
-	astate.rstate = anl_init_selection_state(targrows);
+	reservoir_init_selection_state(&astate.rstate, targrows);
 
 	/* Remember ANALYZE context, and create a per-tuple temp context */
 	astate.anl_cxt = CurrentMemoryContext;
@@ -2537,13 +2552,12 @@ analyze_row_processor(PGresult *res, int row, PgFdwAnalyzeState *astate)
 		 * analyze.c; see Jeff Vitter's paper.
 		 */
 		if (astate->rowstoskip < 0)
-			astate->rowstoskip = anl_get_next_S(astate->samplerows, targrows,
-												&astate->rstate);
+			astate->rowstoskip = reservoir_get_next_S(&astate->rstate, astate->samplerows, targrows);
 
 		if (astate->rowstoskip <= 0)
 		{
 			/* Choose a random reservoir element to replace. */
-			pos = (int) (targrows * anl_random_fract());
+			pos = (int) (targrows * sampler_random_fract(astate->rstate.randstate));
 			Assert(pos >= 0 && pos < targrows);
 			heap_freetuple(astate->rows[pos]);
 		}
@@ -2720,7 +2734,7 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid)
 					appendStringInfoString(&buf, ", ");
 				deparseStringLiteral(&buf, rv->relname);
 			}
-			appendStringInfoString(&buf, ")");
+			appendStringInfoChar(&buf, ')');
 		}
 
 		/* Append ORDER BY at the end of query to ensure output ordering */
@@ -2784,7 +2798,7 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid)
 				 */
 				appendStringInfoString(&buf, " OPTIONS (column_name ");
 				deparseStringLiteral(&buf, attname);
-				appendStringInfoString(&buf, ")");
+				appendStringInfoChar(&buf, ')');
 
 				/* Add COLLATE if needed */
 				if (import_collate && collname != NULL && collnamespace != NULL)
@@ -2950,8 +2964,14 @@ make_tuple_from_result_row(PGresult *res,
 
 	tuple = heap_form_tuple(tupdesc, values, nulls);
 
+	/*
+	 * If we have a CTID to return, install it in both t_self and t_ctid.
+	 * t_self is the normal place, but if the tuple is converted to a
+	 * composite Datum, t_self will be lost; setting t_ctid allows CTID to be
+	 * preserved during EvalPlanQual re-evaluations (see ROW_MARK_COPY code).
+	 */
 	if (ctid)
-		tuple->t_self = *ctid;
+		tuple->t_self = tuple->t_data->t_ctid = *ctid;
 
 	/* Clean up */
 	MemoryContextReset(temp_context);
diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h
index 950c6f79a2..3835ddb79a 100644
--- a/contrib/postgres_fdw/postgres_fdw.h
+++ b/contrib/postgres_fdw/postgres_fdw.h
@@ -60,7 +60,7 @@ extern void appendWhereClause(StringInfo buf,
 				  List **params);
 extern void deparseInsertSql(StringInfo buf, PlannerInfo *root,
 				 Index rtindex, Relation rel,
-				 List *targetAttrs, List *returningList,
+				 List *targetAttrs, bool doNothing, List *returningList,
 				 List **retrieved_attrs);
 extern void deparseUpdateSql(StringInfo buf, PlannerInfo *root,
 				 Index rtindex, Relation rel,
diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql
index 4a23457e79..fcdd92e280 100644
--- a/contrib/postgres_fdw/sql/postgres_fdw.sql
+++ b/contrib/postgres_fdw/sql/postgres_fdw.sql
@@ -372,6 +372,9 @@ UPDATE ft2 SET c2 = c2 + 600 WHERE c1 % 10 = 8 AND c1 < 1200 RETURNING *;
 ALTER TABLE "S 1"."T 1" ADD CONSTRAINT c2positive CHECK (c2 >= 0);
 
 INSERT INTO ft1(c1, c2) VALUES(11, 12);  -- duplicate key
+INSERT INTO ft1(c1, c2) VALUES(11, 12) ON CONFLICT DO NOTHING; -- works
+INSERT INTO ft1(c1, c2) VALUES(11, 12) ON CONFLICT (c1, c2) DO NOTHING; -- unsupported
+INSERT INTO ft1(c1, c2) VALUES(11, 12) ON CONFLICT (c1, c2) DO UPDATE SET c3 = 'ffg'; -- unsupported
 INSERT INTO ft1(c1, c2) VALUES(1111, -2);  -- c2positive
 UPDATE ft1 SET c2 = -c2 WHERE c1 = 1;  -- c2positive
 
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index 8e2d5343ae..1e6c37d9e1 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -12,7 +12,8 @@
 #include <float.h>
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
+#include "fmgr.h"
 
 #include "segdata.h"
 
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index 36c6a37ac1..4a71753d3f 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -145,7 +145,8 @@ fixup_inherited_columns(Oid parentId, Oid childId, Bitmapset *columns)
 static bool
 check_relation_privileges(Oid relOid,
 						  Bitmapset *selected,
-						  Bitmapset *modified,
+						  Bitmapset *inserted,
+						  Bitmapset *updated,
 						  uint32 required,
 						  bool abort_on_violation)
 {
@@ -231,8 +232,9 @@ check_relation_privileges(Oid relOid,
 	 * Check permissions on the columns
 	 */
 	selected = fixup_whole_row_references(relOid, selected);
-	modified = fixup_whole_row_references(relOid, modified);
-	columns = bms_union(selected, modified);
+	inserted = fixup_whole_row_references(relOid, inserted);
+	updated = fixup_whole_row_references(relOid, updated);
+	columns = bms_union(selected, bms_union(inserted, updated));
 
 	while ((index = bms_first_member(columns)) >= 0)
 	{
@@ -241,13 +243,16 @@ check_relation_privileges(Oid relOid,
 
 		if (bms_is_member(index, selected))
 			column_perms |= SEPG_DB_COLUMN__SELECT;
-		if (bms_is_member(index, modified))
+		if (bms_is_member(index, inserted))
 		{
-			if (required & SEPG_DB_TABLE__UPDATE)
-				column_perms |= SEPG_DB_COLUMN__UPDATE;
 			if (required & SEPG_DB_TABLE__INSERT)
 				column_perms |= SEPG_DB_COLUMN__INSERT;
 		}
+		if (bms_is_member(index, updated))
+		{
+			if (required & SEPG_DB_TABLE__UPDATE)
+				column_perms |= SEPG_DB_COLUMN__UPDATE;
+		}
 		if (column_perms == 0)
 			continue;
 
@@ -304,7 +309,7 @@ sepgsql_dml_privileges(List *rangeTabls, bool abort_on_violation)
 			required |= SEPG_DB_TABLE__INSERT;
 		if (rte->requiredPerms & ACL_UPDATE)
 		{
-			if (!bms_is_empty(rte->modifiedCols))
+			if (!bms_is_empty(rte->updatedCols))
 				required |= SEPG_DB_TABLE__UPDATE;
 			else
 				required |= SEPG_DB_TABLE__LOCK;
@@ -333,7 +338,8 @@ sepgsql_dml_privileges(List *rangeTabls, bool abort_on_violation)
 		{
 			Oid			tableOid = lfirst_oid(li);
 			Bitmapset  *selectedCols;
-			Bitmapset  *modifiedCols;
+			Bitmapset  *insertedCols;
+			Bitmapset  *updatedCols;
 
 			/*
 			 * child table has different attribute numbers, so we need to fix
@@ -341,15 +347,18 @@ sepgsql_dml_privileges(List *rangeTabls, bool abort_on_violation)
 			 */
 			selectedCols = fixup_inherited_columns(rte->relid, tableOid,
 												   rte->selectedCols);
-			modifiedCols = fixup_inherited_columns(rte->relid, tableOid,
-												   rte->modifiedCols);
+			insertedCols = fixup_inherited_columns(rte->relid, tableOid,
+												   rte->insertedCols);
+			updatedCols = fixup_inherited_columns(rte->relid, tableOid,
+												  rte->updatedCols);
 
 			/*
 			 * check permissions on individual tables
 			 */
 			if (!check_relation_privileges(tableOid,
 										   selectedCols,
-										   modifiedCols,
+										   insertedCols,
+										   updatedCols,
 										   required, abort_on_violation))
 				return false;
 		}
diff --git a/contrib/spi/insert_username.c b/contrib/spi/insert_username.c
index 875207881a..3812525c4c 100644
--- a/contrib/spi/insert_username.c
+++ b/contrib/spi/insert_username.c
@@ -79,7 +79,7 @@ insert_username(PG_FUNCTION_ARGS)
 						args[0], relname)));
 
 	/* create fields containing name */
-	newval = CStringGetTextDatum(GetUserNameFromId(GetUserId()));
+	newval = CStringGetTextDatum(GetUserNameFromId(GetUserId(), false));
 
 	/* construct new tuple */
 	rettuple = SPI_modifytuple(rel, rettuple, 1, &attnum, &newval, NULL);
diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c
index 0699438d6f..5a345841c6 100644
--- a/contrib/spi/timetravel.c
+++ b/contrib/spi/timetravel.c
@@ -51,7 +51,7 @@ static EPlan *find_plan(char *ident, EPlan **eplan, int *nplans);
  *			and all other column values as in new tuple, and insert tuple
  *			with old data and stop_date eq current date
  *			ELSE - skip updation of tuple.
- *		2.  IF an delete affects tuple with stop_date eq INFINITY
+ *		2.  IF a delete affects tuple with stop_date eq INFINITY
  *			then insert the same tuple with stop_date eq current date
  *			[ and delete_user eq current user ]
  *			ELSE - skip deletion of tuple.
@@ -174,7 +174,7 @@ timetravel(PG_FUNCTION_ARGS)
 	}
 
 	/* create fields containing name */
-	newuser = CStringGetTextDatum(GetUserNameFromId(GetUserId()));
+	newuser = CStringGetTextDatum(GetUserNameFromId(GetUserId(), false));
 
 	nulltext = (Datum) NULL;
 
diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux
index 2dff0094cd..763a8064ab 100644
--- a/contrib/start-scripts/linux
+++ b/contrib/start-scripts/linux
@@ -81,7 +81,7 @@ test -x $DAEMON ||
 
 # If we want to tell child processes to adjust their OOM scores, set up the
 # necessary environment variables.  Can't just export them through the "su".
-if [ -e "$PG_OOM_ADJUST_FILE" -a -n "PG_CHILD_OOM_SCORE_ADJ" ]
+if [ -e "$PG_OOM_ADJUST_FILE" -a -n "$PG_CHILD_OOM_SCORE_ADJ" ]
 then
 	DAEMON_ENV="PG_OOM_ADJUST_FILE=$PG_OOM_ADJUST_FILE PG_OOM_ADJUST_VALUE=$PG_CHILD_OOM_SCORE_ADJ"
 fi
diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile
index 438be44afc..a362e69691 100644
--- a/contrib/test_decoding/Makefile
+++ b/contrib/test_decoding/Makefile
@@ -37,37 +37,36 @@ submake-isolation:
 submake-test_decoding:
 	$(MAKE) -C $(top_builddir)/contrib/test_decoding
 
-REGRESSCHECKS=ddl rewrite toast permissions decoding_in_xact decoding_into_rel binary prepared
+REGRESSCHECKS=ddl rewrite toast permissions decoding_in_xact decoding_into_rel \
+	binary prepared replorigin
 
-regresscheck: all | submake-regress submake-test_decoding
+regresscheck: | submake-regress submake-test_decoding temp-install
 	$(MKDIR_P) regression_output
 	$(pg_regress_check) \
 	    --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
-	    --temp-install=./tmp_check \
-	    --extra-install=contrib/test_decoding \
+	    --temp-instance=./tmp_check \
 	    --outputdir=./regression_output \
 	    $(REGRESSCHECKS)
 
-regresscheck-install-force: | submake-regress submake-test_decoding
+regresscheck-install-force: | submake-regress submake-test_decoding temp-install
 	$(pg_regress_installcheck) \
-	    --extra-install=contrib/test_decoding \
 	    $(REGRESSCHECKS)
 
 ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml
 
-isolationcheck: all | submake-isolation submake-test_decoding
+isolationcheck: | submake-isolation submake-test_decoding temp-install
 	$(MKDIR_P) isolation_output
 	$(pg_isolation_regress_check) \
 	    --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
-	    --extra-install=contrib/test_decoding \
 	    --outputdir=./isolation_output \
 	    $(ISOLATIONCHECKS)
 
-isolationcheck-install-force: all | submake-isolation submake-test_decoding
+isolationcheck-install-force: all | submake-isolation submake-test_decoding temp-install
 	$(pg_isolation_regress_installcheck) \
-	    --extra-install=contrib/test_decoding \
 	    $(ISOLATIONCHECKS)
 
 PHONY: submake-test_decoding submake-regress check \
 	regresscheck regresscheck-install-force \
 	isolationcheck isolationcheck-install-force
+
+temp-install: EXTRA_INSTALL=contrib/test_decoding
diff --git a/contrib/test_decoding/expected/ddl.out b/contrib/test_decoding/expected/ddl.out
index 780120d731..3283fdfcd7 100644
--- a/contrib/test_decoding/expected/ddl.out
+++ b/contrib/test_decoding/expected/ddl.out
@@ -148,6 +148,50 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'inc
  COMMIT
 (9 rows)
 
+-- ON CONFLICT DO UPDATE support
+BEGIN;
+INSERT INTO replication_example(id, somedata, somenum) SELECT i, i, i FROM generate_series(-15, 15) i
+  ON CONFLICT (id) DO UPDATE SET somenum = excluded.somenum + 1;
+COMMIT;
+/* display results */
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+                                                                       data                                                                       
+--------------------------------------------------------------------------------------------------------------------------------------------------
+ BEGIN
+ table public.replication_example: INSERT: id[integer]:-15 somedata[integer]:-15 somenum[integer]:-15 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-14 somedata[integer]:-14 somenum[integer]:-14 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-13 somedata[integer]:-13 somenum[integer]:-13 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-12 somedata[integer]:-12 somenum[integer]:-12 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-11 somedata[integer]:-11 somenum[integer]:-11 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-10 somedata[integer]:-10 somenum[integer]:-10 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-9 somedata[integer]:-9 somenum[integer]:-9 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-8 somedata[integer]:-8 somenum[integer]:-8 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-7 somedata[integer]:-7 somenum[integer]:-7 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-6 somedata[integer]:-6 somenum[integer]:-6 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-5 somedata[integer]:-5 somenum[integer]:-5 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-4 somedata[integer]:-4 somenum[integer]:-4 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-3 somedata[integer]:-3 somenum[integer]:-3 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-2 somedata[integer]:-2 somenum[integer]:-2 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:-1 somedata[integer]:-1 somenum[integer]:-1 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: INSERT: id[integer]:0 somedata[integer]:0 somenum[integer]:0 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:1 somedata[integer]:1 somenum[integer]:2 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:2 somedata[integer]:1 somenum[integer]:3 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:3 somedata[integer]:2 somenum[integer]:4 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:4 somedata[integer]:2 somenum[integer]:5 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:5 somedata[integer]:2 somenum[integer]:6 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:6 somedata[integer]:2 somenum[integer]:7 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:7 somedata[integer]:3 somenum[integer]:8 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:8 somedata[integer]:3 somenum[integer]:9 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:9 somedata[integer]:3 somenum[integer]:10 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:10 somedata[integer]:4 somenum[integer]:11 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:11 somedata[integer]:5 somenum[integer]:12 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:12 somedata[integer]:6 somenum[integer]:13 zaphod1[integer]:null zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:13 somedata[integer]:6 somenum[integer]:14 zaphod1[integer]:1 zaphod2[integer]:null
+ table public.replication_example: UPDATE: id[integer]:14 somedata[integer]:6 somenum[integer]:15 zaphod1[integer]:null zaphod2[integer]:1
+ table public.replication_example: UPDATE: id[integer]:15 somedata[integer]:6 somenum[integer]:16 zaphod1[integer]:2 zaphod2[integer]:null
+ COMMIT
+(33 rows)
+
 -- hide changes bc of oid visible in full table rewrites
 CREATE TABLE tr_unique(id2 serial unique NOT NULL, data int);
 INSERT INTO tr_unique(data) VALUES(10);
@@ -196,6 +240,22 @@ ORDER BY 1,2;
  20467 | table public.tr_etoomuch: DELETE: id[integer]:1 | table public.tr_etoomuch: UPDATE: id[integer]:9999 data[integer]:-9999
 (3 rows)
 
+-- check that a large, spooled, upsert works
+INSERT INTO tr_etoomuch (id, data)
+SELECT g.i, -g.i FROM generate_series(8000, 12000) g(i)
+ON CONFLICT(id) DO UPDATE SET data = EXCLUDED.data;
+SELECT substring(data, 1, 29), count(*)
+FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1')
+GROUP BY 1
+ORDER BY min(location - '0/0');
+           substring           | count 
+-------------------------------+-------
+ BEGIN                         |     1
+ table public.tr_etoomuch: UPD |  2235
+ table public.tr_etoomuch: INS |  1766
+ COMMIT                        |     1
+(4 rows)
+
 /*
  * check whether we decode subtransactions correctly in relation with each
  * other
@@ -603,7 +663,7 @@ SELECT pg_drop_replication_slot('regression_slot');
 
 /* check that the slot is gone */
 SELECT * FROM pg_replication_slots;
- slot_name | plugin | slot_type | datoid | database | active | xmin | catalog_xmin | restart_lsn 
------------+--------+-----------+--------+----------+--------+------+--------------+-------------
+ slot_name | plugin | slot_type | datoid | database | active | active_pid | xmin | catalog_xmin | restart_lsn 
+-----------+--------+-----------+--------+----------+--------+------------+------+--------------+-------------
 (0 rows)
 
diff --git a/contrib/test_decoding/expected/decoding_in_xact.out b/contrib/test_decoding/expected/decoding_in_xact.out
index 456840886a..ab4d3aee72 100644
--- a/contrib/test_decoding/expected/decoding_in_xact.out
+++ b/contrib/test_decoding/expected/decoding_in_xact.out
@@ -11,7 +11,7 @@ SELECT txid_current() = 0;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 ERROR:  cannot create logical replication slot in transaction that has performed writes
 ROLLBACK;
--- fail because we're creating a slot while in an subxact whose topxact has a xid
+-- fail because we're creating a slot while in a subxact whose topxact has an xid
 BEGIN;
 SELECT txid_current() = 0;
  ?column? 
diff --git a/contrib/test_decoding/expected/replorigin.out b/contrib/test_decoding/expected/replorigin.out
new file mode 100644
index 0000000000..c0f512579c
--- /dev/null
+++ b/contrib/test_decoding/expected/replorigin.out
@@ -0,0 +1,141 @@
+-- predictability
+SET synchronous_commit = on;
+CREATE TABLE origin_tbl(id serial primary key, data text);
+CREATE TABLE target_tbl(id serial primary key, data text);
+SELECT pg_replication_origin_create('test_decoding: regression_slot');
+ pg_replication_origin_create 
+------------------------------
+                            1
+(1 row)
+
+-- ensure duplicate creations fail
+SELECT pg_replication_origin_create('test_decoding: regression_slot');
+ERROR:  duplicate key value violates unique constraint "pg_replication_origin_roname_index"
+DETAIL:  Key (roname)=(test_decoding: regression_slot) already exists.
+--ensure deletions work (once)
+SELECT pg_replication_origin_create('test_decoding: temp');
+ pg_replication_origin_create 
+------------------------------
+                            2
+(1 row)
+
+SELECT pg_replication_origin_drop('test_decoding: temp');
+ pg_replication_origin_drop 
+----------------------------
+ 
+(1 row)
+
+SELECT pg_replication_origin_drop('test_decoding: temp');
+ERROR:  cache lookup failed for replication origin 'test_decoding: temp'
+SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
+ ?column? 
+----------
+ init
+(1 row)
+
+-- origin tx
+INSERT INTO origin_tbl(data) VALUES ('will be replicated and decoded and decoded again');
+INSERT INTO target_tbl(data)
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+-- as is normal, the insert into target_tbl shows up
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+                                                                                    data                                                                                    
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ BEGIN
+ table public.target_tbl: INSERT: id[integer]:1 data[text]:'BEGIN'
+ table public.target_tbl: INSERT: id[integer]:2 data[text]:'table public.origin_tbl: INSERT: id[integer]:1 data[text]:''will be replicated and decoded and decoded again'''
+ table public.target_tbl: INSERT: id[integer]:3 data[text]:'COMMIT'
+ COMMIT
+(5 rows)
+
+INSERT INTO origin_tbl(data) VALUES ('will be replicated, but not decoded again');
+-- mark session as replaying
+SELECT pg_replication_origin_session_setup('test_decoding: regression_slot');
+ pg_replication_origin_session_setup 
+-------------------------------------
+ 
+(1 row)
+
+-- ensure we prevent duplicate setup
+SELECT pg_replication_origin_session_setup('test_decoding: regression_slot');
+ERROR:  cannot setup replication origin when one is already setup
+BEGIN;
+-- setup transaction origin
+SELECT pg_replication_origin_xact_setup('0/aabbccdd', '2013-01-01 00:00');
+ pg_replication_origin_xact_setup 
+----------------------------------
+ 
+(1 row)
+
+INSERT INTO target_tbl(data)
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'only-local', '1');
+COMMIT;
+-- check replication progress for the session is correct
+SELECT pg_replication_origin_session_progress(false);
+ pg_replication_origin_session_progress 
+----------------------------------------
+ 0/AABBCCDD
+(1 row)
+
+SELECT pg_replication_origin_session_progress(true);
+ pg_replication_origin_session_progress 
+----------------------------------------
+ 0/AABBCCDD
+(1 row)
+
+SELECT pg_replication_origin_session_reset();
+ pg_replication_origin_session_reset 
+-------------------------------------
+ 
+(1 row)
+
+SELECT local_id, external_id, remote_lsn, local_lsn <> '0/0' FROM pg_replication_origin_status;
+ local_id |          external_id           | remote_lsn | ?column? 
+----------+--------------------------------+------------+----------
+        1 | test_decoding: regression_slot | 0/AABBCCDD | t
+(1 row)
+
+-- check replication progress identified by name is correct
+SELECT pg_replication_origin_progress('test_decoding: regression_slot', false);
+ pg_replication_origin_progress 
+--------------------------------
+ 0/AABBCCDD
+(1 row)
+
+SELECT pg_replication_origin_progress('test_decoding: regression_slot', true);
+ pg_replication_origin_progress 
+--------------------------------
+ 0/AABBCCDD
+(1 row)
+
+-- ensure reset requires previously setup state
+SELECT pg_replication_origin_session_reset();
+ERROR:  no replication origin is configured
+-- and magically the replayed xact will be filtered!
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'only-local', '1');
+ data 
+------
+(0 rows)
+
+--but new original changes still show up
+INSERT INTO origin_tbl(data) VALUES ('will be replicated');
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1',  'only-local', '1');
+                                      data                                      
+--------------------------------------------------------------------------------
+ BEGIN
+ table public.origin_tbl: INSERT: id[integer]:3 data[text]:'will be replicated'
+ COMMIT
+(3 rows)
+
+SELECT pg_drop_replication_slot('regression_slot');
+ pg_drop_replication_slot 
+--------------------------
+ 
+(1 row)
+
+SELECT pg_replication_origin_drop('test_decoding: regression_slot');
+ pg_replication_origin_drop 
+----------------------------
+ 
+(1 row)
+
diff --git a/contrib/test_decoding/expected/toast.out b/contrib/test_decoding/expected/toast.out
index 0a850b7acd..735b14c978 100644
--- a/contrib/test_decoding/expected/toast.out
+++ b/contrib/test_decoding/expected/toast.out
@@ -23,6 +23,10 @@ INSERT INTO xpto (toasted_col2) SELECT repeat(string_agg(to_char(g.i, 'FM0000'),
 -- update of existing column
 UPDATE xpto SET toasted_col1 = (SELECT string_agg(g.i::text, '') FROM generate_series(1, 2000) g(i)) WHERE id = 1;
 UPDATE xpto SET rand1 = 123.456 WHERE id = 1;
+-- updating external via INSERT ... ON CONFLICT DO UPDATE
+INSERT INTO xpto(id, toasted_col2) VALUES (2, 'toasted2-upsert')
+ON CONFLICT (id)
+DO UPDATE SET toasted_col2 = EXCLUDED.toasted_col2 || xpto.toasted_col2;
 DELETE FROM xpto WHERE id = 1;
 DROP TABLE IF EXISTS toasted_key;
 NOTICE:  table "toasted_key" does not exist, skipping
@@ -64,6 +68,9 @@ SELECT substr(data, 1, 200) FROM pg_logical_slot_get_changes('regression_slot',
  table public.xpto: UPDATE: id[integer]:1 toasted_col1[text]:unchanged-toast-datum rand1[double precision]:123.456 toasted_col2[text]:unchanged-toast-datum rand2[double precision]:1578
  COMMIT
  BEGIN
+ table public.xpto: UPDATE: id[integer]:2 toasted_col1[text]:null rand1[double precision]:3077 toasted_col2[text]:'toasted2-upsert00010002000300040005000600070008000900100011001200130014001500160017001
+ COMMIT
+ BEGIN
  table public.xpto: DELETE: id[integer]:1
  COMMIT
  BEGIN
@@ -283,7 +290,7 @@ SELECT substr(data, 1, 200) FROM pg_logical_slot_get_changes('regression_slot',
  table public.toasted_copy: INSERT: id[integer]:202 data[text]:'untoasted199'
  table public.toasted_copy: INSERT: id[integer]:203 data[text]:'untoasted200'
  COMMIT
-(232 rows)
+(235 rows)
 
 SELECT pg_drop_replication_slot('regression_slot');
  pg_drop_replication_slot 
diff --git a/contrib/test_decoding/specs/ondisk_startup.spec b/contrib/test_decoding/specs/ondisk_startup.spec
index 39c4a223ae..8223705639 100644
--- a/contrib/test_decoding/specs/ondisk_startup.spec
+++ b/contrib/test_decoding/specs/ondisk_startup.spec
@@ -36,7 +36,7 @@ step "s3txid" { BEGIN ISOLATION LEVEL REPEATABLE READ; SELECT txid_current() IS
 step "s3c" { COMMIT; }
 
 # Force usage of ondisk snapshot by starting and not finishing a
-# transaction with a assigned xid after consistency has been
+# transaction with an assigned xid after consistency has been
 # reached. In combination with a checkpoint forcing a snapshot to be
 # written and a new restart point computed that'll lead to the usage
 # of the snapshot.
diff --git a/contrib/test_decoding/sql/ddl.sql b/contrib/test_decoding/sql/ddl.sql
index 03314d18ac..9c0502f155 100644
--- a/contrib/test_decoding/sql/ddl.sql
+++ b/contrib/test_decoding/sql/ddl.sql
@@ -84,6 +84,15 @@ COMMIT;
 -- show changes
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
 
+-- ON CONFLICT DO UPDATE support
+BEGIN;
+INSERT INTO replication_example(id, somedata, somenum) SELECT i, i, i FROM generate_series(-15, 15) i
+  ON CONFLICT (id) DO UPDATE SET somenum = excluded.somenum + 1;
+COMMIT;
+
+/* display results */
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+
 -- hide changes bc of oid visible in full table rewrites
 CREATE TABLE tr_unique(id2 serial unique NOT NULL, data int);
 INSERT INTO tr_unique(data) VALUES(10);
@@ -114,6 +123,16 @@ FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids',
 GROUP BY substring(data, 1, 24)
 ORDER BY 1,2;
 
+-- check that a large, spooled, upsert works
+INSERT INTO tr_etoomuch (id, data)
+SELECT g.i, -g.i FROM generate_series(8000, 12000) g(i)
+ON CONFLICT(id) DO UPDATE SET data = EXCLUDED.data;
+
+SELECT substring(data, 1, 29), count(*)
+FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1')
+GROUP BY 1
+ORDER BY min(location - '0/0');
+
 /*
  * check whether we decode subtransactions correctly in relation with each
  * other
diff --git a/contrib/test_decoding/sql/decoding_in_xact.sql b/contrib/test_decoding/sql/decoding_in_xact.sql
index 990f61885e..b524eb9a6e 100644
--- a/contrib/test_decoding/sql/decoding_in_xact.sql
+++ b/contrib/test_decoding/sql/decoding_in_xact.sql
@@ -7,7 +7,7 @@ SELECT txid_current() = 0;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 ROLLBACK;
 
--- fail because we're creating a slot while in an subxact whose topxact has a xid
+-- fail because we're creating a slot while in a subxact whose topxact has an xid
 BEGIN;
 SELECT txid_current() = 0;
 SAVEPOINT barf;
diff --git a/contrib/test_decoding/sql/replorigin.sql b/contrib/test_decoding/sql/replorigin.sql
new file mode 100644
index 0000000000..e12404e106
--- /dev/null
+++ b/contrib/test_decoding/sql/replorigin.sql
@@ -0,0 +1,64 @@
+-- predictability
+SET synchronous_commit = on;
+
+CREATE TABLE origin_tbl(id serial primary key, data text);
+CREATE TABLE target_tbl(id serial primary key, data text);
+
+SELECT pg_replication_origin_create('test_decoding: regression_slot');
+-- ensure duplicate creations fail
+SELECT pg_replication_origin_create('test_decoding: regression_slot');
+
+--ensure deletions work (once)
+SELECT pg_replication_origin_create('test_decoding: temp');
+SELECT pg_replication_origin_drop('test_decoding: temp');
+SELECT pg_replication_origin_drop('test_decoding: temp');
+
+SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
+
+-- origin tx
+INSERT INTO origin_tbl(data) VALUES ('will be replicated and decoded and decoded again');
+INSERT INTO target_tbl(data)
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+
+-- as is normal, the insert into target_tbl shows up
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+
+INSERT INTO origin_tbl(data) VALUES ('will be replicated, but not decoded again');
+
+-- mark session as replaying
+SELECT pg_replication_origin_session_setup('test_decoding: regression_slot');
+
+-- ensure we prevent duplicate setup
+SELECT pg_replication_origin_session_setup('test_decoding: regression_slot');
+
+BEGIN;
+-- setup transaction origin
+SELECT pg_replication_origin_xact_setup('0/aabbccdd', '2013-01-01 00:00');
+INSERT INTO target_tbl(data)
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'only-local', '1');
+COMMIT;
+
+-- check replication progress for the session is correct
+SELECT pg_replication_origin_session_progress(false);
+SELECT pg_replication_origin_session_progress(true);
+
+SELECT pg_replication_origin_session_reset();
+
+SELECT local_id, external_id, remote_lsn, local_lsn <> '0/0' FROM pg_replication_origin_status;
+
+-- check replication progress identified by name is correct
+SELECT pg_replication_origin_progress('test_decoding: regression_slot', false);
+SELECT pg_replication_origin_progress('test_decoding: regression_slot', true);
+
+-- ensure reset requires previously setup state
+SELECT pg_replication_origin_session_reset();
+
+-- and magically the replayed xact will be filtered!
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'only-local', '1');
+
+--but new original changes still show up
+INSERT INTO origin_tbl(data) VALUES ('will be replicated');
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1',  'only-local', '1');
+
+SELECT pg_drop_replication_slot('regression_slot');
+SELECT pg_replication_origin_drop('test_decoding: regression_slot');
diff --git a/contrib/test_decoding/sql/toast.sql b/contrib/test_decoding/sql/toast.sql
index 09293865df..26d6b4fbdd 100644
--- a/contrib/test_decoding/sql/toast.sql
+++ b/contrib/test_decoding/sql/toast.sql
@@ -25,6 +25,11 @@ UPDATE xpto SET toasted_col1 = (SELECT string_agg(g.i::text, '') FROM generate_s
 
 UPDATE xpto SET rand1 = 123.456 WHERE id = 1;
 
+-- updating external via INSERT ... ON CONFLICT DO UPDATE
+INSERT INTO xpto(id, toasted_col2) VALUES (2, 'toasted2-upsert')
+ON CONFLICT (id)
+DO UPDATE SET toasted_col2 = EXCLUDED.toasted_col2 || xpto.toasted_col2;
+
 DELETE FROM xpto WHERE id = 1;
 
 DROP TABLE IF EXISTS toasted_key;
diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c
index 963d5df9da..32d5743018 100644
--- a/contrib/test_decoding/test_decoding.c
+++ b/contrib/test_decoding/test_decoding.c
@@ -21,6 +21,7 @@
 
 #include "replication/output_plugin.h"
 #include "replication/logical.h"
+#include "replication/origin.h"
 
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
@@ -43,6 +44,7 @@ typedef struct
 	bool		include_timestamp;
 	bool		skip_empty_xacts;
 	bool		xact_wrote_changes;
+	bool		only_local;
 } TestDecodingData;
 
 static void pg_decode_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
@@ -51,14 +53,16 @@ static void pg_decode_shutdown(LogicalDecodingContext *ctx);
 static void pg_decode_begin_txn(LogicalDecodingContext *ctx,
 					ReorderBufferTXN *txn);
 static void pg_output_begin(LogicalDecodingContext *ctx,
-							TestDecodingData *data,
-							ReorderBufferTXN *txn,
-							bool last_write);
+				TestDecodingData *data,
+				ReorderBufferTXN *txn,
+				bool last_write);
 static void pg_decode_commit_txn(LogicalDecodingContext *ctx,
 					 ReorderBufferTXN *txn, XLogRecPtr commit_lsn);
 static void pg_decode_change(LogicalDecodingContext *ctx,
 				 ReorderBufferTXN *txn, Relation rel,
 				 ReorderBufferChange *change);
+static bool pg_decode_filter(LogicalDecodingContext *ctx,
+				 RepOriginId origin_id);
 
 void
 _PG_init(void)
@@ -76,6 +80,7 @@ _PG_output_plugin_init(OutputPluginCallbacks *cb)
 	cb->begin_cb = pg_decode_begin_txn;
 	cb->change_cb = pg_decode_change;
 	cb->commit_cb = pg_decode_commit_txn;
+	cb->filter_by_origin_cb = pg_decode_filter;
 	cb->shutdown_cb = pg_decode_shutdown;
 }
 
@@ -97,6 +102,7 @@ pg_decode_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
 	data->include_xids = true;
 	data->include_timestamp = false;
 	data->skip_empty_xacts = false;
+	data->only_local = false;
 
 	ctx->output_plugin_private = data;
 
@@ -155,6 +161,17 @@ pg_decode_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
 				  errmsg("could not parse value \"%s\" for parameter \"%s\"",
 						 strVal(elem->arg), elem->defname)));
 		}
+		else if (strcmp(elem->defname, "only-local") == 0)
+		{
+
+			if (elem->arg == NULL)
+				data->only_local = true;
+			else if (!parse_bool(strVal(elem->arg), &data->only_local))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				  errmsg("could not parse value \"%s\" for parameter \"%s\"",
+						 strVal(elem->arg), elem->defname)));
+		}
 		else
 		{
 			ereport(ERROR,
@@ -223,6 +240,17 @@ pg_decode_commit_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 	OutputPluginWrite(ctx, true);
 }
 
+static bool
+pg_decode_filter(LogicalDecodingContext *ctx,
+				 RepOriginId origin_id)
+{
+	TestDecodingData *data = ctx->output_plugin_private;
+
+	if (data->only_local && origin_id != InvalidRepOriginId)
+		return true;
+	return false;
+}
+
 /*
  * Print literal `outputstr' already represented as string of type `typid'
  * into stringbuf `s'.
@@ -391,7 +419,7 @@ pg_decode_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 													  get_namespace_name(
 							  get_rel_namespace(RelationGetRelid(relation))),
 											  NameStr(class_form->relname)));
-	appendStringInfoString(ctx->out, ":");
+	appendStringInfoChar(ctx->out, ':');
 
 	switch (change->action)
 	{
diff --git a/contrib/tsm_system_rows/.gitignore b/contrib/tsm_system_rows/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/contrib/tsm_system_rows/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/contrib/tsm_system_rows/Makefile b/contrib/tsm_system_rows/Makefile
new file mode 100644
index 0000000000..700ab276db
--- /dev/null
+++ b/contrib/tsm_system_rows/Makefile
@@ -0,0 +1,21 @@
+# src/test/modules/tsm_system_rows/Makefile
+
+MODULE_big = tsm_system_rows
+OBJS = tsm_system_rows.o $(WIN32RES)
+PGFILEDESC = "tsm_system_rows - SYSTEM TABLESAMPLE method which accepts number of rows as a limit"
+
+EXTENSION = tsm_system_rows
+DATA = tsm_system_rows--1.0.sql
+
+REGRESS = tsm_system_rows
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/tsm_system_rows
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/tsm_system_rows/expected/tsm_system_rows.out b/contrib/tsm_system_rows/expected/tsm_system_rows.out
new file mode 100644
index 0000000000..7e0f72b02b
--- /dev/null
+++ b/contrib/tsm_system_rows/expected/tsm_system_rows.out
@@ -0,0 +1,31 @@
+CREATE EXTENSION tsm_system_rows;
+CREATE TABLE test_tablesample (id int, name text) WITH (fillfactor=10); -- force smaller pages so we don't have to load too much data to get multiple pages
+INSERT INTO test_tablesample SELECT i, repeat(i::text, 1000) FROM generate_series(0, 30) s(i) ORDER BY i;
+ANALYZE test_tablesample;
+SELECT count(*) FROM test_tablesample TABLESAMPLE system_rows (1000);
+ count 
+-------
+    31
+(1 row)
+
+SELECT id FROM test_tablesample TABLESAMPLE system_rows (8) REPEATABLE (5432);
+ id 
+----
+  7
+ 14
+ 21
+ 28
+  4
+ 11
+ 18
+ 25
+(8 rows)
+
+EXPLAIN SELECT id FROM test_tablesample TABLESAMPLE system_rows (20) REPEATABLE (10);
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Sample Scan (system_rows) on test_tablesample  (cost=0.00..80.20 rows=20 width=4)
+(1 row)
+
+-- done
+DROP TABLE test_tablesample CASCADE;
diff --git a/contrib/tsm_system_rows/sql/tsm_system_rows.sql b/contrib/tsm_system_rows/sql/tsm_system_rows.sql
new file mode 100644
index 0000000000..bd812220ed
--- /dev/null
+++ b/contrib/tsm_system_rows/sql/tsm_system_rows.sql
@@ -0,0 +1,14 @@
+CREATE EXTENSION tsm_system_rows;
+
+CREATE TABLE test_tablesample (id int, name text) WITH (fillfactor=10); -- force smaller pages so we don't have to load too much data to get multiple pages
+
+INSERT INTO test_tablesample SELECT i, repeat(i::text, 1000) FROM generate_series(0, 30) s(i) ORDER BY i;
+ANALYZE test_tablesample;
+
+SELECT count(*) FROM test_tablesample TABLESAMPLE system_rows (1000);
+SELECT id FROM test_tablesample TABLESAMPLE system_rows (8) REPEATABLE (5432);
+
+EXPLAIN SELECT id FROM test_tablesample TABLESAMPLE system_rows (20) REPEATABLE (10);
+
+-- done
+DROP TABLE test_tablesample CASCADE;
diff --git a/contrib/tsm_system_rows/tsm_system_rows--1.0.sql b/contrib/tsm_system_rows/tsm_system_rows--1.0.sql
new file mode 100644
index 0000000000..1a29c584b5
--- /dev/null
+++ b/contrib/tsm_system_rows/tsm_system_rows--1.0.sql
@@ -0,0 +1,44 @@
+/* src/test/modules/tablesample/tsm_system_rows--1.0.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION tsm_system_rows" to load this file. \quit
+
+CREATE FUNCTION tsm_system_rows_init(internal, int4, int4)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_rows_nextblock(internal)
+RETURNS int4
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_rows_nexttuple(internal, int4, int2)
+RETURNS int2
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_rows_examinetuple(internal, int4, internal, bool)
+RETURNS bool
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_rows_end(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_rows_reset(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_rows_cost(internal, internal, internal, internal, internal, internal, internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+INSERT INTO pg_tablesample_method VALUES('system_rows', false, true,
+	'tsm_system_rows_init', 'tsm_system_rows_nextblock',
+	'tsm_system_rows_nexttuple', 'tsm_system_rows_examinetuple',
+	'tsm_system_rows_end', 'tsm_system_rows_reset', 'tsm_system_rows_cost');
diff --git a/contrib/tsm_system_rows/tsm_system_rows.c b/contrib/tsm_system_rows/tsm_system_rows.c
new file mode 100644
index 0000000000..e325eaff49
--- /dev/null
+++ b/contrib/tsm_system_rows/tsm_system_rows.c
@@ -0,0 +1,271 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsm_system_rows.c
+ *	  interface routines for system_rows tablesample method
+ *
+ *
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  contrib/tsm_system_rows_rowlimit/tsm_system_rows.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+
+#include "access/tablesample.h"
+#include "access/relscan.h"
+#include "miscadmin.h"
+#include "nodes/execnodes.h"
+#include "nodes/relation.h"
+#include "optimizer/clauses.h"
+#include "storage/bufmgr.h"
+#include "utils/sampling.h"
+
+PG_MODULE_MAGIC;
+
+/*
+ * State
+ */
+typedef struct
+{
+	SamplerRandomState randstate;
+	uint32		seed;			/* random seed */
+	BlockNumber nblocks;		/* number of block in relation */
+	int32		ntuples;		/* number of tuples to return */
+	int32		donetuples;		/* tuples already returned */
+	OffsetNumber lt;			/* last tuple returned from current block */
+	BlockNumber step;			/* step size */
+	BlockNumber lb;				/* last block visited */
+	BlockNumber doneblocks;		/* number of already returned blocks */
+} SystemSamplerData;
+
+
+PG_FUNCTION_INFO_V1(tsm_system_rows_init);
+PG_FUNCTION_INFO_V1(tsm_system_rows_nextblock);
+PG_FUNCTION_INFO_V1(tsm_system_rows_nexttuple);
+PG_FUNCTION_INFO_V1(tsm_system_rows_examinetuple);
+PG_FUNCTION_INFO_V1(tsm_system_rows_end);
+PG_FUNCTION_INFO_V1(tsm_system_rows_reset);
+PG_FUNCTION_INFO_V1(tsm_system_rows_cost);
+
+static uint32 random_relative_prime(uint32 n, SamplerRandomState randstate);
+
+/*
+ * Initializes the state.
+ */
+Datum
+tsm_system_rows_init(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	uint32		seed = PG_GETARG_UINT32(1);
+	int32		ntuples = PG_ARGISNULL(2) ? -1 : PG_GETARG_INT32(2);
+	HeapScanDesc scan = tsdesc->heapScan;
+	SystemSamplerData *sampler;
+
+	if (ntuples < 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("invalid sample size"),
+				 errhint("Sample size must be positive integer value.")));
+
+	sampler = palloc0(sizeof(SystemSamplerData));
+
+	/* Remember initial values for reinit */
+	sampler->seed = seed;
+	sampler->nblocks = scan->rs_nblocks;
+	sampler->ntuples = ntuples;
+	sampler->donetuples = 0;
+	sampler->lt = InvalidOffsetNumber;
+	sampler->doneblocks = 0;
+
+	sampler_random_init_state(sampler->seed, sampler->randstate);
+
+	/* Find relative prime as step size for linear probing. */
+	sampler->step = random_relative_prime(sampler->nblocks, sampler->randstate);
+
+	/*
+	 * Randomize start position so that blocks close to step size don't have
+	 * higher probability of being chosen on very short scan.
+	 */
+	sampler->lb = sampler_random_fract(sampler->randstate) *
+		(sampler->nblocks / sampler->step);
+
+	tsdesc->tsmdata = (void *) sampler;
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Get next block number or InvalidBlockNumber when we're done.
+ *
+ * Uses linear probing algorithm for picking next block.
+ */
+Datum
+tsm_system_rows_nextblock(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+
+	sampler->lb = (sampler->lb + sampler->step) % sampler->nblocks;
+	sampler->doneblocks++;
+
+	/* All blocks have been read, we're done */
+	if (sampler->doneblocks > sampler->nblocks ||
+		sampler->donetuples >= sampler->ntuples)
+		PG_RETURN_UINT32(InvalidBlockNumber);
+
+	PG_RETURN_UINT32(sampler->lb);
+}
+
+/*
+ * Get next tuple offset in current block or InvalidOffsetNumber if we are done
+ * with this block.
+ */
+Datum
+tsm_system_rows_nexttuple(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	OffsetNumber maxoffset = PG_GETARG_UINT16(2);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+	OffsetNumber tupoffset = sampler->lt;
+
+	if (tupoffset == InvalidOffsetNumber)
+		tupoffset = FirstOffsetNumber;
+	else
+		tupoffset++;
+
+	if (tupoffset > maxoffset ||
+		sampler->donetuples >= sampler->ntuples)
+		tupoffset = InvalidOffsetNumber;
+
+	sampler->lt = tupoffset;
+
+	PG_RETURN_UINT16(tupoffset);
+}
+
+/*
+ * Examine tuple and decide if it should be returned.
+ */
+Datum
+tsm_system_rows_examinetuple(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	bool		visible = PG_GETARG_BOOL(3);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+
+	if (!visible)
+		PG_RETURN_BOOL(false);
+
+	sampler->donetuples++;
+
+	PG_RETURN_BOOL(true);
+}
+
+/*
+ * Cleanup method.
+ */
+Datum
+tsm_system_rows_end(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+
+	pfree(tsdesc->tsmdata);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Reset state (called by ReScan).
+ */
+Datum
+tsm_system_rows_reset(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+
+	sampler->lt = InvalidOffsetNumber;
+	sampler->donetuples = 0;
+	sampler->doneblocks = 0;
+
+	sampler_random_init_state(sampler->seed, sampler->randstate);
+	sampler->step = random_relative_prime(sampler->nblocks, sampler->randstate);
+	sampler->lb = sampler_random_fract(sampler->randstate) * (sampler->nblocks / sampler->step);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Costing function.
+ */
+Datum
+tsm_system_rows_cost(PG_FUNCTION_ARGS)
+{
+	PlannerInfo *root = (PlannerInfo *) PG_GETARG_POINTER(0);
+	Path	   *path = (Path *) PG_GETARG_POINTER(1);
+	RelOptInfo *baserel = (RelOptInfo *) PG_GETARG_POINTER(2);
+	List	   *args = (List *) PG_GETARG_POINTER(3);
+	BlockNumber *pages = (BlockNumber *) PG_GETARG_POINTER(4);
+	double	   *tuples = (double *) PG_GETARG_POINTER(5);
+	Node	   *limitnode;
+	int32		ntuples;
+
+	limitnode = linitial(args);
+	limitnode = estimate_expression_value(root, limitnode);
+
+	if (IsA(limitnode, RelabelType))
+		limitnode = (Node *) ((RelabelType *) limitnode)->arg;
+
+	if (IsA(limitnode, Const))
+		ntuples = DatumGetInt32(((Const *) limitnode)->constvalue);
+	else
+	{
+		/* Default ntuples if the estimation didn't return Const. */
+		ntuples = 1000;
+	}
+
+	*pages = Min(baserel->pages, ntuples);
+	*tuples = ntuples;
+	path->rows = *tuples;
+
+	PG_RETURN_VOID();
+}
+
+
+static uint32
+gcd(uint32 a, uint32 b)
+{
+	uint32		c;
+
+	while (a != 0)
+	{
+		c = a;
+		a = b % a;
+		b = c;
+	}
+
+	return b;
+}
+
+static uint32
+random_relative_prime(uint32 n, SamplerRandomState randstate)
+{
+	/* Pick random starting number, with some limits on what it can be. */
+	uint32		r = (uint32) sampler_random_fract(randstate) * n / 2 + n / 4,
+				t;
+
+	/*
+	 * This should only take 2 or 3 iterations as the probability of 2 numbers
+	 * being relatively prime is ~61%.
+	 */
+	while ((t = gcd(r, n)) > 1)
+	{
+		CHECK_FOR_INTERRUPTS();
+		r /= t;
+	}
+
+	return r;
+}
diff --git a/contrib/tsm_system_rows/tsm_system_rows.control b/contrib/tsm_system_rows/tsm_system_rows.control
new file mode 100644
index 0000000000..84ea7adb49
--- /dev/null
+++ b/contrib/tsm_system_rows/tsm_system_rows.control
@@ -0,0 +1,5 @@
+# tsm_system_rows extension
+comment = 'SYSTEM TABLESAMPLE method which accepts number rows as a limit'
+default_version = '1.0'
+module_pathname = '$libdir/tsm_system_rows'
+relocatable = true
diff --git a/contrib/tsm_system_time/.gitignore b/contrib/tsm_system_time/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/contrib/tsm_system_time/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/contrib/tsm_system_time/Makefile b/contrib/tsm_system_time/Makefile
new file mode 100644
index 0000000000..c42c1c6bb6
--- /dev/null
+++ b/contrib/tsm_system_time/Makefile
@@ -0,0 +1,21 @@
+# src/test/modules/tsm_system_time/Makefile
+
+MODULE_big = tsm_system_time
+OBJS = tsm_system_time.o $(WIN32RES)
+PGFILEDESC = "tsm_system_time - SYSTEM TABLESAMPLE method which accepts number rows of as a limit"
+
+EXTENSION = tsm_system_time
+DATA = tsm_system_time--1.0.sql
+
+REGRESS = tsm_system_time
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/tsm_system_time
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/tsm_system_time/expected/tsm_system_time.out b/contrib/tsm_system_time/expected/tsm_system_time.out
new file mode 100644
index 0000000000..32ad03c4bd
--- /dev/null
+++ b/contrib/tsm_system_time/expected/tsm_system_time.out
@@ -0,0 +1,54 @@
+CREATE EXTENSION tsm_system_time;
+CREATE TABLE test_tablesample (id int, name text) WITH (fillfactor=10); -- force smaller pages so we don't have to load too much data to get multiple pages
+INSERT INTO test_tablesample SELECT i, repeat(i::text, 1000) FROM generate_series(0, 30) s(i) ORDER BY i;
+ANALYZE test_tablesample;
+SELECT count(*) FROM test_tablesample TABLESAMPLE system_time (1000);
+ count 
+-------
+    31
+(1 row)
+
+SELECT id FROM test_tablesample TABLESAMPLE system_time (1000) REPEATABLE (5432);
+ id 
+----
+  7
+ 14
+ 21
+ 28
+  4
+ 11
+ 18
+ 25
+  1
+  8
+ 15
+ 22
+ 29
+  5
+ 12
+ 19
+ 26
+  2
+  9
+ 16
+ 23
+ 30
+  6
+ 13
+ 20
+ 27
+  3
+ 10
+ 17
+ 24
+  0
+(31 rows)
+
+EXPLAIN SELECT id FROM test_tablesample TABLESAMPLE system_time (100) REPEATABLE (10);
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Sample Scan (system_time) on test_tablesample  (cost=0.00..100.25 rows=25 width=4)
+(1 row)
+
+-- done
+DROP TABLE test_tablesample CASCADE;
diff --git a/contrib/tsm_system_time/sql/tsm_system_time.sql b/contrib/tsm_system_time/sql/tsm_system_time.sql
new file mode 100644
index 0000000000..68dbbf98af
--- /dev/null
+++ b/contrib/tsm_system_time/sql/tsm_system_time.sql
@@ -0,0 +1,14 @@
+CREATE EXTENSION tsm_system_time;
+
+CREATE TABLE test_tablesample (id int, name text) WITH (fillfactor=10); -- force smaller pages so we don't have to load too much data to get multiple pages
+
+INSERT INTO test_tablesample SELECT i, repeat(i::text, 1000) FROM generate_series(0, 30) s(i) ORDER BY i;
+ANALYZE test_tablesample;
+
+SELECT count(*) FROM test_tablesample TABLESAMPLE system_time (1000);
+SELECT id FROM test_tablesample TABLESAMPLE system_time (1000) REPEATABLE (5432);
+
+EXPLAIN SELECT id FROM test_tablesample TABLESAMPLE system_time (100) REPEATABLE (10);
+
+-- done
+DROP TABLE test_tablesample CASCADE;
diff --git a/contrib/tsm_system_time/tsm_system_time--1.0.sql b/contrib/tsm_system_time/tsm_system_time--1.0.sql
new file mode 100644
index 0000000000..1f390d6ed7
--- /dev/null
+++ b/contrib/tsm_system_time/tsm_system_time--1.0.sql
@@ -0,0 +1,39 @@
+/* src/test/modules/tablesample/tsm_system_time--1.0.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION tsm_system_time" to load this file. \quit
+
+CREATE FUNCTION tsm_system_time_init(internal, int4, int4)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_time_nextblock(internal)
+RETURNS int4
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_time_nexttuple(internal, int4, int2)
+RETURNS int2
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_time_end(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_time_reset(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION tsm_system_time_cost(internal, internal, internal, internal, internal, internal, internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+INSERT INTO pg_tablesample_method VALUES('system_time', false, true,
+	'tsm_system_time_init', 'tsm_system_time_nextblock',
+	'tsm_system_time_nexttuple', '-', 'tsm_system_time_end',
+	'tsm_system_time_reset', 'tsm_system_time_cost');
diff --git a/contrib/tsm_system_time/tsm_system_time.c b/contrib/tsm_system_time/tsm_system_time.c
new file mode 100644
index 0000000000..7708fc0761
--- /dev/null
+++ b/contrib/tsm_system_time/tsm_system_time.c
@@ -0,0 +1,317 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsm_system_time.c
+ *	  interface routines for system_time tablesample method
+ *
+ *
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  contrib/tsm_system_time_rowlimit/tsm_system_time.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+
+#include "access/tablesample.h"
+#include "access/relscan.h"
+#include "miscadmin.h"
+#include "nodes/execnodes.h"
+#include "nodes/relation.h"
+#include "optimizer/clauses.h"
+#include "storage/bufmgr.h"
+#include "utils/sampling.h"
+#include "utils/spccache.h"
+#include "utils/timestamp.h"
+
+PG_MODULE_MAGIC;
+
+/*
+ * State
+ */
+typedef struct
+{
+	SamplerRandomState randstate;
+	uint32		seed;			/* random seed */
+	BlockNumber nblocks;		/* number of block in relation */
+	int32		time;			/* time limit for sampling */
+	TimestampTz start_time;		/* start time of sampling */
+	TimestampTz end_time;		/* end time of sampling */
+	OffsetNumber lt;			/* last tuple returned from current block */
+	BlockNumber step;			/* step size */
+	BlockNumber lb;				/* last block visited */
+	BlockNumber estblocks;		/* estimated number of returned blocks
+								 * (moving) */
+	BlockNumber doneblocks;		/* number of already returned blocks */
+} SystemSamplerData;
+
+
+PG_FUNCTION_INFO_V1(tsm_system_time_init);
+PG_FUNCTION_INFO_V1(tsm_system_time_nextblock);
+PG_FUNCTION_INFO_V1(tsm_system_time_nexttuple);
+PG_FUNCTION_INFO_V1(tsm_system_time_end);
+PG_FUNCTION_INFO_V1(tsm_system_time_reset);
+PG_FUNCTION_INFO_V1(tsm_system_time_cost);
+
+static uint32 random_relative_prime(uint32 n, SamplerRandomState randstate);
+
+/*
+ * Initializes the state.
+ */
+Datum
+tsm_system_time_init(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	uint32		seed = PG_GETARG_UINT32(1);
+	int32		time = PG_ARGISNULL(2) ? -1 : PG_GETARG_INT32(2);
+	HeapScanDesc scan = tsdesc->heapScan;
+	SystemSamplerData *sampler;
+
+	if (time < 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("invalid time limit"),
+				 errhint("Time limit must be positive integer value.")));
+
+	sampler = palloc0(sizeof(SystemSamplerData));
+
+	/* Remember initial values for reinit */
+	sampler->seed = seed;
+	sampler->nblocks = scan->rs_nblocks;
+	sampler->lt = InvalidOffsetNumber;
+	sampler->estblocks = 2;
+	sampler->doneblocks = 0;
+	sampler->time = time;
+	sampler->start_time = GetCurrentTimestamp();
+	sampler->end_time = TimestampTzPlusMilliseconds(sampler->start_time,
+													sampler->time);
+
+	sampler_random_init_state(sampler->seed, sampler->randstate);
+
+	/* Find relative prime as step size for linear probing. */
+	sampler->step = random_relative_prime(sampler->nblocks, sampler->randstate);
+
+	/*
+	 * Randomize start position so that blocks close to step size don't have
+	 * higher probability of being chosen on very short scan.
+	 */
+	sampler->lb = sampler_random_fract(sampler->randstate) * (sampler->nblocks / sampler->step);
+
+	tsdesc->tsmdata = (void *) sampler;
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Get next block number or InvalidBlockNumber when we're done.
+ *
+ * Uses linear probing algorithm for picking next block.
+ */
+Datum
+tsm_system_time_nextblock(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+
+	sampler->lb = (sampler->lb + sampler->step) % sampler->nblocks;
+	sampler->doneblocks++;
+
+	/* All blocks have been read, we're done */
+	if (sampler->doneblocks > sampler->nblocks)
+		PG_RETURN_UINT32(InvalidBlockNumber);
+
+	/*
+	 * Update the estimations for time limit at least 10 times per estimated
+	 * number of returned blocks to handle variations in block read speed.
+	 */
+	if (sampler->doneblocks % Max(sampler->estblocks / 10, 1) == 0)
+	{
+		TimestampTz now = GetCurrentTimestamp();
+		long		secs;
+		int			usecs;
+		int			usecs_remaining;
+		int			time_per_block;
+
+		TimestampDifference(sampler->start_time, now, &secs, &usecs);
+		usecs += (int) secs *1000000;
+
+		time_per_block = usecs / sampler->doneblocks;
+
+		/* No time left, end. */
+		TimestampDifference(now, sampler->end_time, &secs, &usecs);
+		if (secs <= 0 && usecs <= 0)
+			PG_RETURN_UINT32(InvalidBlockNumber);
+
+		/* Remaining microseconds */
+		usecs_remaining = usecs + (int) secs *1000000;
+
+		/* Recalculate estimated returned number of blocks */
+		if (time_per_block < usecs_remaining && time_per_block > 0)
+			sampler->estblocks = sampler->time * time_per_block;
+	}
+
+	PG_RETURN_UINT32(sampler->lb);
+}
+
+/*
+ * Get next tuple offset in current block or InvalidOffsetNumber if we are done
+ * with this block.
+ */
+Datum
+tsm_system_time_nexttuple(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	OffsetNumber maxoffset = PG_GETARG_UINT16(2);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+	OffsetNumber tupoffset = sampler->lt;
+
+	if (tupoffset == InvalidOffsetNumber)
+		tupoffset = FirstOffsetNumber;
+	else
+		tupoffset++;
+
+	if (tupoffset > maxoffset)
+		tupoffset = InvalidOffsetNumber;
+
+	sampler->lt = tupoffset;
+
+	PG_RETURN_UINT16(tupoffset);
+}
+
+/*
+ * Cleanup method.
+ */
+Datum
+tsm_system_time_end(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+
+	pfree(tsdesc->tsmdata);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Reset state (called by ReScan).
+ */
+Datum
+tsm_system_time_reset(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+
+	sampler->lt = InvalidOffsetNumber;
+	sampler->start_time = GetCurrentTimestamp();
+	sampler->end_time = TimestampTzPlusMilliseconds(sampler->start_time,
+													sampler->time);
+	sampler->estblocks = 2;
+	sampler->doneblocks = 0;
+
+	sampler_random_init_state(sampler->seed, sampler->randstate);
+	sampler->step = random_relative_prime(sampler->nblocks, sampler->randstate);
+	sampler->lb = sampler_random_fract(sampler->randstate) * (sampler->nblocks / sampler->step);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Costing function.
+ */
+Datum
+tsm_system_time_cost(PG_FUNCTION_ARGS)
+{
+	PlannerInfo *root = (PlannerInfo *) PG_GETARG_POINTER(0);
+	Path	   *path = (Path *) PG_GETARG_POINTER(1);
+	RelOptInfo *baserel = (RelOptInfo *) PG_GETARG_POINTER(2);
+	List	   *args = (List *) PG_GETARG_POINTER(3);
+	BlockNumber *pages = (BlockNumber *) PG_GETARG_POINTER(4);
+	double	   *tuples = (double *) PG_GETARG_POINTER(5);
+	Node	   *limitnode;
+	int32		time;
+	BlockNumber relpages;
+	double		reltuples;
+	double		density;
+	double		spc_random_page_cost;
+
+	limitnode = linitial(args);
+	limitnode = estimate_expression_value(root, limitnode);
+
+	if (IsA(limitnode, RelabelType))
+		limitnode = (Node *) ((RelabelType *) limitnode)->arg;
+
+	if (IsA(limitnode, Const))
+		time = DatumGetInt32(((Const *) limitnode)->constvalue);
+	else
+	{
+		/* Default time (1s) if the estimation didn't return Const. */
+		time = 1000;
+	}
+
+	relpages = baserel->pages;
+	reltuples = baserel->tuples;
+
+	/* estimate the tuple density */
+	if (relpages > 0)
+		density = reltuples / (double) relpages;
+	else
+		density = (BLCKSZ - SizeOfPageHeaderData) / baserel->width;
+
+	/*
+	 * We equal random page cost value to number of ms it takes to read the
+	 * random page here which is far from accurate but we don't have anything
+	 * better to base our predicted page reads.
+	 */
+	get_tablespace_page_costs(baserel->reltablespace,
+							  &spc_random_page_cost,
+							  NULL);
+
+	/*
+	 * Assumption here is that we'll never read less than 1% of table pages,
+	 * this is here mainly because it is much less bad to overestimate than
+	 * underestimate and using just spc_random_page_cost will probably lead to
+	 * underestimations in general.
+	 */
+	*pages = Min(baserel->pages, Max(time / spc_random_page_cost, baserel->pages / 100));
+	*tuples = rint(density * (double) *pages * path->rows / baserel->tuples);
+	path->rows = *tuples;
+
+	PG_RETURN_VOID();
+}
+
+static uint32
+gcd(uint32 a, uint32 b)
+{
+	uint32		c;
+
+	while (a != 0)
+	{
+		c = a;
+		a = b % a;
+		b = c;
+	}
+
+	return b;
+}
+
+static uint32
+random_relative_prime(uint32 n, SamplerRandomState randstate)
+{
+	/* Pick random starting number, with some limits on what it can be. */
+	uint32		r = (uint32) sampler_random_fract(randstate) * n / 2 + n / 4,
+				t;
+
+	/*
+	 * This should only take 2 or 3 iterations as the probability of 2 numbers
+	 * being relatively prime is ~61%.
+	 */
+	while ((t = gcd(r, n)) > 1)
+	{
+		CHECK_FOR_INTERRUPTS();
+		r /= t;
+	}
+
+	return r;
+}
diff --git a/contrib/tsm_system_time/tsm_system_time.control b/contrib/tsm_system_time/tsm_system_time.control
new file mode 100644
index 0000000000..ebcee19d23
--- /dev/null
+++ b/contrib/tsm_system_time/tsm_system_time.control
@@ -0,0 +1,5 @@
+# tsm_system_time extension
+comment = 'SYSTEM TABLESAMPLE method which accepts time in milliseconds as a limit'
+default_version = '1.0'
+module_pathname = '$libdir/tsm_system_time'
+relocatable = true
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 8bdd26ce28..ac3a142bb2 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -17,6 +17,8 @@
 # to want to use.
 html:
 
+NO_TEMP_INSTALL=yes
+
 subdir = doc/src/sgml
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
@@ -331,6 +333,7 @@ endif
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
 
+# If the install used a man directory shared with other applications, this will remove all files.
 uninstall:
 	rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix  '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)
 
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index e25e0d0edf..def43a21da 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -836,8 +836,11 @@ SELECT pg_start_backup('label');
      <function>pg_start_backup</> creates a <firstterm>backup label</> file,
      called <filename>backup_label</>, in the cluster directory with
      information about your backup, including the start time and label
-     string.  The file is critical to the integrity of the backup, should
-     you need to restore from it.
+     string.  The function also creates a <firstterm>tablespace map</> file,
+     called <filename>tablespace_map</>, in the cluster directory with
+     information about tablespace symbolic links in <filename>pg_tblspc/</>
+     if one or more such link is present.  Both files are critical to the
+     integrity of the backup, should you need to restore from it.
     </para>
 
     <para>
@@ -965,17 +968,20 @@ SELECT pg_stop_backup();
 
    <para>
     It's also worth noting that the <function>pg_start_backup</> function
-    makes a file named <filename>backup_label</> in the database cluster
-    directory, which is removed by <function>pg_stop_backup</>.
-    This file will of course be archived as a part of your backup dump file.
-    The backup label file includes the label string you gave to
-    <function>pg_start_backup</>, as well as the time at which
-    <function>pg_start_backup</> was run, and the name of the starting WAL
-    file.  In case of confusion it is therefore possible to look inside a
-    backup dump file and determine exactly which backup session the dump file
-    came from.  However, this file is not merely for your information; its
-    presence and contents are critical to the proper operation of the system's
-    recovery process.
+    makes files named <filename>backup_label</> and
+    <filename>tablesapce_map</> in the database cluster directory,
+    which are removed by <function>pg_stop_backup</>.  These files will of
+    course be archived as a part of your backup dump file.  The backup label
+    file includes the label string you gave to <function>pg_start_backup</>,
+    as well as the time at which <function>pg_start_backup</> was run, and
+    the name of the starting WAL file.  In case of confusion it is therefore
+    possible to look inside a backup dump file and determine exactly which
+    backup session the dump file came from.  The tablespace map file includes
+    the symbolic link names as they exist in the directory
+    <filename>pg_tblspc/</> and the full path of each symbolic link.
+    These files are not merely for your information; their presence and
+    contents are critical to the proper operation of the system's recovery
+    process.
    </para>
 
    <para>
diff --git a/doc/src/sgml/brin.sgml b/doc/src/sgml/brin.sgml
index 1ac282c57a..4d8fd20c1c 100644
--- a/doc/src/sgml/brin.sgml
+++ b/doc/src/sgml/brin.sgml
@@ -72,7 +72,9 @@
  <para>
   The <firstterm>minmax</>
   operator classes store the minimum and the maximum values appearing
-  in the indexed column within the range.
+  in the indexed column within the range.  The <firstterm>inclusion</>
+  operator classes store a value which includes the values in the indexed
+  column within the range.
  </para>
 
  <table id="brin-builtin-opclasses-table">
@@ -252,6 +254,18 @@
      </entry>
     </row>
     <row>
+     <entry><literal>inet_inclusion_ops</literal></entry>
+     <entry><type>inet</type></entry>
+     <entry>
+      <literal>&amp;&amp;</>
+      <literal>&gt;&gt;</>
+      <literal>&gt;&gt;=</>
+      <literal>&lt;&lt;</literal>
+      <literal>&lt;&lt;=</literal>
+      <literal>=</literal>
+     </entry>
+    </row>
+    <row>
      <entry><literal>bpchar_minmax_ops</literal></entry>
      <entry><type>character</type></entry>
      <entry>
@@ -373,6 +387,25 @@
      </entry>
     </row>
     <row>
+     <entry><literal>range_inclusion_ops</></entry>
+     <entry><type>any range type</type></entry>
+     <entry>
+      <literal>&amp;&amp;</>
+      <literal>&amp;&gt;</>
+      <literal>&amp;&lt;</>
+      <literal>&gt;&gt;</>
+      <literal>&lt;&lt;</>
+      <literal>&lt;@</>
+      <literal>=</>
+      <literal>@&gt;</>
+      <literal>&lt;</literal>
+      <literal>&lt;=</literal>
+      <literal>=</literal>
+      <literal>&gt;=</literal>
+      <literal>&gt;</literal>
+     </entry>
+    </row>
+    <row>
      <entry><literal>pg_lsn_minmax_ops</literal></entry>
      <entry><type>pg_lsn</type></entry>
      <entry>
@@ -383,6 +416,24 @@
       <literal>&gt;</literal>
      </entry>
     </row>
+    <row>
+     <entry><literal>box_inclusion_ops</></entry>
+     <entry><type>box</type></entry>
+     <entry>
+      <literal>&amp;&amp;</>
+      <literal>&amp;&gt;</>
+      <literal>&amp;&lt;</>
+      <literal>&gt;&gt;</>
+      <literal>&lt;&lt;</>
+      <literal>&lt;@</>
+      <literal>~=</>
+      <literal>@&gt;</>
+      <literal>&amp;&gt;|</>
+      <literal>|&amp;&lt;</>
+      <literal>&gt;&gt;|</>
+      <literal>|&lt;&lt;</literal>
+     </entry>
+    </row>
    </tbody>
   </tgroup>
  </table>
@@ -428,8 +479,8 @@ typedef struct BrinOpcInfo
     /* Opaque pointer for the opclass' private use */
     void       *oi_opaque;
 
-    /* Type IDs of the stored columns */
-    Oid         oi_typids[FLEXIBLE_ARRAY_MEMBER];
+    /* Type cache entries of the stored columns */
+    TypeCacheEntry *oi_typcache[FLEXIBLE_ARRAY_MEMBER];
 } BrinOpcInfo;
 </programlisting>
       <structname>BrinOpcInfo</>.<structfield>oi_opaque</> can be used by the
diff --git a/doc/src/sgml/btree-gin.sgml b/doc/src/sgml/btree-gin.sgml
index 42b9e97b72..2b081db9d5 100644
--- a/doc/src/sgml/btree-gin.sgml
+++ b/doc/src/sgml/btree-gin.sgml
@@ -36,7 +36,7 @@
 <programlisting>
 CREATE TABLE test (a int4);
 -- create index
-CREATE INDEX testidx ON test USING gin (a);
+CREATE INDEX testidx ON test USING GIN (a);
 -- query
 SELECT * FROM test WHERE a &lt; 10;
 </programlisting>
diff --git a/doc/src/sgml/btree-gist.sgml b/doc/src/sgml/btree-gist.sgml
index 2275a997ba..f4afc09546 100644
--- a/doc/src/sgml/btree-gist.sgml
+++ b/doc/src/sgml/btree-gist.sgml
@@ -61,7 +61,7 @@
 <programlisting>
 CREATE TABLE test (a int4);
 -- create index
-CREATE INDEX testidx ON test USING gist (a);
+CREATE INDEX testidx ON test USING GIST (a);
 -- query
 SELECT * FROM test WHERE a &lt; 10;
 -- nearest-neighbor search: find the ten entries closest to "42"
@@ -78,7 +78,7 @@ SELECT *, a &lt;-&gt; 42 AS dist FROM test ORDER BY a &lt;-&gt; 42 LIMIT 10;
 =&gt; CREATE TABLE zoo (
   cage   INTEGER,
   animal TEXT,
-  EXCLUDE USING gist (cage WITH =, animal WITH &lt;&gt;)
+  EXCLUDE USING GIST (cage WITH =, animal WITH &lt;&gt;)
 );
 
 =&gt; INSERT INTO zoo VALUES(123, 'zebra');
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index d0b78f2782..b6e0268e3f 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -239,6 +239,16 @@
      </row>
 
      <row>
+      <entry><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link></entry>
+      <entry>registered replication origins</entry>
+     </row>
+
+     <row>
+      <entry><link linkend="catalog-pg-replication-origin-status"><structname>pg_replication_origin_status</structname></link></entry>
+      <entry>information about replication origins, including replication progress</entry>
+     </row>
+
+     <row>
       <entry><link linkend="catalog-pg-replication-slots"><structname>pg_replication_slots</structname></link></entry>
       <entry>replication slot information</entry>
      </row>
@@ -269,11 +279,21 @@
      </row>
 
      <row>
+      <entry><link linkend="catalog-pg-tablesample-method"><structname>pg_tablesample_method</structname></link></entry>
+      <entry>table sampling methods</entry>
+     </row>
+
+     <row>
       <entry><link linkend="catalog-pg-tablespace"><structname>pg_tablespace</structname></link></entry>
       <entry>tablespaces within this database cluster</entry>
      </row>
 
      <row>
+      <entry><link linkend="catalog-pg-transform"><structname>pg_transform</structname></link></entry>
+      <entry>transforms (data type to procedural language conversions)</entry>
+     </row>
+
+     <row>
       <entry><link linkend="catalog-pg-trigger"><structname>pg_trigger</structname></link></entry>
       <entry>triggers</entry>
      </row>
@@ -1995,11 +2015,11 @@
       <entry><type>xid</type></entry>
       <entry></entry>
       <entry>
-       All multitransaction IDs before this one have been replaced by a
+       All multixact IDs before this one have been replaced by a
        transaction ID in this table.  This is used to track
-       whether the table needs to be vacuumed in order to prevent multitransaction ID
-       ID wraparound or to allow <literal>pg_clog</> to be shrunk.  Zero
-       (<symbol>InvalidTransactionId</symbol>) if the relation is not a table.
+       whether the table needs to be vacuumed in order to prevent multixact ID
+       wraparound or to allow <literal>pg_multixact</> to be shrunk.  Zero
+       (<symbol>InvalidMultiXactId</symbol>) if the relation is not a table.
       </entry>
      </row>
 
@@ -2663,10 +2683,10 @@
       <entry><type>xid</type></entry>
       <entry></entry>
       <entry>
-       All multitransaction IDs before this one have been replaced with a
+       All multixact IDs before this one have been replaced with a
        transaction ID in this database.  This is used to
        track whether the database needs to be vacuumed in order to prevent
-       transaction ID wraparound or to allow <literal>pg_clog</> to be shrunk.
+       multixact ID wraparound or to allow <literal>pg_multixact</> to be shrunk.
        It is the minimum of the per-table
        <structname>pg_class</>.<structfield>relminmxid</> values.
       </entry>
@@ -5072,6 +5092,15 @@
      </row>
 
      <row>
+      <entry><structfield>protrftypes</structfield></entry>
+      <entry><type>oid[]</type></entry>
+      <entry></entry>
+      <entry>
+       Data type OIDs for which to apply transforms.
+      </entry>
+     </row>
+
+     <row>
       <entry><structfield>prosrc</structfield></entry>
       <entry><type>text</type></entry>
       <entry></entry>
@@ -5323,6 +5352,119 @@
 
  </sect1>
 
+ <sect1 id="catalog-pg-replication-origin">
+  <title><structname>pg_replication_origin</structname></title>
+
+  <indexterm zone="catalog-pg-replication-origin">
+   <primary>pg_replication_origin</primary>
+  </indexterm>
+
+  <para>
+   The <structname>pg_replication_origin</structname> catalog contains
+   all replication origins created.  For more on replication origins
+   see <xref linkend="replication-origins">.
+  </para>
+
+  <table>
+
+   <title><structname>pg_replication_origin</structname> Columns</title>
+
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>References</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><structfield>roident</structfield></entry>
+      <entry><type>Oid</type></entry>
+      <entry></entry>
+      <entry>A unique, cluster-wide identifier for the replication
+      origin. Should never leave the system.</entry>
+     </row>
+
+     <row>
+      <entry><structfield>roname</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry></entry>
+      <entry>The external, user defined, name of a replication
+      origin.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+ </sect1>
+
+  <sect1 id="catalog-pg-replication-origin-status">
+  <title><structname>pg_replication_origin_status</structname></title>
+
+  <indexterm zone="catalog-pg-replication-origin-status">
+   <primary>pg_replication_origin_status</primary>
+  </indexterm>
+
+  <para>
+   The <structname>pg_replication_origin_status</structname> view
+   contains information about how far replay for a certain origin has
+   progressed.  For more on replication origins
+   see <xref linkend="replication-origins">.
+  </para>
+
+  <table>
+
+   <title><structname>pg_replication_origin_status</structname> Columns</title>
+
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>References</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><structfield>local_id</structfield></entry>
+      <entry><type>Oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link>.roident</literal></entry>
+      <entry>internal node identifier</entry>
+     </row>
+
+     <row>
+      <entry><structfield>external_id</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry><literal><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link>.roname</literal></entry>
+      <entry>external node identifier</entry>
+     </row>
+
+     <row>
+      <entry><structfield>remote_lsn</structfield></entry>
+      <entry><type>pg_lsn</type></entry>
+      <entry></entry>
+      <entry>The origin node's LSN up to which data has been replicated.</entry>
+     </row>
+
+
+     <row>
+      <entry><structfield>local_lsn</structfield></entry>
+      <entry><type>pg_lsn</type></entry>
+      <entry></entry>
+      <entry>This node's LSN that at
+      which <literal>remote_lsn</literal> has been replicated. Used to
+      flush commit records before persisting data to disk when using
+      asynchronous commits.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+ </sect1>
+
  <sect1 id="catalog-pg-replication-slots">
   <title><structname>pg_replication_slots</structname></title>
 
@@ -5401,6 +5543,16 @@
      </row>
 
      <row>
+      <entry><structfield>active_pid</structfield></entry>
+      <entry><type>integer</type></entry>
+      <entry></entry>
+      <entry>The process ID of the session using this slot if the slot
+       is currently actively being used. <literal>NULL</literal> if
+       inactive.
+      </entry>
+     </row>
+
+     <row>
       <entry><structfield>xmin</structfield></entry>
       <entry><type>xid</type></entry>
       <entry></entry>
@@ -5980,6 +6132,121 @@
  </sect1>
 
 
+ <sect1 id="catalog-pg-tablesample-method">
+  <title><structname>pg_tabesample_method</structname></title>
+
+  <indexterm zone="catalog-pg-tablesample-method">
+   <primary>pg_am</primary>
+  </indexterm>
+
+  <para>
+   The catalog <structname>pg_tablesample_method</structname> stores
+   information about table sampling methods which can be used in
+   <command>TABLESAMPLE</command> clause of a <command>SELECT</command>
+   statement.
+  </para>
+
+  <table>
+   <title><structname>pg_tablesample_method</> Columns</title>
+
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>References</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+    <tbody>
+
+     <row>
+      <entry><structfield>oid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry></entry>
+      <entry>Row identifier (hidden attribute; must be explicitly selected)</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmname</structfield></entry>
+      <entry><type>name</type></entry>
+      <entry></entry>
+      <entry>Name of the sampling method</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmseqscan</structfield></entry>
+      <entry><type>bool</type></entry>
+      <entry></entry>
+      <entry>If true, the sampling method scans the whole table sequentially.
+      </entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmpagemode</structfield></entry>
+      <entry><type>bool</type></entry>
+      <entry></entry>
+      <entry>If true, the sampling method always reads the pages completely.
+      </entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsminit</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry><quote>Initialize the sampling scan</quote> function</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmnextblock</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry><quote>Get next block number</quote> function</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmnexttuple</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry><quote>Get next tuple offset</quote> function</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmexaminetuple</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry>Function which examines the tuple contents and decides if to
+        return it, or zero if none</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmend</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry><quote>End the sampling scan</quote> function</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmreset</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry><quote>Restart the state of sampling scan</quote> function</entry>
+     </row>
+
+     <row>
+      <entry><structfield>tsmcost</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry>Costing function</entry>
+     </row>
+
+    </tbody>
+   </tgroup>
+  </table>
+
+ </sect1>
+
+
  <sect1 id="catalog-pg-tablespace">
   <title><structname>pg_tablespace</structname></title>
 
@@ -6061,6 +6328,74 @@
  </sect1>
 
 
+ <sect1 id="catalog-pg-transform">
+  <title><structname>pg_transform</structname></title>
+
+  <indexterm zone="catalog-pg-transform">
+   <primary>pg_transform</primary>
+  </indexterm>
+
+  <para>
+   The catalog <structname>pg_transform</structname> stores information about
+   transforms, which are a mechanism to adapt data types to procedural
+   languages.  See <xref linkend="sql-createtransform"> for more information.
+  </para>
+
+  <table>
+   <title><structname>pg_transform</> Columns</title>
+
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>References</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><structfield>trftype</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-type"><structname>pg_type</structname></link>.oid</literal></entry>
+      <entry>OID of the data type this transform is for</entry>
+     </row>
+
+     <row>
+      <entry><structfield>trflang</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-language"><structname>pg_language</structname></link>.oid</literal></entry>
+      <entry>OID of the language this transform is for</entry>
+     </row>
+
+     <row>
+      <entry><structfield>trffromsql</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry>
+       The OID of the function to use when converting the data type for input
+       to the procedural language (e.g., function parameters).  Zero is stored
+       if this operation is not supported.
+      </entry>
+     </row>
+
+     <row>
+      <entry><structfield>trftosql</structfield></entry>
+      <entry><type>regproc</type></entry>
+      <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
+      <entry>
+       The OID of the function to use when converting output from the
+       procedural language (e.g., return values) to the data type.  Zero is
+       stored if this operation is not supported.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+ </sect1>
+
+
  <sect1 id="catalog-pg-trigger">
   <title><structname>pg_trigger</structname></title>
 
@@ -7345,6 +7680,11 @@
      </row>
 
      <row>
+      <entry><link linkend="view-pg-file-settings"><structname>pg_file_settings</structname></link></entry>
+      <entry>file location of parameter settings</entry>
+     </row>
+
+     <row>
       <entry><link linkend="view-pg-shadow"><structname>pg_shadow</structname></link></entry>
       <entry>database users</entry>
      </row>
@@ -8822,6 +9162,14 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       or when examined by a non-superuser)
       </entry>
      </row>
+     <row>
+      <entry><structfield>pending_restart</structfield></entry>
+      <entry><type>boolean</type></entry>
+      <entry><literal>true</literal> if the value has been changed in the
+      configuration file but needs a restart; or <literal>false</literal>
+      otherwise.
+      </entry>
+     </row>
     </tbody>
    </tgroup>
   </table>
@@ -8958,6 +9306,79 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
 
  </sect1>
 
+ <sect1 id="view-pg-file-settings">
+  <title><structname>pg_file_settings</structname></title>
+
+  <indexterm zone="view-pg-file-settings">
+   <primary>pg_file_settings</primary>
+  </indexterm>
+
+  <para>
+   The view <structname>pg_file_settings</structname> provides the file
+   name, line number and value of all parameters which are set through
+   configuration files.
+   In contrast to <structname>pg_settings</structname>, a row is provided for
+   each occurrence of the parameter across all configuration files. This is helpful
+   for discovering why one value may have been used in preference to another
+   when the parameters were loaded.
+  </para>
+
+  <table>
+   <title><structname>pg_file_settings</> Columns</title>
+
+  <tgroup cols="3">
+   <thead>
+    <row>
+     <entry>Name</entry>
+     <entry>Type</entry>
+     <entry>Description</entry>
+    </row>
+   </thead>
+   <tbody>
+    <row>
+     <entry><structfield>sourcefile</structfield></entry>
+     <entry><structfield>text</structfield></entry>
+     <entry>Path to and name of the configration file</entry>
+    </row>
+    <row>
+     <entry><structfield>sourceline</structfield></entry>
+     <entry><structfield>integer</structfield></entry>
+     <entry>
+      Line number within the configuration file where the value was set
+     </entry>
+    </row>
+    <row>
+     <entry><structfield>seqno</structfield></entry>
+     <entry><structfield>integer</structfield></entry>
+     <entry>Order in which the setting was loaded</entry>
+    </row>
+    <row>
+     <entry><structfield>name</structfield></entry>
+     <entry><structfield>text</structfield></entry>
+     <entry>Run-time configuration parameter name</entry>
+    </row>
+    <row>
+     <entry><structfield>setting</structfield></entry>
+     <entry><structfield>text</structfield></entry>
+     <entry>value of the parameter</entry>
+    </row>
+   </tbody>
+  </tgroup>
+ </table>
+
+  <para>
+   See <xref linkend="config-setting"> for more information about the various
+   ways to change these parameters.
+  </para>
+
+  <para>
+   The <structname>pg_file_settings</structname> view cannot be modified
+   directly as it represents information, as read in at server start or
+   reload time, about all parameter settings across all configuration files.
+  </para>
+
+</sect1>
+
  <sect1 id="view-pg-shadow">
   <title><structname>pg_shadow</structname></title>
 
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 1bbd2f4415..f8c7ac3b16 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -694,7 +694,7 @@ SELECT a COLLATE "C" &lt; b COLLATE "POSIX" FROM test1;
          <entry>National Standard</entry>
          <entry>Chinese</entry>
          <entry>No</entry>
-         <entry>1-2</entry>
+         <entry>1-4</entry>
          <entry></entry>
         </row>
         <row>
diff --git a/doc/src/sgml/citext.sgml b/doc/src/sgml/citext.sgml
index 0c6855fea6..7fdf30252a 100644
--- a/doc/src/sgml/citext.sgml
+++ b/doc/src/sgml/citext.sgml
@@ -126,6 +126,11 @@ SELECT * FROM users WHERE nick = 'Larry';
   <itemizedlist>
    <listitem>
     <para>
+      <function>regexp_matches()</>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
       <function>regexp_replace()</>
     </para>
    </listitem>
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index d27dd49145..5f72bebba8 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -947,15 +947,24 @@ omicron         bryanh                  guest1
    </para>
 
    <para>
-    Client principals must have their <productname>PostgreSQL</> database user
-    name as their first component, for example
-    <literal>pgusername@realm</>.  Alternatively, you can use a user name
-    mapping to map from the first component of the principal name to the
-    database user name.  By default, the realm of the client is
-    not checked by <productname>PostgreSQL</>. If you have cross-realm
-    authentication enabled and need to verify the realm, use the
-    <literal>krb_realm</> parameter, or enable <literal>include_realm</>
-    and use user name mapping to check the realm.
+    Client principals can be mapped to different <productname>PostgreSQL</>
+    database user names with <filename>pg_ident.conf</>.  For example,
+    <literal>pgusername@realm</> could be mapped to just <literal>pgusername</>.
+    Alternatively, you can use the full <literal>username@realm</> principal as
+    the role name in <productname>PostgreSQL</> without any mapping.
+   </para>
+
+   <para>
+    <productname>PostgreSQL</> also supports a parameter to strip the realm from
+    the principal.  This method is supported for backwards compatibility and is
+    strongly discouraged as it is then impossible to distinguish different users
+    with the same username but coming from different realms.  To enable this,
+    set <literal>include_realm</> to 0.  For simple single-realm
+    installations, <literal>include_realm</> combined with the
+    <literal>krb_realm</> parameter (which checks that the realm provided
+    matches exactly what is in the krb_realm parameter) would be a secure but
+    less capable option compared to specifying an explicit mapping in
+    <filename>pg_ident.conf</>.
    </para>
 
    <para>
@@ -997,10 +1006,13 @@ omicron         bryanh                  guest1
       <term><literal>include_realm</literal></term>
       <listitem>
        <para>
-        If set to 1, the realm name from the authenticated user
-        principal is included in the system user name that's passed through
-        user name mapping (<xref linkend="auth-username-maps">). This is
-        useful for handling users from multiple realms.
+        If set to 0, the realm name from the authenticated user principal is
+        stripped off before being passed through the user name mapping
+        (<xref linkend="auth-username-maps">). This is discouraged and is
+        primairly available for backwards compatibility as it is not secure
+        in multi-realm environments unless krb_realm is also used.  Users
+        are recommended to leave include_realm set to the default (1) and to
+        provide an explicit mapping in <filename>pg_ident.conf</>.
        </para>
       </listitem>
      </varlistentry>
@@ -1010,12 +1022,15 @@ omicron         bryanh                  guest1
       <listitem>
        <para>
         Allows for mapping between system and database user names. See
-        <xref linkend="auth-username-maps"> for details. For a Kerberos
-        principal <literal>username/[email protected]</literal>, the
-        user name used for mapping is <literal>username/hostbased</literal>
-        if <literal>include_realm</literal> is disabled, and
-        <literal>username/[email protected]</literal> if
-        <literal>include_realm</literal> is enabled.
+        <xref linkend="auth-username-maps"> for details.  For a GSSAPI/Kerberos
+        principal, such as <literal>[email protected]</literal> (or, less
+        commonly, <literal>username/[email protected]</literal>), the
+        user name used for mapping is
+        <literal>[email protected]</literal> (or
+        <literal>username/[email protected]</literal>, respectively),
+        unless <literal>include_realm</literal> has been set to 0, in which case
+        <literal>username</literal> (or <literal>username/hostbased</literal>)
+        is what is seen as the system username when mapping.
        </para>
       </listitem>
      </varlistentry>
@@ -1070,10 +1085,13 @@ omicron         bryanh                  guest1
       <term><literal>include_realm</literal></term>
       <listitem>
        <para>
-        If set to 1, the realm name from the authenticated user
-        principal is included in the system user name that's passed through
-        user name mapping (<xref linkend="auth-username-maps">). This is
-        useful for handling users from multiple realms.
+        If set to 0, the realm name from the authenticated user principal is
+        stripped off before being passed through the user name mapping
+        (<xref linkend="auth-username-maps">). This is discouraged and is
+        primairly available for backwards compatibility as it is not secure
+        in multi-realm environments unless krb_realm is also used.  Users
+        are recommended to leave include_realm set to the default (1) and to
+        provide an explicit mapping in <filename>pg_ident.conf</>.
        </para>
       </listitem>
      </varlistentry>
@@ -1083,7 +1101,15 @@ omicron         bryanh                  guest1
       <listitem>
        <para>
         Allows for mapping between system and database user names. See
-        <xref linkend="auth-username-maps"> for details.
+        <xref linkend="auth-username-maps"> for details.  For a SSPI/Kerberos
+        principal, such as <literal>[email protected]</literal> (or, less
+        commonly, <literal>username/[email protected]</literal>), the
+        user name used for mapping is
+        <literal>[email protected]</literal> (or
+        <literal>username/[email protected]</literal>, respectively),
+        unless <literal>include_realm</literal> has been set to 0, in which case
+        <literal>username</literal> (or <literal>username/hostbased</literal>)
+        is what is seen as the system username when mapping.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index b30c68dc13..5549b7dce6 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -2521,7 +2521,7 @@ include_dir 'conf.d'
 
     <variablelist>
      <varlistentry id="guc-archive-mode" xreflabel="archive_mode">
-      <term><varname>archive_mode</varname> (<type>boolean</type>)
+      <term><varname>archive_mode</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>archive_mode</> configuration parameter</primary>
       </indexterm>
@@ -2530,7 +2530,16 @@ include_dir 'conf.d'
        <para>
         When <varname>archive_mode</> is enabled, completed WAL segments
         are sent to archive storage by setting
-        <xref linkend="guc-archive-command">.
+        <xref linkend="guc-archive-command">. In addition to <literal>off</>,
+        to disable, there are two modes: <literal>on</>, and
+        <literal>always</>. During normal operation, there is no
+        difference between the two modes, but when set to <literal>always</>
+        the WAL archiver is enabled also during archive recovery or standby
+        mode. In <literal>always</> mode, all files restored from the archive
+        or streamed with streaming replication will be archived (again). See
+        <xref linkend="continuous-archiving-in-standby"> for details.
+       </para>  
+       <para>
         <varname>archive_mode</> and <varname>archive_command</> are
         separate variables so that <varname>archive_command</> can be
         changed without leaving archiving mode.
@@ -6752,7 +6761,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         determines whether OIDs will be included in tables created by
         <command>SELECT INTO</command>. The parameter is <literal>off</>
         by default; in <productname>PostgreSQL</> 8.0 and earlier, it
-        was on by default.
+        was <literal>on</> by default.
        </para>
 
        <para>
diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml
index adc21843db..1b3d2d93c7 100644
--- a/doc/src/sgml/contrib.sgml
+++ b/doc/src/sgml/contrib.sgml
@@ -141,6 +141,8 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
  &tcn;
  &test-decoding;
  &tsearch2;
+ &tsm-system-rows;
+ &tsm-system-time;
  &unaccent;
  &uuid-ossp;
  &xml2;
@@ -202,8 +204,5 @@ pages.
   </para>
 
  &pgstandby;
- &pgtestfsync;
- &pgtesttiming;
- &pgxlogdump;
  </sect1>
 </appendix>
diff --git a/doc/src/sgml/custom-scan.sgml b/doc/src/sgml/custom-scan.sgml
index 8a4a3dfcfe..62a8a3305b 100644
--- a/doc/src/sgml/custom-scan.sgml
+++ b/doc/src/sgml/custom-scan.sgml
@@ -32,12 +32,13 @@
  </para>
 
  <sect1 id="custom-scan-path">
-  <title>Implementing Custom Paths</title>
+  <title>Creating Custom Scan Paths</title>
 
   <para>
-    A custom scan provider will typically add paths by setting the following
-    hook, which is called after the core code has generated what it believes
-    to be the complete and correct set of access paths for the relation.
+    A custom scan provider will typically add paths for a base relation by
+    setting the following hook, which is called after the core code has
+    generated what it believes to be the complete and correct set of access
+    paths for the relation.
 <programlisting>
 typedef void (*set_rel_pathlist_hook_type) (PlannerInfo *root,
                                             RelOptInfo *rel,
@@ -74,15 +75,36 @@ typedef struct CustomPath
     can support mark and restore.  Both capabilities are optional.
     <structfield>custom_private</> can be used to store the custom path's
     private data.  Private data should be stored in a form that can be handled
-    by <literal>nodeToString</>, so that debugging routines which attempt to
+    by <literal>nodeToString</>, so that debugging routines that attempt to
     print the custom path will work as designed.  <structfield>methods</> must
     point to a (usually statically allocated) object implementing the required
     custom path methods, of which there are currently only two, as further
     detailed below.
   </para>
 
+  <para>
+   A custom scan provider can also provide join paths.  Just as for base
+   relations, such a path must produce the same output as would normally be
+   produced by the join it replaces.  To do this, the join provider should
+   set the following hook, and then within the hook function,
+   create <structname>CustomPath</> path(s) for the join relation.
+<programlisting>
+typedef void (*set_join_pathlist_hook_type) (PlannerInfo *root,
+                                             RelOptInfo *joinrel,
+                                             RelOptInfo *outerrel,
+                                             RelOptInfo *innerrel,
+                                             JoinType jointype,
+                                             JoinPathExtraData *extra);
+extern PGDLLIMPORT set_join_pathlist_hook_type set_join_pathlist_hook;
+</programlisting>
+
+   This hook will be invoked repeatedly for the same join relation, with
+   different combinations of inner and outer relations; it is the
+   responsibility of the hook to minimize duplicated work.
+  </para>
+
   <sect2 id="custom-scan-path-callbacks">
-  <title>Custom Path Callbacks</title>
+  <title>Custom Scan Path Callbacks</title>
 
   <para>
 <programlisting>
@@ -103,7 +125,7 @@ void (*TextOutCustomPath) (StringInfo str,
                            const CustomPath *node);
 </programlisting>
     Generate additional output when <function>nodeToString</> is invoked on
-    this custom path.  This callback is optional. Since
+    this custom path.  This callback is optional.  Since
     <function>nodeToString</> will automatically dump all fields in the
     structure that it can see, including <structfield>custom_private</>, this
     is only useful if the <structname>CustomPath</> is actually embedded in a
@@ -113,7 +135,7 @@ void (*TextOutCustomPath) (StringInfo str,
  </sect1>
 
  <sect1 id="custom-scan-plan">
-  <title>Implementing Custom Plans</title>
+  <title>Creating Custom Scan Plans</title>
 
   <para>
     A custom scan is represented in a finished plan tree using the following
@@ -125,6 +147,8 @@ typedef struct CustomScan
     uint32    flags;
     List     *custom_exprs;
     List     *custom_private;
+    List     *custom_scan_tlist;
+    Bitmapset *custom_relids;
     const CustomScanMethods *methods;
 } CustomScan;
 </programlisting>
@@ -134,20 +158,44 @@ typedef struct CustomScan
     <structfield>scan</> must be initialized as for any other scan, including
     estimated costs, target lists, qualifications, and so on.
     <structfield>flags</> is a bitmask with the same meaning as in
-    <structname>CustomPath</>.  <structfield>custom_exprs</> should be used to
+    <structname>CustomPath</>.
+    <structfield>custom_exprs</> should be used to
     store expression trees that will need to be fixed up by
     <filename>setrefs.c</> and <filename>subselect.c</>, while
-    <literal>custom_private</> should be used to store other private data that
-    is only used by the custom scan provider itself.  Plan trees must be able
-    to be duplicated using <function>copyObject</>, so all the data stored
-    within these two fields must consist of nodes that function can handle.
+    <structfield>custom_private</> should be used to store other private data
+    that is only used by the custom scan provider itself.
+    <structfield>custom_scan_tlist</> can be NIL when scanning a base
+    relation, indicating that the custom scan returns scan tuples that match
+    the base relation's rowtype.  Otherwise it is a targetlist describing
+    the actual scan tuples.  <structfield>custom_scan_tlist</> must be
+    provided for joins, and could be provided for scans if the custom scan
+    provider can compute some non-Var expressions.
+    <structfield>custom_relids</> is set by the core code to the set of
+    relations (rangetable indexes) that this scan node handles; except when
+    this scan is replacing a join, it will have only one member.
     <structfield>methods</> must point to a (usually statically allocated)
     object implementing the required custom scan methods, which are further
     detailed below.
   </para>
 
+  <para>
+   When a <structname>CustomScan</> scans a single relation,
+   <structfield>scan.scanrelid</> must be the range table index of the table
+   to be scanned.  When it replaces a join, <structfield>scan.scanrelid</>
+   should be zero.
+  </para>
+
+  <para>
+   Plan trees must be able to be duplicated using <function>copyObject</>,
+   so all the data stored within the <quote>custom</> fields must consist of
+   nodes that that function can handle.  Furthermore, custom scan providers
+   cannot substitute a larger structure that embeds
+   a <structname>CustomScan</> for the structure itself, as would be possible
+   for a <structname>CustomPath</> or <structname>CustomScanState</>.
+  </para>
+
   <sect2 id="custom-scan-plan-callbacks">
-   <title>Custom Scan Callbacks</title>
+   <title>Custom Scan Plan Callbacks</title>
    <para>
 <programlisting>
 Node *(*CreateCustomScanState) (CustomScan *cscan);
@@ -155,12 +203,12 @@ Node *(*CreateCustomScanState) (CustomScan *cscan);
     Allocate a <structname>CustomScanState</> for this
     <structname>CustomScan</>.  The actual allocation will often be larger than
     required for an ordinary <structname>CustomScanState</>, because many
-    scan types will wish to embed that as the first field of a large structure.
+    providers will wish to embed that as the first field of a larger structure.
     The value returned must have the node tag and <structfield>methods</>
-    set appropriately, but the other fields need not be initialized at this
+    set appropriately, but other fields should be left as zeroes at this
     stage; after <function>ExecInitCustomScan</> performs basic initialization,
     the <function>BeginCustomScan</> callback will be invoked to give the
-    custom scan state a chance to do whatever else is needed.
+    custom scan provider a chance to do whatever else is needed.
    </para>
 
    <para>
@@ -169,23 +217,21 @@ void (*TextOutCustomScan) (StringInfo str,
                            const CustomScan *node);
 </programlisting>
     Generate additional output when <function>nodeToString</> is invoked on
-    this custom plan.  This callback is optional.  Since a
-    <structname>CustomScan</> must be copyable by <function>copyObject</>,
-    custom scan providers cannot substitute a larger structure that embeds a
-    <structname>CustomScan</> for the structure itself, as would be possible
-    for a <structname>CustomPath</> or <structname>CustomScanState</>.
-    Therefore, providing this callback is unlikely to be useful.
+    this custom plan node.  This callback is optional.  Since
+    <function>nodeToString</> will automatically dump all fields in the
+    structure, including the substructure of the <quote>custom</> fields,
+    there is usually not much need for this callback.
    </para>
   </sect2>
  </sect1>
 
- <sect1 id="custom-scan-scan">
-  <title>Implementing Custom Scans</title>
+ <sect1 id="custom-scan-execution">
+  <title>Executing Custom Scans</title>
 
   <para>
    When a <structfield>CustomScan</> is executed, its execution state is
    represented by a <structfield>CustomScanState</>, which is declared as
-   follows.
+   follows:
 <programlisting>
 typedef struct CustomScanState
 {
@@ -197,7 +243,9 @@ typedef struct CustomScanState
   </para>
 
   <para>
-   <structfield>ss</> must be initialized as for any other scanstate;
+   <structfield>ss</> is initialized as for any other scanstate,
+   except that if the scan is for a join rather than a base relation,
+   <literal>ss.ss_currentRelation</> is left NULL.
    <structfield>flags</> is a bitmask with the same meaning as in
    <structname>CustomPath</> and <structname>CustomScan</>.
    <structfield>methods</> must point to a (usually statically allocated)
@@ -207,8 +255,8 @@ typedef struct CustomScanState
    structure embedding the above as its first member.
   </para>
 
-  <sect2 id="custom-scan-scan-callbacks">
-   <title>Custom Execution-Time Callbacks</title>
+  <sect2 id="custom-scan-execution-callbacks">
+   <title>Custom Scan Execution Callbacks</title>
 
    <para>
 <programlisting>
@@ -217,8 +265,8 @@ void (*BeginCustomScan) (CustomScanState *node,
                          int eflags);
 </programlisting>
     Complete initialization of the supplied <structname>CustomScanState</>.
-    Some initialization is performed by <function>ExecInitCustomScan</>, but
-    any private fields should be initialized here.
+    Standard fields have been initialized by <function>ExecInitCustomScan</>,
+    but any private fields should be initialized here.
    </para>
 
    <para>
@@ -236,8 +284,8 @@ TupleTableSlot *(*ExecCustomScan) (CustomScanState *node);
 void (*EndCustomScan) (CustomScanState *node);
 </programlisting>
     Clean up any private data associated with the <literal>CustomScanState</>.
-    This method is required, but may not need to do anything if the associated
-    data does not exist or will be cleaned up automatically.
+    This method is required, but it does not need to do anything if there is
+    no associated data or it will be cleaned up automatically.
    </para>
 
    <para>
@@ -253,8 +301,8 @@ void (*ReScanCustomScan) (CustomScanState *node);
 void (*MarkPosCustomScan) (CustomScanState *node);
 </programlisting>
     Save the current scan position so that it can subsequently be restored
-    by the <function>RestrPosCustomScan</> callback.  This calback is optional,
-    and need only be supplied if 
+    by the <function>RestrPosCustomScan</> callback.  This callback is
+    optional, and need only be supplied if the
     <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</> flag is set.
    </para>
 
@@ -264,7 +312,7 @@ void (*RestrPosCustomScan) (CustomScanState *node);
 </programlisting>
     Restore the previous scan position as saved by the
     <function>MarkPosCustomScan</> callback.  This callback is optional,
-    and need only be supplied if 
+    and need only be supplied if the
     <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</> flag is set.
    </para>
 
@@ -274,8 +322,8 @@ void (*ExplainCustomScan) (CustomScanState *node,
                            List *ancestors,
                            ExplainState *es);
 </programlisting>
-    Output additional information on <command>EXPLAIN</> that involves
-    custom-scan node.  This callback is optional.  Common data stored in the
+    Output additional information for <command>EXPLAIN</> of a custom-scan
+    plan node.  This callback is optional.  Common data stored in the
     <structname>ScanState</>, such as the target list and scan relation, will
     be shown even without this callback, but the callback allows the display
     of additional, private state.
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index da1f25fe28..9d5ce953f1 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -4321,7 +4321,8 @@ SET xmloption TO { DOCUMENT | CONTENT };
     an object identifier.  There are also several alias types for
     <type>oid</>: <type>regproc</>, <type>regprocedure</>,
     <type>regoper</>, <type>regoperator</>, <type>regclass</>,
-    <type>regtype</>, <type>regconfig</>, and <type>regdictionary</>.
+    <type>regtype</>, <type>regrole</>, <type>regnamespace</>, 
+    <type>regconfig</>, and <type>regdictionary</>.
     <xref linkend="datatype-oid-table"> shows an overview.
    </para>
 
@@ -4431,6 +4432,20 @@ SELECT * FROM pg_attribute
        </row>
 
        <row>
+        <entry><type>regrole</></entry>
+        <entry><structname>pg_authid</></entry>
+        <entry>role name</entry>
+        <entry><literal>smithee</></entry>
+       </row>
+
+       <row>
+        <entry><type>regnamespace</></entry>
+        <entry><structname>pg_namespace</></entry>
+        <entry>namespace name</entry>
+        <entry><literal>pg_catalog</></entry>
+       </row>
+
+       <row>
         <entry><type>regconfig</></entry>
         <entry><structname>pg_ts_config</></entry>
         <entry>text search configuration</entry>
@@ -4448,7 +4463,8 @@ SELECT * FROM pg_attribute
     </table>
 
    <para>
-    All of the OID alias types accept schema-qualified names, and will
+    All of the OID alias types for objects grouped by namespace accept
+    schema-qualified names, and will
     display schema-qualified names on output if the object would not
     be found in the current search path without being qualified.
     The <type>regproc</> and <type>regoper</> alias types will only
@@ -4460,7 +4476,7 @@ SELECT * FROM pg_attribute
    </para>
 
    <para>
-    An additional property of the OID alias types is the creation of
+    An additional property of most of the OID alias types is the creation of
     dependencies.  If a
     constant of one of these types appears in a stored expression
     (such as a column default expression or view), it creates a dependency
@@ -4470,8 +4486,18 @@ SELECT * FROM pg_attribute
     understands that the default expression depends on the sequence
     <literal>my_seq</>; the system will not let the sequence be dropped
     without first removing the default expression.
+    <type>regrole</> is the only exception for the property. Constants of this
+    type are not allowed in such expressions.
    </para>
 
+   <note>
+   <para>
+    The OID alias types do not completely follow transaction isolation
+    rules. The planner also treats them as simple constants, which may
+    result in sub-optimal planning.
+   </para>
+   </note>
+
    <para>
     Another identifier type used by the system is <type>xid</>, or transaction
     (abbreviated <abbrev>xact</>) identifier.  This is the data type of the system columns
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 1c56f162de..0aa0c13c5c 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1553,7 +1553,7 @@ REVOKE ALL ON accounts FROM PUBLIC;
    both.  The commands available are <literal>ALL</literal>,
    <literal>SELECT</>, <literal>INSERT</>, <literal>UPDATE</>, and
    <literal>DELETE</>.  Multiple roles can be assigned to a given policy
-   and normal role membership and inheiritance rules apply.
+   and normal role membership and inheritance rules apply.
   </para>
 
   <para>
diff --git a/doc/src/sgml/event-trigger.sgml b/doc/src/sgml/event-trigger.sgml
index f151eb7375..b6cbb1bc24 100644
--- a/doc/src/sgml/event-trigger.sgml
+++ b/doc/src/sgml/event-trigger.sgml
@@ -29,7 +29,8 @@
      occurs in the database in which it is defined. Currently, the only
      supported events are
      <literal>ddl_command_start</>,
-     <literal>ddl_command_end</>
+     <literal>ddl_command_end</>,
+     <literal>table_rewrite</>
      and <literal>sql_drop</>.
      Support for additional events may be added in future releases.
    </para>
@@ -52,7 +53,13 @@
 
    <para>
     The <literal>ddl_command_end</> event occurs just after the execution of
-    this same set of commands.
+    this same set of commands.  To obtain more details on the <acronym>DDL</>
+    operations that took place, use the set-returning function
+    <literal>pg_event_trigger_ddl_commands()</> from the
+    <literal>ddl_command_end</> event trigger code (see
+    <xref linkend="functions-event-triggers">).  Note that the trigger fires
+    after the actions have taken place (but before the transaction commits),
+    and thus the system catalogs can be read as already changed.
    </para>
 
    <para>
@@ -991,8 +998,6 @@ typedef struct EventTriggerData
 
 PG_MODULE_MAGIC;
 
-Datum noddl(PG_FUNCTION_ARGS);
-
 PG_FUNCTION_INFO_V1(noddl);
 
 Datum
diff --git a/doc/src/sgml/fdwhandler.sgml b/doc/src/sgml/fdwhandler.sgml
index c1daa4be5a..236157743a 100644
--- a/doc/src/sgml/fdwhandler.sgml
+++ b/doc/src/sgml/fdwhandler.sgml
@@ -175,8 +175,11 @@ GetForeignPlan (PlannerInfo *root,
      access path.  This is called at the end of query planning.
      The parameters are as for <function>GetForeignRelSize</>, plus
      the selected <structname>ForeignPath</> (previously produced by
-     <function>GetForeignPaths</>), the target list to be emitted by the
-     plan node, and the restriction clauses to be enforced by the plan node.
+     <function>GetForeignPaths</> or <function>GetForeignJoinPaths</>),
+     the target list to be emitted by the plan node,
+     and the restriction clauses to be enforced by the plan node.
+     (If the path is for a join rather than a base
+     relation, <literal>foreigntableid</> is <literal>InvalidOid</>.)
     </para>
 
     <para>
@@ -235,20 +238,23 @@ IterateForeignScan (ForeignScanState *node);
     </para>
 
     <para>
-     The rows returned must match the column signature of the foreign table
-     being scanned.  If you choose to optimize away fetching columns that
-     are not needed, you should insert nulls in those column positions.
+     The rows returned must match the <structfield>fdw_scan_tlist</> target
+     list if one was supplied, otherwise they must match the rowtype of the
+     foreign table being scanned.  If you choose to optimize away fetching
+     columns that are not needed, you should insert nulls in those column
+     positions, or else generate a <structfield>fdw_scan_tlist</> list with
+     those columns omitted.
     </para>
 
     <para>
      Note that <productname>PostgreSQL</productname>'s executor doesn't care
-     whether the rows returned violate any <literal>NOT NULL</literal>
-     constraints that were defined on the foreign table columns &mdash; but
-     the planner does care, and may optimize queries incorrectly if
-     <literal>NULL</> values are present in a column declared not to contain
-     them.  If a <literal>NULL</> value is encountered when the user has
-     declared that none should be present, it may be appropriate to raise an
-     error (just as you would need to do in the case of a data type mismatch).
+     whether the rows returned violate any constraints that were defined on
+     the foreign table &mdash; but the planner does care, and may optimize
+     queries incorrectly if there are rows visible in the foreign table that
+     do not satisfy a declared constraint.  If a constraint is violated when
+     the user has declared that the constraint should hold true, it may be
+     appropriate to raise an error (just as you would need to do in the case
+     of a data type mismatch).
     </para>
 
     <para>
@@ -275,6 +281,67 @@ EndForeignScan (ForeignScanState *node);
 
    </sect2>
 
+   <sect2 id="fdw-callbacks-join-scan">
+    <title>FDW Routines For Scanning Foreign Joins</title>
+
+    <para>
+     If an FDW supports performing foreign joins remotely (rather than
+     by fetching both tables' data and doing the join locally), it should
+     provide this callback function:
+    </para>
+
+    <para>
+<programlisting>
+void
+GetForeignJoinPaths (PlannerInfo *root,
+                     RelOptInfo *joinrel,
+                     RelOptInfo *outerrel,
+                     RelOptInfo *innerrel,
+                     JoinType jointype,
+                     JoinPathExtraData *extra);
+</programlisting>
+     Create possible access paths for a join of two (or more) foreign tables
+     that all belong to the same foreign server.  This optional
+     function is called during query planning.  As
+     with <function>GetForeignPaths</>, this function should
+     generate <structname>ForeignPath</> path(s) for the
+     supplied <literal>joinrel</>, and call <function>add_path</> to add these
+     paths to the set of paths considered for the join.  But unlike
+     <function>GetForeignPaths</>, it is not necessary that this function
+     succeed in creating at least one path, since paths involving local
+     joining are always possible.
+    </para>
+
+    <para>
+     Note that this function will be invoked repeatedly for the same join
+     relation, with different combinations of inner and outer relations; it is
+     the responsibility of the FDW to minimize duplicated work.
+    </para>
+
+    <para>
+     If a <structname>ForeignPath</> path is chosen for the join, it will
+     represent the entire join process; paths generated for the component
+     tables and subsidiary joins will not be used.  Subsequent processing of
+     the join path proceeds much as it does for a path scanning a single
+     foreign table.  One difference is that the <structfield>scanrelid</> of
+     the resulting <structname>ForeignScan</> plan node should be set to zero,
+     since there is no single relation that it represents; instead,
+     the <structfield>fs_relids</> field of the <structname>ForeignScan</>
+     node represents the set of relations that were joined.  (The latter field
+     is set up automatically by the core planner code, and need not be filled
+     by the FDW.)  Another difference is that, because the column list for a
+     remote join cannot be found from the system catalogs, the FDW must
+     fill <structfield>fdw_scan_tlist</> with an appropriate list
+     of <structfield>TargetEntry</> nodes, representing the set of columns
+     it will supply at runtime in the tuples it returns.
+    </para>
+
+    <para>
+     See <xref linkend="fdw-planning"> for additional information.
+    </para>
+
+   </sect2>
+
    <sect2 id="fdw-callbacks-update">
     <title>FDW Routines For Updating Foreign Tables</title>
 
@@ -598,6 +665,108 @@ IsForeignRelUpdatable (Relation rel);
 
    </sect2>
 
+   <sect2 id="fdw-callbacks-row-locking">
+    <title>FDW Routines For Row Locking</title>
+
+    <para>
+     If an FDW wishes to support <firstterm>late row locking</> (as described
+     in <xref linkend="fdw-row-locking">), it must provide the following
+     callback functions:
+    </para>
+
+    <para>
+<programlisting>
+RowMarkType
+GetForeignRowMarkType (RangeTblEntry *rte,
+                       LockClauseStrength strength);
+</programlisting>
+
+     Report which row-marking option to use for a foreign table.
+     <literal>rte</> is the <structname>RangeTblEntry</> node for the table
+     and <literal>strength</> describes the lock strength requested by the
+     relevant <literal>FOR UPDATE/SHARE</> clause, if any.  The result must be
+     a member of the <literal>RowMarkType</> enum type.
+    </para>
+
+    <para>
+     This function is called during query planning for each foreign table that
+     appears in an <command>UPDATE</>, <command>DELETE</>, or <command>SELECT
+     FOR UPDATE/SHARE</> query and is not the target of <command>UPDATE</>
+     or <command>DELETE</>.
+    </para>
+
+    <para>
+     If the <function>GetForeignRowMarkType</> pointer is set to
+     <literal>NULL</>, the <literal>ROW_MARK_COPY</> option is always used.
+     (This implies that <function>RefetchForeignRow</> will never be called,
+     so it need not be provided either.)
+    </para>
+
+    <para>
+     See <xref linkend="fdw-row-locking"> for more information.
+    </para>
+
+    <para>
+<programlisting>
+HeapTuple
+RefetchForeignRow (EState *estate,
+                   ExecRowMark *erm,
+                   Datum rowid,
+                   bool *updated);
+</programlisting>
+
+     Re-fetch one tuple from the foreign table, after locking it if required.
+     <literal>estate</> is global execution state for the query.
+     <literal>erm</> is the <structname>ExecRowMark</> struct describing
+     the target foreign table and the row lock type (if any) to acquire.
+     <literal>rowid</> identifies the tuple to be fetched.
+     <literal>updated</> is an output parameter.
+    </para>
+
+    <para>
+     This function should return a palloc'ed copy of the fetched tuple,
+     or <literal>NULL</> if the row lock couldn't be obtained.  The row lock
+     type to acquire is defined by <literal>erm-&gt;markType</>, which is the
+     value previously returned by <function>GetForeignRowMarkType</>.
+     (<literal>ROW_MARK_REFERENCE</> means to just re-fetch the tuple without
+     acquiring any lock, and <literal>ROW_MARK_COPY</> will never be seen by
+     this routine.)
+    </para>
+
+    <para>
+     In addition, <literal>*updated</> should be set to <literal>true</>
+     if what was fetched was an updated version of the tuple rather than
+     the same version previously obtained.  (If the FDW cannot be sure about
+     this, always returning <literal>true</> is recommended.)
+    </para>
+
+    <para>
+     Note that by default, failure to acquire a row lock should result in
+     raising an error; a <literal>NULL</> return is only appropriate if
+     the <literal>SKIP LOCKED</> option is specified
+     by <literal>erm-&gt;waitPolicy</>.
+    </para>
+
+    <para>
+     The <literal>rowid</> is the <structfield>ctid</> value previously read
+     for the row to be re-fetched.  Although the <literal>rowid</> value is
+     passed as a <type>Datum</>, it can currently only be a <type>tid</>.  The
+     function API is chosen in hopes that it may be possible to allow other
+     datatypes for row IDs in future.
+    </para>
+
+    <para>
+     If the <function>RefetchForeignRow</> pointer is set to
+     <literal>NULL</>, attempts to re-fetch rows will fail
+     with an error message.
+    </para>
+
+    <para>
+     See <xref linkend="fdw-row-locking"> for more information.
+    </para>
+
+   </sect2>
+
    <sect2 id="fdw-callbacks-explain">
     <title>FDW Routines for <command>EXPLAIN</></title>
 
@@ -868,10 +1037,10 @@ GetForeignServerByName(const char *name, bool missing_ok);
 
     <para>
      The FDW callback functions <function>GetForeignRelSize</>,
-     <function>GetForeignPaths</>, <function>GetForeignPlan</>, and
-     <function>PlanForeignModify</> must fit into the workings of the
-     <productname>PostgreSQL</> planner.  Here are some notes about what
-     they must do.
+     <function>GetForeignPaths</>, <function>GetForeignPlan</>,
+     <function>PlanForeignModify</>, and <function>GetForeignJoinPaths</>
+     must fit into the workings of the <productname>PostgreSQL</> planner.
+     Here are some notes about what they must do.
     </para>
 
     <para>
@@ -898,7 +1067,7 @@ GetForeignServerByName(const char *name, bool missing_ok);
      <literal>baserel-&gt;fdw_private</> is a <type>void</> pointer that is
      available for FDW planning functions to store information relevant to
      the particular foreign table.  The core planner does not touch it except
-     to initialize it to NULL when the <literal>baserel</> node is created.
+     to initialize it to NULL when the <literal>RelOptInfo</> node is created.
      It is useful for passing information forward from
      <function>GetForeignRelSize</> to <function>GetForeignPaths</> and/or
      <function>GetForeignPaths</> to <function>GetForeignPlan</>, thereby
@@ -967,6 +1136,23 @@ GetForeignServerByName(const char *name, bool missing_ok);
     </para>
 
     <para>
+     Another <structname>ForeignScan</> field that can be filled by FDWs
+     is <structfield>fdw_scan_tlist</>, which describes the tuples returned by
+     the FDW for this plan node.  For simple foreign table scans this can be
+     set to <literal>NIL</>, implying that the returned tuples have the
+     rowtype declared for the foreign table.  A non-NIL value must be a
+     targetlist (list of <structname>TargetEntry</>s) containing Vars and/or
+     expressions representing the returned columns.  This might be used, for
+     example, to show that the FDW has omitted some columns that it noticed
+     won't be needed for the query.  Also, if the FDW can compute expressions
+     used by the query more cheaply than can be done locally, it could add
+     those expressions to <structfield>fdw_scan_tlist</>.  Note that join
+     plans (created from paths made by <function>GetForeignJoinPaths</>) must
+     always supply <structfield>fdw_scan_tlist</> to describe the set of
+     columns they will return.
+    </para>
+
+    <para>
      The FDW should always construct at least one path that depends only on
      the table's restriction clauses.  In join queries, it might also choose
      to construct path(s) that depend on join clauses, for example
@@ -984,6 +1170,18 @@ GetForeignServerByName(const char *name, bool missing_ok);
     </para>
 
     <para>
+     If an FDW supports remote joins, <function>GetForeignJoinPaths</> should
+     produce <structname>ForeignPath</>s for potential remote joins in much
+     the same way as <function>GetForeignPaths</> works for base tables.
+     Information about the intended join can be passed forward
+     to <function>GetForeignPlan</> in the same ways described above.
+     However, <structfield>baserestrictinfo</> is not relevant for join
+     relations; instead, the relevant join clauses for a particular join are
+     passed to <function>GetForeignJoinPaths</> as a separate parameter
+     (<literal>extra-&gt;restrictlist</>).
+    </para>
+
+    <para>
      When planning an <command>UPDATE</> or <command>DELETE</>,
      <function>PlanForeignModify</> can look up the <structname>RelOptInfo</>
      struct for the foreign table and make use of the
@@ -997,21 +1195,122 @@ GetForeignServerByName(const char *name, bool missing_ok);
     </para>
 
     <para>
-     For an <command>UPDATE</> or <command>DELETE</> against an external data
-     source that supports concurrent updates, it is recommended that the
-     <literal>ForeignScan</> operation lock the rows that it fetches, perhaps
-     via the equivalent of <command>SELECT FOR UPDATE</>.  The FDW may also
-     choose to lock rows at fetch time when the foreign table is referenced
-     in a <command>SELECT FOR UPDATE/SHARE</>; if it does not, the
-     <literal>FOR UPDATE</> or <literal>FOR SHARE</> option is essentially a
-     no-op so far as the foreign table is concerned.  This behavior may yield
-     semantics slightly different from operations on local tables, where row
-     locking is customarily delayed as long as possible: remote rows may get
-     locked even though they subsequently fail locally-applied restriction or
-     join conditions.  However, matching the local semantics exactly would
-     require an additional remote access for every row, and might be
-     impossible anyway depending on what locking semantics the external data
-     source provides.
+     <command>INSERT</> with an <literal>ON CONFLICT</> clause does not
+     support specifying the conflict target, as remote constraints are not
+     locally known. This in turn implies that <literal>ON CONFLICT DO
+     UPDATE</> is not supported, since the specification is mandatory there.
+    </para>
+
+   </sect1>
+
+   <sect1 id="fdw-row-locking">
+    <title>Row Locking in Foreign Data Wrappers</title>
+
+    <para>
+     If an FDW's underlying storage mechanism has a concept of locking
+     individual rows to prevent concurrent updates of those rows, it is
+     usually worthwhile for the FDW to perform row-level locking with as
+     close an approximation as practical to the semantics used in
+     ordinary <productname>PostgreSQL</> tables.  There are multiple
+     considerations involved in this.
+    </para>
+
+    <para>
+     One key decision to be made is whether to perform <firstterm>early
+     locking</> or <firstterm>late locking</>.  In early locking, a row is
+     locked when it is first retrieved from the underlying store, while in
+     late locking, the row is locked only when it is known that it needs to
+     be locked.  (The difference arises because some rows may be discarded by
+     locally-checked restriction or join conditions.)  Early locking is much
+     simpler and avoids extra round trips to a remote store, but it can cause
+     locking of rows that need not have been locked, resulting in reduced
+     concurrency or even unexpected deadlocks.  Also, late locking is only
+     possible if the row to be locked can be uniquely re-identified later.
+     Preferably the row identifier should identify a specific version of the
+     row, as <productname>PostgreSQL</> TIDs do.
+    </para>
+
+    <para>
+     By default, <productname>PostgreSQL</> ignores locking considerations
+     when interfacing to FDWs, but an FDW can perform early locking without
+     any explicit support from the core code.  The API functions described
+     in <xref linkend="fdw-callbacks-row-locking">, which were added
+     in <productname>PostgreSQL</> 9.5, allow an FDW to use late locking if
+     it wishes.
+    </para>
+
+    <para>
+     An additional consideration is that in <literal>READ COMMITTED</>
+     isolation mode, <productname>PostgreSQL</> may need to re-check
+     restriction and join conditions against an updated version of some
+     target tuple.  Rechecking join conditions requires re-obtaining copies
+     of the non-target rows that were previously joined to the target tuple.
+     When working with standard <productname>PostgreSQL</> tables, this is
+     done by including the TIDs of the non-target tables in the column list
+     projected through the join, and then re-fetching non-target rows when
+     required.  This approach keeps the join data set compact, but it
+     requires inexpensive re-fetch capability, as well as a TID that can
+     uniquely identify the row version to be re-fetched.  By default,
+     therefore, the approach used with foreign tables is to include a copy of
+     the entire row fetched from a foreign table in the column list projected
+     through the join.  This puts no special demands on the FDW but can
+     result in reduced performance of merge and hash joins.  An FDW that is
+     capable of meeting the re-fetch requirements can choose to do it the
+     first way.
+    </para>
+
+    <para>
+     For an <command>UPDATE</> or <command>DELETE</> on a foreign table, it
+     is recommended that the <literal>ForeignScan</> operation on the target
+     table perform early locking on the rows that it fetches, perhaps via the
+     equivalent of <command>SELECT FOR UPDATE</>.  An FDW can detect whether
+     a table is an <command>UPDATE</>/<command>DELETE</> target at plan time
+     by comparing its relid to <literal>root-&gt;parse-&gt;resultRelation</>,
+     or at execution time by using <function>ExecRelationIsTargetRelation()</>.
+     An alternative possibility is to perform late locking within the
+     <function>ExecForeignUpdate</> or <function>ExecForeignDelete</>
+     callback, but no special support is provided for this.
+    </para>
+
+    <para>
+     For foreign tables that are specified to be locked by a <command>SELECT
+     FOR UPDATE/SHARE</> command, the <literal>ForeignScan</> operation can
+     again perform early locking by fetching tuples with the equivalent
+     of <command>SELECT FOR UPDATE/SHARE</>.  To perform late locking
+     instead, provide the callback functions defined
+     in <xref linkend="fdw-callbacks-row-locking">.
+     In <function>GetForeignRowMarkType</>, select rowmark option
+     <literal>ROW_MARK_EXCLUSIVE</>, <literal>ROW_MARK_NOKEYEXCLUSIVE</>,
+     <literal>ROW_MARK_SHARE</>, or <literal>ROW_MARK_KEYSHARE</> depending
+     on the requested lock strength.  (The core code will act the same
+     regardless of which of these four options you choose.)
+     Elsewhere, you can detect whether a foreign table was specified to be
+     locked by this type of command by using <function>get_plan_rowmark</> at
+     plan time, or <function>ExecFindRowMark</> at execution time; you must
+     check not only whether a non-null rowmark struct is returned, but that
+     its <structfield>strength</> field is not <literal>LCS_NONE</>.
+    </para>
+
+    <para>
+     Lastly, for foreign tables that are used in an <command>UPDATE</>,
+     <command>DELETE</> or <command>SELECT FOR UPDATE/SHARE</> command but
+     are not specified to be row-locked, you can override the default choice
+     to copy entire rows by having <function>GetForeignRowMarkType</> select
+     option <literal>ROW_MARK_REFERENCE</> when it sees lock strength
+     <literal>LCS_NONE</>.  This will cause <function>RefetchForeignRow</> to
+     be called with that value for <structfield>markType</>; it should then
+     re-fetch the row without acquiring any new lock.  (If you have
+     a <function>GetForeignRowMarkType</> function but don't wish to re-fetch
+     unlocked rows, select option <literal>ROW_MARK_COPY</>
+     for <literal>LCS_NONE</>.)
+    </para>
+
+    <para>
+     See <filename>src/include/nodes/lockoptions.h</>, the comments
+     for <type>RowMarkType</> and <type>PlanRowMark</>
+     in <filename>src/include/nodes/plannodes.h</>, and the comments for
+     <type>ExecRowMark</> in <filename>src/include/nodes/execnodes.h</> for
+     additional information.
     </para>
 
   </sect1>
diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
index 2d7514c3ea..a8d1281ab6 100644
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -95,9 +95,11 @@
 <!ENTITY fdwhandler SYSTEM "fdwhandler.sgml">
 <!ENTITY custom-scan SYSTEM "custom-scan.sgml">
 <!ENTITY logicaldecoding SYSTEM "logicaldecoding.sgml">
+<!ENTITY replication-origins SYSTEM "replication-origins.sgml">
 <!ENTITY protocol   SYSTEM "protocol.sgml">
 <!ENTITY sources    SYSTEM "sources.sgml">
 <!ENTITY storage    SYSTEM "storage.sgml">
+<!ENTITY tablesample-method SYSTEM "tablesample-method.sgml">
 
 <!-- contrib information -->
 <!ENTITY contrib         SYSTEM "contrib.sgml">
@@ -133,10 +135,7 @@
 <!ENTITY pgstandby       SYSTEM "pgstandby.sgml">
 <!ENTITY pgstatstatements SYSTEM "pgstatstatements.sgml">
 <!ENTITY pgstattuple     SYSTEM "pgstattuple.sgml">
-<!ENTITY pgtestfsync     SYSTEM "pgtestfsync.sgml">
-<!ENTITY pgtesttiming    SYSTEM "pgtesttiming.sgml">
 <!ENTITY pgtrgm          SYSTEM "pgtrgm.sgml">
-<!ENTITY pgxlogdump      SYSTEM "pg_xlogdump.sgml">
 <!ENTITY postgres-fdw    SYSTEM "postgres-fdw.sgml">
 <!ENTITY seg             SYSTEM "seg.sgml">
 <!ENTITY contrib-spi     SYSTEM "contrib-spi.sgml">
@@ -148,6 +147,8 @@
 <!ENTITY test-parser     SYSTEM "test-parser.sgml">
 <!ENTITY test-shm-mq     SYSTEM "test-shm-mq.sgml">
 <!ENTITY tsearch2        SYSTEM "tsearch2.sgml">
+<!ENTITY tsm-system-rows SYSTEM "tsm-system-rows.sgml">
+<!ENTITY tsm-system-time SYSTEM "tsm-system-time.sgml">
 <!ENTITY unaccent      SYSTEM "unaccent.sgml">
 <!ENTITY uuid-ossp       SYSTEM "uuid-ossp.sgml">
 <!ENTITY vacuumlo        SYSTEM "vacuumlo.sgml">
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 5f7bf6aa13..c6e354054c 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -8296,6 +8296,12 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         <entry><literal>box(circle '((0,0),2.0)')</literal></entry>
        </row>
        <row>
+        <entry><literal><function>box(<type>point</type>)</function></literal></entry>
+        <entry><type>box</type></entry>
+        <entry>point to empty box</entry>
+        <entry><literal>box(point '(0,0)')</literal></entry>
+       </row>
+       <row>
         <entry><literal><function>box(<type>point</type>, <type>point</type>)</function></literal></entry>
         <entry><type>box</type></entry>
         <entry>points to box</entry>
@@ -8308,6 +8314,12 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         <entry><literal>box(polygon '((0,0),(1,1),(2,0))')</literal></entry>
        </row>
        <row>
+        <entry><literal><function>bound_box(<type>box</type>, <type>box</type>)</function></literal></entry>
+        <entry><type>box</type></entry>
+        <entry>boxes to bounding box</entry>
+        <entry><literal>bound_box(box '((0,0),(1,1))', box '((3,3),(4,4))')</literal></entry>
+       </row>
+       <row>
         <entry>
          <indexterm>
           <primary>circle</primary>
@@ -8734,6 +8746,30 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         <entry><literal>text(inet '192.168.1.5')</literal></entry>
         <entry><literal>192.168.1.5/32</literal></entry>
        </row>
+       <row>
+        <entry>
+         <indexterm>
+          <primary>inet_same_family</primary>
+         </indexterm>
+         <literal><function>inet_same_family(<type>inet</type>, <type>inet</type>)</function></literal>
+        </entry>
+        <entry><type>boolean</type></entry>
+        <entry>are the addresses from the same family?</entry>
+        <entry><literal>inet_same_family('192.168.1.5/24', '::1')</literal></entry>
+        <entry><literal>false</literal></entry>
+       </row>
+       <row>
+        <entry>
+         <indexterm>
+          <primary>inet_merge</primary>
+         </indexterm>
+         <literal><function>inet_merge(<type>inet</type>, <type>inet</type>)</function></literal>
+        </entry>
+        <entry><type>cidr</type></entry>
+        <entry>the smallest network which includes both of the given networks</entry>
+        <entry><literal>inet_merge('192.168.1.5/24', '192.168.2.5/24')</literal></entry>
+        <entry><literal>192.168.0.0/22</literal></entry>
+       </row>
       </tbody>
      </tgroup>
     </table>
@@ -10257,10 +10293,45 @@ table2-mapping
         <entry>Do all of these key/element <emphasis>strings</emphasis> exist?</entry>
         <entry><literal>'["a", "b"]'::jsonb ?&amp; array['a', 'b']</literal></entry>
        </row>
+       <row>
+        <entry><literal>||</literal></entry>
+        <entry><type>jsonb</type></entry>
+        <entry>Concatentate two jsonb values into a new jsonb value</entry>
+        <entry><literal>'["a", "b"]'::jsonb || '["c", "d"]'::jsonb</literal></entry>
+       </row>
+       <row>
+        <entry><literal>-</literal></entry>
+        <entry><type>text</type></entry>
+        <entry>Delete the field with a specified key, or element with this
+        value</entry>
+        <entry><literal>'{"a": "b"}'::jsonb - 'a' </literal></entry>
+       </row>
+       <row>
+        <entry><literal>-</literal></entry>
+        <entry><type>integer</type></entry>
+        <entry>Delete the field or element with specified index (Negative
+        integers count from the end)</entry>
+        <entry><literal>'["a", "b"]'::jsonb - 1 </literal></entry>
+       </row>
+       <row>
+        <entry><literal>-</literal></entry>
+        <entry><type>text[]</type></entry>
+        <entry>Delete the field or element with specified path</entry>
+        <entry><literal>'["a", {"b":1}]'::jsonb - '{1,b}'::text[] </literal></entry>
+       </row>
       </tbody>
      </tgroup>
    </table>
 
+  <note>
+   <para>
+    The <literal>||</> operator concatenates the elements at the top level of
+    each of its operands. It does not operate recursively. For example, if
+    both operands are objects with a common key field name, the value of the
+    field in the result will just be the value from the right hand operand.
+   </para>
+  </note>
+
   <para>
    <xref linkend="functions-json-creation-table"> shows the functions that are
    available for creating <type>json</type> and <type>jsonb</type> values.
@@ -10767,6 +10838,49 @@ table2-mapping
        <entry><literal>json_strip_nulls('[{"f1":1,"f2":null},2,null,3]')</literal></entry>
        <entry><literal>[{"f1":1},2,null,3]</literal></entry>
        </row>
+      <row>
+       <entry><para><literal>jsonb_set(target jsonb, path text[], new_value jsonb<optional>, <parameter>create_missing</parameter> <type>boolean</type></optional>)</literal>
+         </para></entry>
+       <entry><para><type>jsonb</type></para></entry>
+       <entry>
+         Returns <replaceable>target</replaceable>
+         with the section designated by <replaceable>path</replaceable>
+         replaced by <replaceable>new_value</replaceable>, or with
+         <replaceable>new_value</replaceable> added if
+         <replaceable>create_missing</replaceable> is true ( default is
+         <literal>true</>) and the item
+         designated by <replaceable>path</replaceable> does not exist.
+       </entry>
+       <entry><para><literal>jsonb_set('[{"f1":1,"f2":null},2,null,3]', '{0,f1}','[2,3,4]', false)</literal>
+         </para><para><literal>jsonb_set('[{"f1":1,"f2":null},2]', '{0,f3}','[2,3,4]')</literal>
+         </para></entry>
+       <entry><para><literal>[{"f1":[2,3,4],"f2":null},2,null,3]</literal>
+         </para><para><literal>[{"f1": 1, "f2": null, "f3": [2, 3, 4]}, 2]</literal>
+        </para></entry>
+       </row>
+      <row>
+       <entry><para><literal>jsonb_pretty(from_json jsonb)</literal>
+         </para></entry>
+       <entry><para><type>text</type></para></entry>
+       <entry>
+         Returns <replaceable>from_json</replaceable>
+         as indented json text.
+       </entry>
+       <entry><literal>jsonb_pretty('[{"f1":1,"f2":null},2,null,3]')</literal></entry>
+       <entry>
+<programlisting>                    
+ [
+     {
+         "f1": 1,
+         "f2": null
+     },
+     2,
+     null,
+     3
+ ]
+</programlisting>
+        </entry>
+       </row>
      </tbody>
     </tgroup>
    </table>
@@ -10795,6 +10909,27 @@ table2-mapping
 
   <note>
     <para>
+      All the items of the <literal>path</> parameter of <literal>jsonb_set</>
+      must be present in the <literal>target</>, unless
+      <literal>create_missing</> is true, in which case all but the last item
+      must be present. If these conditions are not met the <literal>target</>
+      is returned unchanged.
+    </para>
+    <para>
+      If the last path item is an object key, it will be created if it
+      is absent and given the new value. If the last path item is an array
+      index, if it is positive the item to set is found by counting from
+      the left, and if negative by counting from the right - <literal>-1</>
+      designates the rightmost element, and so on.
+      If the item is out of the range -array_length .. array_length -1,
+      and create_missing is true, the new value is added at the beginning
+      of the array if the item is negative, and at the end of the array if
+      it is positive.
+    </para>
+  </note>
+
+  <note>
+    <para>
       The <literal>json_typeof</> function's <literal>null</> return value
       should not be confused with a SQL NULL.  While
       calling <literal>json_typeof('null'::json)</> will
@@ -12090,6 +12225,17 @@ NULL baz</literallayout>(3 rows)</entry>
         <entry><literal>upper_inf('(,)'::daterange)</literal></entry>
         <entry><literal>true</literal></entry>
        </row>
+       <row>
+        <entry>
+         <literal>
+          <function>range_merge</function>(<type>anyrange</type>, <type>anyrange</type>)
+         </literal>
+        </entry>
+        <entry><type>anyrange</type></entry>
+        <entry>the smallest range which includes both of the given ranges</entry>
+        <entry><literal>range_merge('[1,2)'::int4range, '[3,4)'::int4range)</literal></entry>
+        <entry><literal>[1,4)</literal></entry>
+       </row>
       </tbody>
      </tgroup>
     </table>
@@ -12119,7 +12265,9 @@ NULL baz</literallayout>(3 rows)</entry>
    <xref linkend="functions-aggregate-statistics-table">.
    The built-in ordered-set aggregate functions
    are listed in <xref linkend="functions-orderedset-table"> and
-   <xref linkend="functions-hypothetical-table">.
+   <xref linkend="functions-hypothetical-table">.  Grouping operations,
+   which are closely related to aggregate functions, are listed in
+   <xref linkend="functions-grouping-table">.
    The special syntax considerations for aggregate
    functions are explained in <xref linkend="syntax-aggregates">.
    Consult <xref linkend="tutorial-agg"> for additional introductory
@@ -13217,6 +13365,72 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
    to the rule specified in the <literal>ORDER BY</> clause.
   </para>
 
+  <table id="functions-grouping-table">
+   <title>Grouping Operations</title>
+
+   <tgroup cols="3">
+    <thead>
+     <row>
+      <entry>Function</entry>
+      <entry>Return Type</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+
+     <row>
+      <entry>
+       <indexterm>
+        <primary>GROUPING</primary>
+       </indexterm>
+       <function>GROUPING(<replaceable class="parameter">args...</replaceable>)</function>
+      </entry>
+      <entry>
+       <type>integer</type>
+      </entry>
+      <entry>
+       Integer bitmask indicating which arguments are not being included in the current
+       grouping set
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+
+   <para>
+    Grouping operations are used in conjunction with grouping sets (see
+    <xref linkend="queries-grouping-sets">) to distinguish result rows.  The
+    arguments to the <literal>GROUPING</> operation are not actually evaluated,
+    but they must match exactly expressions given in the <literal>GROUP BY</>
+    clause of the associated query level.  Bits are assigned with the rightmost
+    argument being the least-significant bit; each bit is 0 if the corresponding
+    expression is included in the grouping criteria of the grouping set generating
+    the result row, and 1 if it is not.  For example:
+<screen>
+<prompt>=&gt;</> <userinput>SELECT * FROM items_sold;</>
+ make  | model | sales
+-------+-------+-------
+ Foo   | GT    |  10
+ Foo   | Tour  |  20
+ Bar   | City  |  15
+ Bar   | Sport |  5
+(4 rows)
+
+<prompt>=&gt;</> <userinput>SELECT make, model, GROUPING(make,model), sum(sales) FROM items_sold GROUP BY ROLLUP(make,model);</>
+ make  | model | grouping | sum
+-------+-------+----------+-----
+ Foo   | GT    |        0 | 10
+ Foo   | Tour  |        0 | 20
+ Bar   | City  |        0 | 15
+ Bar   | Sport |        0 | 5
+ Foo   |       |        1 | 30
+ Bar   |       |        1 | 20
+       |       |        3 | 50
+(7 rows)
+</screen>
+   </para>
+
  </sect1>
 
  <sect1 id="functions-window">
@@ -14617,7 +14831,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
       <row>
        <entry><literal><function>version()</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry><productname>PostgreSQL</> version information</entry>
+       <entry><productname>PostgreSQL</> version information. See also <xref linkend="guc-server-version-num"> for a machine-readable version.</entry>
       </row>
      </tbody>
     </tgroup>
@@ -14804,7 +15018,12 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
 
    <para>
     <function>version</function> returns a string describing the
-    <productname>PostgreSQL</productname> server's version.
+    <productname>PostgreSQL</productname> server's version. You can also
+    get this information from <xref linkend="guc-server-version"> or
+    for a machine-readable version, <xref linkend="guc-server-version-num">.
+    Software developers should use <literal>server_version_num</literal>
+    (available since 8.2) or <xref linkend="libpq-pqserverversion"> instead
+    of parsing the text version.
    </para>
 
   <indexterm>
@@ -16051,7 +16270,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
       <row>
        <entry><literal><function>txid_current()</function></literal></entry>
        <entry><type>bigint</type></entry>
-       <entry>get current transaction ID</entry>
+       <entry>get current transaction ID, assigning a new one if the current transaction does not have one</entry>
       </row>
       <row>
        <entry><literal><function>txid_current_snapshot()</function></literal></entry>
@@ -16539,11 +16758,12 @@ SELECT set_config('log_statement_stats', 'off', false);
     <function>pg_start_backup</> accepts an
     arbitrary user-defined label for the backup.  (Typically this would be
     the name under which the backup dump file will be stored.)  The function
-    writes a backup label file (<filename>backup_label</>) into the
-    database cluster's data directory, performs a checkpoint,
-    and then returns the backup's starting transaction log location as text.
-    The user can ignore this result value, but it is
-    provided in case it is useful.
+    writes a backup label file (<filename>backup_label</>) and, if there
+    are any links in the <filename>pg_tblspc/</> directory, a tablespace map
+    file (<filename>tablespace_map</>) into the database cluster's data
+    directory, performs a checkpoint, and then returns the backup's starting
+    transaction log location as text.  The user can ignore this result value,
+    but it is provided in case it is useful.
 <programlisting>
 postgres=# select pg_start_backup('label_goes_here');
  pg_start_backup
@@ -16558,7 +16778,8 @@ postgres=# select pg_start_backup('label_goes_here');
    </para>
 
    <para>
-    <function>pg_stop_backup</> removes the label file created by
+    <function>pg_stop_backup</> removes the label file and, if it exists,
+    the <filename>tablespace_map</> file created by
     <function>pg_start_backup</>, and creates a backup history file in
     the transaction log archive area.  The history file includes the label given to
     <function>pg_start_backup</>, the starting and ending transaction log locations for
@@ -16874,11 +17095,13 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
    <title>Replication Functions</title>
 
    <para>
-    The functions shown in <xref linkend="functions-replication-table"> are
-    for controlling and interacting with replication features.
-    See <xref linkend="streaming-replication">
-    and <xref linkend="streaming-replication-slots"> for information about the
-    underlying features.  Use of these functions is restricted to superusers.
+    The functions shown
+    in <xref linkend="functions-replication-table"> are for
+    controlling and interacting with replication features.
+    See <xref linkend="streaming-replication">,
+    <xref linkend="streaming-replication-slots">, <xref linkend="replication-origins">
+    for information about the underlying features.  Use of these
+    functions is restricted to superusers.
    </para>
 
    <para>
@@ -17035,6 +17258,194 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
         on future calls.
        </entry>
       </row>
+
+      <row id="pg-replication-origin-create">
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_create</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_create(<parameter>node_name</parameter> <type>text</type>)</function></literal>
+       </entry>
+       <entry>
+        <parameter>internal_id</parameter> <type>oid</type>
+       </entry>
+       <entry>
+        Create a replication origin with the passed in external
+        name, and create an internal id for it.
+       </entry>
+      </row>
+
+      <row id="pg-replication-origin-drop">
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_drop</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_drop(<parameter>node_name</parameter> <type>text</type>)</function></literal>
+       </entry>
+       <entry>
+        void
+       </entry>
+       <entry>
+        Delete a previously created replication origin, including the
+        associated replay progress.
+       </entry>
+      </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_oid</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_oid(<parameter>node_name</parameter> <type>text</type>)</function></literal>
+       </entry>
+       <entry>
+        <parameter>internal_id</parameter> <type>oid</type>
+       </entry>
+       <entry>
+        Lookup replication origin by name and return the internal id. If no
+        corresponding replication origin is found an error is thrown.
+       </entry>
+      </row>
+
+      <row id="pg-replication-origin-session-setup">
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_session_setup</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_setup_session(<parameter>node_name</parameter> <type>text</type>)</function></literal>
+       </entry>
+       <entry>
+        void
+       </entry>
+       <entry>
+        Configure the current session to be replaying from the passed in
+        origin, allowing replay progress to be tracked.  Use
+        <function>pg_replication_origin_session_reset</function> to revert.
+        Can only be used if no previous origin is configured.
+       </entry>
+      </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_session_reset</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_session_reset()</function></literal>
+       </entry>
+       <entry>
+        void
+       </entry>
+       <entry>
+        Cancel the effects
+        of <function>pg_replication_origin_session_setup()</function>.
+       </entry>
+      </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>pg_replication_session_is_setup</primary>
+        </indexterm>
+        <literal><function>pg_replication_session_is_setup()</function></literal>
+       </entry>
+       <entry>
+        bool
+       </entry>
+       <entry>
+        Has a replication origin been configured in the current session?
+       </entry>
+      </row>
+
+      <row id="pg-replication-origin-session-progress">
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_session_progress</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_progress(<parameter>flush</parameter> <type>bool</type>)</function></literal>
+       </entry>
+       <entry>
+        pg_lsn
+       </entry>
+       <entry>
+        Return the replay position for the replication origin configured in
+        the current session. The parameter <parameter>flush</parameter>
+        determines whether the corresponding local transaction will be
+        guaranteed to have been flushed to disk or not.
+       </entry>
+      </row>
+
+      <row id="pg-replication-origin-xact-setup">
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_xact_setup</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_xact_setup(<parameter>origin_lsn</parameter> <type>pg_lsn</type>, <parameter>origin_timestamp</parameter> <type>timestamptz</type>)</function></literal>
+       </entry>
+       <entry>
+        void
+       </entry>
+       <entry>
+        Mark the current transaction to be replaying a transaction that has
+        committed at the passed in <acronym>LSN</acronym> and timestamp. Can
+        only be called when a replication origin has previously been
+        configured using
+        <function>pg_replication_origin_session_setup()</function>.
+       </entry>
+      </row>
+
+      <row id="pg-replication-origin-xact-reset">
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_xact_reset</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_xact_reset()</function></literal>
+       </entry>
+       <entry>
+        void
+       </entry>
+       <entry>
+        Cancel the effects of
+        <function>pg_replication_origin_xact_setup()</function>.
+       </entry>
+      </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_advance</primary>
+        </indexterm>
+        <literal>pg_replication_origin_advance<function>(<parameter>node_name</parameter> <type>text</type>, <parameter>pos</parameter> <type>pg_lsn</type>)</function></literal>
+       </entry>
+       <entry>
+        void
+       </entry>
+       <entry>
+        Set replication progress for the passed in node to the passed in
+        position. This primarily is useful for setting up the initial position
+        or a new position after configuration changes and similar. Be aware
+        that careless use of this function can lead to inconsistently
+        replicated data.
+       </entry>
+      </row>
+
+      <row id="pg-replication-origin-progress">
+       <entry>
+        <indexterm>
+         <primary>pg_replication_origin_progress</primary>
+        </indexterm>
+        <literal><function>pg_replication_origin_progress(<parameter>node_name</parameter> <type>text</type>, <parameter>flush</parameter> <type>bool</type>)</function></literal>
+       </entry>
+       <entry>
+        pg_lsn
+       </entry>
+       <entry>
+        Return the replay position for the passed in replication origin. The
+        parameter <parameter>flush</parameter> determines whether the
+        corresponding local transaction will be guaranteed to have been
+        flushed to disk or not.
+       </entry>
+      </row>
+
      </tbody>
     </tgroup>
    </table>
@@ -17824,8 +18235,99 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
     see <xref linkend="event-triggers">.
    </para>
 
+  <sect2 id="pg-event-trigger-ddl-command-end-functions">
+   <title>Capturing Changes at Command End</title>
+
+   <indexterm>
+    <primary>pg_event_trigger_ddl_commands</primary>
+   </indexterm>
+
+   <para>
+    <function>pg_event_trigger_ddl_commands</> returns a list of
+    <acronym>DDL</acronym> commands executed by each user action,
+    when invoked in a function attached to a
+    <literal>ddl_command_end</> event trigger.  If called in any other
+    context, an error is raised.
+    <function>pg_event_trigger_ddl_commands</> returns one row for each
+    base command executed; some commands that are a single SQL sentence
+    may return more than one row.  This function returns the following
+    columns:
+
+    <informaltable>
+     <tgroup cols="3">
+      <thead>
+       <row>
+        <entry>Name</entry>
+        <entry>Type</entry>
+        <entry>Description</entry>
+       </row>
+      </thead>
+
+      <tbody>
+       <row>
+        <entry><literal>classid</literal></entry>
+        <entry><type>Oid</type></entry>
+        <entry>OID of catalog the object belongs in</entry>
+       </row>
+       <row>
+        <entry><literal>objid</literal></entry>
+        <entry><type>Oid</type></entry>
+        <entry>OID of the object in the catalog</entry>
+       </row>
+       <row>
+        <entry><literal>objsubid</literal></entry>
+        <entry><type>integer</type></entry>
+        <entry>Object sub-id (e.g. attribute number for columns)</entry>
+       </row>
+       <row>
+        <entry><literal>command_tag</literal></entry>
+        <entry><type>text</type></entry>
+        <entry>command tag</entry>
+       </row>
+       <row>
+        <entry><literal>object_type</literal></entry>
+        <entry><type>text</type></entry>
+        <entry>Type of the object</entry>
+       </row>
+       <row>
+        <entry><literal>schema_name</literal></entry>
+        <entry><type>text</type></entry>
+        <entry>
+         Name of the schema the object belongs in, if any; otherwise <literal>NULL</>.
+         No quoting is applied.
+        </entry>
+       </row>
+       <row>
+        <entry><literal>object_identity</literal></entry>
+        <entry><type>text</type></entry>
+        <entry>
+         Text rendering of the object identity, schema-qualified. Each and every
+         identifier present in the identity is quoted if necessary.
+        </entry>
+       </row>
+       <row>
+        <entry><literal>in_extension</literal></entry>
+        <entry><type>bool</type></entry>
+        <entry>whether the command is part of an extension script</entry>
+       </row>
+       <row>
+        <entry><literal>command</literal></entry>
+        <entry><type>pg_ddl_command</type></entry>
+        <entry>
+         A complete representation of the command, in internal format.
+         This cannot be output directly, but it can be passed to other
+         functions to obtain different pieces of information about the
+         command.
+        </entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </informaltable>
+   </para>
+  </sect2>
+
   <sect2 id="pg-event-trigger-sql-drop-functions">
-   <title>Processing objects dropped by a DDL command.</title>
+   <title>Processing Objects Dropped by a DDL Command</title>
 
    <indexterm>
      <primary>pg_event_trigger_dropped_objects</primary>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index e7d1ff9d83..2d1a5aa863 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -105,6 +105,7 @@
        <literal>~=</>
       </entry>
       <entry>
+       <literal>&lt;-&gt;</>
       </entry>
      </row>
      <row>
@@ -163,6 +164,7 @@
        <literal>~=</>
       </entry>
       <entry>
+       <literal>&lt;-&gt;</>
       </entry>
      </row>
      <row>
@@ -212,7 +214,7 @@
   To use it, mention the class name in <command>CREATE INDEX</>,
   for example
 <programlisting>
-CREATE INDEX ON my_table USING gist (my_inet_column inet_ops);
+CREATE INDEX ON my_table USING GIST (my_inet_column inet_ops);
 </programlisting>
  </para>
 
@@ -325,7 +327,6 @@ LANGUAGE C STRICT;
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_consistent(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_consistent);
 
 Datum
@@ -388,7 +389,6 @@ LANGUAGE C STRICT;
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_union(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_union);
 
 Datum
@@ -462,7 +462,6 @@ LANGUAGE C STRICT;
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_compress(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_compress);
 
 Datum
@@ -523,7 +522,6 @@ LANGUAGE C STRICT;
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_decompress(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_decompress);
 
 Datum
@@ -563,7 +561,6 @@ LANGUAGE C STRICT;  -- in some cases penalty functions need not be strict
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_penalty(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_penalty);
 
 Datum
@@ -612,7 +609,6 @@ LANGUAGE C STRICT;
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_picksplit(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_picksplit);
 
 Datum
@@ -719,7 +715,6 @@ LANGUAGE C STRICT;
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_same(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_same);
 
 Datum
@@ -770,7 +765,6 @@ LANGUAGE C STRICT;
         And the matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_distance(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_distance);
 
 Datum
@@ -780,6 +774,7 @@ my_distance(PG_FUNCTION_ARGS)
     data_type  *query = PG_GETARG_DATA_TYPE_P(1);
     StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
     /* Oid subtype = PG_GETARG_OID(3); */
+    /* bool *recheck = (bool *) PG_GETARG_POINTER(4); */
     data_type  *key = DatumGetDataType(entry-&gt;key);
     double      retval;
 
@@ -792,17 +787,34 @@ my_distance(PG_FUNCTION_ARGS)
 </programlisting>
 
        The arguments to the <function>distance</> function are identical to
-       the arguments of the <function>consistent</> function, except that no
-       recheck flag is used.  The distance to a leaf index entry must always
-       be determined exactly, since there is no way to re-order the tuples
-       once they are returned.  Some approximation is allowed when determining
-       the distance to an internal tree node, so long as the result is never
-       greater than any child's actual distance.  Thus, for example, distance
-       to a bounding box is usually sufficient in geometric applications.  The
-       result value can be any finite <type>float8</> value.  (Infinity and
-       minus infinity are used internally to handle cases such as nulls, so it
-       is not recommended that <function>distance</> functions return these
-       values.)
+       the arguments of the <function>consistent</> function.
+      </para>
+
+      <para>
+       Some approximation is allowed when determining the distance, so long
+       as the result is never greater than the entry's actual distance. Thus,
+       for example, distance to a bounding box is usually sufficient in
+       geometric applications.  For an internal tree node, the distance
+       returned must not be greater than the distance to any of the child
+       nodes. If the returned distance is not exact, the function must set
+       <literal>*recheck</> to true. (This is not necessary for internal tree
+       nodes; for them, the calculation is always assumed to be inexact.) In
+       this case the executor will calculate the accurate distance after
+       fetching the tuple from the heap, and reorder the tuples if necessary.
+      </para>
+
+      <para>
+       If the distance function returns <literal>*recheck = true</> for any
+       leaf node, the original ordering operator's return type must
+       be <type>float8</> or <type>float4</>, and the distance function's
+       result values must be comparable to those of the original ordering
+       operator, since the executor will sort using both distance function
+       results and recalculated ordering-operator results.  Otherwise, the
+       distance function's result values can be any finite <type>float8</>
+       values, so long as the relative order of the result values matches the
+       order returned by the ordering operator.  (Infinity and minus infinity
+       are used internally to handle cases such as nulls, so it is not
+       recommended that <function>distance</> functions return these values.)
       </para>
 
      </listitem>
@@ -833,13 +845,12 @@ LANGUAGE C STRICT;
         struct, whose 'key' field contains the same datum in the original,
         uncompressed form. If the opclass' compress function does nothing for
         leaf entries, the fetch method can return the argument as is.
-       </para> 
+       </para>
 
        <para>
         The matching code in the C module could then follow this skeleton:
 
 <programlisting>
-Datum       my_fetch(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(my_fetch);
 
 Datum
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index a17f55545c..d2f7fec523 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1220,6 +1220,46 @@ primary_slot_name = 'node_a_slot'
 
    </sect3>
   </sect2>
+
+  <sect2 id="continuous-archiving-in-standby">
+   <title>Continuous archiving in standby</title>
+
+   <indexterm>
+     <primary>continuous archiving</primary>
+     <secondary>in standby</secondary>
+   </indexterm>
+
+   <para>
+     When continuous WAL archiving is used in a standby, there are two
+     different scenarios: the WAL archive can be shared between the primary
+     and the standby, or the standby can have its own WAL archive. When
+     the standby has its own WAL archive, set <varname>archive_mode</varname>
+     to <literal>always</literal>, and the standby will call the archive
+     command for every WAL segment it receives, whether it's by restoring
+     from the archive or by streaming replication. The shared archive can
+     be handled similarly, but the <varname>archive_command</varname> must
+     test if the file being archived exists already, and if the existing file
+     has identical contents. This requires more care in the
+     <varname>archive_command</varname>, as it must
+     be careful to not overwrite an existing file with different contents,
+     but return success if the exactly same file is archived twice. And
+     all that must be done free of race conditions, if two servers attempt
+     to archive the same file at the same time.
+   </para>
+
+   <para>
+     If <varname>archive_mode</varname> is set to <literal>on</>, the
+     archiver is not enabled during recovery or standby mode. If the standby
+     server is promoted, it will start archiving after the promotion, but
+     will not archive any WAL it did not generate itself. To get a complete
+     series of WAL files in the archive, you must ensure that all WAL is
+     archived, before it reaches the standby. This is inherently true with
+     file-based log shipping, as the standby can only restore files that
+     are found in the archive, but not if streaming replication is enabled.
+     When a server is not in recovery mode, there is no difference between
+     <literal>on</literal> and <literal>always</literal> modes.
+   </para>
+  </sect2>
   </sect1>
 
   <sect1 id="warm-standby-failover">
diff --git a/doc/src/sgml/hstore.sgml b/doc/src/sgml/hstore.sgml
index fbe9543dfe..94f01f8dfe 100644
--- a/doc/src/sgml/hstore.sgml
+++ b/doc/src/sgml/hstore.sgml
@@ -597,6 +597,25 @@ ALTER TABLE tablename ALTER hstorecol TYPE hstore USING hstorecol || '';
  </sect2>
 
  <sect2>
+  <title>Transforms</title>
+
+  <para>
+   Additional extensions are available that implement transforms for
+   the <type>hstore</type> type for the languages PL/Perl and PL/Python.  The
+   extensions for PL/Perl are called <literal>hstore_plperl</literal>
+   and <literal>hstore_plperlu</literal>, for trusted and untrusted PL/Perl.
+   If you install these transforms and specify them when creating a
+   function, <type>hstore</type> values are mapped to Perl hashes.  The
+   extensions for PL/Python are
+   called <literal>hstore_plpythonu</literal>, <literal>hstore_plpython2u</literal>,
+   and <literal>hstore_plpython3u</literal>
+   (see <xref linkend="plpython-python23"> for the PL/Python naming
+   convention).  If you use them, <type>hstore</type> values are mapped to
+   Python dictionaries.
+  </para>
+ </sect2>
+
+ <sect2>
   <title>Authors</title>
 
   <para>
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index b73463a323..309fd1269b 100644
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -189,7 +189,7 @@ CREATE INDEX test1_id_index ON test1 (id);
    <literal>=</literal> operator.
    The following command is used to create a hash index:
 <synopsis>
-CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING hash (<replaceable>column</replaceable>);
+CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING HASH (<replaceable>column</replaceable>);
 </synopsis>
   </para>
 
diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml
index 22f43c8a5b..ca1f20b338 100644
--- a/doc/src/sgml/information_schema.sgml
+++ b/doc/src/sgml/information_schema.sgml
@@ -5519,6 +5519,91 @@ ORDER BY c.ordinal_position;
   </table>
  </sect1>
 
+ <sect1 id="infoschema-transforms">
+  <title><literal>transforms</literal></title>
+
+  <para>
+   The view <literal>transforms</literal> contains information about the
+   transforms defined in the current database.  More precisely, it contains a
+   row for each function contained in a transform (the <quote>from SQL</quote>
+   or <quote>to SQL</quote> function).
+  </para>
+
+  <table>
+   <title><literal>transforms</literal> Columns</title>
+
+   <tgroup cols="3">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Data Type</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><literal>udt_catalog</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Name of the database that contains the type the transform is for (always the current database)</entry>
+     </row>
+
+     <row>
+      <entry><literal>udt_schema</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Name of the schema that contains the type the transform is for</entry>
+     </row>
+
+     <row>
+      <entry><literal>udt_name</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Name of the type the transform is for</entry>
+     </row>
+
+     <row>
+      <entry><literal>specific_catalog</literal></entry>
+      <entry><literal>sql_identifier</literal></entry>
+      <entry>Name of the database containing the function (always the current database)</entry>
+     </row>
+
+     <row>
+      <entry><literal>specific_schema</literal></entry>
+      <entry><literal>sql_identifier</literal></entry>
+      <entry>Name of the schema containing the function</entry>
+     </row>
+
+     <row>
+      <entry><literal>specific_name</literal></entry>
+      <entry><literal>sql_identifier</literal></entry>
+      <entry>
+       The <quote>specific name</quote> of the function.  See <xref
+       linkend="infoschema-routines"> for more information.
+      </entry>
+     </row>
+
+     <row>
+      <entry><literal>group_name</literal></entry>
+      <entry><literal>sql_identifier</literal></entry>
+      <entry>
+       The SQL standard allows defining transforms in <quote>groups</quote>,
+       and selecting a group at run time.  PostgreSQL does not support this.
+       Instead, transforms are specific to a language.  As a compromise, this
+       field contains the language the transform is for.
+      </entry>
+     </row>
+
+     <row>
+      <entry><literal>transform_type</literal></entry>
+      <entry><type>character_data</type></entry>
+      <entry>
+       <literal>FROM SQL</literal> or <literal>TO SQL</literal>
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+ </sect1>
+
  <sect1 id="infoschema-triggered-update-columns">
   <title><literal>triggered_update_columns</literal></title>
 
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 4968e09c99..89648349c2 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -169,32 +169,22 @@ su - postgres
       also on most platforms.  This appears to be the default in
       recent <productname>Perl</productname> versions, but it was not
       in earlier versions, and in any case it is the choice of whomever
-      installed Perl at your site.
+      installed Perl at your site.  <filename>configure</filename> will fail
+      if building <application>PL/Perl</application> is selected but it cannot
+      find a shared <filename>libperl</filename>.  In that case, you will have
+      to rebuild and install <productname>Perl</productname> manually to be
+      able to build <application>PL/Perl</application>.  During the
+      configuration process for <productname>Perl</productname>, request a
+      shared library.
+     </para>
+
+     <para>
       If you intend to make more than incidental use of
       <application>PL/Perl</application>, you should ensure that the
       <productname>Perl</productname> installation was built with the
       <literal>usemultiplicity</> option enabled (<literal>perl -V</>
       will show whether this is the case).
      </para>
-
-     <para>
-      If you don't have the shared library but you need one, a message
-      like this will appear during the <productname>PostgreSQL</>
-      build to point out this fact:
-<screen>
-*** Cannot build PL/Perl because libperl is not a shared library.
-*** You might have to rebuild your Perl installation.  Refer to
-*** the documentation for details.
-</screen>
-      (If you don't follow the on-screen output you will merely notice
-      that the <application>PL/Perl</application> library object,
-      <filename>plperl.so</filename> or similar, will not be
-      installed.)  If you see this, you will have to rebuild and
-      install <productname>Perl</productname> manually to be able to
-      build <application>PL/Perl</application>.  During the
-      configuration process for <productname>Perl</productname>,
-      request a shared library.
-     </para>
     </listitem>
 
     <listitem>
@@ -220,28 +210,15 @@ su - postgres
       library, the <indexterm><primary>libpython</primary></indexterm>
       <filename>libpython</filename> library must be a shared library
       also on most platforms.  This is not the case in a default
-      <productname>Python</productname> installation.  If after
-      building and installing <productname>PostgreSQL</> you have a file called
-      <filename>plpython.so</filename> (possibly a different
-      extension), then everything went well.  Otherwise you should
-      have seen a notice like this flying by:
-<screen>
-*** Cannot build PL/Python because libpython is not a shared library.
-*** You might have to rebuild your Python installation.  Refer to
-*** the documentation for details.
-</screen>
-      That means you have to rebuild (part of) your
-      <productname>Python</productname> installation to create this
-      shared library.
-     </para>
-
-     <para>
-      If you have problems, run <productname>Python</> 2.3 or later's
-      configure using the <literal>--enable-shared</> flag.  On some
-      operating systems you don't have to build a shared library, but
-      you will have to convince the <productname>PostgreSQL</> build
-      system of this.  Consult the <filename>Makefile</filename> in
-      the <filename>src/pl/plpython</filename> directory for details.
+      <productname>Python</productname> installation built from source, but a
+      shared library is available in many operating system
+      distributions.  <filename>configure</filename> will fail if
+      building <application>PL/Python</application> is selected but it cannot
+      find a shared <filename>libpython</filename>.  That might mean that you
+      either have to install additional packages or rebuild (part of) your
+      <productname>Python</productname> installation to provide this shared
+      library.  When building from source, run <productname>Python</>'s
+      configure with the <literal>--enable-shared</> flag.
      </para>
     </listitem>
 
diff --git a/doc/src/sgml/json.sgml b/doc/src/sgml/json.sgml
index 6282ab8853..1e78558e27 100644
--- a/doc/src/sgml/json.sgml
+++ b/doc/src/sgml/json.sgml
@@ -375,13 +375,13 @@ SELECT '"foo"'::jsonb ? 'foo';
     implement, see <xref linkend="functions-jsonb-op-table">.)
     An example of creating an index with this operator class is:
 <programlisting>
-CREATE INDEX idxgin ON api USING gin (jdoc);
+CREATE INDEX idxgin ON api USING GIN (jdoc);
 </programlisting>
     The non-default GIN operator class <literal>jsonb_path_ops</>
     supports indexing the <literal>@&gt;</> operator only.
     An example of creating an index with this operator class is:
 <programlisting>
-CREATE INDEX idxginp ON api USING gin (jdoc jsonb_path_ops);
+CREATE INDEX idxginp ON api USING GIN (jdoc jsonb_path_ops);
 </programlisting>
   </para>
 
@@ -426,7 +426,7 @@ SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc -&gt; 'tags' ? 'qui'
     the <literal>"tags"</> key is common, defining an index like this
     may be worthwhile:
 <programlisting>
-CREATE INDEX idxgintags ON api USING gin ((jdoc -&gt; 'tags'));
+CREATE INDEX idxgintags ON api USING GIN ((jdoc -&gt; 'tags'));
 </programlisting>
     Now, the <literal>WHERE</> clause <literal>jdoc -&gt; 'tags' ? 'qui'</>
     will be recognized as an application of the indexable
diff --git a/doc/src/sgml/keywords.sgml b/doc/src/sgml/keywords.sgml
index b0dfd5ff75..ea582116ab 100644
--- a/doc/src/sgml/keywords.sgml
+++ b/doc/src/sgml/keywords.sgml
@@ -854,6 +854,13 @@
     <entry></entry>
    </row>
    <row>
+    <entry><token>CONFLICT</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
     <entry><token>CONNECT</token></entry>
     <entry></entry>
     <entry>reserved</entry>
diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml
index 3650567852..5fa2f77ea8 100644
--- a/doc/src/sgml/logicaldecoding.sgml
+++ b/doc/src/sgml/logicaldecoding.sgml
@@ -62,10 +62,10 @@ postgres=# SELECT * FROM pg_create_logical_replication_slot('regression_slot', '
  regression_slot | 0/16B1970
 (1 row)
 
-postgres=# SELECT * FROM pg_replication_slots;
-    slot_name    |    plugin     | slot_type | datoid | database | active |  xmin  | catalog_xmin | restart_lsn
------------------+---------------+-----------+--------+----------+--------+--------+--------------+-------------
- regression_slot | test_decoding | logical   |  12052 | postgres | f      |        |          684 | 0/16A4408
+postgres=# SELECT slot_name, plugin, slot_type, database, active, restart_lsn FROM pg_replication_slots;
+    slot_name    |    plugin     | slot_type | database | active | restart_lsn
+-----------------+---------------+-----------+----------+--------+-------------
+ regression_slot | test_decoding | logical   | postgres | f      | 0/16A4408
 (1 row)
 
 postgres=# -- There are no changes to see yet
@@ -363,6 +363,7 @@ typedef struct OutputPluginCallbacks
     LogicalDecodeBeginCB begin_cb;
     LogicalDecodeChangeCB change_cb;
     LogicalDecodeCommitCB commit_cb;
+    LogicalDecodeFilterByOriginCB filter_by_origin_cb;
     LogicalDecodeShutdownCB shutdown_cb;
 } OutputPluginCallbacks;
 
@@ -370,7 +371,8 @@ typedef void (*LogicalOutputPluginInit)(struct OutputPluginCallbacks *cb);
 </programlisting>
      The <function>begin_cb</function>, <function>change_cb</function>
      and <function>commit_cb</function> callbacks are required,
-     while <function>startup_cb</function>
+     while <function>startup_cb</function>,
+     <function>filter_by_origin_cb</function>
      and <function>shutdown_cb</function> are optional.
     </para>
    </sect2>
@@ -569,6 +571,37 @@ typedef void (*LogicalDecodeChangeCB) (
       </para>
      </note>
     </sect3>
+
+     <sect3 id="logicaldecoding-output-plugin-filter-origin">
+     <title>Origin Filter Callback</title>
+
+     <para>
+       The optional <function>filter_by_origin_cb</function> callback
+       is called to determine wheter data that has been replayed
+       from <parameter>origin_id</parameter> is of interest to the
+       output plugin.
+<programlisting>
+typedef bool (*LogicalDecodeChangeCB) (
+    struct LogicalDecodingContext *ctx,
+    RepNodeId origin_id
+);
+</programlisting>
+      The <parameter>ctx</parameter> parameter has the same contents
+      as for the other callbacks. No information but the origin is
+      available. To signal that changes originating on the passed in
+      node are irrelevant, return true, causing them to be filtered
+      away; false otherwise. The other callbacks will not be called
+      for transactions and changes that have been filtered away.
+     </para>
+     <para>
+       This is useful when implementing cascading or multi directional
+       replication solutions. Filtering by the origin allows to
+       prevent replicating the same changes back and forth in such
+       setups.  While transactions and changes also carry information
+       about the origin, filtering via this callback is noticeably
+       more efficient.
+     </para>
+     </sect3>
    </sect2>
 
    <sect2 id="logicaldecoding-output-plugin-output">
@@ -616,7 +649,7 @@ OutputPluginWrite(ctx, true);
    <title>Synchronous Replication Support for Logical Decoding</title>
 
    <para>
-    Logical decoding can be used to to build
+    Logical decoding can be used to build
     <link linkend="synchronous-replication">synchronous
     replication</link> solutions with the same user interface as synchronous
     replication for <link linkend="streaming-replication">streaming
diff --git a/doc/src/sgml/ltree.sgml b/doc/src/sgml/ltree.sgml
index cd8a061c94..8a7a36390d 100644
--- a/doc/src/sgml/ltree.sgml
+++ b/doc/src/sgml/ltree.sgml
@@ -550,8 +550,8 @@ INSERT INTO test VALUES ('Top.Collections.Pictures.Astronomy');
 INSERT INTO test VALUES ('Top.Collections.Pictures.Astronomy.Stars');
 INSERT INTO test VALUES ('Top.Collections.Pictures.Astronomy.Galaxies');
 INSERT INTO test VALUES ('Top.Collections.Pictures.Astronomy.Astronauts');
-CREATE INDEX path_gist_idx ON test USING gist(path);
-CREATE INDEX path_idx ON test USING btree(path);
+CREATE INDEX path_gist_idx ON test USING GIST (path);
+CREATE INDEX path_idx ON test USING BTREE (path);
 </programlisting>
 
   <para>
@@ -665,6 +665,21 @@ ltreetest=&gt; SELECT ins_label(path,2,'Space') FROM test WHERE path &lt;@ 'Top.
  </sect2>
 
  <sect2>
+  <title>Transforms</title>
+
+  <para>
+   Additional extensions are available that implement transforms for
+   the <type>ltree</type> type for PL/Python.  The extensions are
+   called <literal>ltree_plpythonu</literal>, <literal>ltree_plpython2u</literal>,
+   and <literal>ltree_plpython3u</literal>
+   (see <xref linkend="plpython-python23"> for the PL/Python naming
+   convention).  If you install these transforms and specify them when
+   creating a function, <type>ltree</type> values are mapped to Python lists.
+   (The reverse is currently not supported, however.)
+  </para>
+ </sect2>
+
+ <sect2>
   <title>Authors</title>
 
   <para>
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index 8764e0091a..e34426ff18 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -628,6 +628,9 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
      Like transaction IDs, multixact IDs are implemented as a
      32-bit counter and corresponding storage, all of which requires
      careful aging management, storage cleanup, and wraparound handling.
+     There is a separate storage area which holds the list of members in
+     each multixact, which also uses a 32-bit counter and which must also
+     be managed.
     </para>
 
     <para>
@@ -655,8 +658,12 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
     <para>
      As a safety device, a whole-table vacuum scan will occur for any table
      whose multixact-age is greater than
-     <xref linkend="guc-autovacuum-multixact-freeze-max-age">.
-     This will occur even if autovacuum is nominally disabled.
+     <xref linkend="guc-autovacuum-multixact-freeze-max-age">.  Whole-table
+     vacuum scans will also occur progressively for all tables, starting with
+     those that have the oldest multixact-age, if the amount of used member
+     storage space exceeds the amount 50% of the addressible storage space.
+     Both of these kinds of whole-table scans will occur even if autovacuum is
+     nominally disabled.
     </para>
    </sect3>
   </sect2>
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index f88b16e778..385691e21e 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -143,6 +143,20 @@
        </para>
       </listitem>
      </varlistentry>
+
+     <varlistentry>
+      <term>
+       serialization anomaly
+       <indexterm><primary>serialization anomaly</primary></indexterm>
+      </term>
+     <listitem>
+      <para>
+        The result of successfully committing a group of transactions
+        is inconsistent with all possible orderings of running those
+        transactions one at a time.
+       </para>
+      </listitem>
+     </varlistentry>
     </variablelist>
    </para>
 
@@ -150,13 +164,13 @@
     <indexterm>
      <primary>transaction isolation level</primary>
     </indexterm>
-    The four transaction isolation levels and the corresponding
-    behaviors are described in <xref linkend="mvcc-isolevel-table">.
+    The SQL standard and PostgreSQL-implemented transaction isolation levels
+    are described in <xref linkend="mvcc-isolevel-table">.
    </para>
 
     <table tocentry="1" id="mvcc-isolevel-table">
-     <title>Standard <acronym>SQL</acronym> Transaction Isolation Levels</title>
-     <tgroup cols="4">
+     <title>Transaction Isolation Levels</title>
+     <tgroup cols="5">
       <thead>
        <row>
         <entry>
@@ -171,6 +185,9 @@
         <entry>
          Phantom Read
         </entry>
+        <entry>
+         Serialization Anomaly
+        </entry>
        </row>
       </thead>
       <tbody>
@@ -179,6 +196,9 @@
          Read uncommitted
         </entry>
         <entry>
+         Allowed, but not in PG
+        </entry>
+        <entry>
          Possible
         </entry>
         <entry>
@@ -202,6 +222,9 @@
         <entry>
          Possible
         </entry>
+        <entry>
+         Possible
+        </entry>
        </row>
 
        <row>
@@ -215,6 +238,9 @@
          Not possible
         </entry>
         <entry>
+         Allowed, but not in PG
+        </entry>
+        <entry>
          Possible
         </entry>
        </row>
@@ -232,27 +258,30 @@
         <entry>
          Not possible
         </entry>
+        <entry>
+         Not possible
+        </entry>
        </row>
       </tbody>
      </tgroup>
     </table>
 
    <para>
-    In <productname>PostgreSQL</productname>, you can request any of the
-    four standard transaction isolation levels.  But internally, there are
-    only three distinct isolation levels, which correspond to the levels Read
-    Committed, Repeatable Read, and Serializable.  When you select the level Read
-    Uncommitted you really get Read Committed, and phantom reads are not possible
-    in the <productname>PostgreSQL</productname> implementation of Repeatable
-    Read, so the actual
-    isolation level might be stricter than what you select.  This is
-    permitted by the SQL standard: the four isolation levels only
-    define which phenomena must not happen, they do not define which
-    phenomena must happen.  The reason that <productname>PostgreSQL</>
-    only provides three isolation levels is that this is the only
-    sensible way to map the standard isolation levels to the multiversion
-    concurrency control architecture.  The behavior of the available
-    isolation levels is detailed in the following subsections.
+    In <productname>PostgreSQL</productname>, you can request any of
+    the four standard transaction isolation levels, but internally only
+    three distinct isolation levels are implemented, i.e. PostgreSQL's
+    Read Uncommitted mode behaves like Read Committed.  This is because
+    it is the only sensible way to map the standard isolation levels to
+    PostgreSQL's multiversion concurrency control architecture.
+   </para>
+
+   <para>
+    The table also shows that PostgreSQL's Repeatable Read implementation
+    does not allow phantom reads.  Stricter behavior is permitted by the
+    SQL standard: the four isolation levels only define which phenomena
+    must not happen, not which phenomena <emphasis>must</> happen.
+    The behavior of the available isolation levels is detailed in the
+    following subsections.
    </para>
 
    <para>
@@ -326,8 +355,27 @@
    </para>
 
    <para>
-    Because of the above rule, it is possible for an updating command to see an
-    inconsistent snapshot: it can see the effects of concurrent updating
+    <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</> clause
+    behaves similarly. In Read Committed mode, each row proposed for insertion
+    will either insert or update. Unless there are unrelated errors, one of
+    those two outcomes is guaranteed.  If a conflict originates in another
+    transaction whose effects are not yet visible to the <command>INSERT
+    </command>, the <command>UPDATE</command> clause will affect that row,
+    even though possibly <emphasis>no</> version of that row is
+    conventionally visible to the command.
+   </para>
+
+   <para>
+    <command>INSERT</command> with an <literal>ON CONFLICT DO
+    NOTHING</> clause may have insertion not proceed for a row due to
+    the outcome of another transaction whose effects are not visible
+    to the <command>INSERT</command> snapshot.  Again, this is only
+    the case in Read Committed mode.
+   </para>
+
+   <para>
+    Because of the above rules, it is possible for an updating command to see
+    an inconsistent snapshot: it can see the effects of concurrent updating
     commands on the same rows it is trying to update, but it
     does not see effects of those commands on other rows in the database.
     This behavior makes Read Committed mode unsuitable for commands that
diff --git a/doc/src/sgml/pgcrypto.sgml b/doc/src/sgml/pgcrypto.sgml
index d409446c37..bfcbe02f85 100644
--- a/doc/src/sgml/pgcrypto.sgml
+++ b/doc/src/sgml/pgcrypto.sgml
@@ -1270,6 +1270,14 @@ gen_random_uuid() returns uuid
    <para>
     If you cannot, then better do crypto inside client application.
    </para>
+
+   <para>
+    The implementation does not resist
+    <ulink url="http://en.wikipedia.org/wiki/Side-channel_attack">side-channel
+    attacks</ulink>.  For example, the time required for
+    a <filename>pgcrypto</> decryption function to complete varies among
+    ciphertexts of a given size.
+   </para>
   </sect3>
 
   <sect3>
diff --git a/doc/src/sgml/pgstatstatements.sgml b/doc/src/sgml/pgstatstatements.sgml
index 04b3f01ed5..4d7a6e68ea 100644
--- a/doc/src/sgml/pgstatstatements.sgml
+++ b/doc/src/sgml/pgstatstatements.sgml
@@ -19,12 +19,22 @@
   This means that a server restart is needed to add or remove the module.
  </para>
 
+ <para>
+   When <filename>pg_stat_statements</filename> is loaded, it tracks
+   statistics across all databases of the server.  To access and manipulate
+   these statistics, the module provides a view, <structname>pg_stat_statements</>,
+   and the utility functions <function>pg_stat_statements_reset</> and
+   <function>pg_stat_statements</>.  These are not available globally but
+   can be enabled for a specific database with
+   <command>CREATE EXTENSION pg_stat_statements</>.
+ </para>
+
  <sect2>
   <title>The <structname>pg_stat_statements</structname> View</title>
 
   <para>
    The statistics gathered by the module are made available via a
-   system view named <structname>pg_stat_statements</>.  This view
+   view named <structname>pg_stat_statements</>.  This view
    contains one row for each distinct database ID, user ID and query
    ID (up to the maximum number of distinct statements that the module
    can track).  The columns of the view are shown in
@@ -216,19 +226,9 @@
   </table>
 
   <para>
-   This view, and the functions <function>pg_stat_statements_reset</>
-   and <function>pg_stat_statements</>, are available only in
-   databases they have been specifically installed into by installing
-   the <literal>pg_stat_statements</> extension.
-   However, statistics are tracked across all databases of the server
-   whenever the <filename>pg_stat_statements</filename> module is loaded
-   into the server, regardless of presence of the view.
-  </para>
-
-  <para>
    For security reasons, non-superusers are not allowed to see the SQL
-   text or <structfield>queryid</structfield> of queries executed by other users.  They can see
-   the statistics, however, if the view has been installed in their
+   text or <structfield>queryid</structfield> of queries executed by other users.
+   They can see the statistics, however, if the view has been installed in their
    database.
   </para>
 
diff --git a/doc/src/sgml/pgstattuple.sgml b/doc/src/sgml/pgstattuple.sgml
index 9cabd71166..40a9669c90 100644
--- a/doc/src/sgml/pgstattuple.sgml
+++ b/doc/src/sgml/pgstattuple.sgml
@@ -358,6 +358,140 @@ pending_tuples | 0
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term>
+     <indexterm>
+      <primary>pgstattuple_approx</primary>
+     </indexterm>
+     <function>pgstattuple_approx(regclass) returns record</>
+    </term>
+
+    <listitem>
+     <para>
+      <function>pgstattuple_approx</function> is a faster alternative to
+      <function>pgstattuple</function> that returns approximate results.
+      The argument is the target relation's OID.
+      For example:
+<programlisting>
+test=> SELECT * FROM pgstattuple_approx('pg_catalog.pg_proc'::regclass);
+-[ RECORD 1 ]--------+-------
+table_len            | 573440
+scanned_percent      | 2
+approx_tuple_count   | 2740
+approx_tuple_len     | 561210
+approx_tuple_percent | 97.87
+dead_tuple_count     | 0
+dead_tuple_len       | 0
+dead_tuple_percent   | 0
+approx_free_space    | 11996
+approx_free_percent  | 2.09
+</programlisting>
+      The output columns are described in <xref linkend="pgstatapprox-columns">.
+     </para>
+
+     <para>
+      Whereas <function>pgstattuple</function> always performs a
+      full-table scan and returns an exact count of live and dead tuples
+      (and their sizes) and free space, <function>pgstattuple_approx</function>
+      tries to avoid the full-table scan and returns exact dead tuple
+      statistics along with an approximation of the number and
+      size of live tuples and free space.
+     </para>
+
+     <para>
+      It does this by skipping pages that have only visible tuples
+      according to the visibility map (if a page has the corresponding VM
+      bit set, then it is assumed to contain no dead tuples). For such
+      pages, it derives the free space value from the free space map, and
+      assumes that the rest of the space on the page is taken up by live
+      tuples.
+     </para>
+
+     <para>
+      For pages that cannot be skipped, it scans each tuple, recording its
+      presence and size in the appropriate counters, and adding up the
+      free space on the page. At the end, it estimates the total number of
+      live tuples based on the number of pages and tuples scanned (in the
+      same way that VACUUM estimates pg_class.reltuples).
+     </para>
+
+     <table id="pgstatapprox-columns">
+      <title><function>pgstattuple_approx</function> Output Columns</title>
+      <tgroup cols="3">
+       <thead>
+        <row>
+         <entry>Column</entry>
+         <entry>Type</entry>
+         <entry>Description</entry>
+        </row>
+       </thead>
+
+       <tbody>
+        <row>
+         <entry><structfield>table_len</structfield></entry>
+         <entry><type>bigint</type></entry>
+         <entry>Physical relation length in bytes (exact)</entry>
+        </row>
+        <row>
+         <entry><structfield>scanned_percent</structfield></entry>
+         <entry><type>float8</type></entry>
+         <entry>Percentage of table scanned</entry>
+        </row>
+        <row>
+         <entry><structfield>approx_tuple_count</structfield></entry>
+         <entry><type>bigint</type></entry>
+         <entry>Number of live tuples (estimated)</entry>
+        </row>
+        <row>
+         <entry><structfield>approx_tuple_len</structfield></entry>
+         <entry><type>bigint</type></entry>
+         <entry>Total length of live tuples in bytes (estimated)</entry>
+        </row>
+        <row>
+         <entry><structfield>approx_tuple_percent</structfield></entry>
+         <entry><type>float8</type></entry>
+         <entry>Percentage of live tuples</entry>
+        </row>
+        <row>
+         <entry><structfield>dead_tuple_count</structfield></entry>
+         <entry><type>bigint</type></entry>
+         <entry>Number of dead tuples (exact)</entry>
+        </row>
+        <row>
+         <entry><structfield>dead_tuple_len</structfield></entry>
+         <entry><type>bigint</type></entry>
+         <entry>Total length of dead tuples in bytes (exact)</entry>
+        </row>
+        <row>
+         <entry><structfield>dead_tuple_percent</structfield></entry>
+         <entry><type>float8</type></entry>
+         <entry>Percentage of dead tuples</entry>
+        </row>
+        <row>
+         <entry><structfield>approx_free_space</structfield></entry>
+         <entry><type>bigint</type></entry>
+         <entry>Total free space in bytes (estimated)</entry>
+        </row>
+        <row>
+         <entry><structfield>approx_free_percent</structfield></entry>
+         <entry><type>float8</type></entry>
+         <entry>Percentage of free space</entry>
+        </row>
+
+       </tbody>
+      </tgroup>
+     </table>
+
+     <para>
+      In the above output, the free space figures may not match the
+      <function>pgstattuple</function> output exactly, because the free
+      space map gives us an exact figure, but is not guaranteed to be
+      accurate to the byte.
+     </para>
+
+    </listitem>
+   </varlistentry>
+
   </variablelist>
  </sect2>
 
@@ -365,7 +499,7 @@ pending_tuples | 0
   <title>Authors</title>
 
   <para>
-   Tatsuo Ishii and Satoshi Nagayasu
+   Tatsuo Ishii, Satoshi Nagayasu and Abhijit Menon-Sen
   </para>
  </sect2>
 
diff --git a/doc/src/sgml/pgtrgm.sgml b/doc/src/sgml/pgtrgm.sgml
index f66439523a..9eb2a6742e 100644
--- a/doc/src/sgml/pgtrgm.sgml
+++ b/doc/src/sgml/pgtrgm.sgml
@@ -168,11 +168,11 @@
 
 <programlisting>
 CREATE TABLE test_trgm (t text);
-CREATE INDEX trgm_idx ON test_trgm USING gist (t gist_trgm_ops);
+CREATE INDEX trgm_idx ON test_trgm USING GIST (t gist_trgm_ops);
 </programlisting>
 or
 <programlisting>
-CREATE INDEX trgm_idx ON test_trgm USING gin (t gin_trgm_ops);
+CREATE INDEX trgm_idx ON test_trgm USING GIN (t gin_trgm_ops);
 </programlisting>
   </para>
 
@@ -274,7 +274,7 @@ CREATE TABLE words AS SELECT word FROM
    Next, create a trigram index on the word column:
 
 <programlisting>
-CREATE INDEX words_idx ON words USING gin(word gin_trgm_ops);
+CREATE INDEX words_idx ON words USING GIN (word gin_trgm_ops);
 </programlisting>
 
    Now, a <command>SELECT</command> query similar to the previous example can
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index d36acf6d99..9a7763d18c 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -2623,7 +2623,11 @@ END;
     <para>
 
     This example uses exception handling to perform either
-    <command>UPDATE</> or <command>INSERT</>, as appropriate:
+    <command>UPDATE</> or <command>INSERT</>, as appropriate.  It is
+    recommended that applications use <command>INSERT</> with
+    <literal>ON CONFLICT DO UPDATE</> rather than actually using
+    this pattern.  This example serves primarily to illustrate use of
+    <application>PL/pgSQL</application> control flow structures:
 
 <programlisting>
 CREATE TABLE db (a INT PRIMARY KEY, b TEXT);
@@ -3852,9 +3856,11 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
     <command>INSERT</> and <command>UPDATE</> operations, the return value
     should be <varname>NEW</>, which the trigger function may modify to
     support <command>INSERT RETURNING</> and <command>UPDATE RETURNING</>
-    (this will also affect the row value passed to any subsequent triggers).
-    For <command>DELETE</> operations, the return value should be
-    <varname>OLD</>.
+    (this will also affect the row value passed to any subsequent triggers,
+    or passed to a special <varname>EXCLUDED</> alias reference within
+    an <command>INSERT</> statement with an <literal>ON CONFLICT DO
+    UPDATE</> clause).  For <command>DELETE</> operations, the return
+    value should be <varname>OLD</>.
    </para>
 
    <para>
diff --git a/doc/src/sgml/postgres-fdw.sgml b/doc/src/sgml/postgres-fdw.sgml
index 43adb61455..14b12e37dc 100644
--- a/doc/src/sgml/postgres-fdw.sgml
+++ b/doc/src/sgml/postgres-fdw.sgml
@@ -69,6 +69,14 @@
  </para>
 
  <para>
+  Note that <filename>postgres_fdw</> currently lacks support for
+  <command>INSERT</command> statements with an <literal>ON CONFLICT DO
+  UPDATE</> clause.  However, the <literal>ON CONFLICT DO NOTHING</>
+  clause is supported, provided a unique index inference specification
+  is omitted.
+ </para>
+
+ <para>
   It is generally recommended that the columns of a foreign table be declared
   with exactly the same data types, and collations if applicable, as the
   referenced columns of the remote table.  Although <filename>postgres_fdw</>
@@ -301,8 +309,8 @@
     using <xref linkend="sql-importforeignschema">.  This command creates
     foreign table definitions on the local server that match tables or
     views present on the remote server.  If the remote tables to be imported
-    have columns of user-defined data types, the local server must have types
-    of the same names.
+    have columns of user-defined data types, the local server must have
+    compatible types of the same names.
    </para>
 
    <para>
@@ -353,9 +361,16 @@
 
    <para>
     Note that constraints other than <literal>NOT NULL</> will never be
-    imported from the remote tables, since <productname>PostgreSQL</>
-    does not support any other type of constraint on a foreign table.
-    Checking other types of constraints is always left to the remote server.
+    imported from the remote tables.  Although <productname>PostgreSQL</>
+    does support <literal>CHECK</> constraints on foreign tables, there is no
+    provision for importing them automatically, because of the risk that a
+    constraint expression could evaluate differently on the local and remote
+    servers.  Any such inconsistency in the behavior of a <literal>CHECK</>
+    constraint could lead to hard-to-detect errors in query optimization.
+    So if you wish to import <literal>CHECK</> constraints, you must do so
+    manually, and you should verify the semantics of each one carefully.
+    For more detail about the treatment of <literal>CHECK</> constraints on
+    foreign tables, see <xref linkend="sql-createforeigntable">.
    </para>
   </sect3>
  </sect2>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index e378d6978d..d1703e9c01 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -220,6 +220,7 @@
   &spi;
   &bgworker;
   &logicaldecoding;
+  &replication-origins;
 
  </part>
 
@@ -249,6 +250,7 @@
   &spgist;
   &gin;
   &brin;
+  &tablesample-method;
   &storage;
   &bki;
   &planstats;
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 3a753a0b9b..c7df697845 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1882,7 +1882,7 @@ The commands accepted in walsender mode are:
   </varlistentry>
 
   <varlistentry>
-    <term>BASE_BACKUP [<literal>LABEL</literal> <replaceable>'label'</replaceable>] [<literal>PROGRESS</literal>] [<literal>FAST</literal>] [<literal>WAL</literal>] [<literal>NOWAIT</literal>] [<literal>MAX_RATE</literal> <replaceable>rate</replaceable>]
+    <term>BASE_BACKUP [<literal>LABEL</literal> <replaceable>'label'</replaceable>] [<literal>PROGRESS</literal>] [<literal>FAST</literal>] [<literal>WAL</literal>] [<literal>NOWAIT</literal>] [<literal>MAX_RATE</literal> <replaceable>rate</replaceable>] [<literal>TABLESPACE_MAP</literal>]
      <indexterm><primary>BASE_BACKUP</primary></indexterm>
     </term>
     <listitem>
@@ -1968,6 +1968,19 @@ The commands accepted in walsender mode are:
          </para>
         </listitem>
        </varlistentry>
+
+       <varlistentry>
+        <term><literal>TABLESPACE_MAP</literal></term>
+        <listitem>
+         <para>
+          Include information about symbolic links present in the directory
+          <filename>pg_tblspc</filename> in a file named
+          <filename>tablespace_map</filename>. The tablespace map file includes
+          each symbolic link name as it exists in the directory
+          <filename>pg_tblspc/</> and the full path of that symbolic link.
+         </para>
+        </listitem>
+       </varlistentry>
       </variablelist>
      </para>
      <para>
diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml
index 7dbad462a5..ab49bd7e91 100644
--- a/doc/src/sgml/queries.sgml
+++ b/doc/src/sgml/queries.sgml
@@ -1183,6 +1183,181 @@ SELECT product_id, p.name, (sum(s.units) * (p.price - p.cost)) AS profit
    </para>
   </sect2>
 
+  <sect2 id="queries-grouping-sets">
+   <title><literal>GROUPING SETS</>, <literal>CUBE</>, and <literal>ROLLUP</></title>
+
+   <indexterm zone="queries-grouping-sets">
+    <primary>GROUPING SETS</primary>
+   </indexterm>
+   <indexterm zone="queries-grouping-sets">
+    <primary>CUBE</primary>
+   </indexterm>
+   <indexterm zone="queries-grouping-sets">
+    <primary>ROLLUP</primary>
+   </indexterm>
+
+   <para>
+    More complex grouping operations than those described above are possible
+    using the concept of <firstterm>grouping sets</>.  The data selected by
+    the <literal>FROM</> and <literal>WHERE</> clauses is grouped separately
+    by each specified grouping set, aggregates computed for each group just as
+    for simple <literal>GROUP BY</> clauses, and then the results returned.
+    For example:
+<screen>
+<prompt>=&gt;</> <userinput>SELECT * FROM items_sold;</>
+ brand | size | sales
+-------+------+-------
+ Foo   | L    |  10
+ Foo   | M    |  20
+ Bar   | M    |  15
+ Bar   | L    |  5
+(4 rows)
+
+<prompt>=&gt;</> <userinput>SELECT brand, size, sum(sales) FROM items_sold GROUP BY GROUPING SETS ((brand), (size), ());</>
+ brand | size | sum
+-------+------+-----
+ Foo   |      |  30
+ Bar   |      |  20
+       | L    |  15
+       | M    |  35
+       |      |  50
+(5 rows)
+</screen>
+   </para>
+
+   <para>
+    Each sublist of <literal>GROUPING SETS</> may specify zero or more columns
+    or expressions and is interpreted the same way as though it were directly
+    in the <literal>GROUP BY</> clause.  An empty grouping set means that all
+    rows are aggregated down to a single group (which is output even if no
+    input rows were present), as described above for the case of aggregate
+    functions with no <literal>GROUP BY</> clause.
+   </para>
+
+   <para>
+    References to the grouping columns or expressions are replaced
+    by <literal>NULL</> values in result rows for grouping sets in which those
+    columns do not appear.  To distinguish which grouping a particular output
+    row resulted from, see <xref linkend="functions-grouping-table">.
+   </para>
+
+   <para>
+    A shorthand notation is provided for specifying two common types of grouping set.
+    A clause of the form
+<programlisting>
+ROLLUP ( <replaceable>e1</>, <replaceable>e2</>, <replaceable>e3</>, ... )
+</programlisting>
+    represents the given list of expressions and all prefixes of the list including
+    the empty list; thus it is equivalent to
+<programlisting>
+GROUPING SETS (
+    ( <replaceable>e1</>, <replaceable>e2</>, <replaceable>e3</>, ... ),
+    ...
+    ( <replaceable>e1</>, <replaceable>e2</> )
+    ( <replaceable>e1</> )
+    ( )
+)
+</programlisting>
+    This is commonly used for analysis over hierarchical data; e.g. total
+    salary by department, division, and company-wide total.
+   </para>
+
+   <para>
+    A clause of the form
+<programlisting>
+CUBE ( <replaceable>e1</>, <replaceable>e2</>, ... )
+</programlisting>
+    represents the given list and all of its possible subsets (i.e. the power
+    set).  Thus
+<programlisting>
+CUBE ( a, b, c )
+</programlisting>
+    is equivalent to
+<programlisting>
+GROUPING SETS (
+    ( a, b, c ),
+    ( a, b    ),
+    ( a,    c ),
+    ( a       ),
+    (    b, c ),
+    (    b    ),
+    (       c ),
+    (         ),
+)
+</programlisting>
+   </para>
+
+   <para>
+    The individual elements of a <literal>CUBE</> or <literal>ROLLUP</>
+    clause may be either individual expressions, or sub-lists of elements in
+    parentheses.  In the latter case, the sub-lists are treated as single
+    units for the purposes of generating the individual grouping sets.
+    For example:
+<programlisting>
+CUBE ( (a,b), (c,d) )
+</programlisting>
+    is equivalent to
+<programlisting>
+GROUPING SETS (
+    ( a, b, c, d )
+    ( a, b       )
+    (       c, d )
+    (            )
+)
+</programlisting>
+    and
+<programlisting>
+ROLLUP ( a, (b,c), d )
+</programlisting>
+    is equivalent to
+<programlisting>
+GROUPING SETS (
+    ( a, b, c, d )
+    ( a, b, c    )
+    ( a          )
+    (            )
+)
+</programlisting>
+   </para>
+
+   <para>
+    The <literal>CUBE</> and <literal>ROLLUP</> constructs can be used either
+    directly in the <literal>GROUP BY</> clause, or nested inside a
+    <literal>GROUPING SETS</> clause.  If one <literal>GROUPING SETS</> clause
+    is nested inside another, the effect is the same as if all the elements of
+    the inner clause had been written directly in the outer clause.
+   </para>
+
+   <para>
+    If multiple grouping items are specified in a single <literal>GROUP BY</>
+    clause, then the final list of grouping sets is the cross product of the
+    individual items.  For example:
+<programlisting>
+GROUP BY a, CUBE(b,c), GROUPING SETS ((d), (e))
+</programlisting>
+    is equivalent to
+<programlisting>
+GROUP BY GROUPING SETS (
+  (a,b,c,d), (a,b,c,e),
+  (a,b,d),   (a,b,e),
+  (a,c,d),   (a,c,e),
+  (a,d),     (a,e)
+)
+</programlisting>
+   </para>
+
+  <note>
+   <para>
+    The construct <literal>(a,b)</> is normally recognized in expressions as
+    a <link linkend="sql-syntax-row-constructors">row constructor</link>.
+    Within the <literal>GROUP BY</> clause, this does not apply at the top
+    levels of expressions, and <literal>(a,b)</> is parsed as a list of
+    expressions as described above.  If for some reason you <emphasis>need</>
+    a row constructor in a grouping expression, use <literal>ROW(a,b)</>.
+   </para>
+  </note>
+  </sect2>
+
   <sect2 id="queries-window">
    <title>Window Function Processing</title>
 
diff --git a/doc/src/sgml/rangetypes.sgml b/doc/src/sgml/rangetypes.sgml
index d1125618b4..260545711b 100644
--- a/doc/src/sgml/rangetypes.sgml
+++ b/doc/src/sgml/rangetypes.sgml
@@ -406,7 +406,7 @@ SELECT '[1.234, 5.678]'::floatrange;
    GiST and SP-GiST indexes can be created for table columns of range types.
    For instance, to create a GiST index:
 <programlisting>
-CREATE INDEX reservation_idx ON reservation USING gist (during);
+CREATE INDEX reservation_idx ON reservation USING GIST (during);
 </programlisting>
    A GiST or SP-GiST index can accelerate queries involving these range operators:
    <literal>=</>,
@@ -453,7 +453,7 @@ CREATE INDEX reservation_idx ON reservation USING gist (during);
 <programlisting>
 CREATE TABLE reservation (
     during tsrange,
-    EXCLUDE USING gist (during WITH &amp;&amp;)
+    EXCLUDE USING GIST (during WITH &amp;&amp;)
 );
 </programlisting>
 
@@ -486,7 +486,7 @@ CREATE EXTENSION btree_gist;
 CREATE TABLE room_reservation (
     room text,
     during tsrange,
-    EXCLUDE USING gist (room WITH =, during WITH &amp;&amp;)
+    EXCLUDE USING GIST (room WITH =, during WITH &amp;&amp;)
 );
 
 INSERT INTO room_reservation VALUES
diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index 211a3c42bd..bf95453b6c 100644
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -79,6 +79,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY createTable        SYSTEM "create_table.sgml">
 <!ENTITY createTableAs      SYSTEM "create_table_as.sgml">
 <!ENTITY createTableSpace   SYSTEM "create_tablespace.sgml">
+<!ENTITY createTransform    SYSTEM "create_transform.sgml">
 <!ENTITY createTrigger      SYSTEM "create_trigger.sgml">
 <!ENTITY createTSConfig     SYSTEM "create_tsconfig.sgml">
 <!ENTITY createTSDictionary SYSTEM "create_tsdictionary.sgml">
@@ -120,6 +121,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY dropServer         SYSTEM "drop_server.sgml">
 <!ENTITY dropTable          SYSTEM "drop_table.sgml">
 <!ENTITY dropTableSpace     SYSTEM "drop_tablespace.sgml">
+<!ENTITY dropTransform      SYSTEM "drop_transform.sgml">
 <!ENTITY dropTrigger        SYSTEM "drop_trigger.sgml">
 <!ENTITY dropTSConfig       SYSTEM "drop_tsconfig.sgml">
 <!ENTITY dropTSDictionary   SYSTEM "drop_tsdictionary.sgml">
@@ -193,7 +195,10 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY pgResetxlog        SYSTEM "pg_resetxlog.sgml">
 <!ENTITY pgRestore          SYSTEM "pg_restore.sgml">
 <!ENTITY pgRewind           SYSTEM "pg_rewind.sgml">
+<!ENTITY pgtestfsync        SYSTEM "pgtestfsync.sgml">
+<!ENTITY pgtesttiming       SYSTEM "pgtesttiming.sgml">
 <!ENTITY pgupgrade          SYSTEM "pgupgrade.sgml">
+<!ENTITY pgxlogdump         SYSTEM "pg_xlogdump.sgml">
 <!ENTITY postgres           SYSTEM "postgres-ref.sgml">
 <!ENTITY postmaster         SYSTEM "postmaster.sgml">
 <!ENTITY psqlRef            SYSTEM "psql-ref.sgml">
diff --git a/doc/src/sgml/ref/alter_extension.sgml b/doc/src/sgml/ref/alter_extension.sgml
index 0d479c8ca2..7141ee352e 100644
--- a/doc/src/sgml/ref/alter_extension.sgml
+++ b/doc/src/sgml/ref/alter_extension.sgml
@@ -52,6 +52,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
   TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> |
   TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> |
   TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> |
+  TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> |
   TYPE <replaceable class="PARAMETER">object_name</replaceable> |
   VIEW <replaceable class="PARAMETER">object_name</replaceable>
 
@@ -259,6 +260,26 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
       </para>
      </listitem>
     </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>type_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the data type of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>lang_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the language of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml
index ace0040a9b..4329d43a1e 100644
--- a/doc/src/sgml/ref/alter_foreign_table.sgml
+++ b/doc/src/sgml/ref/alter_foreign_table.sgml
@@ -169,7 +169,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable></literal> [ NOT VALID ]</term>
+    <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]</literal></term>
     <listitem>
      <para>
       This form adds a new constraint to a foreign table, using the same
@@ -541,7 +541,7 @@ ALTER FOREIGN TABLE distributors ALTER COLUMN street SET NOT NULL;
   <para>
    To change options of a foreign table:
 <programlisting>
-ALTER FOREIGN TABLE myschema.distributors OPTIONS (ADD opt1 'value', SET opt2, 'value2', DROP opt3 'value3');
+ALTER FOREIGN TABLE myschema.distributors OPTIONS (ADD opt1 'value', SET opt2 'value2', DROP opt3 'value3');
 </programlisting></para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/alter_policy.sgml b/doc/src/sgml/ref/alter_policy.sgml
index 6d03db5547..2e63206014 100644
--- a/doc/src/sgml/ref/alter_policy.sgml
+++ b/doc/src/sgml/ref/alter_policy.sgml
@@ -23,7 +23,7 @@ PostgreSQL documentation
 <synopsis>
 ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable>
     [ RENAME TO <replaceable class="PARAMETER">new_name</replaceable> ]
-    [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] ]
+    [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_USER | SESSION_USER } [, ...] ]
     [ USING ( <replaceable class="parameter">using_expression</replaceable> ) ]
     [ WITH CHECK ( <replaceable class="parameter">check_expression</replaceable> ) ]
 </synopsis>
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 6a82730a4b..207fec1758 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -66,7 +66,7 @@ ALTER TABLE ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
     SET WITH OIDS
     SET WITHOUT OIDS
     SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable>
-    SET {LOGGED | UNLOGGED}
+    SET { LOGGED | UNLOGGED }
     SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
     RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )
     INHERIT <replaceable class="PARAMETER">parent_table</replaceable>
@@ -74,7 +74,7 @@ ALTER TABLE ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
     OF <replaceable class="PARAMETER">type_name</replaceable>
     NOT OF
     OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-    REPLICA IDENTITY {DEFAULT | USING INDEX <replaceable class="PARAMETER">index_name</replaceable> | FULL | NOTHING}
+    REPLICA IDENTITY { DEFAULT | USING INDEX <replaceable class="PARAMETER">index_name</replaceable> | FULL | NOTHING }
 
 <phrase>and <replaceable class="PARAMETER">table_constraint_using_index</replaceable> is:</phrase>
 
@@ -122,16 +122,6 @@ ALTER TABLE ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>IF EXISTS</literal></term>
-    <listitem>
-     <para>
-      Do not throw an error if the table does not exist. A notice is issued
-      in this case.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
     <term><literal>SET DATA TYPE</literal></term>
     <listitem>
      <para>
@@ -526,7 +516,7 @@ ALTER TABLE ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>SET {LOGGED | UNLOGGED}</literal></term>
+    <term><literal>SET { LOGGED | UNLOGGED }</literal></term>
     <listitem>
      <para>
       This form changes the table from unlogged to logged or vice-versa
@@ -727,6 +717,16 @@ ALTER TABLE ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
     <variablelist>
 
      <varlistentry>
+      <term><literal>IF EXISTS</literal></term>
+      <listitem>
+       <para>
+        Do not throw an error if the table does not exist. A notice is issued
+        in this case.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
       <term><replaceable class="PARAMETER">name</replaceable></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index 62e1968c08..656f5aae5b 100644
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -55,6 +55,7 @@ COMMENT ON
   TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> |
   TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> |
   TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> |
+  TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> |
   TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
   TYPE <replaceable class="PARAMETER">object_name</replaceable> |
   VIEW <replaceable class="PARAMETER">object_name</replaceable>
@@ -225,6 +226,26 @@ COMMENT ON
      </listitem>
     </varlistentry>
 
+    <varlistentry>
+     <term><replaceable>type_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the data type of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>lang_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the language of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
    <varlistentry>
     <term><replaceable class="parameter">text</replaceable></term>
     <listitem>
@@ -305,6 +326,7 @@ COMMENT ON TEXT SEARCH CONFIGURATION my_config IS 'Special word filtering';
 COMMENT ON TEXT SEARCH DICTIONARY swedish IS 'Snowball stemmer for Swedish language';
 COMMENT ON TEXT SEARCH PARSER my_parser IS 'Splits text into words';
 COMMENT ON TEXT SEARCH TEMPLATE snowball IS 'Snowball stemmer';
+COMMENT ON TRANSFORM FOR hstore LANGUAGE plpythonu IS 'Transform between hstore and Python dict';
 COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for RI';
 COMMENT ON TYPE complex IS 'Complex number data type';
 COMMENT ON VIEW my_view IS 'View of departmental costs';
diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml
index abadd83fc3..413b033cb5 100644
--- a/doc/src/sgml/ref/create_foreign_table.sgml
+++ b/doc/src/sgml/ref/create_foreign_table.sgml
@@ -32,13 +32,13 @@ CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name
 [ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
 { NOT NULL |
   NULL |
-  CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) |
+  CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] |
   DEFAULT <replaceable>default_expr</replaceable> }
 
 <phrase>and <replaceable class="PARAMETER">table_constraint</replaceable> is:</phrase>
 
 [ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
-CHECK ( <replaceable class="PARAMETER">expression</replaceable> )
+CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
 </synopsis>
  </refsynopsisdiv>
 
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index 2001921535..c5beb166cf 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -25,6 +25,7 @@ CREATE [ OR REPLACE ] FUNCTION
     [ RETURNS <replaceable class="parameter">rettype</replaceable>
       | RETURNS TABLE ( <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">column_type</replaceable> [, ...] ) ]
   { LANGUAGE <replaceable class="parameter">lang_name</replaceable>
+    | TRANSFORM { FOR TYPE <replaceable class="parameter">type_name</replaceable> } [, ... ]
     | WINDOW
     | IMMUTABLE | STABLE | VOLATILE | [ NOT ] LEAKPROOF
     | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT
@@ -261,6 +262,23 @@ CREATE [ OR REPLACE ] FUNCTION
     </varlistentry>
 
     <varlistentry>
+     <term><literal>TRANSFORM { FOR TYPE <replaceable class="parameter">type_name</replaceable> } [, ... ] }</literal></term>
+
+     <listitem>
+      <para>
+       Lists which transforms a call to the function should apply.  Transforms
+       convert between SQL types and language-specific data types;
+       see <xref linkend="sql-createtransform">.  Procedural language
+       implementations usually have hardcoded knowledge of the built-in types,
+       so those don't need to be listed here.  If a procedural language
+       implementation does not know how to handle a type and no transform is
+       supplied, it will fall back to a default behavior for converting data
+       types, but this depends on the implementation.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
      <term><literal>WINDOW</literal></term>
 
      <listitem>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 6b2ee28181..ce36a1ba48 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -637,7 +637,7 @@ CREATE UNIQUE INDEX title_idx ON films (title) WITH (fillfactor = 70);
   <para>
    To create a <acronym>GIN</> index with fast updates disabled:
 <programlisting>
-CREATE INDEX gin_idx ON documents_table USING gin (locations) WITH (fastupdate = off);
+CREATE INDEX gin_idx ON documents_table USING GIN (locations) WITH (fastupdate = off);
 </programlisting>
   </para>
 
diff --git a/doc/src/sgml/ref/create_policy.sgml b/doc/src/sgml/ref/create_policy.sgml
index 868a6c1cd3..e826984633 100644
--- a/doc/src/sgml/ref/create_policy.sgml
+++ b/doc/src/sgml/ref/create_policy.sgml
@@ -23,7 +23,7 @@ PostgreSQL documentation
 <synopsis>
 CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable>
     [ FOR { ALL | SELECT | INSERT | UPDATE | DELETE } ]
-    [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] ]
+    [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_USER | SESSION_USER } [, ...] ]
     [ USING ( <replaceable class="parameter">using_expression</replaceable> ) ]
     [ WITH CHECK ( <replaceable class="parameter">check_expression</replaceable> ) ]
 </synopsis>
@@ -61,6 +61,14 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
   </para>
 
   <para>
+    For INSERT and UPDATE queries, WITH CHECK expressions are enforced after
+    BEFORE triggers are fired, and before any data modifications are made.
+    Thus a BEFORE ROW trigger may modify the data to be inserted, affecting
+    the result of the security policy check.  WITH CHECK expressions are
+    enforced before any other constraints.
+  </para>
+
+  <para>
    Policy names are per-table, therefore one policy name can be used for many
    different tables and have a definition for each table which is appropriate to
    that table.
@@ -70,11 +78,13 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
    Policies can be applied for specific commands or for specific roles.  The
    default for newly created policies is that they apply for all commands and
    roles, unless otherwise specified.  If multiple policies apply to a given
-   query, they will be combined using OR.  Further, for commands which can have
-   both USING and WITH CHECK policies (ALL and UPDATE), if no WITH CHECK policy
-   is defined then the USING policy will be used for both what rows are visible
-   (normal USING case) and which rows will be allowed to be added (WITH CHECK
-   case).
+   query, they will be combined using OR (although <literal>ON CONFLICT DO
+   UPDATE</> and <literal>INSERT</> policies are not combined in this way, but
+   rather enforced as noted at each stage of <literal>ON CONFLICT</> execution).
+   Further, for commands which can have both USING and WITH CHECK policies (ALL
+   and UPDATE), if no WITH CHECK policy is defined then the USING policy will be
+   used for both what rows are visible (normal USING case) and which rows will
+   be allowed to be added (WITH CHECK case).
   </para>
 
   <para>
@@ -255,6 +265,12 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
          as it only ever applies in cases where records are being added to the
          relation.
        </para>
+       <para>
+         Note that <literal>INSERT</literal> with <literal>ON CONFLICT DO
+         UPDATE</literal> requires that any <literal>INSERT</literal> policy
+         WITH CHECK expression passes for any rows appended to the relation by
+         the INSERT path only.
+       </para>
       </listitem>
      </varlistentry>
 
@@ -263,22 +279,39 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       <listitem>
        <para>
          Using <literal>UPDATE</literal> for a policy means that it will apply
-         to <literal>UPDATE</literal> commands.  As <literal>UPDATE</literal>
-         involves pulling an existing record and then making changes to some
-         portion (but possibly not all) of the record, the
-         <literal>UPDATE</literal> policy accepts both a USING expression and
-         a WITH CHECK expression.  The USING expression will be used to
-         determine which records the <literal>UPDATE</literal> command will
-         see to operate against, while the <literal>WITH CHECK</literal>
-         expression defines what rows are allowed to be added back into the
-         relation (similar to the <literal>INSERT</literal> policy).
-         Any rows whose resulting values do not pass the
-         <literal>WITH CHECK</literal> expression will cause an ERROR and the
-         entire command will be aborted.  Note that if only a
-         <literal>USING</literal> clause is specified then that clause will be
-         used for both <literal>USING</literal> and
+         to <literal>UPDATE</literal> commands (or auxiliary <literal>ON
+         CONFLICT DO UPDATE</literal> clauses of <literal>INSERT</literal>
+         commands).  As <literal>UPDATE</literal> involves pulling an existing
+         record and then making changes to some portion (but possibly not all)
+         of the record, the <literal>UPDATE</literal> policy accepts both a
+         <literal>USING</literal> expression and a <literal>WITH CHECK</literal>
+         expression.  The <literal>USING</literal> expression will be used to
+         determine which records the <literal>UPDATE</literal> command will see
+         to operate against, while the <literal>WITH CHECK</literal> expression
+         defines what rows are allowed to be added back into the relation
+         (similar to the <literal>INSERT</literal> policy).  Any rows whose
+         resulting values do not pass the <literal>WITH CHECK</literal>
+         expression will cause an ERROR and the entire command will be aborted.
+         Note that if only a <literal>USING</literal> clause is specified then
+         that clause will be used for both <literal>USING</literal> and
          <literal>WITH CHECK</literal> cases.
        </para>
+       <para>
+         Note, however, that <literal>INSERT</literal> with <literal>ON CONFLICT
+         DO UPDATE</literal> requires that an <literal>UPDATE</literal> policy
+         <literal>USING</literal> expression always be enforced as a
+         <literal>WITH CHECK</literal> expression.  This
+         <literal>UPDATE</literal> policy must always pass when the
+         <literal>UPDATE</literal> path is taken.  Any existing row that
+         necessitates that the <literal>UPDATE</literal> path be taken must pass
+         the (UPDATE or ALL) <literal>USING</literal> qualifications (combined
+         using <literal>OR</literal>), which are always enforced as WTIH CHECK
+         options in this context (the <literal>UPDATE</literal> path will
+         <emphasis>never</> be silently avoided; an error will be thrown
+         instead).  Finally, the final row appended to the relation must pass
+         any <literal>WITH CHECK</literal> options that a conventional
+         <literal>UPDATE</literal> is required to pass.
+       </para>
       </listitem>
      </varlistentry>
 
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index 677766a2d5..53fdf56621 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -136,7 +136,11 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
      <para>
       The event is one of <literal>SELECT</literal>,
       <literal>INSERT</literal>, <literal>UPDATE</literal>, or
-      <literal>DELETE</literal>.
+      <literal>DELETE</literal>.  Note that an
+      <command>INSERT</command> containing an <literal>ON
+      CONFLICT</literal> clause cannot be used on tables that have
+      either <literal>INSERT</literal> or <literal>UPDATE</literal>
+      rules.  Consider using an updatable view instead.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index be7ebd5f54..fac7e1ec5e 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -717,7 +717,9 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
       <literal>EXCLUDE</>, and
       <literal>REFERENCES</> (foreign key) constraints accept this
       clause.  <literal>NOT NULL</> and <literal>CHECK</> constraints are not
-      deferrable.
+      deferrable.  Note that deferrable constraints cannot be used as
+      conflict arbitrators in an <command>INSERT</command> statement that
+      includes an <literal>ON CONFLICT DO UPDATE</> clause.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml
index 9072d077cd..5756c3e080 100644
--- a/doc/src/sgml/ref/create_tablespace.sgml
+++ b/doc/src/sgml/ref/create_tablespace.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
-    [ OWNER <replaceable class="parameter">user_name</replaceable> ]
+    [ OWNER { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } ]
     LOCATION '<replaceable class="parameter">directory</replaceable>'
     [ WITH ( <replaceable class="PARAMETER">tablespace_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) ]
 </synopsis>
diff --git a/doc/src/sgml/ref/create_transform.sgml b/doc/src/sgml/ref/create_transform.sgml
new file mode 100644
index 0000000000..d321dad7a5
--- /dev/null
+++ b/doc/src/sgml/ref/create_transform.sgml
@@ -0,0 +1,207 @@
+<!-- doc/src/sgml/ref/create_transform.sgml -->
+
+<refentry id="SQL-CREATETRANSFORM">
+ <indexterm zone="sql-createtransform">
+  <primary>CREATE TRANSFORM</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>CREATE TRANSFORM</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>CREATE TRANSFORM</refname>
+  <refpurpose>define a new transform</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+CREATE [ OR REPLACE ] TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> (
+    FROM SQL WITH FUNCTION <replaceable>from_sql_function_name</replaceable> (<replaceable>argument_type</replaceable> [, ...]),
+    TO SQL WITH FUNCTION <replaceable>to_sql_function_name</replaceable> (<replaceable>argument_type</replaceable> [, ...])
+);
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1 id="sql-createtransform-description">
+  <title>Description</title>
+
+  <para>
+   <command>CREATE TRANSFORM</command> defines a new transform.
+   <command>CREATE OR REPLACE TRANSFORM</command> will either create a new
+   transform, or replace an existing definition.
+  </para>
+
+  <para>
+   A transform specifies how to adapt a data type to a procedural language.
+   For example, when writing a function in PL/Python using
+   the <type>hstore</type> type, PL/Python has no prior knowledge how to
+   present <type>hstore</type> values in the Python environment.  Language
+   implementations usually default to using the text representation, but that
+   is inconvenient when, for example, an associative array or a list would be
+   more appropriate.
+  </para>
+
+  <para>
+   A transform specifies two functions:
+   <itemizedlist>
+    <listitem>
+     <para>
+      A <quote>from SQL</quote> function that converts the type from the SQL
+      environment to the language.  This function will be invoked on the
+      arguments of a function written in the language.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      A <quote>to SQL</quote> function that converts the type from the
+      language to the SQL environment.  This function will be invoked on the
+      return value of a function written in the language.
+     </para>
+    </listitem>
+   </itemizedlist>
+   It is not necessary to provide both of these functions.  If one is not
+   specified, the language-specific default behavior will be used if
+   necessary.  (To prevent a transformation in a certain direction from
+   happening at all, you could also write a transform function that always
+   errors out.)
+  </para>
+
+  <para>
+   To be able to create a transform, you must own and
+   have <literal>USAGE</literal> privilege on the type, have
+   <literal>USAGE</literal> privilege on the language, and own and
+   have <literal>EXECUTE</literal> privilege on the from-SQL and to-SQL
+   functions, if specified.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+   <variablelist>
+    <varlistentry>
+     <term><replaceable>type_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the data type of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>lang_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the language of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>from_sql_function_name</replaceable>(<replaceable>argument_type</replaceable> [, ...])</term>
+
+     <listitem>
+      <para>
+       The name of the function for converting the type from the SQL
+       environment to the language.  It must take one argument of
+       type <type>internal</type> and return type <type>internal</type>.  The
+       actual argument will be of the type for the transform, and the function
+       should be coded as if it were.  (But it is not allowed to declare an
+       SQL-level function function returning <type>internal</type> without at
+       least one argument of type <type>internal</type>.)  The actual return
+       value will be something specific to the language implementation.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>to_sql_function_name</replaceable>(<replaceable>argument_type</replaceable> [, ...])</term>
+
+     <listitem>
+      <para>
+       The name of the function for converting the type from the language to
+       the SQL environment.  It must take one argument of type
+       <type>internal</type> and return the type that is the type for the
+       transform.  The actual argument value will be something specific to the
+       language implementation.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+ </refsect1>
+
+ <refsect1 id="sql-createtransform-notes">
+  <title>Notes</title>
+
+  <para>
+   Use <xref linkend="sql-droptransform"> to remove transforms.
+  </para>
+ </refsect1>
+
+ <refsect1 id="sql-createtransform-examples">
+  <title>Examples</title>
+
+  <para>
+   To create a transform for type <type>hstore</type> and language
+   <literal>plpythonu</literal>, first set up the type and the language:
+<programlisting>
+CREATE TYPE hstore ...;
+
+CREATE LANGUAGE plpythonu ...;
+</programlisting>
+   Then create the necessary functions:
+<programlisting>
+CREATE FUNCTION hstore_to_plpython(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS ...;
+
+CREATE FUNCTION plpython_to_hstore(val internal) RETURNS hstore
+LANGUAGE C STRICT IMMUTABLE
+AS ...;
+</programlisting>
+   And finally create the transform to connect them all together:
+<programlisting>
+CREATE TRANSFORM FOR hstore LANGUAGE plpythonu (
+    FROM SQL WITH FUNCTION hstore_to_plpython(internal),
+    TO SQL WITH FUNCTION plpython_to_hstore(internal)
+);
+</programlisting>
+   In practice, these commands would be wrapped up in extensions.
+  </para>
+
+  <para>
+   The <filename>contrib</filename> section contains a number of extensions
+   that provide transforms, which can serve as real-world examples.
+  </para>
+ </refsect1>
+
+ <refsect1 id="sql-createtransform-compat">
+  <title>Compatibility</title>
+
+  <para>
+   This form of <command>CREATE TRANSFORM</command> is a
+   <productname>PostgreSQL</productname> extension.  There is a <command>CREATE
+   TRANSFORM</command> command in the <acronym>SQL</acronym> standard, but it
+   is for adapting data types to client languages.  That usage is not supported
+   by <productname>PostgreSQL</productname>.
+  </para>
+ </refsect1>
+
+ <refsect1 id="sql-createtransform-seealso">
+  <title>See Also</title>
+
+  <para>
+   <xref linkend="sql-createfunction">,
+   <xref linkend="sql-createlanguage">,
+   <xref linkend="sql-createtype">,
+   <xref linkend="sql-droptransform">
+  </para>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index aae0b41cd2..4bde815012 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -76,7 +76,10 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
    executes once for any given operation, regardless of how many rows
    it modifies (in particular, an operation that modifies zero rows
    will still result in the execution of any applicable <literal>FOR
-   EACH STATEMENT</literal> triggers).
+   EACH STATEMENT</literal> triggers).  Note that with an
+   <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</>
+   clause, both <command>INSERT</command> and
+   <command>UPDATE</command> statement level trigger will be fired.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index 5dadab1dee..8fa3564021 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -333,7 +333,8 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
     If the view is automatically updatable the system will convert any
     <command>INSERT</>, <command>UPDATE</> or <command>DELETE</> statement
     on the view into the corresponding statement on the underlying base
-    relation.
+    relation.  <command>INSERT</> statements that have an <literal>ON
+    CONFLICT UPDATE</> clause are fully supported.
    </para>
 
    <para>
@@ -345,8 +346,10 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
     condition, and thus is no longer visible through the view.  Similarly,
     an <command>INSERT</> command can potentially insert base-relation rows
     that do not satisfy the <literal>WHERE</> condition and thus are not
-    visible through the view.  The <literal>CHECK OPTION</> may be used to
-    prevent <command>INSERT</> and <command>UPDATE</> commands from creating
+    visible through the view (<literal>ON CONFLICT UPDATE</> may
+    similarly affect an existing row not visible through the view).
+    The <literal>CHECK OPTION</> may be used to prevent
+    <command>INSERT</> and <command>UPDATE</> commands from creating
     such rows that are not visible through the view.
    </para>
 
diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml
index 1cd8e60e40..64906efd3d 100644
--- a/doc/src/sgml/ref/drop_owned.sgml
+++ b/doc/src/sgml/ref/drop_owned.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER | SESSION_USER } [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
diff --git a/doc/src/sgml/ref/drop_transform.sgml b/doc/src/sgml/ref/drop_transform.sgml
new file mode 100644
index 0000000000..59ff87cfe4
--- /dev/null
+++ b/doc/src/sgml/ref/drop_transform.sgml
@@ -0,0 +1,123 @@
+<!-- doc/src/sgml/ref/drop_transform.sgml -->
+
+<refentry id="SQL-DROPTRANSFORM">
+ <indexterm zone="sql-droptransform">
+  <primary>DROP TRANSFORM</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>DROP TRANSFORM</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DROP TRANSFORM</refname>
+  <refpurpose>remove a transform</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+DROP TRANSFORM [ IF EXISTS ] FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable>
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1 id="sql-droptransform-description">
+  <title>Description</title>
+
+  <para>
+   <command>DROP TRANSFORM</command> removes a previously defined transform.
+  </para>
+
+  <para>
+   To be able to drop a transform, you must own the type and the language.
+   These are the same privileges that are required to create a transform.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+   <variablelist>
+
+   <varlistentry>
+    <term><literal>IF EXISTS</literal></term>
+    <listitem>
+     <para>
+      Do not throw an error if the transform does not exist. A notice is issued
+      in this case.
+     </para>
+    </listitem>
+   </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>type_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the data type of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>lang_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the language of the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><literal>CASCADE</literal></term>
+     <listitem>
+      <para>
+       Automatically drop objects that depend on the transform.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><literal>RESTRICT</literal></term>
+     <listitem>
+      <para>
+       Refuse to drop the transform if any objects depend on it.  This is the
+       default.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+ </refsect1>
+
+ <refsect1 id="sql-droptransform-examples">
+  <title>Examples</title>
+
+  <para>
+   To drop the transform for type <type>hstore</type> and language
+   <literal>plpythonu</literal>:
+<programlisting>
+DROP TRANSFORM FOR hstore LANGUAGE plpythonu;
+</programlisting></para>
+ </refsect1>
+
+ <refsect1 id="sql-droptransform-compat">
+  <title>Compatibility</title>
+
+  <para>
+   This form of <command>DROP TRANSFORM</command> is a
+   <productname>PostgreSQL</productname> extension.  See <xref
+   linkend="sql-createtransform"> for details.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createtransform"></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index a3cccb9f7c..7cd4577f1e 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -22,9 +22,24 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
-INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ]
+INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replaceable class="parameter">alias</replaceable> ] [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ]
     { DEFAULT VALUES | VALUES ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) [, ...] | <replaceable class="PARAMETER">query</replaceable> }
+    [ ON CONFLICT [ <replaceable class="parameter">conflict_target</replaceable> ] <replaceable class="parameter">conflict_action</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
+
+<phrase>where <replaceable class="parameter">conflict_target</replaceable> can be one of:</phrase>
+
+    ( { <replaceable class="parameter">column_name_index</replaceable> | ( <replaceable class="parameter">expression_index</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="PARAMETER">index_predicate</replaceable> ]
+    ON CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable>
+
+<phrase>and <replaceable class="parameter">conflict_action</replaceable> is one of:</phrase>
+
+    DO NOTHING
+    DO UPDATE SET { <replaceable class="PARAMETER">column_name</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } |
+                    ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) |
+                    ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( <replaceable class="PARAMETER">sub-SELECT</replaceable> )
+                  } [, ...]
+              [ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -59,19 +74,46 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ ( <replace
   </para>
 
   <para>
+   <literal>ON CONFLICT</> can be used to specify an alternative
+   action to raising a unique constraint or exclusion constraint
+   violation error. (See <xref linkend="sql-on-conflict"
+   endterm="sql-on-conflict-title"> below.)
+  </para>
+
+  <para>
    The optional <literal>RETURNING</> clause causes <command>INSERT</>
-   to compute and return value(s) based on each row actually inserted.
-   This is primarily useful for obtaining values that were supplied by
-   defaults, such as a serial sequence number.  However, any expression
-   using the table's columns is allowed.  The syntax of the
-   <literal>RETURNING</> list is identical to that of the output list
-   of <command>SELECT</>.
+   to compute and return value(s) based on each row actually inserted
+   (or updated, if an <literal>ON CONFLICT DO UPDATE</> clause was
+   used).  This is primarily useful for obtaining values that were
+   supplied by defaults, such as a serial sequence number.  However,
+   any expression using the table's columns is allowed.  The syntax of
+   the <literal>RETURNING</> list is identical to that of the output
+   list of <command>SELECT</>.  Only rows that were successfully
+   inserted or updated will be returned.  For example, if a row was
+   locked but not updated because an <literal>ON CONFLICT DO UPDATE
+   ... WHERE</literal> clause <replaceable
+   class="PARAMETER">condition</replaceable> was not satisfied, the
+   row will not be returned.
   </para>
 
   <para>
    You must have <literal>INSERT</literal> privilege on a table in
-   order to insert into it.  If a column list is specified, you only
-   need <literal>INSERT</literal> privilege on the listed columns.
+   order to insert into it.  If <literal>ON CONFLICT DO UPDATE</> is
+   present the <literal>UPDATE</literal> privilege is also required.
+  </para>
+
+  <para>
+   If a column list is specified, you only need
+   <literal>INSERT</literal> privilege on the listed columns.
+   Similarly, when <literal>ON CONFLICT DO UPDATE</> is specified, you
+   only need <literal>UPDATE</> privilege on the column(s) that are
+   listed to be updated.  However, <literal>ON CONFLICT DO UPDATE</>
+   also requires <literal>SELECT</> privilege on any column whose
+   values are read in the <literal>ON CONFLICT DO UPDATE</>
+   expressions or <replaceable>condition</>.
+  </para>
+
+  <para>
    Use of the <literal>RETURNING</> clause requires <literal>SELECT</>
    privilege on all columns mentioned in <literal>RETURNING</>.
    If you use the <replaceable
@@ -115,13 +157,32 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ ( <replace
    </varlistentry>
 
    <varlistentry>
+    <term><replaceable class="parameter">alias</replaceable></term>
+    <listitem>
+     <para>
+      A substitute name for the target table. When an alias is provided, it
+      completely hides the actual name of the table.  This is particularly
+      useful when using <literal>ON CONFLICT DO UPDATE</literal> into a table
+      named <literal>excluded</literal> as that's also the name of the
+      pseudo-relation containing the proposed row.
+     </para>
+    </listitem>
+   </varlistentry>
+
+
+   <varlistentry>
     <term><replaceable class="PARAMETER">column_name</replaceable></term>
     <listitem>
      <para>
       The name of a column in the table named by <replaceable class="PARAMETER">table_name</replaceable>.
       The column name can be qualified with a subfield name or array
       subscript, if needed.  (Inserting into only some fields of a
-      composite column leaves the other fields null.)
+      composite column leaves the other fields null.)  When
+      referencing a column with <literal>ON CONFLICT DO UPDATE</>, do
+      not include the table's name in the specification of a target
+      column.  For example, <literal>INSERT ... ON CONFLICT DO UPDATE
+      tab SET table_name.col = 1</> is invalid (this follows the general
+      behavior for <command>UPDATE</>).
      </para>
     </listitem>
    </varlistentry>
@@ -171,14 +232,35 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ ( <replace
     <listitem>
      <para>
       An expression to be computed and returned by the <command>INSERT</>
-      command after each row is inserted.  The expression can use any
-      column names of the table named by <replaceable class="PARAMETER">table_name</replaceable>.
+      command after each row is inserted (not updated). The
+      expression can use any column names of the table named by
+      <replaceable class="PARAMETER">table_name</replaceable>.
       Write <literal>*</> to return all columns of the inserted row(s).
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
+    <term><literal>conflict_target</literal></term>
+    <listitem>
+     <para>
+      Specify which conflicts <literal>ON CONFLICT</literal> refers to.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>conflict_action</literal></term>
+    <listitem>
+     <para>
+      <literal>DO NOTHING</literal> or <literal>DO UPDATE
+      SET</literal> clause specifying the action to be performed in
+      case of a conflict.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
     <term><replaceable class="PARAMETER">output_name</replaceable></term>
     <listitem>
      <para>
@@ -186,9 +268,226 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ ( <replace
      </para>
     </listitem>
    </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">column_name_index</replaceable></term>
+    <listitem>
+     <para>
+      The name of a <replaceable
+      class="PARAMETER">table_name</replaceable> column.  Part of a
+      unique index inference clause.  Follows <command>CREATE
+      INDEX</command> format.  <literal>SELECT</> privilege on
+      <replaceable class="PARAMETER">column_name_index</replaceable>
+      is required.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">expression_index</replaceable></term>
+    <listitem>
+     <para>
+      Similar to <replaceable
+      class="PARAMETER">column_name_index</replaceable>, but used to
+      infer expressions on <replaceable
+      class="PARAMETER">table_name</replaceable> columns appearing
+      within index definitions (not simple columns).  Part of unique
+      index inference clause.  Follows <command>CREATE INDEX</command>
+      format.  <literal>SELECT</> privilege on any column appearing
+      within <replaceable
+      class="PARAMETER">expression_index</replaceable> is required.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">collation</replaceable></term>
+    <listitem>
+     <para>
+      When specified, mandates that corresponding <replaceable
+      class="PARAMETER">column_name_index</replaceable> or
+      <replaceable class="PARAMETER">expression_index</replaceable> use a
+      particular collation in order to be matched in the inference clause.
+      Typically this is omitted, as collations usually do not affect wether or
+      not a constraint violation occurs.  Follows <command>CREATE
+      INDEX</command> format.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">opclass</replaceable></term>
+    <listitem>
+     <para>
+      When specified, mandates that corresponding <replaceable
+      class="PARAMETER">column_name_index</replaceable> or
+      <replaceable class="PARAMETER">expression_index</replaceable> use
+      particular operator class in order to be matched by the inference
+      clause.  Sometimes this is omitted because the
+      <emphasis>equality</emphasis> semantics are often equivalent across a
+      type's operator classes anyway, or because it's sufficient to trust that
+      the defined unique indexes have the pertinent definition of equality.
+      Follows <command>CREATE INDEX</command> format.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">index_predicate</replaceable></term>
+    <listitem>
+     <para>
+      Used to allow inference of partial unique indexes.  Any indexes
+      that satisfy the predicate (which need not actually be partial
+      indexes) can be matched by the rest of the inference clause.
+      Follows <command>CREATE INDEX</command> format.
+      <literal>SELECT</> privilege on any column appearing within
+      <replaceable class="PARAMETER">index_predicate</replaceable> is
+      required.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">constraint_name</replaceable></term>
+    <listitem>
+     <para>
+      Explicitly specifies an arbiter <emphasis>constraint</emphasis>
+      by name, rather than inferring a constraint or index.  This is
+      mostly useful for exclusion constraints, that cannot be chosen
+      in the conventional way (with an inference clause).
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">condition</replaceable></term>
+    <listitem>
+     <para>
+      An expression that returns a value of type <type>boolean</type>.  Only
+      rows for which this expression returns <literal>true</literal> will be
+      updated, although all rows will be locked when the
+      <literal>ON CONFLICT DO UPDATE</> action is taken.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </refsect1>
 
+ <refsect1 id="sql-on-conflict">
+  <title id="sql-on-conflict-title"><literal>ON CONFLICT</literal> Clause</title>
+  <indexterm zone="SQL-INSERT">
+   <primary>UPSERT</primary>
+  </indexterm>
+  <indexterm zone="SQL-INSERT">
+   <primary>ON CONFLICT</primary>
+  </indexterm>
+  <para>
+   The optional <literal>ON CONFLICT</literal> clause specifies an
+   alternative action to raising a unique violation or exclusion
+   constraint violation error.  For each individual row proposed for
+   insertion, either the insertion proceeds, or, if a constraint
+   specified by the <parameter>conflict_target</parameter> is
+   violated, the alternative <parameter>conflict_action</parameter> is
+   taken.
+  </para>
+
+  <para>
+   <parameter>conflict_target</parameter> describes which conflicts
+   are handled by the <literal>ON CONFLICT</literal> clause.  Either a
+   <emphasis>unique index inference</emphasis> clause or an explicitly
+   named constraint can be used.  For <literal>ON CONFLICT DO
+   NOTHING</literal>, it is optional to specify a
+   <parameter>conflict_target</parameter>; when omitted, conflicts
+   with all usable constraints (and unique indexes) are handled.  For
+   <literal>ON CONFLICT DO UPDATE</literal>, a conflict target
+   <emphasis>must</emphasis> be specified.
+
+   Every time an insertion without <literal>ON CONFLICT</literal>
+   would ordinarily raise an error due to violating one of the
+   inferred (or explicitly named) constraints, a conflict (as in
+   <literal>ON CONFLICT</literal>) occurs, and the alternative action,
+   as specified by <parameter>conflict_action</parameter> is taken.
+   This happens on a row-by-row basis.
+  </para>
+
+  <para>
+   A <emphasis>unique index inference</emphasis> clause consists of
+   one or more <replaceable
+   class="PARAMETER">column_name_index</replaceable> columns and/or
+   <replaceable class="PARAMETER">expression_index</replaceable>
+   expressions, and an optional <replaceable class="PARAMETER">
+   index_predicate</replaceable>.
+  </para>
+
+  <para>
+   All the <replaceable class="PARAMETER">table_name</replaceable>
+   unique indexes that, without regard to order, contain exactly the
+   specified columns/expressions and, if specified, whose predicate
+   implies the <replaceable class="PARAMETER">
+   index_predicate</replaceable> are chosen as arbiter indexes.  Note
+   that this means an index without a predicate will be used if a
+   non-partial index matching every other criteria happens to be
+   available.
+  </para>
+
+  <para>
+   If no index matches the inference clause (nor is there a constraint
+   explicitly named), an error is raised.  Deferred constraints are
+   not supported as arbiters.
+  </para>
+
+  <para>
+   <parameter>conflict_action</parameter> defines the action to be
+   taken in case of conflict.  <literal>ON CONFLICT DO
+   NOTHING</literal> simply avoids inserting a row as its alternative
+   action.  <literal>ON CONFLICT DO UPDATE</literal> updates the
+   existing row that conflicts with the row proposed for insertion as
+   its alternative action.
+
+   <literal>ON CONFLICT DO UPDATE</literal> guarantees an atomic
+   <command>INSERT</command> or <command>UPDATE</command> outcome - provided
+   there is no independent error, one of those two outcomes is guaranteed,
+   even under high concurrency.  This feature is also known as
+   <firstterm>UPSERT</firstterm>.
+
+   Note that exclusion constraints are not supported with
+   <literal>ON CONFLICT DO UPDATE</literal>.
+  </para>
+
+  <para>
+   <literal>ON CONFLICT DO UPDATE</literal> optionally accepts
+   a <literal>WHERE</literal> clause <replaceable>condition</replaceable>.
+   When provided, the statement only proceeds with updating if
+   the <replaceable>condition</replaceable> is satisfied.  Otherwise, unlike a
+   conventional <command>UPDATE</command>, the row is still locked for update.
+   Note that the <replaceable>condition</replaceable> is evaluated last, after
+   a conflict has been identified as a candidate to update.
+  </para>
+
+  <para>
+   The <literal>SET</literal> and <literal>WHERE</literal> clauses in
+   <literal>ON CONFLICT UPDATE</literal> have access to the existing
+   row, using the table's name, and to the row
+   proposed for insertion, using the <varname>excluded</varname>
+   alias.  The <varname>excluded</varname> alias requires
+   <literal>SELECT</> privilege on any column whose values are read.
+
+   Note that the effects of all per-row <literal>BEFORE INSERT</literal>
+   triggers are reflected in <varname>excluded</varname> values, since those
+   effects may have contributed to the row being excluded from insertion.
+  </para>
+
+  <para>
+   <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</>
+   clause is a <quote>deterministic</quote> statement.  This means
+   that the command will not be allowed to affect any single existing
+   row more than once; a cardinality violation error will be raised
+   when this situation arises.  Rows proposed for insertion should not
+   duplicate each other in terms of attributes constrained by the
+   conflict-arbitrating unique index.
+  </para>
+ </refsect1>
+
  <refsect1>
   <title>Outputs</title>
 
@@ -198,20 +497,22 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ ( <replace
 <screen>
 INSERT <replaceable>oid</replaceable> <replaceable class="parameter">count</replaceable>
 </screen>
-   The <replaceable class="parameter">count</replaceable> is the number
-   of rows inserted.  If <replaceable class="parameter">count</replaceable>
-   is exactly one, and the target table has OIDs, then
-   <replaceable class="parameter">oid</replaceable> is the
-   <acronym>OID</acronym> assigned to the inserted row.  Otherwise
-   <replaceable class="parameter">oid</replaceable> is zero.
+   The <replaceable class="parameter">count</replaceable> is the
+   number of rows inserted or updated.  If <replaceable
+   class="parameter">count</replaceable> is exactly one, and the
+   target table has OIDs, then <replaceable
+   class="parameter">oid</replaceable> is the <acronym>OID</acronym>
+   assigned to the inserted row.  The single row must have been
+   inserted rather than updated.  Otherwise <replaceable
+   class="parameter">oid</replaceable> is zero.
   </para>
 
   <para>
    If the <command>INSERT</> command contains a <literal>RETURNING</>
    clause, the result will be similar to that of a <command>SELECT</>
    statement containing the columns and values defined in the
-   <literal>RETURNING</> list, computed over the row(s) inserted by the
-   command.
+   <literal>RETURNING</> list, computed over the row(s) inserted or
+   updated by the command.
   </para>
  </refsect1>
 
@@ -311,7 +612,65 @@ WITH upd AS (
     RETURNING *
 )
 INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
-</programlisting></para>
+</programlisting>
+  </para>
+  <para>
+   Insert or update new distributors as appropriate.  Assumes a unique
+   index has been defined that constrains values appearing in the
+   <literal>did</literal> column.  Note that an <varname>EXCLUDED</>
+   expression is used to reference values originally proposed for
+   insertion:
+<programlisting>
+  INSERT INTO distributors (did, dname)
+  VALUES (5, 'Gizmo transglobal'), (6, 'Associated Computing, inc')
+  ON CONFLICT (did) DO UPDATE SET dname = EXCLUDED.dname;
+</programlisting>
+  </para>
+  <para>
+   Insert a distributor, or do nothing for rows proposed for insertion
+   when an existing, excluded row (a row with a matching constrained
+   column or columns after before row insert triggers fire) exists.
+   Example assumes a unique index has been defined that constrains
+   values appearing in the <literal>did</literal> column:
+<programlisting>
+  INSERT INTO distributors (did, dname) VALUES (7, 'Redline GmbH')
+  ON CONFLICT (did) DO NOTHING;
+</programlisting>
+  </para>
+  <para>
+   Insert or update new distributors as appropriate.  Example assumes
+   a unique index has been defined that constrains values appearing in
+   the <literal>did</literal> column.  <literal>WHERE</> clause is
+   used to limit the rows actually updated (any existing row not
+   updated will still be locked, though):
+<programlisting>
+  -- Don't update existing distributors based in a certain ZIP code
+  INSERT INTO distributors AS d (did, dname) VALUES (8, 'Anvil Distribution')
+  ON CONFLICT (did) DO UPDATE
+  SET dname = EXCLUDED.dname || ' (formerly ' || d.dname || ')'
+  WHERE d.zipcode != '21201';
+
+  -- Name a constraint directly in the statement (uses associated
+  -- index to arbitrate taking the DO NOTHING action)
+  INSERT INTO distributors (did, dname) VALUES (9, 'Antwerp Design')
+  ON CONFLICT ON CONSTRAINT distributors_pkey DO NOTHING;
+</programlisting>
+  </para>
+  <para>
+   Insert new distributor if possible;  otherwise
+   <literal>DO NOTHING</literal>.  Example assumes a unique index has been
+   defined that constrains values appearing in the
+   <literal>did</literal> column on a subset of rows where the
+   <literal>is_active</literal> boolean column evaluates to
+   <literal>true</literal>:
+<programlisting>
+  -- This statement could infer a partial unique index on "did"
+  -- with a predicate of "WHERE is_active", but it could also
+  -- just use a regular unique constraint on "did"
+  INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International')
+  ON CONFLICT (did) WHERE is_active DO NOTHING;
+</programlisting>
+  </para>
  </refsect1>
 
  <refsect1>
@@ -321,7 +680,8 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
    <command>INSERT</command> conforms to the SQL standard, except that
    the <literal>RETURNING</> clause is a
    <productname>PostgreSQL</productname> extension, as is the ability
-   to use <literal>WITH</> with <command>INSERT</>.
+   to use <literal>WITH</> with <command>INSERT</>, and the ability to
+   specify an alternative action with <literal>ON CONFLICT</>.
    Also, the case in
    which a column name list is omitted, but not all the columns are
    filled from the <literal>VALUES</> clause or <replaceable>query</>,
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 913afe76dd..b946eab303 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -161,9 +161,11 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
 
    <para>
     <literal>LOCK TABLE ... IN ACCESS SHARE MODE</> requires <literal>SELECT</>
-    privileges on the target table.  All other forms of <command>LOCK</>
-    require table-level <literal>UPDATE</>, <literal>DELETE</>, or
-    <literal>TRUNCATE</> privileges.
+    privileges on the target table.  <literal>LOCK TABLE ... IN ROW EXCLUSIVE
+    MODE</> requires <literal>INSERT</>, <literal>UPDATE</>, <literal>DELETE</>,
+    or <literal>TRUNCATE</> privileges on the target table. All other forms of
+    <command>LOCK</> require table-level <literal>UPDATE</>, <literal>DELETE</>,
+    or <literal>TRUNCATE</> privileges.
    </para>
 
    <para>
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index 642fccf325..07d3a5a1dc 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -588,10 +588,22 @@ PostgreSQL documentation
   </para>
 
   <para>
+   When tar format mode is used, it is the user's responsibility to unpack each
+   tar file before starting postgres. If there are additional tablespaces, the
+   tar files for them need to be unpacked in the correct locations. In this
+   case the symbolic links for those tablespaces will be created by Postgres
+   according to the contents of the <filename>tablespace_map</> file that is
+   included in the <filename>base.tar</> file.
+  </para>
+
+  <para>
    <application>pg_basebackup</application> works with servers of the same
    or an older major version, down to 9.1. However, WAL streaming mode (-X
-   stream) only works with server version 9.3 and later.
+   stream) only works with server version 9.3 and later, and tar format mode
+   (--format=tar) of the current version only works with server version 9.5
+   or later.
   </para>
+
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index fcf5f77a6d..272af3eb0a 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -454,8 +454,8 @@ PostgreSQL documentation
       <term><option>--database=<replaceable>dbname</replaceable></option></term>
       <listitem>
        <para>
-         Specifies the name of the database to connect to to dump global
-         objects and discover what other databases should be dumped. If
+         Specifies the name of the database to connect to for dumping global
+         objects and discovering what other databases should be dumped. If
          not specified, the <literal>postgres</literal> database will be used,
          and if that does not exist, <literal>template1</literal> will be used.
        </para>
diff --git a/doc/src/sgml/pg_xlogdump.sgml b/doc/src/sgml/ref/pg_xlogdump.sgml
index d9f4a6a499..d9f4a6a499 100644
--- a/doc/src/sgml/pg_xlogdump.sgml
+++ b/doc/src/sgml/ref/pg_xlogdump.sgml
diff --git a/doc/src/sgml/pgtestfsync.sgml b/doc/src/sgml/ref/pgtestfsync.sgml
index c4b4014b1a..5dcabe4b77 100644
--- a/doc/src/sgml/pgtestfsync.sgml
+++ b/doc/src/sgml/ref/pgtestfsync.sgml
@@ -1,4 +1,4 @@
-<!-- doc/src/sgml/pgtestfsync.sgml -->
+<!-- doc/src/sgml/ref/pgtestfsync.sgml -->
 
 <refentry id="pgtestfsync">
  <indexterm zone="pgtestfsync">
@@ -104,14 +104,6 @@
  </refsect1>
 
  <refsect1>
-  <title>Author</title>
-
-  <para>
-   Bruce Momjian <email>[email protected]</email>
-  </para>
- </refsect1>
-
- <refsect1>
   <title>See Also</title>
 
   <simplelist type="inline">
diff --git a/doc/src/sgml/pgtesttiming.sgml b/doc/src/sgml/ref/pgtesttiming.sgml
index a6ab9b114b..d5e231fff7 100644
--- a/doc/src/sgml/pgtesttiming.sgml
+++ b/doc/src/sgml/ref/pgtesttiming.sgml
@@ -1,4 +1,4 @@
-<!-- doc/src/sgml/pgtesttiming.sgml -->
+<!-- doc/src/sgml/ref/pgtesttiming.sgml -->
 
 <refentry id="pgtesttiming">
  <indexterm zone="pgtesttiming">
@@ -291,14 +291,6 @@ Histogram of timing durations:
  </refsect1>
 
  <refsect1>
-  <title>Author</title>
-
-  <para>
-   Ants Aasma <email>[email protected]</email>
-  </para>
- </refsect1>
-
- <refsect1>
   <title>See Also</title>
 
   <simplelist type="inline">
diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml
index d7d6abb9d8..382cba337b 100644
--- a/doc/src/sgml/ref/reassign_owned.sgml
+++ b/doc/src/sgml/ref/reassign_owned.sgml
@@ -21,7 +21,8 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-REASSIGN OWNED BY <replaceable class="PARAMETER">old_role</replaceable> [, ...] TO <replaceable class="PARAMETER">new_role</replaceable>
+REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURRENT_USER | SESSION_USER } [, ...]
+               TO { <replaceable class="PARAMETER">new_role</replaceable> | CURRENT_USER | SESSION_USER }
 </synopsis>
  </refsynopsisdiv>
 
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index 998340c5db..703b7609cf 100644
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable>
+REINDEX [ ( { VERBOSE } [, ...] ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -150,6 +150,15 @@ REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAM
      </para>
     </listitem>
    </varlistentry>
+
+   <varlistentry>
+    <term><literal>VERBOSE</literal></term>
+    <listitem>
+     <para>
+      Prints a progress report as each index is reindexed.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index b5b449c256..713efc099b 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -23,14 +23,15 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>reindexdb</command>
    <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
-
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+   
    <arg choice="plain" rep="repeat">
     <arg choice="opt">
      <group choice="plain">
       <arg choice="plain"><option>--schema</option></arg>
       <arg choice="plain"><option>-S</option></arg>
      </group>
-     <replaceable>table</replaceable>
+     <replaceable>schema</replaceable>
     </arg>
    </arg>
 
@@ -60,6 +61,8 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>reindexdb</command>
    <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+
    <group choice="plain">
     <arg choice="plain"><option>--all</option></arg>
     <arg choice="plain"><option>-a</option></arg>
@@ -69,6 +72,8 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>reindexdb</command>
    <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+
    <group choice="plain">
     <arg choice="plain"><option>--system</option></arg>
     <arg choice="plain"><option>-s</option></arg>
@@ -196,6 +201,16 @@ PostgreSQL documentation
      </varlistentry>
 
     <varlistentry>
+     <term><option>-v</></term>
+     <term><option>--verbose</></term>
+     <listitem>
+      <para>
+       Print detailed information during processing.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><option>-V</></term>
       <term><option>--version</></term>
       <listitem>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 2295f63c13..632d7935cb 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -37,7 +37,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
     [ * | <replaceable class="parameter">expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
     [ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
     [ WHERE <replaceable class="parameter">condition</replaceable> ]
-    [ GROUP BY <replaceable class="parameter">expression</replaceable> [, ...] ]
+    [ GROUP BY <replaceable class="parameter">grouping_element</replaceable> [, ...] ]
     [ HAVING <replaceable class="parameter">condition</replaceable> [, ...] ]
     [ WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceable class="parameter">window_definition</replaceable> ) [, ...] ]
     [ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] <replaceable class="parameter">select</replaceable> ]
@@ -49,7 +49,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
 
 <phrase>where <replaceable class="parameter">from_item</replaceable> can be one of:</phrase>
 
-    [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> [ ( <replaceable class="parameter">column_alias</replaceable> [, ...] ) ] ]
+    [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> [ ( <replaceable class="parameter">column_alias</replaceable> [, ...] ) ] ] [ TABLESAMPLE <replaceable class="parameter">sampling_method</replaceable> ( <replaceable class="parameter">argument</replaceable> [, ...] ) [ REPEATABLE ( <replaceable class="parameter">seed</replaceable> ) ] ]
     [ LATERAL ] ( <replaceable class="parameter">select</replaceable> ) [ AS ] <replaceable class="parameter">alias</replaceable> [ ( <replaceable class="parameter">column_alias</replaceable> [, ...] ) ]
     <replaceable class="parameter">with_query_name</replaceable> [ [ AS ] <replaceable class="parameter">alias</replaceable> [ ( <replaceable class="parameter">column_alias</replaceable> [, ...] ) ] ]
     [ LATERAL ] <replaceable class="parameter">function_name</replaceable> ( [ <replaceable class="parameter">argument</replaceable> [, ...] ] )
@@ -60,6 +60,15 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
                 [ WITH ORDINALITY ] [ [ AS ] <replaceable class="parameter">alias</replaceable> [ ( <replaceable class="parameter">column_alias</replaceable> [, ...] ) ] ]
     <replaceable class="parameter">from_item</replaceable> [ NATURAL ] <replaceable class="parameter">join_type</replaceable> <replaceable class="parameter">from_item</replaceable> [ ON <replaceable class="parameter">join_condition</replaceable> | USING ( <replaceable class="parameter">join_column</replaceable> [, ...] ) ]
 
+<phrase>and <replaceable class="parameter">grouping_element</replaceable> can be one of:</phrase>
+
+    ( )
+    <replaceable class="parameter">expression</replaceable>
+    ( <replaceable class="parameter">expression</replaceable> [, ...] )
+    ROLLUP ( { <replaceable class="parameter">expression</replaceable> | ( <replaceable class="parameter">expression</replaceable> [, ...] ) } [, ...] )
+    CUBE ( { <replaceable class="parameter">expression</replaceable> | ( <replaceable class="parameter">expression</replaceable> [, ...] ) } [, ...] )
+    GROUPING SETS ( <replaceable class="parameter">grouping_element</replaceable> [, ...] )
+
 <phrase>and <replaceable class="parameter">with_query</replaceable> is:</phrase>
 
     <replaceable class="parameter">with_query_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] AS ( <replaceable class="parameter">select</replaceable> | <replaceable class="parameter">values</replaceable> | <replaceable class="parameter">insert</replaceable> | <replaceable class="parameter">update</replaceable> | <replaceable class="parameter">delete</replaceable> )
@@ -317,6 +326,50 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
      </varlistentry>
 
      <varlistentry>
+      <term>TABLESAMPLE <replaceable class="parameter">sampling_method</replaceable> ( <replaceable class="parameter">argument</replaceable> [, ...] ) [ REPEATABLE ( <replaceable class="parameter">seed</replaceable> ) ]</term>
+      <listitem>
+       <para>
+        Table sample clause after
+        <replaceable class="parameter">table_name</replaceable> indicates that
+        a <replaceable class="parameter">sampling_method</replaceable> should
+        be used to retrieve subset of rows in the table.
+        The <replaceable class="parameter">sampling_method</replaceable> can be
+        any sampling method installed in the database. There are currently two
+        sampling methods available in the standard
+        <productname>PostgreSQL</productname> distribution:
+        <itemizedlist>
+         <listitem>
+          <para><literal>SYSTEM</literal></para>
+         </listitem>
+         <listitem>
+          <para><literal>BERNOULLI</literal></para>
+         </listitem>
+        </itemizedlist>
+        Both of these sampling methods currently accept only single argument
+        which is the percent (floating point from 0 to 100) of the rows to
+        be returned.
+        The <literal>SYSTEM</literal> sampling method does block level
+        sampling with each block having the same chance of being selected and
+        returns all rows from each selected block.
+        The <literal>BERNOULLI</literal> scans whole table and returns
+        individual rows with equal probability. Additional sampling methods
+        may be installed in the database via extensions.
+       </para>
+       <para>
+        The optional parameter <literal>REPEATABLE</literal> uses the seed
+        parameter, which can be a number or expression producing a number, as
+        a random seed for sampling. Note that subsequent commands may return
+        different results even if same <literal>REPEATABLE</literal> clause was
+        specified. This happens because <acronym>DML</acronym> statements and
+        maintenance operations such as <command>VACUUM</> may affect physical
+        distribution of data. The <function>setseed()</> function will not
+        affect the sampling result when the <literal>REPEATABLE</literal>
+        parameter is used.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
       <term><replaceable class="parameter">alias</replaceable></term>
       <listitem>
        <para>
@@ -621,23 +674,35 @@ WHERE <replaceable class="parameter">condition</replaceable>
    <para>
     The optional <literal>GROUP BY</literal> clause has the general form
 <synopsis>
-GROUP BY <replaceable class="parameter">expression</replaceable> [, ...]
+GROUP BY <replaceable class="parameter">grouping_element</replaceable> [, ...]
 </synopsis>
    </para>
 
    <para>
     <literal>GROUP BY</literal> will condense into a single row all
     selected rows that share the same values for the grouped
-    expressions.  <replaceable
-    class="parameter">expression</replaceable> can be an input column
-    name, or the name or ordinal number of an output column
-    (<command>SELECT</command> list item), or an arbitrary
+    expressions.  An <replaceable
+    class="parameter">expression</replaceable> used inside a
+    <replaceable class="parameter">grouping_element</replaceable>
+    can be an input column name, or the name or ordinal number of an
+    output column (<command>SELECT</command> list item), or an arbitrary
     expression formed from input-column values.  In case of ambiguity,
     a <literal>GROUP BY</literal> name will be interpreted as an
     input-column name rather than an output column name.
    </para>
 
    <para>
+    If any of <literal>GROUPING SETS</>, <literal>ROLLUP</> or
+    <literal>CUBE</> are present as grouping elements, then the
+    <literal>GROUP BY</> clause as a whole defines some number of
+    independent <replaceable>grouping sets</>.  The effect of this is
+    equivalent to constructing a <literal>UNION ALL</> between
+    subqueries with the individual grouping sets as their
+    <literal>GROUP BY</> clauses.  For further details on the handling
+    of grouping sets see <xref linkend="queries-grouping-sets">.
+   </para>
+
+   <para>
     Aggregate functions, if any are used, are computed across all rows
     making up each group, producing a separate value for each group.
     (If there are aggregate functions but no <literal>GROUP BY</literal>
@@ -1927,5 +1992,20 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
     <literal>ROWS FROM( ... )</> is an extension of the SQL standard.
    </para>
   </refsect2>
+
+  <refsect2>
+   <title><literal>TABLESAMPLE</literal> clause</title>
+
+   <para>
+    The <literal>TABLESAMPLE</> clause is currently accepted only on physical
+    relations and materialized views.
+   </para>
+
+   <para>
+    Additional modules allow you to install custom sampling methods and use
+    them instead of the SQL standard methods.
+   </para>
+  </refsect2>
+
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index fb18d94ea0..03020dfec4 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -111,6 +111,7 @@
    &createTSDictionary;
    &createTSParser;
    &createTSTemplate;
+   &createTransform;
    &createTrigger;
    &createType;
    &createUser;
@@ -152,6 +153,7 @@
    &dropTSDictionary;
    &dropTSParser;
    &dropTSTemplate;
+   &dropTransform;
    &dropTrigger;
    &dropType;
    &dropUser;
@@ -263,7 +265,10 @@
    &pgCtl;
    &pgResetxlog;
    &pgRewind;
+   &pgtestfsync;
+   &pgtesttiming;
    &pgupgrade;
+   &pgxlogdump;
    &postgres;
    &postmaster;
 
diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml
index 90339a5eae..80cd1c43cd 100644
--- a/doc/src/sgml/release-9.0.sgml
+++ b/doc/src/sgml/release-9.0.sgml
@@ -1,6 +1,544 @@
 <!-- doc/src/sgml/release-9.0.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-0-21">
+  <title>Release 9.0.21</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-06-04</simpara>
+  </note>
+
+  <para>
+   This release contains a small number of fixes from 9.0.20.
+   For information about new features in the 9.0 major release, see
+   <xref linkend="release-9-0">.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</> community will stop releasing updates
+   for the 9.0.X release series in September 2015.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.0.21</title>
+
+   <para>
+    A dump/restore is not required for those running 9.0.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.0.18,
+    see <xref linkend="release-9-0-18">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid failures while <function>fsync</>'ing data directory during
+      crash restart (Abhijit Menon-Sen, Tom Lane)
+     </para>
+
+     <para>
+      In the previous minor releases we added a patch to <function>fsync</>
+      everything in the data directory after a crash.  Unfortunately its
+      response to any error condition was to fail, thereby preventing the
+      server from starting up, even when the problem was quite harmless.
+      An example is that an unwritable file in the data directory would
+      prevent restart on some platforms; but it is common to make SSL
+      certificate files unwritable by the server.  Revise this behavior so
+      that permissions failures are ignored altogether, and other types of
+      failures are logged but do not prevent continuing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove <application>configure</>'s check prohibiting linking to a
+      threaded <application>libpython</>
+      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+     </para>
+
+     <para>
+      The failure this restriction was meant to prevent seems to not be a
+      problem anymore on current <systemitem class="osname">OpenBSD</>
+      versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      (Noah Misch)
+     </para>
+
+     <para>
+      For a long time, <application>libpq</> was coded so that the only SSL
+      protocol it would allow was TLS v1.  Now that newer TLS versions are
+      becoming popular, allow it to negotiate the highest commonly-supported
+      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      already capable of such negotiation, so no change is needed on the
+      server side.)  This is a back-patch of a change already released in
+      9.4.0.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-0-20">
+  <title>Release 9.0.20</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-05-22</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.0.19.
+   For information about new features in the 9.0 major release, see
+   <xref linkend="release-9-0">.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</> community will stop releasing updates
+   for the 9.0.X release series in September 2015.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.0.20</title>
+
+   <para>
+    A dump/restore is not required for those running 9.0.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.0.18,
+    see <xref linkend="release-9-0-18">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid possible crash when client disconnects just before the
+      authentication timeout expires (Benkocs Norbert Attila)
+     </para>
+
+     <para>
+      If the timeout interrupt fired partway through the session shutdown
+      sequence, SSL-related state would be freed twice, typically causing a
+      crash and hence denial of service to other sessions.  Experimentation
+      shows that an unauthenticated remote attacker could trigger the bug
+      somewhat consistently, hence treat as security issue.
+      (CVE-2015-3165)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve detection of system-call failures (Noah Misch)
+     </para>
+
+     <para>
+      Our replacement implementation of <function>snprintf()</> failed to
+      check for errors reported by the underlying system library calls;
+      the main case that might be missed is out-of-memory situations.
+      In the worst case this might lead to information exposure, due to our
+      code assuming that a buffer had been overwritten when it hadn't been.
+      Also, there were a few places in which security-relevant calls of other
+      system library functions did not check for failure.
+     </para>
+
+     <para>
+      It remains possible that some calls of the <function>*printf()</>
+      family of functions are vulnerable to information disclosure if an
+      out-of-memory error occurs at just the wrong time.  We judge the risk
+      to not be large, but will continue analysis in this area.
+      (CVE-2015-3166)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, some cases of decryption with an incorrect key could report
+      other error message texts.  It has been shown that such variance in
+      error reports can aid attackers in recovering keys from other systems.
+      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      are likewise exploitable, it seems better to avoid the risk by using a
+      one-size-fits-all message.
+      (CVE-2015-3167)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect checking of deferred exclusion constraints after a HOT
+      update (Tom Lane)
+     </para>
+
+     <para>
+      If a new row that potentially violates a deferred exclusion constraint
+      is HOT-updated (that is, no indexed columns change and the row can be
+      stored back onto the same table page) later in the same transaction,
+      the exclusion constraint would be reported as violated when the check
+      finally occurred, even if the row(s) the new row originally conflicted
+      with had been deleted.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent improper reordering of antijoins (NOT EXISTS joins) versus
+      other outer joins (Tom Lane)
+     </para>
+
+     <para>
+      This oversight in the planner has been observed to cause <quote>could
+      not find RelOptInfo for given relids</> errors, but it seems possible
+      that sometimes an incorrect query plan might get past that consistency
+      check and result in silently-wrong query output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect matching of subexpressions in outer-join plan nodes
+      (Tom Lane)
+     </para>
+
+     <para>
+      Previously, if textually identical non-strict subexpressions were used
+      both above and below an outer join, the planner might try to re-use
+      the value computed below the join, which would be incorrect because the
+      executor would force the value to NULL in case of an unmatched outer row.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix GEQO planner to cope with failure of its join order heuristic
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight has been seen to lead to <quote>failed to join all
+      relations together</> errors in queries involving <literal>LATERAL</>,
+      and that might happen in other cases as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible deadlock at startup
+      when <literal>max_prepared_transactions</> is too small
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't archive useless preallocated WAL files after a timeline switch
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</> error
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recursively <function>fsync()</> the data directory after a crash
+      (Abhijit Menon-Sen, Robert Haas)
+     </para>
+
+     <para>
+      This ensures consistency if another crash occurs shortly later.  (The
+      second crash would have to be a system-level crash, not just a database
+      crash, for there to be a problem.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix autovacuum launcher's possible failure to shut down, if an error
+      occurs after it receives SIGTERM (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      (Andres Freund)
+     </para>
+
+     <para>
+      This oversight could result in spurious errors about <quote>multiple
+      backends attempting to wait for pincount 1</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid waiting for WAL flush or synchronous replication during commit of
+      a transaction that was read-only so far as the user is concerned
+      (Andres Freund)
+     </para>
+
+     <para>
+      Previously, a delay could occur at commit in transactions that had
+      written WAL due to HOT page pruning, leading to undesirable effects
+      such as sessions getting stuck at startup if all synchronous replicas
+      are down.  Sessions have also been observed to get stuck in catchup
+      interrupt processing when using synchronous replication; this will fix
+      that problem as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when manipulating hash indexes on temporary tables
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failure during hash index bucket split, if other processes
+      are modifying the index concurrently (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while analyzing index expressions (Jeff Janes)
+     </para>
+
+     <para>
+      <command>ANALYZE</> executes index expressions many times; if there are
+      slow functions in such an expression, it's desirable to be able to
+      cancel the <command>ANALYZE</> before that loop finishes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add the name of the target server to object description strings for
+      foreign-server user mappings (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recommend setting <literal>include_realm</> to 1 when using
+      Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
+     </para>
+
+     <para>
+      Without this, identically-named users from different realms cannot be
+      distinguished.  For the moment this is only a documentation change, but
+      it will become the default setting in <productname>PostgreSQL</> 9.5.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      IPv4-in-IPv6 addresses (Tom Lane)
+     </para>
+
+     <para>
+      This hack was added in 2003 in response to a report that some Linux
+      kernels of the time would report IPv4 connections as having
+      IPv4-in-IPv6 addresses.  However, the logic was accidentally broken in
+      9.0.  The lack of any field complaints since then shows that it's not
+      needed anymore.  Now we have reports that the broken code causes
+      crashes on some systems, so let's just remove it rather than fix it.
+      (Had we chosen to fix it, that would make for a subtle and potentially
+      security-sensitive change in the effective meaning of
+      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      thing to do in minor releases.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      While shutting down service on Windows, periodically send status
+      updates to the Service Control Manager to prevent it from killing the
+      service too soon; and ensure that <application>pg_ctl</> will wait for
+      shutdown (Krystian Bigaj)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce risk of network deadlock when using <application>libpq</>'s
+      non-blocking mode (Heikki Linnakangas)
+     </para>
+
+     <para>
+      When sending large volumes of data, it's important to drain the input
+      buffer every so often, in case the server has sent enough response data
+      to cause it to block on output.  (A typical scenario is that the server
+      is sending a stream of NOTICE messages during <literal>COPY FROM
+      STDIN</>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</>
+      to opportunistically drain input when it can, but a full defense
+      against this problem requires application cooperation: the application
+      should watch for socket read-ready as well as write-ready conditions,
+      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array handling in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</>
+      (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      This syntax has been accepted (but undocumented) for a long time, but
+      previously some parameters might be taken from the old connection
+      instead of the given string, which was agreed to be undesirable.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Suppress incorrect complaints from <application>psql</> on some
+      platforms that it failed to write <filename>~/.psql_history</> at exit
+      (Tom Lane)
+     </para>
+
+     <para>
+      This misbehavior was caused by a workaround for a bug in very old
+      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      removing the workaround, which will cause a similar failure to appear
+      for anyone still using such versions of <application>libedit</>.
+      Recommendation: upgrade that library, or use <application>libreadline</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</>'s rule for deciding which casts are
+      system-provided casts that should not be dumped (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      column aliases (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This change prevents upgrade failures caused by bogus complaints about
+      missing WAL history files.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, check for improperly non-connectable
+      databases before proceeding
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</> script
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, preserve database-level freezing info
+      properly
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This oversight could cause missing-clog-file errors for tables within
+      the <literal>postgres</> and <literal>template1</> databases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      restricted privileges on Windows, so that they don't fail when run by
+      an administrator (Muhammad Asif Naeem)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix compile failure on Sparc V8 machines (Rob Rowan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2015d
+      for DST law changes in Egypt, Mongolia, and Palestine, plus historical
+      changes in Canada and Chile.  Also adopt revised zone abbreviations for
+      the America/Adak zone (HST/HDT not HAST/HADT).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-0-19">
   <title>Release 9.0.19</title>
 
diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml
index f5849ff8fa..8306cfab03 100644
--- a/doc/src/sgml/release-9.1.sgml
+++ b/doc/src/sgml/release-9.1.sgml
@@ -1,6 +1,620 @@
 <!-- doc/src/sgml/release-9.1.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-1-17">
+  <title>Release 9.1.17</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-06-04</simpara>
+  </note>
+
+  <para>
+   This release contains a small number of fixes from 9.1.16.
+   For information about new features in the 9.1 major release, see
+   <xref linkend="release-9-1">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.1.17</title>
+
+   <para>
+    A dump/restore is not required for those running 9.1.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.1.16,
+    see <xref linkend="release-9-1-16">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid failures while <function>fsync</>'ing data directory during
+      crash restart (Abhijit Menon-Sen, Tom Lane)
+     </para>
+
+     <para>
+      In the previous minor releases we added a patch to <function>fsync</>
+      everything in the data directory after a crash.  Unfortunately its
+      response to any error condition was to fail, thereby preventing the
+      server from starting up, even when the problem was quite harmless.
+      An example is that an unwritable file in the data directory would
+      prevent restart on some platforms; but it is common to make SSL
+      certificate files unwritable by the server.  Revise this behavior so
+      that permissions failures are ignored altogether, and other types of
+      failures are logged but do not prevent continuing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove <application>configure</>'s check prohibiting linking to a
+      threaded <application>libpython</>
+      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+     </para>
+
+     <para>
+      The failure this restriction was meant to prevent seems to not be a
+      problem anymore on current <systemitem class="osname">OpenBSD</>
+      versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      (Noah Misch)
+     </para>
+
+     <para>
+      For a long time, <application>libpq</> was coded so that the only SSL
+      protocol it would allow was TLS v1.  Now that newer TLS versions are
+      becoming popular, allow it to negotiate the highest commonly-supported
+      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      already capable of such negotiation, so no change is needed on the
+      server side.)  This is a back-patch of a change already released in
+      9.4.0.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-1-16">
+  <title>Release 9.1.16</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-05-22</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.1.15.
+   For information about new features in the 9.1 major release, see
+   <xref linkend="release-9-1">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.1.16</title>
+
+   <para>
+    A dump/restore is not required for those running 9.1.X.
+   </para>
+
+   <para>
+    However, if you use <filename>contrib/citext</>'s
+    <function>regexp_matches()</> functions, see the changelog entry below
+    about that.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.1.14,
+    see <xref linkend="release-9-1-14">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid possible crash when client disconnects just before the
+      authentication timeout expires (Benkocs Norbert Attila)
+     </para>
+
+     <para>
+      If the timeout interrupt fired partway through the session shutdown
+      sequence, SSL-related state would be freed twice, typically causing a
+      crash and hence denial of service to other sessions.  Experimentation
+      shows that an unauthenticated remote attacker could trigger the bug
+      somewhat consistently, hence treat as security issue.
+      (CVE-2015-3165)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve detection of system-call failures (Noah Misch)
+     </para>
+
+     <para>
+      Our replacement implementation of <function>snprintf()</> failed to
+      check for errors reported by the underlying system library calls;
+      the main case that might be missed is out-of-memory situations.
+      In the worst case this might lead to information exposure, due to our
+      code assuming that a buffer had been overwritten when it hadn't been.
+      Also, there were a few places in which security-relevant calls of other
+      system library functions did not check for failure.
+     </para>
+
+     <para>
+      It remains possible that some calls of the <function>*printf()</>
+      family of functions are vulnerable to information disclosure if an
+      out-of-memory error occurs at just the wrong time.  We judge the risk
+      to not be large, but will continue analysis in this area.
+      (CVE-2015-3166)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, some cases of decryption with an incorrect key could report
+      other error message texts.  It has been shown that such variance in
+      error reports can aid attackers in recovering keys from other systems.
+      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      are likewise exploitable, it seems better to avoid the risk by using a
+      one-size-fits-all message.
+      (CVE-2015-3167)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect declaration of <filename>contrib/citext</>'s
+      <function>regexp_matches()</> functions (Tom Lane)
+     </para>
+
+     <para>
+      These functions should return <type>setof text[]</>, like the core
+      functions they are wrappers for; but they were incorrectly declared as
+      returning just <type>text[]</>.  This mistake had two results: first,
+      if there was no match you got a scalar null result, whereas what you
+      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      was effectively ignored, since you would get only one result array even
+      if there were multiple matches.
+     </para>
+
+     <para>
+      While the latter behavior is clearly a bug, there might be applications
+      depending on the former behavior; therefore the function declarations
+      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      In pre-9.5 branches, the old behavior exists in version 1.0 of
+      the <literal>citext</> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</> installed by
+      default).  To adopt the fix in pre-9.5 branches, execute
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
+      which <literal>citext</> is installed.  (You can also <quote>update</>
+      back to 1.0 if you need to undo that.)  Be aware that either update
+      direction will require dropping and recreating any views or rules that
+      use <filename>citext</>'s <function>regexp_matches()</> functions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect checking of deferred exclusion constraints after a HOT
+      update (Tom Lane)
+     </para>
+
+     <para>
+      If a new row that potentially violates a deferred exclusion constraint
+      is HOT-updated (that is, no indexed columns change and the row can be
+      stored back onto the same table page) later in the same transaction,
+      the exclusion constraint would be reported as violated when the check
+      finally occurred, even if the row(s) the new row originally conflicted
+      with had been deleted.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent improper reordering of antijoins (NOT EXISTS joins) versus
+      other outer joins (Tom Lane)
+     </para>
+
+     <para>
+      This oversight in the planner has been observed to cause <quote>could
+      not find RelOptInfo for given relids</> errors, but it seems possible
+      that sometimes an incorrect query plan might get past that consistency
+      check and result in silently-wrong query output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect matching of subexpressions in outer-join plan nodes
+      (Tom Lane)
+     </para>
+
+     <para>
+      Previously, if textually identical non-strict subexpressions were used
+      both above and below an outer join, the planner might try to re-use
+      the value computed below the join, which would be incorrect because the
+      executor would force the value to NULL in case of an unmatched outer row.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix GEQO planner to cope with failure of its join order heuristic
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight has been seen to lead to <quote>failed to join all
+      relations together</> errors in queries involving <literal>LATERAL</>,
+      and that might happen in other cases as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible deadlock at startup
+      when <literal>max_prepared_transactions</> is too small
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't archive useless preallocated WAL files after a timeline switch
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</> error
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recursively <function>fsync()</> the data directory after a crash
+      (Abhijit Menon-Sen, Robert Haas)
+     </para>
+
+     <para>
+      This ensures consistency if another crash occurs shortly later.  (The
+      second crash would have to be a system-level crash, not just a database
+      crash, for there to be a problem.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix autovacuum launcher's possible failure to shut down, if an error
+      occurs after it receives SIGTERM (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      (Andres Freund)
+     </para>
+
+     <para>
+      This oversight could result in spurious errors about <quote>multiple
+      backends attempting to wait for pincount 1</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid waiting for WAL flush or synchronous replication during commit of
+      a transaction that was read-only so far as the user is concerned
+      (Andres Freund)
+     </para>
+
+     <para>
+      Previously, a delay could occur at commit in transactions that had
+      written WAL due to HOT page pruning, leading to undesirable effects
+      such as sessions getting stuck at startup if all synchronous replicas
+      are down.  Sessions have also been observed to get stuck in catchup
+      interrupt processing when using synchronous replication; this will fix
+      that problem as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when manipulating hash indexes on temporary tables
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failure during hash index bucket split, if other processes
+      are modifying the index concurrently (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while analyzing index expressions (Jeff Janes)
+     </para>
+
+     <para>
+      <command>ANALYZE</> executes index expressions many times; if there are
+      slow functions in such an expression, it's desirable to be able to
+      cancel the <command>ANALYZE</> before that loop finishes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure <structfield>tableoid</> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
+      or <command>DELETE</> (Etsuro Fujita)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add the name of the target server to object description strings for
+      foreign-server user mappings (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recommend setting <literal>include_realm</> to 1 when using
+      Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
+     </para>
+
+     <para>
+      Without this, identically-named users from different realms cannot be
+      distinguished.  For the moment this is only a documentation change, but
+      it will become the default setting in <productname>PostgreSQL</> 9.5.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      IPv4-in-IPv6 addresses (Tom Lane)
+     </para>
+
+     <para>
+      This hack was added in 2003 in response to a report that some Linux
+      kernels of the time would report IPv4 connections as having
+      IPv4-in-IPv6 addresses.  However, the logic was accidentally broken in
+      9.0.  The lack of any field complaints since then shows that it's not
+      needed anymore.  Now we have reports that the broken code causes
+      crashes on some systems, so let's just remove it rather than fix it.
+      (Had we chosen to fix it, that would make for a subtle and potentially
+      security-sensitive change in the effective meaning of
+      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      thing to do in minor releases.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      replication command (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This avoids a possible startup failure
+      in <application>pg_receivexlog</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      While shutting down service on Windows, periodically send status
+      updates to the Service Control Manager to prevent it from killing the
+      service too soon; and ensure that <application>pg_ctl</> will wait for
+      shutdown (Krystian Bigaj)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce risk of network deadlock when using <application>libpq</>'s
+      non-blocking mode (Heikki Linnakangas)
+     </para>
+
+     <para>
+      When sending large volumes of data, it's important to drain the input
+      buffer every so often, in case the server has sent enough response data
+      to cause it to block on output.  (A typical scenario is that the server
+      is sending a stream of NOTICE messages during <literal>COPY FROM
+      STDIN</>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</>
+      to opportunistically drain input when it can, but a full defense
+      against this problem requires application cooperation: the application
+      should watch for socket read-ready as well as write-ready conditions,
+      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array handling in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</>
+      (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      This syntax has been accepted (but undocumented) for a long time, but
+      previously some parameters might be taken from the old connection
+      instead of the given string, which was agreed to be undesirable.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Suppress incorrect complaints from <application>psql</> on some
+      platforms that it failed to write <filename>~/.psql_history</> at exit
+      (Tom Lane)
+     </para>
+
+     <para>
+      This misbehavior was caused by a workaround for a bug in very old
+      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      removing the workaround, which will cause a similar failure to appear
+      for anyone still using such versions of <application>libedit</>.
+      Recommendation: upgrade that library, or use <application>libreadline</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</>'s rule for deciding which casts are
+      system-provided casts that should not be dumped (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
+      compression level option together with <literal>-Fd</>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_dump</> consider foreign key relationships
+      between extension configuration tables while choosing dump order
+      (Gilles Darold, Michael Paquier, Stephen Frost)
+     </para>
+
+     <para>
+      This oversight could result in producing dumps that fail to reload
+      because foreign key constraints are transiently violated.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      column aliases (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This change prevents upgrade failures caused by bogus complaints about
+      missing WAL history files.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, check for improperly non-connectable
+      databases before proceeding
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</> script
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, preserve database-level freezing info
+      properly
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This oversight could cause missing-clog-file errors for tables within
+      the <literal>postgres</> and <literal>template1</> databases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      restricted privileges on Windows, so that they don't fail when run by
+      an administrator (Muhammad Asif Naeem)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve handling of <function>readdir()</> failures when scanning
+      directories in <application>initdb</> and <application>pg_basebackup</>
+      (Marco Nenciarini)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix compile failure on Sparc V8 machines (Rob Rowan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2015d
+      for DST law changes in Egypt, Mongolia, and Palestine, plus historical
+      changes in Canada and Chile.  Also adopt revised zone abbreviations for
+      the America/Adak zone (HST/HDT not HAST/HADT).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-1-15">
   <title>Release 9.1.15</title>
 
diff --git a/doc/src/sgml/release-9.2.sgml b/doc/src/sgml/release-9.2.sgml
index 7bdbd89ae9..ef4ce98e53 100644
--- a/doc/src/sgml/release-9.2.sgml
+++ b/doc/src/sgml/release-9.2.sgml
@@ -1,6 +1,683 @@
 <!-- doc/src/sgml/release-9.2.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-2-12">
+  <title>Release 9.2.12</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-06-04</simpara>
+  </note>
+
+  <para>
+   This release contains a small number of fixes from 9.2.11.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.12</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.2.11,
+    see <xref linkend="release-9-2-11">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid failures while <function>fsync</>'ing data directory during
+      crash restart (Abhijit Menon-Sen, Tom Lane)
+     </para>
+
+     <para>
+      In the previous minor releases we added a patch to <function>fsync</>
+      everything in the data directory after a crash.  Unfortunately its
+      response to any error condition was to fail, thereby preventing the
+      server from starting up, even when the problem was quite harmless.
+      An example is that an unwritable file in the data directory would
+      prevent restart on some platforms; but it is common to make SSL
+      certificate files unwritable by the server.  Revise this behavior so
+      that permissions failures are ignored altogether, and other types of
+      failures are logged but do not prevent continuing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_functiondef()</> to show
+      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove <application>configure</>'s check prohibiting linking to a
+      threaded <application>libpython</>
+      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+     </para>
+
+     <para>
+      The failure this restriction was meant to prevent seems to not be a
+      problem anymore on current <systemitem class="osname">OpenBSD</>
+      versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      (Noah Misch)
+     </para>
+
+     <para>
+      For a long time, <application>libpq</> was coded so that the only SSL
+      protocol it would allow was TLS v1.  Now that newer TLS versions are
+      becoming popular, allow it to negotiate the highest commonly-supported
+      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      already capable of such negotiation, so no change is needed on the
+      server side.)  This is a back-patch of a change already released in
+      9.4.0.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-2-11">
+  <title>Release 9.2.11</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-05-22</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.2.10.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.11</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you use <filename>contrib/citext</>'s
+    <function>regexp_matches()</> functions, see the changelog entry below
+    about that.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.2.10,
+    see <xref linkend="release-9-2-10">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid possible crash when client disconnects just before the
+      authentication timeout expires (Benkocs Norbert Attila)
+     </para>
+
+     <para>
+      If the timeout interrupt fired partway through the session shutdown
+      sequence, SSL-related state would be freed twice, typically causing a
+      crash and hence denial of service to other sessions.  Experimentation
+      shows that an unauthenticated remote attacker could trigger the bug
+      somewhat consistently, hence treat as security issue.
+      (CVE-2015-3165)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve detection of system-call failures (Noah Misch)
+     </para>
+
+     <para>
+      Our replacement implementation of <function>snprintf()</> failed to
+      check for errors reported by the underlying system library calls;
+      the main case that might be missed is out-of-memory situations.
+      In the worst case this might lead to information exposure, due to our
+      code assuming that a buffer had been overwritten when it hadn't been.
+      Also, there were a few places in which security-relevant calls of other
+      system library functions did not check for failure.
+     </para>
+
+     <para>
+      It remains possible that some calls of the <function>*printf()</>
+      family of functions are vulnerable to information disclosure if an
+      out-of-memory error occurs at just the wrong time.  We judge the risk
+      to not be large, but will continue analysis in this area.
+      (CVE-2015-3166)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, some cases of decryption with an incorrect key could report
+      other error message texts.  It has been shown that such variance in
+      error reports can aid attackers in recovering keys from other systems.
+      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      are likewise exploitable, it seems better to avoid the risk by using a
+      one-size-fits-all message.
+      (CVE-2015-3167)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect declaration of <filename>contrib/citext</>'s
+      <function>regexp_matches()</> functions (Tom Lane)
+     </para>
+
+     <para>
+      These functions should return <type>setof text[]</>, like the core
+      functions they are wrappers for; but they were incorrectly declared as
+      returning just <type>text[]</>.  This mistake had two results: first,
+      if there was no match you got a scalar null result, whereas what you
+      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      was effectively ignored, since you would get only one result array even
+      if there were multiple matches.
+     </para>
+
+     <para>
+      While the latter behavior is clearly a bug, there might be applications
+      depending on the former behavior; therefore the function declarations
+      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      In pre-9.5 branches, the old behavior exists in version 1.0 of
+      the <literal>citext</> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</> installed by
+      default).  To adopt the fix in pre-9.5 branches, execute
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
+      which <literal>citext</> is installed.  (You can also <quote>update</>
+      back to 1.0 if you need to undo that.)  Be aware that either update
+      direction will require dropping and recreating any views or rules that
+      use <filename>citext</>'s <function>regexp_matches()</> functions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect checking of deferred exclusion constraints after a HOT
+      update (Tom Lane)
+     </para>
+
+     <para>
+      If a new row that potentially violates a deferred exclusion constraint
+      is HOT-updated (that is, no indexed columns change and the row can be
+      stored back onto the same table page) later in the same transaction,
+      the exclusion constraint would be reported as violated when the check
+      finally occurred, even if the row(s) the new row originally conflicted
+      with had been deleted.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix planning of star-schema-style queries (Tom Lane)
+     </para>
+
+     <para>
+      Sometimes, efficient scanning of a large table requires that index
+      parameters be provided from more than one other table (commonly,
+      dimension tables whose keys are needed to index a large fact table).
+      The planner should be able to find such plans, but an overly
+      restrictive search heuristic prevented it.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent improper reordering of antijoins (NOT EXISTS joins) versus
+      other outer joins (Tom Lane)
+     </para>
+
+     <para>
+      This oversight in the planner has been observed to cause <quote>could
+      not find RelOptInfo for given relids</> errors, but it seems possible
+      that sometimes an incorrect query plan might get past that consistency
+      check and result in silently-wrong query output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect matching of subexpressions in outer-join plan nodes
+      (Tom Lane)
+     </para>
+
+     <para>
+      Previously, if textually identical non-strict subexpressions were used
+      both above and below an outer join, the planner might try to re-use
+      the value computed below the join, which would be incorrect because the
+      executor would force the value to NULL in case of an unmatched outer row.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix GEQO planner to cope with failure of its join order heuristic
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight has been seen to lead to <quote>failed to join all
+      relations together</> errors in queries involving <literal>LATERAL</>,
+      and that might happen in other cases as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible deadlock at startup
+      when <literal>max_prepared_transactions</> is too small
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't archive useless preallocated WAL files after a timeline switch
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+<!--
+Author: Alvaro Herrera <[email protected]>
+Branch: REL9_2_STABLE [97ff2a564] 2015-05-18 17:44:21 -0300
+Branch: REL9_1_STABLE [2360eea3b] 2015-05-18 17:44:21 -0300
+Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
+-->
+
+    <listitem>
+     <para>
+      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</> error
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recursively <function>fsync()</> the data directory after a crash
+      (Abhijit Menon-Sen, Robert Haas)
+     </para>
+
+     <para>
+      This ensures consistency if another crash occurs shortly later.  (The
+      second crash would have to be a system-level crash, not just a database
+      crash, for there to be a problem.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix autovacuum launcher's possible failure to shut down, if an error
+      occurs after it receives SIGTERM (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      (Andres Freund)
+     </para>
+
+     <para>
+      This oversight could result in spurious errors about <quote>multiple
+      backends attempting to wait for pincount 1</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when doing <literal>COPY IN</> to a table with check
+      constraints that contain whole-row references (Tom Lane)
+     </para>
+
+     <para>
+      The known failure case only crashes in 9.4 and up, but there is very
+      similar code in 9.3 and 9.2, so back-patch those branches as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid waiting for WAL flush or synchronous replication during commit of
+      a transaction that was read-only so far as the user is concerned
+      (Andres Freund)
+     </para>
+
+     <para>
+      Previously, a delay could occur at commit in transactions that had
+      written WAL due to HOT page pruning, leading to undesirable effects
+      such as sessions getting stuck at startup if all synchronous replicas
+      are down.  Sessions have also been observed to get stuck in catchup
+      interrupt processing when using synchronous replication; this will fix
+      that problem as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when manipulating hash indexes on temporary tables
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failure during hash index bucket split, if other processes
+      are modifying the index concurrently (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while analyzing index expressions (Jeff Janes)
+     </para>
+
+     <para>
+      <command>ANALYZE</> executes index expressions many times; if there are
+      slow functions in such an expression, it's desirable to be able to
+      cancel the <command>ANALYZE</> before that loop finishes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure <structfield>tableoid</> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
+      or <command>DELETE</> (Etsuro Fujita)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add the name of the target server to object description strings for
+      foreign-server user mappings (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recommend setting <literal>include_realm</> to 1 when using
+      Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
+     </para>
+
+     <para>
+      Without this, identically-named users from different realms cannot be
+      distinguished.  For the moment this is only a documentation change, but
+      it will become the default setting in <productname>PostgreSQL</> 9.5.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      IPv4-in-IPv6 addresses (Tom Lane)
+     </para>
+
+     <para>
+      This hack was added in 2003 in response to a report that some Linux
+      kernels of the time would report IPv4 connections as having
+      IPv4-in-IPv6 addresses.  However, the logic was accidentally broken in
+      9.0.  The lack of any field complaints since then shows that it's not
+      needed anymore.  Now we have reports that the broken code causes
+      crashes on some systems, so let's just remove it rather than fix it.
+      (Had we chosen to fix it, that would make for a subtle and potentially
+      security-sensitive change in the effective meaning of
+      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      thing to do in minor releases.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      replication command (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This avoids a possible startup failure
+      in <application>pg_receivexlog</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      While shutting down service on Windows, periodically send status
+      updates to the Service Control Manager to prevent it from killing the
+      service too soon; and ensure that <application>pg_ctl</> will wait for
+      shutdown (Krystian Bigaj)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce risk of network deadlock when using <application>libpq</>'s
+      non-blocking mode (Heikki Linnakangas)
+     </para>
+
+     <para>
+      When sending large volumes of data, it's important to drain the input
+      buffer every so often, in case the server has sent enough response data
+      to cause it to block on output.  (A typical scenario is that the server
+      is sending a stream of NOTICE messages during <literal>COPY FROM
+      STDIN</>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</>
+      to opportunistically drain input when it can, but a full defense
+      against this problem requires application cooperation: the application
+      should watch for socket read-ready as well as write-ready conditions,
+      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, fix misparsing of empty values in URI
+      connection strings (Thomas Fanghaenel)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array handling in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</>
+      (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      This syntax has been accepted (but undocumented) for a long time, but
+      previously some parameters might be taken from the old connection
+      instead of the given string, which was agreed to be undesirable.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Suppress incorrect complaints from <application>psql</> on some
+      platforms that it failed to write <filename>~/.psql_history</> at exit
+      (Tom Lane)
+     </para>
+
+     <para>
+      This misbehavior was caused by a workaround for a bug in very old
+      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      removing the workaround, which will cause a similar failure to appear
+      for anyone still using such versions of <application>libedit</>.
+      Recommendation: upgrade that library, or use <application>libreadline</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</>'s rule for deciding which casts are
+      system-provided casts that should not be dumped (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
+      compression level option together with <literal>-Fd</>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_dump</> consider foreign key relationships
+      between extension configuration tables while choosing dump order
+      (Gilles Darold, Michael Paquier, Stephen Frost)
+     </para>
+
+     <para>
+      This oversight could result in producing dumps that fail to reload
+      because foreign key constraints are transiently violated.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      column aliases (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This change prevents upgrade failures caused by bogus complaints about
+      missing WAL history files.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, check for improperly non-connectable
+      databases before proceeding
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</> script
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, preserve database-level freezing info
+      properly
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This oversight could cause missing-clog-file errors for tables within
+      the <literal>postgres</> and <literal>template1</> databases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      restricted privileges on Windows, so that they don't fail when run by
+      an administrator (Muhammad Asif Naeem)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve handling of <function>readdir()</> failures when scanning
+      directories in <application>initdb</> and <application>pg_basebackup</>
+      (Marco Nenciarini)
+     </para>
+    </listitem>
+
+<!--
+Author: Andres Freund <[email protected]>
+Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
+-->
+
+    <listitem>
+     <para>
+      Fix failure in <application>pg_receivexlog</> (Andres Freund)
+     </para>
+
+     <para>
+      A patch merge mistake in 9.2.10 led to <quote>could not create archive
+      status file</> errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix compile failure on Sparc V8 machines (Rob Rowan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2015d
+      for DST law changes in Egypt, Mongolia, and Palestine, plus historical
+      changes in Canada and Chile.  Also adopt revised zone abbreviations for
+      the America/Adak zone (HST/HDT not HAST/HADT).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-2-10">
   <title>Release 9.2.10</title>
 
diff --git a/doc/src/sgml/release-9.3.sgml b/doc/src/sgml/release-9.3.sgml
index b4fa3845d3..8f1bc7e147 100644
--- a/doc/src/sgml/release-9.3.sgml
+++ b/doc/src/sgml/release-9.3.sgml
@@ -1,6 +1,704 @@
 <!-- doc/src/sgml/release-9.3.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-3-8">
+  <title>Release 9.3.8</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-06-04</simpara>
+  </note>
+
+  <para>
+   This release contains a small number of fixes from 9.3.7.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.8</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.3.7,
+    see <xref linkend="release-9-3-7">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid failures while <function>fsync</>'ing data directory during
+      crash restart (Abhijit Menon-Sen, Tom Lane)
+     </para>
+
+     <para>
+      In the previous minor releases we added a patch to <function>fsync</>
+      everything in the data directory after a crash.  Unfortunately its
+      response to any error condition was to fail, thereby preventing the
+      server from starting up, even when the problem was quite harmless.
+      An example is that an unwritable file in the data directory would
+      prevent restart on some platforms; but it is common to make SSL
+      certificate files unwritable by the server.  Revise this behavior so
+      that permissions failures are ignored altogether, and other types of
+      failures are logged but do not prevent continuing.
+     </para>
+
+     <para>
+      Also apply the same rules in <literal>initdb --sync-only</>.
+      This case is less critical but it should act similarly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_functiondef()</> to show
+      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove <application>configure</>'s check prohibiting linking to a
+      threaded <application>libpython</>
+      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+     </para>
+
+     <para>
+      The failure this restriction was meant to prevent seems to not be a
+      problem anymore on current <systemitem class="osname">OpenBSD</>
+      versions.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: REL9_3_STABLE [c6b7b9a9c] 2015-05-21 20:41:55 -0400
+Branch: REL9_2_STABLE [b78fbfe65] 2015-05-21 20:41:55 -0400
+Branch: REL9_1_STABLE [2c2c5f0e0] 2015-05-21 20:41:55 -0400
+Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
+-->
+
+    <listitem>
+     <para>
+      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      (Noah Misch)
+     </para>
+
+     <para>
+      For a long time, <application>libpq</> was coded so that the only SSL
+      protocol it would allow was TLS v1.  Now that newer TLS versions are
+      becoming popular, allow it to negotiate the highest commonly-supported
+      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      already capable of such negotiation, so no change is needed on the
+      server side.)  This is a back-patch of a change already released in
+      9.4.0.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-7">
+  <title>Release 9.3.7</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-05-22</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.3.6.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.7</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you use <filename>contrib/citext</>'s
+    <function>regexp_matches()</> functions, see the changelog entry below
+    about that.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.3.6,
+    see <xref linkend="release-9-3-6">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Avoid possible crash when client disconnects just before the
+      authentication timeout expires (Benkocs Norbert Attila)
+     </para>
+
+     <para>
+      If the timeout interrupt fired partway through the session shutdown
+      sequence, SSL-related state would be freed twice, typically causing a
+      crash and hence denial of service to other sessions.  Experimentation
+      shows that an unauthenticated remote attacker could trigger the bug
+      somewhat consistently, hence treat as security issue.
+      (CVE-2015-3165)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve detection of system-call failures (Noah Misch)
+     </para>
+
+     <para>
+      Our replacement implementation of <function>snprintf()</> failed to
+      check for errors reported by the underlying system library calls;
+      the main case that might be missed is out-of-memory situations.
+      In the worst case this might lead to information exposure, due to our
+      code assuming that a buffer had been overwritten when it hadn't been.
+      Also, there were a few places in which security-relevant calls of other
+      system library functions did not check for failure.
+     </para>
+
+     <para>
+      It remains possible that some calls of the <function>*printf()</>
+      family of functions are vulnerable to information disclosure if an
+      out-of-memory error occurs at just the wrong time.  We judge the risk
+      to not be large, but will continue analysis in this area.
+      (CVE-2015-3166)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, some cases of decryption with an incorrect key could report
+      other error message texts.  It has been shown that such variance in
+      error reports can aid attackers in recovering keys from other systems.
+      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      are likewise exploitable, it seems better to avoid the risk by using a
+      one-size-fits-all message.
+      (CVE-2015-3167)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Protect against wraparound of multixact member IDs
+      (&Aacute;lvaro Herrera, Robert Haas, Thomas Munro)
+     </para>
+
+     <para>
+      Under certain usage patterns, the existing defenses against this might
+      be insufficient, allowing <filename>pg_multixact/members</> files to be
+      removed too early, resulting in data loss.
+      The fix for this includes modifying the server to fail transactions
+      that would result in overwriting old multixact member ID data, and
+      improving autovacuum to ensure it will act proactively to prevent
+      multixact member ID wraparound, as it does for transaction ID
+      wraparound.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect declaration of <filename>contrib/citext</>'s
+      <function>regexp_matches()</> functions (Tom Lane)
+     </para>
+
+     <para>
+      These functions should return <type>setof text[]</>, like the core
+      functions they are wrappers for; but they were incorrectly declared as
+      returning just <type>text[]</>.  This mistake had two results: first,
+      if there was no match you got a scalar null result, whereas what you
+      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      was effectively ignored, since you would get only one result array even
+      if there were multiple matches.
+     </para>
+
+     <para>
+      While the latter behavior is clearly a bug, there might be applications
+      depending on the former behavior; therefore the function declarations
+      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      In pre-9.5 branches, the old behavior exists in version 1.0 of
+      the <literal>citext</> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</> installed by
+      default).  To adopt the fix in pre-9.5 branches, execute
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
+      which <literal>citext</> is installed.  (You can also <quote>update</>
+      back to 1.0 if you need to undo that.)  Be aware that either update
+      direction will require dropping and recreating any views or rules that
+      use <filename>citext</>'s <function>regexp_matches()</> functions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect checking of deferred exclusion constraints after a HOT
+      update (Tom Lane)
+     </para>
+
+     <para>
+      If a new row that potentially violates a deferred exclusion constraint
+      is HOT-updated (that is, no indexed columns change and the row can be
+      stored back onto the same table page) later in the same transaction,
+      the exclusion constraint would be reported as violated when the check
+      finally occurred, even if the row(s) the new row originally conflicted
+      with had been deleted.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix planning of star-schema-style queries (Tom Lane)
+     </para>
+
+     <para>
+      Sometimes, efficient scanning of a large table requires that index
+      parameters be provided from more than one other table (commonly,
+      dimension tables whose keys are needed to index a large fact table).
+      The planner should be able to find such plans, but an overly
+      restrictive search heuristic prevented it.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent improper reordering of antijoins (NOT EXISTS joins) versus
+      other outer joins (Tom Lane)
+     </para>
+
+     <para>
+      This oversight in the planner has been observed to cause <quote>could
+      not find RelOptInfo for given relids</> errors, but it seems possible
+      that sometimes an incorrect query plan might get past that consistency
+      check and result in silently-wrong query output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect matching of subexpressions in outer-join plan nodes
+      (Tom Lane)
+     </para>
+
+     <para>
+      Previously, if textually identical non-strict subexpressions were used
+      both above and below an outer join, the planner might try to re-use
+      the value computed below the join, which would be incorrect because the
+      executor would force the value to NULL in case of an unmatched outer row.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix GEQO planner to cope with failure of its join order heuristic
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight has been seen to lead to <quote>failed to join all
+      relations together</> errors in queries involving <literal>LATERAL</>,
+      and that might happen in other cases as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible deadlock at startup
+      when <literal>max_prepared_transactions</> is too small
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't archive useless preallocated WAL files after a timeline switch
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recursively <function>fsync()</> the data directory after a crash
+      (Abhijit Menon-Sen, Robert Haas)
+     </para>
+
+     <para>
+      This ensures consistency if another crash occurs shortly later.  (The
+      second crash would have to be a system-level crash, not just a database
+      crash, for there to be a problem.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix autovacuum launcher's possible failure to shut down, if an error
+      occurs after it receives SIGTERM (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      (Andres Freund)
+     </para>
+
+     <para>
+      This oversight could result in spurious errors about <quote>multiple
+      backends attempting to wait for pincount 1</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when doing <literal>COPY IN</> to a table with check
+      constraints that contain whole-row references (Tom Lane)
+     </para>
+
+     <para>
+      The known failure case only crashes in 9.4 and up, but there is very
+      similar code in 9.3 and 9.2, so back-patch those branches as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid waiting for WAL flush or synchronous replication during commit of
+      a transaction that was read-only so far as the user is concerned
+      (Andres Freund)
+     </para>
+
+     <para>
+      Previously, a delay could occur at commit in transactions that had
+      written WAL due to HOT page pruning, leading to undesirable effects
+      such as sessions getting stuck at startup if all synchronous replicas
+      are down.  Sessions have also been observed to get stuck in catchup
+      interrupt processing when using synchronous replication; this will fix
+      that problem as well.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when manipulating hash indexes on temporary tables
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failure during hash index bucket split, if other processes
+      are modifying the index concurrently (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while analyzing index expressions (Jeff Janes)
+     </para>
+
+     <para>
+      <command>ANALYZE</> executes index expressions many times; if there are
+      slow functions in such an expression, it's desirable to be able to
+      cancel the <command>ANALYZE</> before that loop finishes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure <structfield>tableoid</> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
+      or <command>DELETE</> (Etsuro Fujita)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add the name of the target server to object description strings for
+      foreign-server user mappings (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Include the schema name in object identity strings for conversions
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Recommend setting <literal>include_realm</> to 1 when using
+      Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
+     </para>
+
+     <para>
+      Without this, identically-named users from different realms cannot be
+      distinguished.  For the moment this is only a documentation change, but
+      it will become the default setting in <productname>PostgreSQL</> 9.5.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      IPv4-in-IPv6 addresses (Tom Lane)
+     </para>
+
+     <para>
+      This hack was added in 2003 in response to a report that some Linux
+      kernels of the time would report IPv4 connections as having
+      IPv4-in-IPv6 addresses.  However, the logic was accidentally broken in
+      9.0.  The lack of any field complaints since then shows that it's not
+      needed anymore.  Now we have reports that the broken code causes
+      crashes on some systems, so let's just remove it rather than fix it.
+      (Had we chosen to fix it, that would make for a subtle and potentially
+      security-sensitive change in the effective meaning of
+      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      thing to do in minor releases.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      replication command (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This avoids a possible startup failure
+      in <application>pg_receivexlog</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      While shutting down service on Windows, periodically send status
+      updates to the Service Control Manager to prevent it from killing the
+      service too soon; and ensure that <application>pg_ctl</> will wait for
+      shutdown (Krystian Bigaj)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce risk of network deadlock when using <application>libpq</>'s
+      non-blocking mode (Heikki Linnakangas)
+     </para>
+
+     <para>
+      When sending large volumes of data, it's important to drain the input
+      buffer every so often, in case the server has sent enough response data
+      to cause it to block on output.  (A typical scenario is that the server
+      is sending a stream of NOTICE messages during <literal>COPY FROM
+      STDIN</>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</>
+      to opportunistically drain input when it can, but a full defense
+      against this problem requires application cooperation: the application
+      should watch for socket read-ready as well as write-ready conditions,
+      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, fix misparsing of empty values in URI
+      connection strings (Thomas Fanghaenel)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array handling in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</>
+      (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      This syntax has been accepted (but undocumented) for a long time, but
+      previously some parameters might be taken from the old connection
+      instead of the given string, which was agreed to be undesirable.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Suppress incorrect complaints from <application>psql</> on some
+      platforms that it failed to write <filename>~/.psql_history</> at exit
+      (Tom Lane)
+     </para>
+
+     <para>
+      This misbehavior was caused by a workaround for a bug in very old
+      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      removing the workaround, which will cause a similar failure to appear
+      for anyone still using such versions of <application>libedit</>.
+      Recommendation: upgrade that library, or use <application>libreadline</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</>'s rule for deciding which casts are
+      system-provided casts that should not be dumped (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
+      compression level option together with <literal>-Fd</>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_dump</> consider foreign key relationships
+      between extension configuration tables while choosing dump order
+      (Gilles Darold, Michael Paquier, Stephen Frost)
+     </para>
+
+     <para>
+      This oversight could result in producing dumps that fail to reload
+      because foreign key constraints are transiently violated.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possible <application>pg_dump</> failure when concurrent sessions
+      are creating and dropping temporary functions (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      column aliases (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This change prevents upgrade failures caused by bogus complaints about
+      missing WAL history files.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, check for improperly non-connectable
+      databases before proceeding
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</> script
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, preserve database-level freezing info
+      properly
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This oversight could cause missing-clog-file errors for tables within
+      the <literal>postgres</> and <literal>template1</> databases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      restricted privileges on Windows, so that they don't fail when run by
+      an administrator (Muhammad Asif Naeem)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve handling of <function>readdir()</> failures when scanning
+      directories in <application>initdb</> and <application>pg_basebackup</>
+      (Marco Nenciarini)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix compile failure on Sparc V8 machines (Rob Rowan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Silence some build warnings on OS X (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2015d
+      for DST law changes in Egypt, Mongolia, and Palestine, plus historical
+      changes in Canada and Chile.  Also adopt revised zone abbreviations for
+      the America/Adak zone (HST/HDT not HAST/HADT).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-3-6">
   <title>Release 9.3.6</title>
 
diff --git a/doc/src/sgml/release-9.4.sgml b/doc/src/sgml/release-9.4.sgml
index 3e15bb6cad..a96cd8dce2 100644
--- a/doc/src/sgml/release-9.4.sgml
+++ b/doc/src/sgml/release-9.4.sgml
@@ -1,6 +1,1430 @@
 <!-- doc/src/sgml/release-9.4.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-4-3">
+  <title>Release 9.4.3</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-06-04</simpara>
+  </note>
+
+  <para>
+   This release contains a small number of fixes from 9.4.2.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.3</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.4.2,
+    see <xref linkend="release-9-4-2">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [d8179b001] 2015-05-28 17:33:03 -0400
+Branch: REL9_4_STABLE [a3ae3db43] 2015-05-28 17:33:03 -0400
+Branch: REL9_3_STABLE [81f3d3b7c] 2015-05-28 17:33:03 -0400
+Branch: REL9_2_STABLE [aa8377e64] 2015-05-28 17:33:03 -0400
+Branch: REL9_1_STABLE [cb867853a] 2015-05-28 17:33:03 -0400
+Branch: REL9_0_STABLE [e4a04e5a4] 2015-05-28 17:33:03 -0400
+Author: Tom Lane <[email protected]>
+Branch: master [c07d8c963] 2015-05-29 13:05:16 -0400
+Branch: REL9_4_STABLE [dbde225b1] 2015-05-29 13:05:16 -0400
+Branch: REL9_3_STABLE [52fc94844] 2015-05-29 13:05:16 -0400
+Author: Tom Lane <[email protected]>
+Branch: master [57e1138bc] 2015-05-29 15:11:36 -0400
+Branch: REL9_4_STABLE [70a4519b8] 2015-05-29 15:11:36 -0400
+Branch: REL9_3_STABLE [35dd1b51f] 2015-05-29 15:11:36 -0400
+Branch: REL9_2_STABLE [77642a819] 2015-05-29 15:11:36 -0400
+Branch: REL9_1_STABLE [9e79ca326] 2015-05-29 15:11:36 -0400
+Branch: REL9_0_STABLE [bf2f20c08] 2015-05-29 15:11:36 -0400
+Author: Tom Lane <[email protected]>
+Branch: master [1943c000b] 2015-05-29 17:02:58 -0400
+Branch: REL9_4_STABLE [99f50dd72] 2015-05-29 17:02:58 -0400
+Branch: REL9_3_STABLE [c2b68b1f7] 2015-05-29 17:02:58 -0400
+-->
+
+    <listitem>
+     <para>
+      Avoid failures while <function>fsync</>'ing data directory during
+      crash restart (Abhijit Menon-Sen, Tom Lane)
+     </para>
+
+     <para>
+      In the previous minor releases we added a patch to <function>fsync</>
+      everything in the data directory after a crash.  Unfortunately its
+      response to any error condition was to fail, thereby preventing the
+      server from starting up, even when the problem was quite harmless.
+      An example is that an unwritable file in the data directory would
+      prevent restart on some platforms; but it is common to make SSL
+      certificate files unwritable by the server.  Revise this behavior so
+      that permissions failures are ignored altogether, and other types of
+      failures are logged but do not prevent continuing.
+     </para>
+
+     <para>
+      Also apply the same rules in <literal>initdb --sync-only</>.
+      This case is less critical but it should act similarly.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [f46edf479] 2015-05-28 11:24:37 -0400
+Branch: REL9_4_STABLE [d4a9f5519] 2015-05-28 11:24:37 -0400
+Branch: REL9_3_STABLE [27bae8d96] 2015-05-28 11:24:37 -0400
+Branch: REL9_2_STABLE [f3c67aad4] 2015-05-28 11:24:37 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_functiondef()</> to show
+      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+     </para>
+    </listitem>
+
+<!--
+Author: Andrew Dunstan <[email protected]>
+Branch: master [5302760a5] 2015-05-22 10:21:41 -0400
+Branch: REL9_4_STABLE [9b74f32cd] 2015-05-22 10:31:29 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix <function>pushJsonbValue()</> to unpack <type>jbvBinary</>
+      objects (Andrew Dunstan)
+     </para>
+
+     <para>
+      This change does not affect any behavior in the core code as of 9.4,
+      but it avoids a corner case for possible third-party callers.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [86832eb89] 2015-05-26 22:14:59 -0400
+Branch: REL9_4_STABLE [79f0f7cab] 2015-05-26 22:14:59 -0400
+Branch: REL9_3_STABLE [9e980e7d0] 2015-05-26 22:14:59 -0400
+Branch: REL9_2_STABLE [1b1457120] 2015-05-26 22:14:59 -0400
+Branch: REL9_1_STABLE [5585cc707] 2015-05-26 22:14:59 -0400
+Branch: REL9_0_STABLE [b06649b7f] 2015-05-26 22:15:00 -0400
+-->
+
+    <listitem>
+     <para>
+      Remove <application>configure</>'s check prohibiting linking to a
+      threaded <application>libpython</>
+      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+     </para>
+
+     <para>
+      The failure this restriction was meant to prevent seems to not be a
+      problem anymore on current <systemitem class="osname">OpenBSD</>
+      versions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-2">
+  <title>Release 9.4.2</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2015-05-22</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.4.1.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.2</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you use <filename>contrib/citext</>'s
+    <function>regexp_matches()</> functions, see the changelog entry below
+    about that.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.4.1,
+    see <xref linkend="release-9-4-1">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+<!--
+Author: Noah Misch <[email protected]>
+Branch: master [b0ce38503] 2015-05-18 10:02:31 -0400
+Branch: REL9_4_STABLE [7a0d48ac7] 2015-05-18 10:02:35 -0400
+Branch: REL9_3_STABLE [f4c12b415] 2015-05-18 10:02:36 -0400
+Branch: REL9_2_STABLE [439ff9b6b] 2015-05-18 10:02:37 -0400
+Branch: REL9_1_STABLE [6675ab595] 2015-05-18 10:02:38 -0400
+Branch: REL9_0_STABLE [648e41a6e] 2015-05-18 10:02:38 -0400
+-->
+
+    <listitem>
+     <para>
+      Avoid possible crash when client disconnects just before the
+      authentication timeout expires (Benkocs Norbert Attila)
+     </para>
+
+     <para>
+      If the timeout interrupt fired partway through the session shutdown
+      sequence, SSL-related state would be freed twice, typically causing a
+      crash and hence denial of service to other sessions.  Experimentation
+      shows that an unauthenticated remote attacker could trigger the bug
+      somewhat consistently, hence treat as security issue.
+      (CVE-2015-3165)
+     </para>
+    </listitem>
+
+<!--
+Author: Noah Misch <[email protected]>
+Branch: master [cac18a76b] 2015-05-18 10:02:31 -0400
+Branch: REL9_4_STABLE [f7c4fe7d9] 2015-05-18 10:02:35 -0400
+Branch: REL9_3_STABLE [d5abbd114] 2015-05-18 10:02:36 -0400
+Branch: REL9_2_STABLE [1e6652aea] 2015-05-18 10:02:37 -0400
+Branch: REL9_1_STABLE [b544dcdad] 2015-05-18 10:02:38 -0400
+Branch: REL9_0_STABLE [19f7adc01] 2015-05-18 10:02:38 -0400
+Author: Noah Misch <[email protected]>
+Branch: master [16304a013] 2015-05-18 10:02:31 -0400
+Branch: REL9_4_STABLE [2e3bd0665] 2015-05-18 10:02:35 -0400
+Branch: REL9_3_STABLE [34d21e770] 2015-05-18 10:02:36 -0400
+Branch: REL9_2_STABLE [82b7393eb] 2015-05-18 10:02:37 -0400
+Branch: REL9_1_STABLE [e58f042d9] 2015-05-18 10:02:38 -0400
+Branch: REL9_0_STABLE [b08c7aff7] 2015-05-18 10:02:38 -0400
+Author: Noah Misch <[email protected]>
+Branch: master [fd97bd411] 2015-05-18 10:02:31 -0400
+Branch: REL9_4_STABLE [ca325941d] 2015-05-18 10:02:35 -0400
+Branch: REL9_3_STABLE [c669915fd] 2015-05-18 10:02:37 -0400
+Branch: REL9_2_STABLE [01272d95a] 2015-05-18 10:02:37 -0400
+Branch: REL9_1_STABLE [2cb9f2cab] 2015-05-18 10:02:38 -0400
+Branch: REL9_0_STABLE [9b5e831e3] 2015-05-18 10:02:38 -0400
+Author: Tom Lane <[email protected]>
+Branch: master [0c071936e] 2015-05-19 18:19:38 -0400
+Branch: REL9_4_STABLE [2eb2fcd56] 2015-05-19 18:16:19 -0400
+Branch: REL9_3_STABLE [13341276e] 2015-05-19 18:16:58 -0400
+Branch: REL9_2_STABLE [221f7a949] 2015-05-19 18:17:42 -0400
+Branch: REL9_1_STABLE [0510cff6e] 2015-05-19 18:18:16 -0400
+Branch: REL9_0_STABLE [cf893530a] 2015-05-19 18:18:56 -0400
+-->
+
+    <listitem>
+     <para>
+      Improve detection of system-call failures (Noah Misch)
+     </para>
+
+     <para>
+      Our replacement implementation of <function>snprintf()</> failed to
+      check for errors reported by the underlying system library calls;
+      the main case that might be missed is out-of-memory situations.
+      In the worst case this might lead to information exposure, due to our
+      code assuming that a buffer had been overwritten when it hadn't been.
+      Also, there were a few places in which security-relevant calls of other
+      system library functions did not check for failure.
+     </para>
+
+     <para>
+      It remains possible that some calls of the <function>*printf()</>
+      family of functions are vulnerable to information disclosure if an
+      out-of-memory error occurs at just the wrong time.  We judge the risk
+      to not be large, but will continue analysis in this area.
+      (CVE-2015-3166)
+     </para>
+    </listitem>
+
+<!--
+Author: Noah Misch <[email protected]>
+Branch: master [85270ac7a] 2015-05-18 10:02:31 -0400
+Branch: REL9_4_STABLE [fba1fb4ef] 2015-05-18 10:02:35 -0400
+Branch: REL9_3_STABLE [7b758b7d6] 2015-05-18 10:02:37 -0400
+Branch: REL9_2_STABLE [0ba200431] 2015-05-18 10:02:37 -0400
+Branch: REL9_1_STABLE [e5981aebd] 2015-05-18 10:02:38 -0400
+Branch: REL9_0_STABLE [b84e5c017] 2015-05-18 10:02:39 -0400
+-->
+
+    <listitem>
+     <para>
+      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, some cases of decryption with an incorrect key could report
+      other error message texts.  It has been shown that such variance in
+      error reports can aid attackers in recovering keys from other systems.
+      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      are likewise exploitable, it seems better to avoid the risk by using a
+      one-size-fits-all message.
+      (CVE-2015-3167)
+     </para>
+    </listitem>
+
+<!--
+Author: Alvaro Herrera <[email protected]>
+Branch: master [b69bf30b9] 2015-04-28 11:32:53 -0300
+Branch: REL9_4_STABLE [942542cbb] 2015-04-28 11:32:53 -0300
+Branch: REL9_3_STABLE [e2eda4b11] 2015-04-28 11:32:53 -0300
+Author: Alvaro Herrera <[email protected]>
+Branch: master [669c7d20e] 2015-04-30 13:55:06 -0300
+Branch: REL9_4_STABLE [7140e11d8] 2015-04-30 13:55:06 -0300
+Branch: REL9_3_STABLE [e60581fdf] 2015-04-30 13:55:06 -0300
+Author: Robert Haas <[email protected]>
+Branch: master [7be47c56a] 2015-05-07 11:19:31 -0400
+Branch: REL9_4_STABLE [32c50af4c] 2015-05-07 11:13:55 -0400
+Branch: REL9_3_STABLE [83fbd9b59] 2015-05-07 11:16:41 -0400
+Author: Robert Haas <[email protected]>
+Branch: master [312747c22] 2015-05-10 21:34:26 -0400
+Branch: REL9_4_STABLE [7b3f0f8b8] 2015-05-10 21:47:28 -0400
+Branch: REL9_3_STABLE [24aa77ec9] 2015-05-10 21:47:41 -0400
+Author: Robert Haas <[email protected]>
+Branch: master [f6a6c46d7] 2015-05-10 22:21:20 -0400
+Branch: REL9_4_STABLE [ded891916] 2015-05-10 22:45:27 -0400
+Branch: REL9_3_STABLE [5bbac7ec1] 2015-05-10 22:45:42 -0400
+Author: Robert Haas <[email protected]>
+Branch: master [53bb309d2] 2015-05-08 12:53:00 -0400
+Branch: REL9_4_STABLE [3ecab37d9] 2015-05-08 12:53:30 -0400
+Branch: REL9_3_STABLE [596fb5aa7] 2015-05-08 12:55:14 -0400
+Author: Robert Haas <[email protected]>
+Branch: master [04e6d3b87] 2015-05-11 10:51:14 -0400
+Branch: REL9_4_STABLE [8ec1a3a54] 2015-05-11 10:56:19 -0400
+Branch: REL9_3_STABLE [543fbecee] 2015-05-11 10:56:32 -0400
+Author: Robert Haas <[email protected]>
+Branch: master [b4d4ce1d5] 2015-05-11 12:15:50 -0400
+Branch: REL9_4_STABLE [ea70595a3] 2015-05-11 12:16:35 -0400
+Branch: REL9_3_STABLE [ddebd2119] 2015-05-11 12:16:51 -0400
+-->
+
+    <listitem>
+     <para>
+      Protect against wraparound of multixact member IDs
+      (&Aacute;lvaro Herrera, Robert Haas, Thomas Munro)
+     </para>
+
+     <para>
+      Under certain usage patterns, the existing defenses against this might
+      be insufficient, allowing <filename>pg_multixact/members</> files to be
+      removed too early, resulting in data loss.
+      The fix for this includes modifying the server to fail transactions
+      that would result in overwriting old multixact member ID data, and
+      improving autovacuum to ensure it will act proactively to prevent
+      multixact member ID wraparound, as it does for transaction ID
+      wraparound.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [b22527f29] 2015-05-05 15:51:22 -0400
+Branch: REL9_4_STABLE [b1ec45994] 2015-05-05 15:50:53 -0400
+Branch: REL9_3_STABLE [ffac9f65d] 2015-05-05 15:50:53 -0400
+Branch: REL9_2_STABLE [d4070d10c] 2015-05-05 15:50:53 -0400
+Branch: REL9_1_STABLE [801e250a8] 2015-05-05 15:50:53 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix incorrect declaration of <filename>contrib/citext</>'s
+      <function>regexp_matches()</> functions (Tom Lane)
+     </para>
+
+     <para>
+      These functions should return <type>setof text[]</>, like the core
+      functions they are wrappers for; but they were incorrectly declared as
+      returning just <type>text[]</>.  This mistake had two results: first,
+      if there was no match you got a scalar null result, whereas what you
+      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      was effectively ignored, since you would get only one result array even
+      if there were multiple matches.
+     </para>
+
+     <para>
+      While the latter behavior is clearly a bug, there might be applications
+      depending on the former behavior; therefore the function declarations
+      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      In pre-9.5 branches, the old behavior exists in version 1.0 of
+      the <literal>citext</> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</> installed by
+      default).  To adopt the fix in pre-9.5 branches, execute
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
+      which <literal>citext</> is installed.  (You can also <quote>update</>
+      back to 1.0 if you need to undo that.)  Be aware that either update
+      direction will require dropping and recreating any views or rules that
+      use <filename>citext</>'s <function>regexp_matches()</> functions.
+     </para>
+    </listitem>
+
+<!--
+Author: Andrew Dunstan <[email protected]>
+Branch: master [bda76c1c8] 2015-02-26 12:25:21 -0500
+Branch: REL9_4_STABLE [79afe6e66] 2015-02-26 12:34:43 -0500
+-->
+
+    <listitem>
+     <para>
+      Render infinite dates and timestamps as <literal>infinity</> when
+      converting to <type>json</>, rather than throwing an error
+      (Andrew Dunstan)
+     </para>
+    </listitem>
+
+<!--
+Author: Andrew Dunstan <[email protected]>
+Branch: master [3c000fd9a] 2015-05-04 12:38:58 -0400
+Branch: REL9_4_STABLE [997066f44] 2015-05-04 12:43:16 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix <type>json</>/<type>jsonb</>'s <function>populate_record()</>
+      and <function>to_record()</> functions to handle empty input properly
+      (Andrew Dunstan)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [20781765f] 2015-05-11 12:25:43 -0400
+Branch: REL9_4_STABLE [4d3d9719d] 2015-05-11 12:25:44 -0400
+Branch: REL9_3_STABLE [7d09fdf82] 2015-05-11 12:25:45 -0400
+Branch: REL9_2_STABLE [46f9acd3e] 2015-05-11 12:25:28 -0400
+Branch: REL9_1_STABLE [dd75518d5] 2015-05-11 12:25:28 -0400
+Branch: REL9_0_STABLE [b93c8eaf8] 2015-05-11 12:25:28 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix incorrect checking of deferred exclusion constraints after a HOT
+      update (Tom Lane)
+     </para>
+
+     <para>
+      If a new row that potentially violates a deferred exclusion constraint
+      is HOT-updated (that is, no indexed columns change and the row can be
+      stored back onto the same table page) later in the same transaction,
+      the exclusion constraint would be reported as violated when the check
+      finally occurred, even if the row(s) the new row originally conflicted
+      with had been deleted.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [a4820434c] 2015-05-03 11:30:24 -0400
+Branch: REL9_4_STABLE [79edb2981] 2015-05-03 11:30:24 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix behavior when changing foreign key constraint deferrability status
+      with <literal>ALTER TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+     </para>
+
+     <para>
+      Operations later in the same session or concurrent sessions might not
+      honor the status change promptly.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [b514a7460] 2015-02-28 12:43:04 -0500
+Branch: REL9_4_STABLE [fdacbf9e8] 2015-02-28 12:43:04 -0500
+Branch: REL9_3_STABLE [1b558782b] 2015-02-28 12:43:04 -0500
+Branch: REL9_2_STABLE [6f419958a] 2015-02-28 12:43:04 -0500
+-->
+
+    <listitem>
+     <para>
+      Fix planning of star-schema-style queries (Tom Lane)
+     </para>
+
+     <para>
+      Sometimes, efficient scanning of a large table requires that index
+      parameters be provided from more than one other table (commonly,
+      dimension tables whose keys are needed to index a large fact table).
+      The planner should be able to find such plans, but an overly
+      restrictive search heuristic prevented it.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [3cf868601] 2015-04-25 16:44:27 -0400
+Branch: REL9_4_STABLE [5f3d1909c] 2015-04-25 16:44:27 -0400
+Branch: REL9_3_STABLE [3e47d0b2a] 2015-04-25 16:44:27 -0400
+Branch: REL9_2_STABLE [950f80dd5] 2015-04-25 16:44:27 -0400
+Branch: REL9_1_STABLE [2e38198f6] 2015-04-25 16:44:27 -0400
+Branch: REL9_0_STABLE [985da346e] 2015-04-25 16:44:27 -0400
+-->
+
+    <listitem>
+     <para>
+      Prevent improper reordering of antijoins (NOT EXISTS joins) versus
+      other outer joins (Tom Lane)
+     </para>
+
+     <para>
+      This oversight in the planner has been observed to cause <quote>could
+      not find RelOptInfo for given relids</> errors, but it seems possible
+      that sometimes an incorrect query plan might get past that consistency
+      check and result in silently-wrong query output.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [ca6805338] 2015-04-04 19:55:15 -0400
+Branch: REL9_4_STABLE [1d71d36ff] 2015-04-04 19:55:15 -0400
+Branch: REL9_3_STABLE [e105df208] 2015-04-04 19:55:15 -0400
+Branch: REL9_2_STABLE [b7d493bf7] 2015-04-04 19:55:15 -0400
+Branch: REL9_1_STABLE [3b5d67102] 2015-04-04 19:55:15 -0400
+Branch: REL9_0_STABLE [da8819194] 2015-04-04 19:55:15 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix incorrect matching of subexpressions in outer-join plan nodes
+      (Tom Lane)
+     </para>
+
+     <para>
+      Previously, if textually identical non-strict subexpressions were used
+      both above and below an outer join, the planner might try to re-use
+      the value computed below the join, which would be incorrect because the
+      executor would force the value to NULL in case of an unmatched outer row.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [1a179f36f] 2015-02-10 20:37:19 -0500
+Branch: REL9_4_STABLE [433c79d2c] 2015-02-10 20:37:22 -0500
+Branch: REL9_3_STABLE [672abc402] 2015-02-10 20:37:24 -0500
+Branch: REL9_2_STABLE [0d083103f] 2015-02-10 20:37:26 -0500
+Branch: REL9_1_STABLE [52579d507] 2015-02-10 20:37:29 -0500
+Branch: REL9_0_STABLE [72bbca27e] 2015-02-10 20:37:31 -0500
+-->
+
+    <listitem>
+     <para>
+      Fix GEQO planner to cope with failure of its join order heuristic
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight has been seen to lead to <quote>failed to join all
+      relations together</> errors in queries involving <literal>LATERAL</>,
+      and that might happen in other cases as well.
+     </para>
+    </listitem>
+
+<!--
+Author: Stephen Frost <[email protected]>
+Branch: master [6f9bd50ea] 2015-02-25 21:36:29 -0500
+Branch: REL9_4_STABLE [f16270ade] 2015-02-25 21:36:40 -0500
+-->
+
+    <listitem>
+     <para>
+      Ensure that row locking occurs properly when the target of
+      an <command>UPDATE</> or <command>DELETE</> is a security-barrier view
+      (Stephen Frost)
+     </para>
+    </listitem>
+
+<!--
+Author: Andres Freund <[email protected]>
+Branch: master [dfbaed459] 2015-04-28 00:17:43 +0200
+Branch: REL9_4_STABLE [fd3dfc236] 2015-04-28 00:18:04 +0200
+-->
+
+    <listitem>
+     <para>
+      Use a file opened for read/write when syncing replication slot data
+      during database startup (Andres Freund)
+     </para>
+
+     <para>
+      On some platforms, the previous coding could result in errors like
+      <quote>could not fsync file "pg_replslot/...": Bad file descriptor</>.
+     </para>
+    </listitem>
+
+<!--
+Author: Heikki Linnakangas <[email protected]>
+Branch: master [2c47fe16a] 2015-04-23 21:39:35 +0300
+Branch: REL9_4_STABLE [438a062d5] 2015-04-23 21:35:10 +0300
+Branch: REL9_3_STABLE [f73ebd766] 2015-04-23 21:36:24 +0300
+Branch: REL9_2_STABLE [d3f5d2892] 2015-04-23 21:36:50 +0300
+Branch: REL9_1_STABLE [e8528a8f5] 2015-04-23 21:36:59 +0300
+Branch: REL9_0_STABLE [223a94680] 2015-04-23 21:37:09 +0300
+-->
+
+    <listitem>
+     <para>
+      Fix possible deadlock at startup
+      when <literal>max_prepared_transactions</> is too small
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+<!--
+Author: Heikki Linnakangas <[email protected]>
+Branch: master [b2a5545bd] 2015-04-13 16:53:49 +0300
+Branch: REL9_4_STABLE [d72792d02] 2015-04-13 17:22:21 +0300
+Branch: REL9_3_STABLE [a800267e4] 2015-04-13 17:22:35 +0300
+Branch: REL9_2_STABLE [cc2939f44] 2015-04-13 17:26:59 +0300
+Branch: REL9_1_STABLE [ad2925e20] 2015-04-13 17:26:49 +0300
+Branch: REL9_0_STABLE [5b6938186] 2015-04-13 17:26:35 +0300
+-->
+
+    <listitem>
+     <para>
+      Don't archive useless preallocated WAL files after a timeline switch
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+<!--
+Author: Robert Haas <[email protected]>
+Branch: master [2ce439f33] 2015-05-04 14:13:53 -0400
+Branch: REL9_4_STABLE [d8ac77ab1] 2015-05-04 14:19:32 -0400
+Branch: REL9_3_STABLE [14de825de] 2015-05-04 12:27:55 -0400
+Branch: REL9_2_STABLE [2bc339716] 2015-05-04 12:41:53 -0400
+Branch: REL9_1_STABLE [4b71d28d5] 2015-05-04 12:47:11 -0400
+Branch: REL9_0_STABLE [30ba0d0c2] 2015-05-04 14:04:53 -0400
+Author: Robert Haas <[email protected]>
+Branch: master [456ff0863] 2015-05-05 09:29:49 -0400
+Branch: REL9_4_STABLE [603fe0181] 2015-05-05 09:16:39 -0400
+Branch: REL9_3_STABLE [6fd666954] 2015-05-05 09:19:39 -0400
+Branch: REL9_2_STABLE [53e1498c6] 2015-05-05 09:22:51 -0400
+Branch: REL9_1_STABLE [6ee1a7738] 2015-05-05 09:25:51 -0400
+Branch: REL9_0_STABLE [262fbcb9d] 2015-05-05 09:30:07 -0400
+-->
+
+    <listitem>
+     <para>
+      Recursively <function>fsync()</> the data directory after a crash
+      (Abhijit Menon-Sen, Robert Haas)
+     </para>
+
+     <para>
+      This ensures consistency if another crash occurs shortly later.  (The
+      second crash would have to be a system-level crash, not just a database
+      crash, for there to be a problem.)
+     </para>
+    </listitem>
+
+<!--
+Author: Alvaro Herrera <[email protected]>
+Branch: master [5df64f298] 2015-04-08 13:19:49 -0300
+Branch: REL9_4_STABLE [ec01c1c0a] 2015-04-08 13:19:49 -0300
+Branch: REL9_3_STABLE [0d6c9e061] 2015-04-08 13:19:49 -0300
+Branch: REL9_2_STABLE [37dc228e8] 2015-04-08 13:19:49 -0300
+Branch: REL9_1_STABLE [cf5d3f274] 2015-04-08 13:19:49 -0300
+Branch: REL9_0_STABLE [595bc97b5] 2015-04-08 13:19:49 -0300
+-->
+
+    <listitem>
+     <para>
+      Fix autovacuum launcher's possible failure to shut down, if an error
+      occurs after it receives SIGTERM (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [bc49d9324] 2015-04-03 00:07:29 -0400
+Branch: REL9_4_STABLE [ee0d06c0b] 2015-04-03 00:07:29 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix failure to handle invalidation messages for system catalogs
+      early in session startup (Tom Lane)
+     </para>
+
+     <para>
+      This oversight could result in failures in sessions that start
+      concurrently with a <command>VACUUM FULL</> on a system catalog.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [701dcc983] 2015-03-30 13:05:27 -0400
+Branch: REL9_4_STABLE [2897e069c] 2015-03-30 13:05:35 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix crash in <function>BackendIdGetTransactionIds()</> when trying
+      to get status for a backend process that just exited (Tom Lane)
+     </para>
+    </listitem>
+
+<!--
+Author: Andres Freund <[email protected]>
+Branch: master [bc208a5a2] 2015-02-23 16:14:14 +0100
+Branch: REL9_4_STABLE [89629f289] 2015-02-23 16:14:14 +0100
+Branch: REL9_3_STABLE [a6ddff812] 2015-02-23 16:14:15 +0100
+Branch: REL9_2_STABLE [c76e6dd7a] 2015-02-23 16:14:15 +0100
+Branch: REL9_1_STABLE [25576bee2] 2015-02-23 16:14:15 +0100
+Branch: REL9_0_STABLE [87b7fcc87] 2015-02-23 16:14:16 +0100
+-->
+
+    <listitem>
+     <para>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      (Andres Freund)
+     </para>
+
+     <para>
+      This oversight could result in spurious errors about <quote>multiple
+      backends attempting to wait for pincount 1</>.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [08361cea2] 2015-02-15 23:26:45 -0500
+Branch: REL9_4_STABLE [1bf32972e] 2015-02-15 23:26:45 -0500
+Branch: REL9_3_STABLE [4662ba5a2] 2015-02-15 23:26:46 -0500
+Branch: REL9_2_STABLE [effcaa4c2] 2015-02-15 23:26:46 -0500
+-->
+
+    <listitem>
+     <para>
+      Fix crash when doing <literal>COPY IN</> to a table with check
+      constraints that contain whole-row references (Tom Lane)
+     </para>
+
+     <para>
+      The known failure case only crashes in 9.4 and up, but there is very
+      similar code in 9.3 and 9.2, so back-patch those branches as well.
+     </para>
+    </listitem>
+
+<!--
+Author: Andres Freund <[email protected]>
+Branch: master [fd6a3f3ad] 2015-02-26 12:50:07 +0100
+Branch: REL9_4_STABLE [d72115112] 2015-02-26 12:50:07 +0100
+Branch: REL9_3_STABLE [abce8dc7d] 2015-02-26 12:50:07 +0100
+Branch: REL9_2_STABLE [d67076529] 2015-02-26 12:50:07 +0100
+Branch: REL9_1_STABLE [5c8dabecd] 2015-02-26 12:50:08 +0100
+Branch: REL9_0_STABLE [82e0d6eb5] 2015-02-26 12:50:08 +0100
+-->
+
+    <listitem>
+     <para>
+      Avoid waiting for WAL flush or synchronous replication during commit of
+      a transaction that was read-only so far as the user is concerned
+      (Andres Freund)
+     </para>
+
+     <para>
+      Previously, a delay could occur at commit in transactions that had
+      written WAL due to HOT page pruning, leading to undesirable effects
+      such as sessions getting stuck at startup if all synchronous replicas
+      are down.  Sessions have also been observed to get stuck in catchup
+      interrupt processing when using synchronous replication; this will fix
+      that problem as well.
+     </para>
+    </listitem>
+
+<!--
+Author: Andres Freund <[email protected]>
+Branch: master [87cec51d3] 2015-03-23 16:51:11 +0100
+Branch: REL9_4_STABLE [16be9737c] 2015-03-23 16:52:17 +0100
+-->
+
+    <listitem>
+     <para>
+      Avoid busy-waiting with short <literal>recovery_min_apply_delay</>
+      values (Andres Freund)
+     </para>
+    </listitem>
+
+<!--
+Author: Heikki Linnakangas <[email protected]>
+Branch: REL9_4_STABLE [462a2f1f0] 2015-05-13 09:53:50 +0300
+Branch: REL9_3_STABLE [96b676cc6] 2015-05-13 09:54:06 +0300
+Branch: REL9_2_STABLE [1a99d392c] 2015-05-13 10:06:52 +0300
+Branch: REL9_1_STABLE [f6c4a8690] 2015-05-13 10:06:47 +0300
+Branch: REL9_0_STABLE [bd1cfde70] 2015-05-13 10:06:38 +0300
+-->
+
+    <listitem>
+     <para>
+      Fix crash when manipulating hash indexes on temporary tables
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [ed9cc2b5d] 2015-03-30 16:40:05 -0400
+Branch: REL9_4_STABLE [a6a8bf5cd] 2015-03-30 16:40:05 -0400
+Branch: REL9_3_STABLE [246bbf65c] 2015-03-30 16:40:05 -0400
+Branch: REL9_2_STABLE [f155466fe] 2015-03-30 16:40:05 -0400
+Branch: REL9_1_STABLE [46bfe44e8] 2015-03-30 16:40:05 -0400
+Branch: REL9_0_STABLE [8f3c57721] 2015-03-30 16:40:05 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix possible failure during hash index bucket split, if other processes
+      are modifying the index concurrently (Tom Lane)
+     </para>
+    </listitem>
+
+<!--
+Author: Heikki Linnakangas <[email protected]>
+Branch: master [26d2c5dc8] 2015-03-12 15:34:32 +0100
+Branch: REL9_4_STABLE [d81072026] 2015-03-12 15:40:07 +0100
+-->
+
+    <listitem>
+     <para>
+      Fix memory leaks in GIN index vacuum (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [e4cbfd673] 2015-03-29 15:04:09 -0400
+Branch: REL9_4_STABLE [f444de5e3] 2015-03-29 15:04:18 -0400
+Branch: REL9_3_STABLE [995a664c8] 2015-03-29 15:04:24 -0400
+Branch: REL9_2_STABLE [d12afe114] 2015-03-29 15:04:28 -0400
+Branch: REL9_1_STABLE [ab02d35e0] 2015-03-29 15:04:33 -0400
+Branch: REL9_0_STABLE [152c94632] 2015-03-29 15:04:38 -0400
+-->
+
+    <listitem>
+     <para>
+      Check for interrupts while analyzing index expressions (Jeff Janes)
+     </para>
+
+     <para>
+      <command>ANALYZE</> executes index expressions many times; if there are
+      slow functions in such an expression, it's desirable to be able to
+      cancel the <command>ANALYZE</> before that loop finishes.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [443fd0540] 2015-03-12 13:39:09 -0400
+Branch: REL9_4_STABLE [32269be59] 2015-03-12 13:39:10 -0400
+Branch: REL9_3_STABLE [5bdf3cf5a] 2015-03-12 13:38:49 -0400
+Branch: REL9_2_STABLE [590fc5d96] 2015-03-12 13:38:49 -0400
+Branch: REL9_1_STABLE [4a4fd2b0c] 2015-03-12 13:38:49 -0400
+-->
+
+    <listitem>
+     <para>
+      Ensure <structfield>tableoid</> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
+      or <command>DELETE</> (Etsuro Fujita)
+     </para>
+    </listitem>
+
+<!--
+Author: Alvaro Herrera <[email protected]>
+Branch: master [cf34e373f] 2015-03-05 18:03:16 -0300
+Branch: REL9_4_STABLE [749977634] 2015-03-05 18:03:16 -0300
+Branch: REL9_3_STABLE [5cf400003] 2015-03-05 18:03:16 -0300
+Branch: REL9_2_STABLE [e166e6441] 2015-03-05 18:03:16 -0300
+Branch: REL9_1_STABLE [8167ef8e2] 2015-03-05 18:03:16 -0300
+Branch: REL9_0_STABLE [71b8e8e6c] 2015-03-05 18:03:16 -0300
+-->
+
+    <listitem>
+     <para>
+      Add the name of the target server to object description strings for
+      foreign-server user mappings (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+<!--
+Author: Alvaro Herrera <[email protected]>
+Branch: master [0d906798f] 2015-02-18 14:28:11 -0300
+Branch: REL9_4_STABLE [66463a3cf] 2015-02-18 14:28:12 -0300
+Branch: REL9_3_STABLE [a196e67f9] 2015-02-18 14:28:12 -0300
+-->
+
+    <listitem>
+     <para>
+      Include the schema name in object identity strings for conversions
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+<!--
+Author: Stephen Frost <[email protected]>
+Branch: REL9_4_STABLE [c106f397d] 2015-05-08 19:39:52 -0400
+Branch: REL9_3_STABLE [3de791ee7] 2015-05-08 19:40:06 -0400
+Branch: REL9_2_STABLE [21cb21de2] 2015-05-08 19:40:09 -0400
+Branch: REL9_1_STABLE [edfef090a] 2015-05-08 19:40:11 -0400
+Branch: REL9_0_STABLE [c981e5999] 2015-05-08 19:40:15 -0400
+-->
+
+    <listitem>
+     <para>
+      Recommend setting <literal>include_realm</> to 1 when using
+      Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
+     </para>
+
+     <para>
+      Without this, identically-named users from different realms cannot be
+      distinguished.  For the moment this is only a documentation change, but
+      it will become the default setting in <productname>PostgreSQL</> 9.5.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [cb66f495f] 2015-02-16 16:18:31 -0500
+Branch: REL9_4_STABLE [23291a796] 2015-02-16 16:17:59 -0500
+Branch: REL9_3_STABLE [7bc6e5954] 2015-02-16 16:18:04 -0500
+Branch: REL9_2_STABLE [3913b897d] 2015-02-16 16:18:08 -0500
+Branch: REL9_1_STABLE [2df854f84] 2015-02-16 16:18:12 -0500
+Branch: REL9_0_STABLE [c99ef9aff] 2015-02-16 16:18:17 -0500
+Author: Tom Lane <[email protected]>
+Branch: master [2e105def0] 2015-02-17 12:49:18 -0500
+Branch: REL9_4_STABLE [a271c9260] 2015-02-17 12:49:18 -0500
+Branch: REL9_3_STABLE [4ea2d2ddb] 2015-02-17 12:49:18 -0500
+Branch: REL9_2_STABLE [d068609b9] 2015-02-17 12:49:44 -0500
+Branch: REL9_1_STABLE [64e045838] 2015-02-17 12:49:46 -0500
+Branch: REL9_0_STABLE [e48ce4f33] 2015-02-17 12:49:18 -0500
+-->
+
+    <listitem>
+     <para>
+      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      IPv4-in-IPv6 addresses (Tom Lane)
+     </para>
+
+     <para>
+      This hack was added in 2003 in response to a report that some Linux
+      kernels of the time would report IPv4 connections as having
+      IPv4-in-IPv6 addresses.  However, the logic was accidentally broken in
+      9.0.  The lack of any field complaints since then shows that it's not
+      needed anymore.  Now we have reports that the broken code causes
+      crashes on some systems, so let's just remove it rather than fix it.
+      (Had we chosen to fix it, that would make for a subtle and potentially
+      security-sensitive change in the effective meaning of
+      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      thing to do in minor releases.)
+     </para>
+    </listitem>
+
+<!--
+Author: Robert Haas <[email protected]>
+Branch: master [bf740ce9e] 2015-03-19 11:04:09 -0400
+Branch: REL9_4_STABLE [76d07a2a0] 2015-03-19 11:08:54 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix status reporting for terminated background workers that were never
+      actually started (Robert Haas)
+     </para>
+    </listitem>
+
+<!--
+Author: Robert Haas <[email protected]>
+Branch: master [b3a5e76e1] 2015-04-02 14:38:06 -0400
+Branch: REL9_4_STABLE [a1f4ade01] 2015-04-02 14:39:18 -0400
+-->
+
+    <listitem>
+     <para>
+      After a database crash, don't restart background workers that are
+      marked <literal>BGW_NEVER_RESTART</> (Amit Khandekar)
+     </para>
+    </listitem>
+
+<!--
+Author: Heikki Linnakangas <[email protected]>
+Branch: master [ff16b40f8] 2015-02-06 11:26:50 +0200
+Branch: REL9_4_STABLE [3bc4c6942] 2015-02-06 11:27:12 +0200
+Branch: REL9_3_STABLE [5f0ba4abb] 2015-02-06 11:32:16 +0200
+Branch: REL9_2_STABLE [2af568c6b] 2015-02-06 11:32:37 +0200
+Branch: REL9_1_STABLE [0d36d9f2b] 2015-02-06 11:32:42 +0200
+-->
+
+    <listitem>
+     <para>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      replication command (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This avoids a possible startup failure
+      in <application>pg_receivexlog</>.
+     </para>
+    </listitem>
+
+<!--
+Author: Magnus Hagander <[email protected]>
+Branch: master [1a241d22a] 2015-05-07 15:04:13 +0200
+Branch: REL9_4_STABLE [43ed06816] 2015-05-07 15:09:21 +0200
+Branch: REL9_3_STABLE [ba3caee84] 2015-05-07 15:09:32 +0200
+Branch: REL9_2_STABLE [447e16581] 2015-05-07 15:09:42 +0200
+Branch: REL9_1_STABLE [b9ded1529] 2015-05-07 15:09:53 +0200
+Branch: REL9_0_STABLE [78ce2dc8e] 2015-05-07 15:10:01 +0200
+-->
+
+    <listitem>
+     <para>
+      While shutting down service on Windows, periodically send status
+      updates to the Service Control Manager to prevent it from killing the
+      service too soon; and ensure that <application>pg_ctl</> will wait for
+      shutdown (Krystian Bigaj)
+     </para>
+    </listitem>
+
+<!--
+Author: Heikki Linnakangas <[email protected]>
+Branch: master [2a3f6e368] 2015-02-23 13:34:21 +0200
+Branch: REL9_4_STABLE [0214a61e0] 2015-02-23 13:32:39 +0200
+Branch: REL9_3_STABLE [cdf813c59] 2015-02-23 13:32:42 +0200
+Branch: REL9_2_STABLE [22c9c8a7e] 2015-02-23 13:32:46 +0200
+Branch: REL9_1_STABLE [7052abbb6] 2015-02-23 13:32:50 +0200
+Branch: REL9_0_STABLE [8878eaaa8] 2015-02-23 13:32:53 +0200
+-->
+
+    <listitem>
+     <para>
+      Reduce risk of network deadlock when using <application>libpq</>'s
+      non-blocking mode (Heikki Linnakangas)
+     </para>
+
+     <para>
+      When sending large volumes of data, it's important to drain the input
+      buffer every so often, in case the server has sent enough response data
+      to cause it to block on output.  (A typical scenario is that the server
+      is sending a stream of NOTICE messages during <literal>COPY FROM
+      STDIN</>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</>
+      to opportunistically drain input when it can, but a full defense
+      against this problem requires application cooperation: the application
+      should watch for socket read-ready as well as write-ready conditions,
+      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [b26e20814] 2015-02-21 12:59:54 -0500
+Branch: REL9_4_STABLE [9c15a778a] 2015-02-21 12:59:35 -0500
+Branch: REL9_3_STABLE [f389b6e0a] 2015-02-21 12:59:39 -0500
+Branch: REL9_2_STABLE [83c3115dd] 2015-02-21 12:59:43 -0500
+-->
+
+    <listitem>
+     <para>
+      In <application>libpq</>, fix misparsing of empty values in URI
+      connection strings (Thomas Fanghaenel)
+     </para>
+    </listitem>
+
+<!--
+Author: Michael Meskes <[email protected]>
+Branch: master [1f393fc92] 2015-02-10 12:04:10 +0100
+Branch: REL9_4_STABLE [66c4ea8cb] 2015-02-11 10:57:02 +0100
+Branch: REL9_3_STABLE [1a321fea7] 2015-02-11 11:13:11 +0100
+Branch: REL9_2_STABLE [9be9ac425] 2015-02-11 11:14:14 +0100
+Branch: REL9_1_STABLE [32e633195] 2015-02-11 11:27:21 +0100
+Branch: REL9_0_STABLE [ce2fcc58e] 2015-02-11 11:30:11 +0100
+-->
+
+    <listitem>
+     <para>
+      Fix array handling in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+<!--
+Author: Alvaro Herrera <[email protected]>
+Branch: master [fcef16172] 2015-04-01 20:00:07 -0300
+Branch: REL9_4_STABLE [a44e54cf4] 2015-04-01 20:00:07 -0300
+Branch: REL9_3_STABLE [f4540cae1] 2015-04-01 20:00:07 -0300
+Branch: REL9_2_STABLE [d4bacdcb9] 2015-04-01 20:00:07 -0300
+Branch: REL9_1_STABLE [276591bc4] 2015-04-01 20:00:07 -0300
+Branch: REL9_0_STABLE [557fcfae3] 2015-04-01 20:00:07 -0300
+-->
+
+    <listitem>
+     <para>
+      Fix <application>psql</> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</>
+      (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      This syntax has been accepted (but undocumented) for a long time, but
+      previously some parameters might be taken from the old connection
+      instead of the given string, which was agreed to be undesirable.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [df9ebf1ee] 2015-03-14 13:43:00 -0400
+Branch: REL9_4_STABLE [f50b5c7d0] 2015-03-14 13:43:08 -0400
+Branch: REL9_3_STABLE [2cb76fa6f] 2015-03-14 13:43:13 -0400
+Branch: REL9_2_STABLE [309ff2ad0] 2015-03-14 13:43:17 -0400
+Branch: REL9_1_STABLE [043fe5c5a] 2015-03-14 13:43:21 -0400
+Branch: REL9_0_STABLE [396ef6fd8] 2015-03-14 13:43:26 -0400
+-->
+
+    <listitem>
+     <para>
+      Suppress incorrect complaints from <application>psql</> on some
+      platforms that it failed to write <filename>~/.psql_history</> at exit
+      (Tom Lane)
+     </para>
+
+     <para>
+      This misbehavior was caused by a workaround for a bug in very old
+      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      removing the workaround, which will cause a similar failure to appear
+      for anyone still using such versions of <application>libedit</>.
+      Recommendation: upgrade that library, or use <application>libreadline</>.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [9feefedf9] 2015-02-10 22:38:15 -0500
+Branch: REL9_4_STABLE [a592e5883] 2015-02-10 22:38:17 -0500
+Branch: REL9_3_STABLE [a4e871caa] 2015-02-10 22:38:20 -0500
+Branch: REL9_2_STABLE [2593c7039] 2015-02-10 22:38:22 -0500
+Branch: REL9_1_STABLE [14794f9b8] 2015-02-10 22:38:26 -0500
+Branch: REL9_0_STABLE [8e70f3c40] 2015-02-10 22:38:29 -0500
+-->
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</>'s rule for deciding which casts are
+      system-provided casts that should not be dumped (Tom Lane)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [0e7e355f2] 2015-02-18 11:43:00 -0500
+Branch: REL9_4_STABLE [a75dfb73e] 2015-02-18 11:43:00 -0500
+Branch: REL9_3_STABLE [a7ad5cf0c] 2015-02-18 11:43:00 -0500
+Branch: REL9_2_STABLE [c86f8f361] 2015-02-18 11:43:00 -0500
+Branch: REL9_1_STABLE [b0d53b2e3] 2015-02-18 11:43:00 -0500
+-->
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
+      compression level option together with <literal>-Fd</>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+<!--
+Author: Stephen Frost <[email protected]>
+Branch: master [ebd092bc2] 2015-03-02 14:12:21 -0500
+Branch: REL9_4_STABLE [c05fa3433] 2015-03-02 14:12:28 -0500
+Branch: REL9_3_STABLE [43d81f16a] 2015-03-02 14:12:33 -0500
+Branch: REL9_2_STABLE [d13bbfabb] 2015-03-02 14:12:38 -0500
+Branch: REL9_1_STABLE [dcb467b8e] 2015-03-02 14:12:43 -0500
+-->
+
+    <listitem>
+     <para>
+      Make <application>pg_dump</> consider foreign key relationships
+      between extension configuration tables while choosing dump order
+      (Gilles Darold, Michael Paquier, Stephen Frost)
+     </para>
+
+     <para>
+      This oversight could result in producing dumps that fail to reload
+      because foreign key constraints are transiently violated.
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [e3bfe6d84] 2015-03-06 13:27:46 -0500
+Branch: REL9_4_STABLE [629f8613f] 2015-03-06 13:27:46 -0500
+Branch: REL9_3_STABLE [d645273cf] 2015-03-06 13:27:46 -0500
+-->
+
+    <listitem>
+     <para>
+      Avoid possible <application>pg_dump</> failure when concurrent sessions
+      are creating and dropping temporary functions (Tom Lane)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [e9f1c01b7] 2015-02-25 12:01:12 -0500
+Branch: REL9_4_STABLE [2164a0de2] 2015-02-25 12:01:12 -0500
+Branch: REL9_3_STABLE [f864fe074] 2015-02-25 12:01:12 -0500
+Branch: REL9_2_STABLE [be8801e9c] 2015-02-25 12:01:12 -0500
+Branch: REL9_1_STABLE [f7b41902a] 2015-02-25 12:01:12 -0500
+Branch: REL9_0_STABLE [7a501bcbf] 2015-02-25 12:01:12 -0500
+-->
+
+    <listitem>
+     <para>
+      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      column aliases (Tom Lane)
+     </para>
+    </listitem>
+
+<!--
+Author: Bruce Momjian <[email protected]>
+Branch: master [b2f95c34f] 2015-05-01 13:03:23 -0400
+Branch: REL9_4_STABLE [70fac4844] 2015-05-01 13:03:23 -0400
+-->
+
+    <listitem>
+     <para>
+      Ensure that a view's replication identity is correctly set
+      to <literal>nothing</> during dump/restore (Marko Tiikkaja)
+     </para>
+
+     <para>
+      Previously, if the view was involved in a circular dependency,
+      it might wind up with an incorrect replication identity property.
+     </para>
+    </listitem>
+
+<!--
+Author: Bruce Momjian <[email protected]>
+Branch: master [4c5e06004] 2015-05-16 00:40:18 -0400
+Branch: REL9_4_STABLE [387a3e46c] 2015-05-16 00:40:18 -0400
+Branch: REL9_3_STABLE [bffbeec0c] 2015-05-16 00:40:18 -0400
+Branch: REL9_2_STABLE [affc04d16] 2015-05-16 00:40:18 -0400
+Branch: REL9_1_STABLE [acd75b264] 2015-05-16 00:40:18 -0400
+Branch: REL9_0_STABLE [df161c94e] 2015-05-16 00:40:18 -0400
+Author: Bruce Momjian <[email protected]>
+Branch: REL9_4_STABLE [5f6539635] 2015-05-16 15:16:28 -0400
+Branch: REL9_3_STABLE [4e9935979] 2015-05-16 15:16:28 -0400
+-->
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This change prevents upgrade failures caused by bogus complaints about
+      missing WAL history files.
+     </para>
+    </listitem>
+
+<!--
+Author: Bruce Momjian <[email protected]>
+Branch: master [fb694d959] 2015-05-16 00:10:03 -0400
+Branch: REL9_4_STABLE [31f5d3f35] 2015-05-16 00:10:03 -0400
+Branch: REL9_3_STABLE [4cfba5369] 2015-05-16 00:10:03 -0400
+Branch: REL9_2_STABLE [2a55e7134] 2015-05-16 00:10:03 -0400
+Branch: REL9_1_STABLE [321db7123] 2015-05-16 00:10:03 -0400
+Branch: REL9_0_STABLE [2194aa92b] 2015-05-16 00:10:03 -0400
+-->
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, check for improperly non-connectable
+      databases before proceeding
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+<!--
+Author: Bruce Momjian <[email protected]>
+Branch: master [056764b10] 2015-02-11 22:06:04 -0500
+Branch: REL9_4_STABLE [5eef3c61e] 2015-02-11 22:06:04 -0500
+Branch: REL9_3_STABLE [9ecd51da7] 2015-02-11 22:06:04 -0500
+Branch: REL9_2_STABLE [66f5217f5] 2015-02-11 22:06:04 -0500
+Branch: REL9_1_STABLE [08aaae40e] 2015-02-11 22:06:04 -0500
+Branch: REL9_0_STABLE [4ae178f60] 2015-02-11 22:06:04 -0500
+-->
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</> script
+      (Bruce Momjian)
+     </para>
+    </listitem>
+
+<!--
+Author: Bruce Momjian <[email protected]>
+Branch: master [866f3017a] 2015-02-11 21:02:44 -0500
+Branch: REL9_4_STABLE [c7bc5be11] 2015-02-11 21:02:36 -0500
+Branch: REL9_3_STABLE [e20523f8f] 2015-02-11 21:02:28 -0500
+Branch: REL9_2_STABLE [d99cf27b7] 2015-02-11 21:02:12 -0500
+Branch: REL9_1_STABLE [55179b03e] 2015-02-11 21:02:07 -0500
+Branch: REL9_0_STABLE [85dac37ee] 2015-02-11 21:02:06 -0500
+-->
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, preserve database-level freezing info
+      properly
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This oversight could cause missing-clog-file errors for tables within
+      the <literal>postgres</> and <literal>template1</> databases.
+     </para>
+    </listitem>
+
+<!--
+Author: Andrew Dunstan <[email protected]>
+Branch: master [fa1e5afa8] 2015-03-30 17:07:52 -0400
+Branch: REL9_4_STABLE [2366761bf] 2015-03-30 17:16:57 -0400
+Branch: REL9_3_STABLE [0904eb3e1] 2015-03-30 17:17:17 -0400
+Branch: REL9_2_STABLE [948566313] 2015-03-30 17:17:39 -0400
+Branch: REL9_1_STABLE [22b3f5b26] 2015-03-30 17:17:54 -0400
+Branch: REL9_0_STABLE [bf22a8e58] 2015-03-30 17:18:10 -0400
+-->
+
+    <listitem>
+     <para>
+      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      restricted privileges on Windows, so that they don't fail when run by
+      an administrator (Muhammad Asif Naeem)
+     </para>
+    </listitem>
+
+<!--
+Author: Robert Haas <[email protected]>
+Branch: master [5d6c2405f] 2015-02-17 10:19:30 -0500
+Branch: REL9_4_STABLE [5e49c98e0] 2015-02-17 10:50:49 -0500
+Branch: REL9_3_STABLE [9a90ec9cf] 2015-02-17 10:54:29 -0500
+Author: Robert Haas <[email protected]>
+Branch: REL9_2_STABLE [319406c2a] 2015-02-17 11:02:46 -0500
+Branch: REL9_1_STABLE [d7d294f59] 2015-02-17 11:08:40 -0500
+-->
+
+    <listitem>
+     <para>
+      Improve handling of <function>readdir()</> failures when scanning
+      directories in <application>initdb</> and <application>pg_basebackup</>
+      (Marco Nenciarini)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [8d1f23900] 2015-03-15 23:22:03 -0400
+Branch: REL9_4_STABLE [904e8b627] 2015-03-15 23:22:03 -0400
+Branch: REL9_3_STABLE [83587a075] 2015-03-15 23:22:03 -0400
+Branch: REL9_2_STABLE [8582ae7aa] 2015-03-15 23:22:03 -0400
+Branch: REL9_1_STABLE [9288645b5] 2015-03-15 23:22:03 -0400
+Branch: REL9_0_STABLE [40b0c10b7] 2015-03-15 23:22:03 -0400
+-->
+
+    <listitem>
+     <para>
+      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+     </para>
+    </listitem>
+
+<!--
+Author: Heikki Linnakangas <[email protected]>
+Branch: master [33e879c4e] 2015-02-13 23:56:25 +0200
+Branch: REL9_4_STABLE [56a23a83f] 2015-02-13 23:56:57 +0200
+Branch: REL9_3_STABLE [6ef5d894a] 2015-02-13 23:57:05 +0200
+Branch: REL9_2_STABLE [a0d84da1d] 2015-02-13 23:57:25 +0200
+Branch: REL9_1_STABLE [ebdc2e1e2] 2015-02-13 23:57:28 +0200
+Branch: REL9_0_STABLE [61165fae0] 2015-02-13 23:57:35 +0200
+-->
+
+    <listitem>
+     <para>
+      Fix compile failure on Sparc V8 machines (Rob Rowan)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [91f4a5a97] 2015-03-14 14:08:45 -0400
+Branch: REL9_4_STABLE [c415c13b7] 2015-03-14 14:08:45 -0400
+Author: Tom Lane <[email protected]>
+Branch: master [73b416b2e] 2015-04-05 13:01:59 -0400
+Branch: REL9_4_STABLE [8972a152c] 2015-04-05 13:01:55 -0400
+Branch: REL9_3_STABLE [6347bdb31] 2015-04-05 13:01:55 -0400
+-->
+
+    <listitem>
+     <para>
+      Silence some build warnings on OS X (Tom Lane)
+     </para>
+    </listitem>
+
+<!--
+Author: Tom Lane <[email protected]>
+Branch: master [9d366c1f3] 2015-05-15 19:35:29 -0400
+Branch: REL9_4_STABLE [d0ddcf62e] 2015-05-15 19:35:51 -0400
+Branch: REL9_3_STABLE [4fd69e412] 2015-05-15 19:35:58 -0400
+Branch: REL9_2_STABLE [2a63434f0] 2015-05-15 19:36:06 -0400
+Branch: REL9_1_STABLE [436f35609] 2015-05-15 19:36:13 -0400
+Branch: REL9_0_STABLE [3c3749a3b] 2015-05-15 19:36:20 -0400
+-->
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2015d
+      for DST law changes in Egypt, Mongolia, and Palestine, plus historical
+      changes in Canada and Chile.  Also adopt revised zone abbreviations for
+      the America/Adak zone (HST/HDT not HAST/HADT).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-4-1">
   <title>Release 9.4.1</title>
 
diff --git a/doc/src/sgml/replication-origins.sgml b/doc/src/sgml/replication-origins.sgml
new file mode 100644
index 0000000000..40fcc6d3d0
--- /dev/null
+++ b/doc/src/sgml/replication-origins.sgml
@@ -0,0 +1,93 @@
+<!-- doc/src/sgml/replication-origins.sgml -->
+<chapter id="replication-origins">
+ <title>Replication Progress Tracking</title>
+ <indexterm zone="replication-origins">
+  <primary>Replication Progress Tracking</primary>
+ </indexterm>
+ <indexterm zone="replication-origins">
+  <primary>Replication Origins</primary>
+ </indexterm>
+
+ <para>
+  Replication origins are intended to make it easier to implement
+  logical replication solutions on top
+  of <xref linkend="logicaldecoding">. They provide a solution to two
+  common problems:
+  <itemizedlist>
+   <listitem><para>How to safely keep track of replication progress</para></listitem>
+   <listitem><para>How to change replication behavior, based on the
+   origin of a row; e.g. to avoid loops in bi-directional replication
+   setups</para></listitem>
+  </itemizedlist>
+ </para>
+
+ <para>
+  Replication origins consist out of a name and an <type>oid</type>. The name,
+  which is what should be used to refer to the origin across systems, is
+  free-form <type>text</type>. It should be used in a way that makes conflicts
+  between replication origins created by different replication solutions
+  unlikely; e.g. by prefixing the replication solution's name to it.
+  The <type>oid</type> is used only to avoid having to store the long version
+  in situations where space efficiency is important. It should never be shared
+  between systems.
+ </para>
+
+ <para>
+  Replication origins can be created using the
+  <link linkend="pg-replication-origin-create"><function>pg_replication_origin_create()</function></link>;
+  dropped using
+  <link linkend="pg-replication-origin-drop"><function>pg_replication_origin_drop()</function></link>;
+  and seen in the
+  <link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link>
+  catalog.
+ </para>
+
+ <para>
+  When replicating from one system to another (independent of the fact that
+  those two might be in the same cluster, or even same database) one
+  nontrivial part of building a replication solution is to keep track of
+  replay progress in a safe manner. When the applying process, or the whole
+  cluster, dies, it needs to be possible to find out up to where data has
+  successfully been replicated. Naive solutions to this like updating a row in
+  a table for every replayed transaction have problems like runtime overhead
+  bloat.
+ </para>
+
+ <para>
+  Using the replication origin infrastructure a session can be
+  marked as replaying from a remote node (using the
+  <link linkend="pg-replication-origin-session-setup"><function>pg_replication_origin_session_setup()</function></link>
+  function. Additionally the <acronym>LSN</acronym> and commit
+  timestamp of every source transaction can be configured on a per
+  transaction basis using
+  <link linkend="pg-replication-origin-xact-setup"><function>pg_replication_origin_xact_setup()</function></link>.
+  If that's done replication progress will persist in a crash safe
+  manner. Replay progress for all replication origins can be seen in the
+  <link linkend="catalog-pg-replication-origin-status">
+   <structname>pg_replication_origin_status</structname>
+  </link> view. An individual origin's progress, e.g. when resuming
+  replication, can be acquired using
+  <link linkend="pg-replication-origin-progress"><function>pg_replication_origin_progress()</function></link>
+  for any origin or
+  <link linkend="pg-replication-origin-session-progress"><function>pg_replication_origin_session_progress()</function></link>
+  for the origin configured in the current session.
+ </para>
+
+ <para>
+  In more complex replication topologies than replication from exactly one
+  system to one other, another problem can be that it is hard to avoid
+  replicating replayed rows again. That can lead both to cycles in the
+  replication and inefficiencies. Replication origins provide an optional
+  mechanism to recognize and prevent that. When configured using the functions
+  referenced in the previous paragraph, every change and transaction passed to
+  output plugin callbacks (see <xref linkend="logicaldecoding-output-plugin">)
+  generated by the session is tagged with the replication origin of the
+  generating session.  This allows to treat them differently in the output
+  plugin, e.g. ignoring all but locally originating rows.  Additionally
+  the <link linkend="logicaldecoding-output-plugin-filter-origin">
+  <function>filter_by_origin_cb</function></link> callback can be used
+  to filter the logical decoding change stream based on the
+  source. While less flexible, filtering via that callback is
+  considerably more efficient.
+ </para>
+</chapter>
diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index 973db7435b..cb5c8fccae 100644
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -2136,7 +2136,7 @@ SELECT * FROM phone_number WHERE tricky(person, phone);
     When it is necessary for a view to provide row level security, the
     <literal>security_barrier</literal> attribute should be applied to
     the view.  This prevents maliciously-chosen functions and operators from
-    being invoked on rows until after the view has done its work.  For
+    being passed values from rows until after the view has done its work.  For
     example, if the view shown above had been created like this, it would
     be secure:
 <programlisting>
@@ -2157,9 +2157,12 @@ CREATE VIEW phone_number WITH (security_barrier) AS
     operators.  The query planner can safely allow such functions to be evaluated
     at any point in the query execution process, since invoking them on rows
     invisible to the user will not leak any information about the unseen rows.
-    In contrast, a function that might throw an error depending on the values
-    received as arguments (such as one that throws an error in the event of
-    overflow or division by zero) are not leak-proof, and could provide
+    Further, functions which do not take arguments or which are not passed any
+    arguments from the security barrier view do not have to be marked as
+    <literal>LEAKPROOF</literal> to be pushed down, as they never receive data
+    from the view.  In contrast, a function that might throw an error depending
+    on the values received as arguments (such as one that throws an error in the
+    event of overflow or division by zero) are not leak-proof, and could provide
     significant information about the unseen rows if applied before the security
     view's row filters.
 </para>
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index d8c52875d8..e5b7b4b68d 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -503,8 +503,9 @@ comparison table, in which all the HTML pages were cut down to 7 kB to fit.
 <acronym>TOAST</> pointers can point to data that is not on disk, but is
 elsewhere in the memory of the current server process.  Such pointers
 obviously cannot be long-lived, but they are nonetheless useful.  There
-is currently just one sub-case:
-pointers to <firstterm>indirect</> data.
+are currently two sub-cases:
+pointers to <firstterm>indirect</> data and
+pointers to <firstterm>expanded</> data.
 </para>
 
 <para>
@@ -519,6 +520,43 @@ and there is no infrastructure to help with this.
 </para>
 
 <para>
+Expanded <acronym>TOAST</> pointers are useful for complex data types
+whose on-disk representation is not especially suited for computational
+purposes.  As an example, the standard varlena representation of a
+<productname>PostgreSQL</> array includes dimensionality information, a
+nulls bitmap if there are any null elements, then the values of all the
+elements in order.  When the element type itself is variable-length, the
+only way to find the <replaceable>N</>'th element is to scan through all the
+preceding elements.  This representation is appropriate for on-disk storage
+because of its compactness, but for computations with the array it's much
+nicer to have an <quote>expanded</> or <quote>deconstructed</>
+representation in which all the element starting locations have been
+identified.  The <acronym>TOAST</> pointer mechanism supports this need by
+allowing a pass-by-reference Datum to point to either a standard varlena
+value (the on-disk representation) or a <acronym>TOAST</> pointer that
+points to an expanded representation somewhere in memory.  The details of
+this expanded representation are up to the data type, though it must have
+a standard header and meet the other API requirements given
+in <filename>src/include/utils/expandeddatum.h</>.  C-level functions
+working with the data type can choose to handle either representation.
+Functions that do not know about the expanded representation, but simply
+apply <function>PG_DETOAST_DATUM</> to their inputs, will automatically
+receive the traditional varlena representation; so support for an expanded
+representation can be introduced incrementally, one function at a time.
+</para>
+
+<para>
+<acronym>TOAST</> pointers to expanded values are further broken down
+into <firstterm>read-write</> and <firstterm>read-only</> pointers.
+The pointed-to representation is the same either way, but a function that
+receives a read-write pointer is allowed to modify the referenced value
+in-place, whereas one that receives a read-only pointer must not; it must
+first create a copy if it wants to make a modified version of the value.
+This distinction and some associated conventions make it possible to avoid
+unnecessary copying of expanded values during query execution.
+</para>
+
+<para>
 For all types of in-memory <acronym>TOAST</> pointer, the <acronym>TOAST</>
 management code ensures that no such pointer datum can accidentally get
 stored on disk.  In-memory <acronym>TOAST</> pointers are automatically
diff --git a/doc/src/sgml/stylesheet-fo.xsl b/doc/src/sgml/stylesheet-fo.xsl
index ad26a5abbe..434e69d8e3 100644
--- a/doc/src/sgml/stylesheet-fo.xsl
+++ b/doc/src/sgml/stylesheet-fo.xsl
@@ -24,4 +24,11 @@
   <xsl:call-template name="inline.monoseq"/>
 </xsl:template>
 
+<!-- bug fix from <https://sourceforge.net/p/docbook/bugs/1360/#831b> -->
+
+<xsl:template match="varlistentry/term" mode="xref-to">
+  <xsl:param name="verbose" select="1"/>
+  <xsl:apply-templates mode="no.anchor.mode"/>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/doc/src/sgml/tablesample-method.sgml b/doc/src/sgml/tablesample-method.sgml
new file mode 100644
index 0000000000..48eb7fe84e
--- /dev/null
+++ b/doc/src/sgml/tablesample-method.sgml
@@ -0,0 +1,139 @@
+<!-- doc/src/sgml/tablesample-method.sgml -->
+
+<chapter id="tablesample-method">
+ <title>Writing A TABLESAMPLE Sampling Method</title>
+
+ <indexterm zone="tablesample-method">
+  <primary>tablesample method</primary>
+ </indexterm>
+
+ <para>
+  The <command>TABLESAMPLE</command> clause implementation in
+  <productname>PostgreSQL</> supports creating a custom sampling methods.
+  These methods control what sample of the table will be returned when the
+  <command>TABLESAMPLE</command> clause is used.
+ </para>
+
+ <sect1 id="tablesample-method-functions">
+  <title>Tablesample Method Functions</title>
+
+  <para>
+   The tablesample method must provide following set of functions:
+  </para>
+
+  <para>
+<programlisting>
+void
+tsm_init (TableSampleDesc *desc,
+         uint32 seed, ...);
+</programlisting>
+   Initialize the tablesample scan. The function is called at the beginning
+   of each relation scan.
+  </para>
+  <para>
+   Note that the first two parameters are required but you can specify
+   additional parameters which then will be used by the <command>TABLESAMPLE</>
+   clause to determine the required user input in the query itself.
+   This means that if your function will specify additional float4 parameter
+   named percent, the user will have to call the tablesample method with
+   expression which evaluates (or can be coerced) to float4.
+   For example this definition:
+<programlisting>
+tsm_init (TableSampleDesc *desc,
+          uint32 seed, float4 pct);
+</programlisting>
+Will lead to SQL call like this:
+<programlisting>
+... TABLESAMPLE yourmethod(0.5) ...
+</programlisting>
+  </para>
+
+  <para>
+<programlisting>
+BlockNumber
+tsm_nextblock (TableSampleDesc *desc);
+</programlisting>
+   Returns the block number of next page to be scanned. InvalidBlockNumber
+   should be returned if the sampling has reached end of the relation.
+  </para>
+
+  <para>
+<programlisting>
+OffsetNumber
+tsm_nexttuple (TableSampleDesc *desc, BlockNumber blockno,
+               OffsetNumber maxoffset);
+</programlisting>
+   Return next tuple offset for the current page. InvalidOffsetNumber should
+   be returned if the sampling has reached end of the page.
+  </para>
+
+  <para>
+<programlisting>
+void
+tsm_end (TableSampleDesc *desc);
+</programlisting>
+   The scan has finished, cleanup any left over state.
+  </para>
+
+  <para>
+<programlisting>
+void
+tsm_reset (TableSampleDesc *desc);
+</programlisting>
+   The scan needs to rescan the relation again, reset any tablesample method
+   state.
+  </para>
+
+  <para>
+<programlisting>
+void
+tsm_cost (PlannerInfo *root, Path *path, RelOptInfo *baserel,
+          List *args, BlockNumber *pages, double *tuples);
+</programlisting>
+   This function is used by optimizer to decide best plan and is also used
+   for output of <command>EXPLAIN</>.
+  </para>
+
+  <para>
+   There is one more function which tablesampling method can implement in order
+   to gain more fine grained control over sampling. This function is optional:
+  </para>
+
+  <para>
+<programlisting>
+bool
+tsm_examinetuple (TableSampleDesc *desc, BlockNumber blockno,
+                  HeapTuple tuple, bool visible);
+</programlisting>
+   Function that enables the sampling method to examine contents of the tuple
+   (for example to collect some internal statistics). The return value of this
+   function is used to determine if the tuple should be returned to client.
+   Note that this function will receive even invisible tuples but it is not
+   allowed to return true for such tuple (if it does,
+   <productname>PostgreSQL</> will raise an error).
+  </para>
+
+  <para>
+  As you can see most of the tablesample method interfaces get the
+  <structname>TableSampleDesc</> as a first parameter. This structure holds
+  state of the current scan and also provides storage for the tablesample
+  method's state. It is defined as following:
+<programlisting>
+typedef struct TableSampleDesc {
+    HeapScanDesc    heapScan;
+    TupleDesc       tupDesc;
+
+    void           *tsmdata;
+} TableSampleDesc;
+</programlisting>
+  Where <structfield>heapScan</> is the descriptor of the physical table scan.
+  It's possible to get table size info from it. The <structfield>tupDesc</>
+  represents the tuple descriptor of the tuples returned by the scan and passed
+  to the <function>tsm_examinetuple()</> interface. The <structfield>tsmdata</>
+  can be used by tablesample method itself to store any state info it might
+  need during the scan. If used by the method, it should be <function>pfree</>d
+  in <function>tsm_end()</> function.
+  </para>
+ </sect1>
+
+</chapter>
diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index 0bc7e7b41c..b1c669fb91 100644
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -481,7 +481,7 @@ LIMIT 10;
     linkend="textsearch-indexes">) to speed up text searches:
 
 <programlisting>
-CREATE INDEX pgweb_idx ON pgweb USING gin(to_tsvector('english', body));
+CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector('english', body));
 </programlisting>
 
     Notice that the 2-argument version of <function>to_tsvector</function> is
@@ -511,7 +511,7 @@ CREATE INDEX pgweb_idx ON pgweb USING gin(to_tsvector('english', body));
     configuration name is specified by another column, e.g.:
 
 <programlisting>
-CREATE INDEX pgweb_idx ON pgweb USING gin(to_tsvector(config_name, body));
+CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector(config_name, body));
 </programlisting>
 
     where <literal>config_name</> is a column in the <literal>pgweb</>
@@ -527,7 +527,7 @@ CREATE INDEX pgweb_idx ON pgweb USING gin(to_tsvector(config_name, body));
     Indexes can even concatenate columns:
 
 <programlisting>
-CREATE INDEX pgweb_idx ON pgweb USING gin(to_tsvector('english', title || ' ' || body));
+CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector('english', title || ' ' || body));
 </programlisting>
    </para>
 
@@ -547,7 +547,7 @@ UPDATE pgweb SET textsearchable_index_col =
     Then we create a <acronym>GIN</acronym> index to speed up the search:
 
 <programlisting>
-CREATE INDEX textsearch_idx ON pgweb USING gin(textsearchable_index_col);
+CREATE INDEX textsearch_idx ON pgweb USING GIN (textsearchable_index_col);
 </programlisting>
 
     Now we are ready to perform a fast full text search:
@@ -3217,7 +3217,7 @@ SELECT plainto_tsquery('supernovae stars');
       <tertiary>text search</tertiary>
      </indexterm>
 
-      <literal>CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING gist(<replaceable>column</replaceable>);</literal>
+      <literal>CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING GIST (<replaceable>column</replaceable>);</literal>
      </term>
 
      <listitem>
@@ -3238,7 +3238,7 @@ SELECT plainto_tsquery('supernovae stars');
       <tertiary>text search</tertiary>
      </indexterm>
 
-      <literal>CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING gin(<replaceable>column</replaceable>);</literal>
+      <literal>CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING GIN (<replaceable>column</replaceable>);</literal>
      </term>
 
      <listitem>
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index f94aea174a..52f28bca7a 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -40,14 +40,17 @@
     On tables and foreign tables, triggers can be defined to execute either
     before or after any <command>INSERT</command>, <command>UPDATE</command>,
     or <command>DELETE</command> operation, either once per modified row,
-    or once per <acronym>SQL</acronym> statement.
-    <command>UPDATE</command> triggers can moreover be set to fire only if
-    certain columns are mentioned in the <literal>SET</literal> clause of the
-    <command>UPDATE</command> statement.
-    Triggers can also fire for <command>TRUNCATE</command> statements.
-    If a trigger event occurs, the trigger's function is called at the
-    appropriate time to handle the event.  Foreign tables do not support the
-    TRUNCATE statement at all.
+    or once per <acronym>SQL</acronym> statement.  If an
+    <command>INSERT</command> contains an <literal>ON CONFLICT DO UPDATE</>
+    clause, it is possible that the effects of a BEFORE insert trigger and
+    a BEFORE update trigger can both be applied together, if a reference to
+    an <varname>EXCLUDED</> column appears.  <command>UPDATE</command>
+    triggers can moreover be set to fire only if certain columns are
+    mentioned in the <literal>SET</literal> clause of the
+    <command>UPDATE</command> statement.  Triggers can also fire for
+    <command>TRUNCATE</command> statements.  If a trigger event occurs,
+    the trigger's function is called at the appropriate time to handle the
+    event.  Foreign tables do not support the TRUNCATE statement at all.
    </para>
 
    <para>
@@ -119,6 +122,35 @@
    </para>
 
    <para>
+    If an <command>INSERT</command> contains an <literal>ON CONFLICT
+    DO UPDATE</> clause, it is possible that the effects of all
+    row-level <literal>BEFORE</> <command>INSERT</command> triggers
+    and all row-level BEFORE <command>UPDATE</command> triggers can
+    both be applied in a way that is apparent from the final state of
+    the updated row, if an <varname>EXCLUDED</> column is referenced.
+    There need not be an <varname>EXCLUDED</> column reference for
+    both sets of BEFORE row-level triggers to execute, though.  The
+    possibility of surprising outcomes should be considered when there
+    are both <literal>BEFORE</> <command>INSERT</command> and
+    <literal>BEFORE</> <command>UPDATE</command> row-level triggers
+    that both affect a row being inserted/updated (this can still be
+    problematic if the modifications are more or less equivalent if
+    they're not also idempotent).  Note that statement-level
+    <command>UPDATE</command> triggers are executed when <literal>ON
+    CONFLICT DO UPDATE</> is specified, regardless of whether or not
+    any rows were affected by the <command>UPDATE</command> (and
+    regardless of whether the alternative <command>UPDATE</command>
+    path was ever taken).  An <command>INSERT</command> with an
+    <literal>ON CONFLICT DO UPDATE</> clause will execute
+    statement-level <literal>BEFORE</> <command>INSERT</command>
+    triggers first, then statement-level <literal>BEFORE</>
+    <command>UPDATE</command> triggers, followed by statement-level
+    <literal>AFTER</> <command>UPDATE</command> triggers and finally
+    statement-level <literal>AFTER</> <command>INSERT</command>
+    triggers.
+   </para>
+
+   <para>
     Trigger functions invoked by per-statement triggers should always
     return <symbol>NULL</symbol>. Trigger functions invoked by per-row
     triggers can return a table row (a value of
@@ -677,11 +709,7 @@ CREATE TABLE ttest (
 #include "commands/trigger.h"   /* ... triggers ... */
 #include "utils/rel.h"          /* ... and relations */
 
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
-
-extern Datum trigf(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(trigf);
 
diff --git a/doc/src/sgml/tsm-system-rows.sgml b/doc/src/sgml/tsm-system-rows.sgml
new file mode 100644
index 0000000000..0c2f1779c9
--- /dev/null
+++ b/doc/src/sgml/tsm-system-rows.sgml
@@ -0,0 +1,50 @@
+<!-- doc/src/sgml/tsm-system-rows.sgml -->
+
+<sect1 id="tsm-system-rows" xreflabel="tsm_system_rows">
+ <title>tsm_system_rows</title>
+
+ <indexterm zone="tsm-system-rows">
+  <primary>tsm_system_rows</primary>
+ </indexterm>
+
+ <para>
+  The <filename>tsm_system_rows</> module provides the tablesample method
+  <literal>SYSTEM_ROWS</literal>, which can be used inside the
+  <command>TABLESAMPLE</command> clause of a <command>SELECT</command>.
+ </para>
+
+ <para>
+  This tablesample method uses a linear probing algorithm to read sample
+  of a table and uses actual number of rows as limit (unlike the
+  <literal>SYSTEM</literal> tablesample method which limits by percentage
+  of a table).
+ </para>
+
+ <sect2>
+  <title>Examples</title>
+
+  <para>
+   Here is an example of selecting sample of a table with
+   <literal>SYSTEM_ROWS</>. First install the extension:
+  </para>
+
+<programlisting>
+CREATE EXTENSION tsm_system_rows;
+</programlisting>
+
+  <para>
+   Then you can use it in <command>SELECT</command> command same way as other
+   tablesample methods:
+
+<programlisting>
+SELECT * FROM my_table TABLESAMPLE SYSTEM_ROWS(100);
+</programlisting>
+  </para>
+
+  <para>
+   The above command will return a sample of 100 rows from the table my_table
+   (less if the table does not have 100 visible rows).
+  </para>
+ </sect2>
+
+</sect1>
diff --git a/doc/src/sgml/tsm-system-time.sgml b/doc/src/sgml/tsm-system-time.sgml
new file mode 100644
index 0000000000..2343ab16d4
--- /dev/null
+++ b/doc/src/sgml/tsm-system-time.sgml
@@ -0,0 +1,51 @@
+<!-- doc/src/sgml/tsm-system-time.sgml -->
+
+<sect1 id="tsm-system-time" xreflabel="tsm_system_time">
+ <title>tsm_system_time</title>
+
+ <indexterm zone="tsm-system-time">
+  <primary>tsm_system_time</primary>
+ </indexterm>
+
+ <para>
+  The <filename>tsm_system_time</> module provides the tablesample method
+  <literal>SYSTEM_TIME</literal>, which can be used inside the
+  <command>TABLESAMPLE</command> clause of a <command>SELECT</command>.
+ </para>
+
+ <para>
+  This tablesample method uses a linear probing algorithm to read sample
+  of a table and uses time in milliseconds as limit (unlike the
+  <literal>SYSTEM</literal> tablesample method which limits by percentage
+  of a table). This gives you some control over the length of execution
+  of your query.
+ </para>
+
+ <sect2>
+  <title>Examples</title>
+
+  <para>
+   Here is an example of selecting sample of a table with
+   <literal>SYSTEM_TIME</>. First install the extension:
+  </para>
+
+<programlisting>
+CREATE EXTENSION tsm_system_time;
+</programlisting>
+
+  <para>
+   Then you can use it in a <command>SELECT</command> command the same way as
+   other tablesample methods:
+
+<programlisting>
+SELECT * FROM my_table TABLESAMPLE SYSTEM_TIME(1000);
+</programlisting>
+  </para>
+
+  <para>
+   The above command will return as large a sample of my_table as it can read in
+   1 second (or less if it reads whole table faster).
+  </para>
+ </sect2>
+
+</sect1>
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 9de7ccc258..9c15950ccd 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1955,6 +1955,11 @@ memcpy(destination->data, buffer, 40);
          <entry><filename>utils/nabstime.h</filename></entry>
         </row>
         <row>
+         <entry><type>bigint</type> (<type>int8</type>)</entry>
+         <entry><type>int64</type></entry>
+         <entry><filename>postgres.h</filename></entry>
+        </row>
+        <row>
          <entry><type>boolean</type></entry>
          <entry><type>bool</type></entry>
          <entry><filename>postgres.h</filename> (maybe compiler built-in)</entry>
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
index 2459616281..ac0b8a2943 100644
--- a/doc/src/sgml/xtypes.sgml
+++ b/doc/src/sgml/xtypes.sgml
@@ -300,6 +300,77 @@ CREATE TYPE complex (
   </para>
  </note>
 
+ <para>
+  Another feature that's enabled by <acronym>TOAST</> support is the
+  possibility of having an <firstterm>expanded</> in-memory data
+  representation that is more convenient to work with than the format that
+  is stored on disk.  The regular or <quote>flat</> varlena storage format
+  is ultimately just a blob of bytes; it cannot for example contain
+  pointers, since it may get copied to other locations in memory.
+  For complex data types, the flat format may be quite expensive to work
+  with, so <productname>PostgreSQL</> provides a way to <quote>expand</>
+  the flat format into a representation that is more suited to computation,
+  and then pass that format in-memory between functions of the data type.
+ </para>
+
+ <para>
+  To use expanded storage, a data type must define an expanded format that
+  follows the rules given in <filename>src/include/utils/expandeddatum.h</>,
+  and provide functions to <quote>expand</> a flat varlena value into
+  expanded format and <quote>flatten</> the expanded format back to the
+  regular varlena representation.  Then ensure that all C functions for
+  the data type can accept either representation, possibly by converting
+  one into the other immediately upon receipt.  This does not require fixing
+  all existing functions for the data type at once, because the standard
+  <function>PG_DETOAST_DATUM</> macro is defined to convert expanded inputs
+  into regular flat format.  Therefore, existing functions that work with
+  the flat varlena format will continue to work, though slightly
+  inefficiently, with expanded inputs; they need not be converted until and
+  unless better performance is important.
+ </para>
+
+ <para>
+  C functions that know how to work with an expanded representation
+  typically fall into two categories: those that can only handle expanded
+  format, and those that can handle either expanded or flat varlena inputs.
+  The former are easier to write but may be less efficient overall, because
+  converting a flat input to expanded form for use by a single function may
+  cost more than is saved by operating on the expanded format.
+  When only expanded format need be handled, conversion of flat inputs to
+  expanded form can be hidden inside an argument-fetching macro, so that
+  the function appears no more complex than one working with traditional
+  varlena input.
+  To handle both types of input, write an argument-fetching function that
+  will detoast external, short-header, and compressed varlena inputs, but
+  not expanded inputs.  Such a function can be defined as returning a
+  pointer to a union of the flat varlena format and the expanded format.
+  Callers can use the <function>VARATT_IS_EXPANDED_HEADER()</> macro to
+  determine which format they received.
+ </para>
+
+ <para>
+  The <acronym>TOAST</> infrastructure not only allows regular varlena
+  values to be distinguished from expanded values, but also
+  distinguishes <quote>read-write</> and <quote>read-only</> pointers to
+  expanded values.  C functions that only need to examine an expanded
+  value, or will only change it in safe and non-semantically-visible ways,
+  need not care which type of pointer they receive.  C functions that
+  produce a modified version of an input value are allowed to modify an
+  expanded input value in-place if they receive a read-write pointer, but
+  must not modify the input if they receive a read-only pointer; in that
+  case they have to copy the value first, producing a new value to modify.
+  A C function that has constructed a new expanded value should always
+  return a read-write pointer to it.  Also, a C function that is modifying
+  a read-write expanded value in-place should take care to leave the value
+  in a sane state if it fails partway through.
+ </para>
+
+ <para>
+  For examples of working with expanded values, see the standard array
+  infrastructure, particularly
+  <filename>src/backend/utils/adt/array_expanded.c</>.
+ </para>
+
  </sect2>
 
 </sect1>
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 153a44fd2f..0d103f1e53 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -43,6 +43,7 @@ MAJORVERSION = @PG_MAJORVERSION@
 # (PGXS VPATH support is handled separately in pgxs.mk)
 ifndef PGXS
 vpath_build = @vpath_build@
+abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 ifneq ($(vpath_build),yes)
@@ -180,7 +181,6 @@ enable_coverage	= @enable_coverage@
 enable_tap_tests	= @enable_tap_tests@
 enable_thread_safety	= @enable_thread_safety@
 
-python_enable_shared	= @python_enable_shared@
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
 python_libspec		= @python_libspec@
@@ -191,7 +191,6 @@ python_version		= @python_version@
 krb_srvtab = @krb_srvtab@
 
 TCLSH			= @TCLSH@
-TCL_LIB_FILE		= @TCL_LIB_FILE@
 TCL_LIBS		= @TCL_LIBS@
 TCL_LIB_SPEC		= @TCL_LIB_SPEC@
 TCL_INCLUDE_SPEC	= @TCL_INCLUDE_SPEC@
@@ -284,7 +283,6 @@ else
 endif
 perl_archlibexp		= @perl_archlibexp@
 perl_privlibexp		= @perl_privlibexp@
-perl_useshrplib		= @perl_useshrplib@
 perl_embed_ldflags	= @perl_embed_ldflags@
 
 # Miscellaneous
@@ -303,6 +301,18 @@ BZIP2	= bzip2
 
 # Testing
 
+check: temp-install
+
+.PHONY: temp-install
+temp-install:
+ifndef NO_TEMP_INSTALL
+ifeq ($(MAKELEVEL),0)
+	rm -rf '$(abs_top_builddir)'/tmp_install
+	$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install
+endif
+	$(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install || exit; done)
+endif
+
 PROVE = @PROVE@
 PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/
 PROVE_FLAGS = --verbose
@@ -317,6 +327,10 @@ define ld_library_path_var
 $(if $(filter $(PORTNAME),darwin),DYLD_LIBRARY_PATH,$(if $(filter $(PORTNAME),aix),LIBPATH,LD_LIBRARY_PATH))
 endef
 
+define with_temp_install
+PATH="$(abs_top_builddir)/tmp_install$(bindir):$$PATH" $(call add_to_path,$(ld_library_path_var),$(abs_top_builddir)/tmp_install$(libdir))
+endef
+
 ifeq ($(enable_tap_tests),yes)
 
 define prove_installcheck
@@ -324,9 +338,7 @@ cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPOR
 endef
 
 define prove_check
-$(MKDIR_P) tmp_check/log
-$(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1
-cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(CURDIR)/tmp_check/install$(bindir):$$PATH" $(call add_to_path,$(ld_library_path_var),$(CURDIR)/tmp_check/install$(libdir)) top_builddir='$(CURDIR)/$(top_builddir)' PGPORT='6$(DEF_PGPORT)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl
+cd $(srcdir) && TESTDIR='$(CURDIR)' $(with_temp_install) PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl
 endef
 
 else
@@ -497,13 +509,13 @@ endif
 
 pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
 
-pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
-pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)' $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
+pg_regress_check = $(with_temp_install) $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-instance=./tmp_check --bindir= $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
+pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --bindir='$(bindir)' $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
 
 pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
 
-pg_isolation_regress_check = $(top_builddir)/src/test/isolation/pg_isolation_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
-pg_isolation_regress_installcheck = $(top_builddir)/src/test/isolation/pg_isolation_regress --inputdir=$(srcdir) --top-builddir=$(top_builddir) $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
+pg_isolation_regress_check = $(with_temp_install) $(top_builddir)/src/test/isolation/pg_isolation_regress --inputdir=$(srcdir) --temp-instance=./tmp_check --bindir= $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
+pg_isolation_regress_installcheck = $(top_builddir)/src/test/isolation/pg_isolation_regress --inputdir=$(srcdir) $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
 
 ##########################################################################
 #
@@ -685,7 +697,7 @@ endif
 define _create_recursive_target
 .PHONY: $(1)-$(2)-recurse
 $(1): $(1)-$(2)-recurse
-$(1)-$(2)-recurse:
+$(1)-$(2)-recurse: $(if $(filter check, $(3)), temp-install)
 	$$(MAKE) -C $(2) $(3)
 endef
 # Note that the use of $$ on the last line above is important; we want
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 09aad055f9..fe233c8e0f 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -127,7 +127,7 @@ ifeq ($(PORTNAME), darwin)
   else
     # loadable module
     DLSUFFIX		= .so
-    LINK.shared		= $(COMPILER) -bundle -multiply_defined suppress
+    LINK.shared		= $(COMPILER) -bundle -multiply_defined suppress -Wl,-undefined,dynamic_lookup
   endif
   BUILD.exports		= $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)
diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile
index 21721b48f0..bd93a6a8d1 100644
--- a/src/backend/access/Makefile
+++ b/src/backend/access/Makefile
@@ -8,6 +8,7 @@ subdir = src/backend/access
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-SUBDIRS	    = brin common gin gist hash heap index nbtree rmgrdesc spgist transam
+SUBDIRS	    = brin common gin gist hash heap index nbtree rmgrdesc spgist \
+			  tablesample transam
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/brin/Makefile b/src/backend/access/brin/Makefile
index ac44fcdee3..f4572d80a8 100644
--- a/src/backend/access/brin/Makefile
+++ b/src/backend/access/brin/Makefile
@@ -13,6 +13,6 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS = brin.o brin_pageops.o brin_revmap.o brin_tuple.o brin_xlog.o \
-	   brin_minmax.o
+       brin_minmax.o brin_inclusion.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
index 2b5fb8dce9..ff18b220c2 100644
--- a/src/backend/access/brin/brin.c
+++ b/src/backend/access/brin/brin.c
@@ -105,11 +105,6 @@ brininsert(PG_FUNCTION_ARGS)
 		BrinMemTuple *dtup;
 		BlockNumber heapBlk;
 		int			keyno;
-#ifdef USE_ASSERT_CHECKING
-		BrinTuple  *tmptup;
-		BrinMemTuple *tmpdtup;
-		Size 		tmpsiz;
-#endif
 
 		CHECK_FOR_INTERRUPTS();
 
@@ -137,45 +132,6 @@ brininsert(PG_FUNCTION_ARGS)
 
 		dtup = brin_deform_tuple(bdesc, brtup);
 
-#ifdef USE_ASSERT_CHECKING
-		{
-			/*
-			 * When assertions are enabled, we use this as an opportunity to
-			 * test the "union" method, which would otherwise be used very
-			 * rarely: first create a placeholder tuple, and addValue the
-			 * value we just got into it.  Then union the existing index tuple
-			 * with the updated placeholder tuple.  The tuple resulting from
-			 * that union should be identical to the one resulting from the
-			 * regular operation (straight addValue) below.
-			 *
-			 * Here we create the tuple to compare with; the actual comparison
-			 * is below.
-			 */
-			tmptup = brin_form_placeholder_tuple(bdesc, heapBlk, &tmpsiz);
-			tmpdtup = brin_deform_tuple(bdesc, tmptup);
-			for (keyno = 0; keyno < bdesc->bd_tupdesc->natts; keyno++)
-			{
-				BrinValues *bval;
-				FmgrInfo   *addValue;
-
-				bval = &tmpdtup->bt_columns[keyno];
-				addValue = index_getprocinfo(idxRel, keyno + 1,
-											 BRIN_PROCNUM_ADDVALUE);
-				FunctionCall4Coll(addValue,
-								  idxRel->rd_indcollation[keyno],
-								  PointerGetDatum(bdesc),
-								  PointerGetDatum(bval),
-								  values[keyno],
-								  nulls[keyno]);
-			}
-
-			union_tuples(bdesc, tmpdtup, brtup);
-
-			tmpdtup->bt_placeholder = dtup->bt_placeholder;
-			tmptup = brin_form_tuple(bdesc, heapBlk, tmpdtup, &tmpsiz);
-		}
-#endif
-
 		/*
 		 * Compare the key values of the new tuple to the stored index values;
 		 * our deformed tuple will get updated if the new tuple doesn't fit
@@ -202,20 +158,6 @@ brininsert(PG_FUNCTION_ARGS)
 			need_insert |= DatumGetBool(result);
 		}
 
-#ifdef USE_ASSERT_CHECKING
-		{
-			/*
-			 * Now we can compare the tuple produced by the union function
-			 * with the one from plain addValue.
-			 */
-			BrinTuple  *cmptup;
-			Size		cmpsz;
-
-			cmptup = brin_form_tuple(bdesc, heapBlk, dtup, &cmpsz);
-			Assert(brin_tuples_equal(tmptup, tmpsiz, cmptup, cmpsz));
-		}
-#endif
-
 		if (!need_insert)
 		{
 			/*
@@ -323,8 +265,6 @@ brinbeginscan(PG_FUNCTION_ARGS)
  * If a TID from the revmap is read as InvalidTID, we know that range is
  * unsummarized.  Pages in those ranges need to be returned regardless of scan
  * keys.
- *
- * XXX see _bt_first on what to do about sk_subtype.
  */
 Datum
 bringetbitmap(PG_FUNCTION_ARGS)
@@ -340,7 +280,6 @@ bringetbitmap(PG_FUNCTION_ARGS)
 	BlockNumber nblocks;
 	BlockNumber heapBlk;
 	int			totalpages = 0;
-	int			keyno;
 	FmgrInfo   *consistentFn;
 	MemoryContext oldcxt;
 	MemoryContext perRangeCxt;
@@ -359,18 +298,11 @@ bringetbitmap(PG_FUNCTION_ARGS)
 	heap_close(heapRel, AccessShareLock);
 
 	/*
-	 * Obtain consistent functions for all indexed column.  Maybe it'd be
-	 * possible to do this lazily only the first time we see a scan key that
-	 * involves each particular attribute.
+	 * Make room for the consistent support procedures of indexed columns.  We
+	 * don't look them up here; we do that lazily the first time we see a scan
+	 * key reference each of them.  We rely on zeroing fn_oid to InvalidOid.
 	 */
-	consistentFn = palloc(sizeof(FmgrInfo) * bdesc->bd_tupdesc->natts);
-	for (keyno = 0; keyno < bdesc->bd_tupdesc->natts; keyno++)
-	{
-		FmgrInfo   *tmp;
-
-		tmp = index_getprocinfo(idxRel, keyno + 1, BRIN_PROCNUM_CONSISTENT);
-		fmgr_info_copy(&consistentFn[keyno], tmp, CurrentMemoryContext);
-	}
+	consistentFn = palloc0(sizeof(FmgrInfo) * bdesc->bd_tupdesc->natts);
 
 	/*
 	 * Setup and use a per-range memory context, which is reset every time we
@@ -418,7 +350,6 @@ bringetbitmap(PG_FUNCTION_ARGS)
 		else
 		{
 			BrinMemTuple *dtup;
-			int			keyno;
 
 			dtup = brin_deform_tuple(bdesc, tup);
 			if (dtup->bt_placeholder)
@@ -431,6 +362,8 @@ bringetbitmap(PG_FUNCTION_ARGS)
 			}
 			else
 			{
+				int			keyno;
+
 				/*
 				 * Compare scan keys with summary values stored for the range.
 				 * If scan keys are matched, the page range must be added to
@@ -454,7 +387,18 @@ bringetbitmap(PG_FUNCTION_ARGS)
 					 */
 					Assert((key->sk_flags & SK_ISNULL) ||
 						   (key->sk_collation ==
-					   bdesc->bd_tupdesc->attrs[keyattno - 1]->attcollation));
+					  bdesc->bd_tupdesc->attrs[keyattno - 1]->attcollation));
+
+					/* First time this column? look up consistent function */
+					if (consistentFn[keyattno - 1].fn_oid == InvalidOid)
+					{
+						FmgrInfo   *tmp;
+
+						tmp = index_getprocinfo(idxRel, keyattno,
+												BRIN_PROCNUM_CONSISTENT);
+						fmgr_info_copy(&consistentFn[keyattno - 1], tmp,
+									   CurrentMemoryContext);
+					}
 
 					/*
 					 * Check whether the scan key is consistent with the page
@@ -579,10 +523,10 @@ brinbuildCallback(Relation index,
 	thisblock = ItemPointerGetBlockNumber(&htup->t_self);
 
 	/*
-	 * If we're in a block that belongs to a future range, summarize what we've
-	 * got and start afresh.  Note the scan might have skipped many pages,
-	 * if they were devoid of live tuples; make sure to insert index tuples
-	 * for those too.
+	 * If we're in a block that belongs to a future range, summarize what
+	 * we've got and start afresh.  Note the scan might have skipped many
+	 * pages, if they were devoid of live tuples; make sure to insert index
+	 * tuples for those too.
 	 */
 	while (thisblock > state->bs_currRangeStart + state->bs_pagesPerRange - 1)
 	{
@@ -716,7 +660,6 @@ brinbuild(PG_FUNCTION_ARGS)
 Datum
 brinbuildempty(PG_FUNCTION_ARGS)
 {
-
 	Relation	index = (Relation) PG_GETARG_POINTER(0);
 	Buffer		metabuf;
 
@@ -752,7 +695,7 @@ brinbulkdelete(PG_FUNCTION_ARGS)
 {
 	/* other arguments are not currently used */
 	IndexBulkDeleteResult *stats =
-		(IndexBulkDeleteResult *) PG_GETARG_POINTER(1);
+	(IndexBulkDeleteResult *) PG_GETARG_POINTER(1);
 
 	/* allocate stats if first time through, else re-use existing struct */
 	if (stats == NULL)
@@ -770,7 +713,7 @@ brinvacuumcleanup(PG_FUNCTION_ARGS)
 {
 	IndexVacuumInfo *info = (IndexVacuumInfo *) PG_GETARG_POINTER(0);
 	IndexBulkDeleteResult *stats =
-		(IndexBulkDeleteResult *) PG_GETARG_POINTER(1);
+	(IndexBulkDeleteResult *) PG_GETARG_POINTER(1);
 	Relation	heapRel;
 
 	/* No-op in ANALYZE ONLY mode */
@@ -956,7 +899,7 @@ terminate_brin_buildstate(BrinBuildState *state)
 
 		page = BufferGetPage(state->bs_currentInsertBuf);
 		RecordPageWithFreeSpace(state->bs_irel,
-								BufferGetBlockNumber(state->bs_currentInsertBuf),
+							BufferGetBlockNumber(state->bs_currentInsertBuf),
 								PageGetFreeSpace(page));
 		ReleaseBuffer(state->bs_currentInsertBuf);
 	}
diff --git a/src/backend/access/brin/brin_inclusion.c b/src/backend/access/brin/brin_inclusion.c
new file mode 100644
index 0000000000..803b07f10a
--- /dev/null
+++ b/src/backend/access/brin/brin_inclusion.c
@@ -0,0 +1,696 @@
+/*
+ * brin_inclusion.c
+ *		Implementation of inclusion opclasses for BRIN
+ *
+ * This module provides framework BRIN support functions for the "inclusion"
+ * operator classes.  A few SQL-level support functions are also required for
+ * each opclass.
+ *
+ * The "inclusion" BRIN strategy is useful for types that support R-Tree
+ * operations.  This implementation is a straight mapping of those operations
+ * to the block-range nature of BRIN, with two exceptions: (a) we explicitly
+ * support "empty" elements: at least with range types, we need to consider
+ * emptiness separately from regular R-Tree strategies; and (b) we need to
+ * consider "unmergeable" elements, that is, a set of elements for whose union
+ * no representation exists.  The only case where that happens as of this
+ * writing is the INET type, where IPv6 values cannot be merged with IPv4
+ * values.
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/access/brin/brin_inclusion.c
+ */
+#include "postgres.h"
+
+#include "access/brin_internal.h"
+#include "access/brin_tuple.h"
+#include "access/genam.h"
+#include "access/skey.h"
+#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
+#include "utils/datum.h"
+#include "utils/lsyscache.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
+
+
+/*
+ * Additional SQL level support functions
+ *
+ * Procedure numbers must not use values reserved for BRIN itself; see
+ * brin_internal.h.
+ */
+#define		INCLUSION_MAX_PROCNUMS	4	/* maximum support procs we need */
+#define		PROCNUM_MERGE			11	/* required */
+#define		PROCNUM_MERGEABLE		12	/* optional */
+#define		PROCNUM_CONTAINS		13	/* optional */
+#define		PROCNUM_EMPTY			14	/* optional */
+
+
+/*
+ * Subtract this from procnum to obtain index in InclusionOpaque arrays
+ * (Must be equal to minimum of private procnums).
+ */
+#define		PROCNUM_BASE			11
+
+/*-
+ * The values stored in the bv_values arrays correspond to:
+ *
+ * 0 - the union of the values in the block range
+ * 1 - whether an empty value is present in any tuple in the block range
+ * 2 - whether the values in the block range cannot be merged (e.g. an IPv6
+ *	   address amidst IPv4 addresses).
+ */
+#define INCLUSION_UNION				0
+#define INCLUSION_UNMERGEABLE		1
+#define INCLUSION_CONTAINS_EMPTY	2
+
+
+typedef struct InclusionOpaque
+{
+	FmgrInfo	extra_procinfos[INCLUSION_MAX_PROCNUMS];
+	bool		extra_proc_missing[INCLUSION_MAX_PROCNUMS];
+	Oid			cached_subtype;
+	FmgrInfo	strategy_procinfos[RTMaxStrategyNumber];
+} InclusionOpaque;
+
+Datum		brin_inclusion_opcinfo(PG_FUNCTION_ARGS);
+Datum		brin_inclusion_add_value(PG_FUNCTION_ARGS);
+Datum		brin_inclusion_consistent(PG_FUNCTION_ARGS);
+Datum		brin_inclusion_union(PG_FUNCTION_ARGS);
+static FmgrInfo *inclusion_get_procinfo(BrinDesc *bdesc, uint16 attno,
+					   uint16 procnum);
+static FmgrInfo *inclusion_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno,
+								Oid subtype, uint16 strategynum);
+
+
+/*
+ * BRIN inclusion OpcInfo function
+ */
+Datum
+brin_inclusion_opcinfo(PG_FUNCTION_ARGS)
+{
+	Oid			typoid = PG_GETARG_OID(0);
+	BrinOpcInfo *result;
+	TypeCacheEntry *bool_typcache = lookup_type_cache(BOOLOID, 0);
+
+	/*
+	 * All members of opaque are initialized lazily; both procinfo arrays
+	 * start out as non-initialized by having fn_oid be InvalidOid, and
+	 * "missing" to false, by zeroing here.  strategy_procinfos elements can
+	 * be invalidated when cached_subtype changes by zeroing fn_oid.
+	 * extra_procinfo entries are never invalidated, but if a lookup fails
+	 * (which is expected), extra_proc_missing is set to true, indicating not
+	 * to look it up again.
+	 */
+	result = palloc0(MAXALIGN(SizeofBrinOpcInfo(3)) + sizeof(InclusionOpaque));
+	result->oi_nstored = 3;
+	result->oi_opaque = (InclusionOpaque *)
+		MAXALIGN((char *) result + SizeofBrinOpcInfo(3));
+
+	/* the union */
+	result->oi_typcache[INCLUSION_UNION] =
+		lookup_type_cache(typoid, 0);
+
+	/* includes elements that are not mergeable */
+	result->oi_typcache[INCLUSION_UNMERGEABLE] = bool_typcache;
+
+	/* includes the empty element */
+	result->oi_typcache[INCLUSION_CONTAINS_EMPTY] = bool_typcache;
+
+	PG_RETURN_POINTER(result);
+}
+
+/*
+ * BRIN inclusion add value function
+ *
+ * Examine the given index tuple (which contains partial status of a certain
+ * page range) by comparing it to the given value that comes from another heap
+ * tuple.  If the new value is outside the union specified by the existing
+ * tuple values, update the index tuple and return true.  Otherwise, return
+ * false and do not modify in this case.
+ */
+Datum
+brin_inclusion_add_value(PG_FUNCTION_ARGS)
+{
+	BrinDesc   *bdesc = (BrinDesc *) PG_GETARG_POINTER(0);
+	BrinValues *column = (BrinValues *) PG_GETARG_POINTER(1);
+	Datum		newval = PG_GETARG_DATUM(2);
+	bool		isnull = PG_GETARG_BOOL(3);
+	Oid			colloid = PG_GET_COLLATION();
+	FmgrInfo   *finfo;
+	Datum		result;
+	bool		new = false;
+	AttrNumber	attno;
+	Form_pg_attribute attr;
+
+	/*
+	 * If the new value is null, we record that we saw it if it's the first
+	 * one; otherwise, there's nothing to do.
+	 */
+	if (isnull)
+	{
+		if (column->bv_hasnulls)
+			PG_RETURN_BOOL(false);
+
+		column->bv_hasnulls = true;
+		PG_RETURN_BOOL(true);
+	}
+
+	attno = column->bv_attno;
+	attr = bdesc->bd_tupdesc->attrs[attno - 1];
+
+	/*
+	 * If the recorded value is null, copy the new value (which we know to be
+	 * not null), and we're almost done.
+	 */
+	if (column->bv_allnulls)
+	{
+		column->bv_values[INCLUSION_UNION] =
+			datumCopy(newval, attr->attbyval, attr->attlen);
+		column->bv_values[INCLUSION_UNMERGEABLE] = BoolGetDatum(false);
+		column->bv_values[INCLUSION_CONTAINS_EMPTY] = BoolGetDatum(false);
+		column->bv_allnulls = false;
+		new = true;
+	}
+
+	/*
+	 * No need for further processing if the block range is marked as
+	 * containing unmergeable values.
+	 */
+	if (DatumGetBool(column->bv_values[INCLUSION_UNMERGEABLE]))
+		PG_RETURN_BOOL(false);
+
+	/*
+	 * If the opclass supports the concept of empty values, test the passed
+	 * new value for emptiness; if it returns true, we need to set the
+	 * "contains empty" flag in the element (unless already set).
+	 */
+	finfo = inclusion_get_procinfo(bdesc, attno, PROCNUM_EMPTY);
+	if (finfo != NULL && DatumGetBool(FunctionCall1Coll(finfo, colloid, newval)))
+	{
+		if (!DatumGetBool(column->bv_values[INCLUSION_CONTAINS_EMPTY]))
+		{
+			column->bv_values[INCLUSION_CONTAINS_EMPTY] = BoolGetDatum(true);
+			PG_RETURN_BOOL(true);
+		}
+
+		PG_RETURN_BOOL(false);
+	}
+
+	if (new)
+		PG_RETURN_BOOL(true);
+
+	/* Check if the new value is already contained. */
+	finfo = inclusion_get_procinfo(bdesc, attno, PROCNUM_CONTAINS);
+	if (finfo != NULL &&
+		DatumGetBool(FunctionCall2Coll(finfo, colloid,
+									   column->bv_values[INCLUSION_UNION],
+									   newval)))
+		PG_RETURN_BOOL(false);
+
+	/*
+	 * Check if the new value is mergeable to the existing union.  If it is
+	 * not, mark the value as containing unmergeable elements and get out.
+	 *
+	 * Note: at this point we could remove the value from the union, since
+	 * it's not going to be used any longer.  However, the BRIN framework
+	 * doesn't allow for the value not being present.  Improve someday.
+	 */
+	finfo = inclusion_get_procinfo(bdesc, attno, PROCNUM_MERGEABLE);
+	if (finfo != NULL &&
+		!DatumGetBool(FunctionCall2Coll(finfo, colloid,
+										column->bv_values[INCLUSION_UNION],
+										newval)))
+	{
+		column->bv_values[INCLUSION_UNMERGEABLE] = BoolGetDatum(true);
+		PG_RETURN_BOOL(true);
+	}
+
+	/* Finally, merge the new value to the existing union. */
+	finfo = inclusion_get_procinfo(bdesc, attno, PROCNUM_MERGE);
+	Assert(finfo != NULL);
+	result = FunctionCall2Coll(finfo, colloid,
+							   column->bv_values[INCLUSION_UNION], newval);
+	if (!attr->attbyval)
+		pfree(DatumGetPointer(column->bv_values[INCLUSION_UNION]));
+	column->bv_values[INCLUSION_UNION] = result;
+
+	PG_RETURN_BOOL(true);
+}
+
+/*
+ * BRIN inclusion consistent function
+ *
+ * All of the strategies are optional.
+ */
+Datum
+brin_inclusion_consistent(PG_FUNCTION_ARGS)
+{
+	BrinDesc   *bdesc = (BrinDesc *) PG_GETARG_POINTER(0);
+	BrinValues *column = (BrinValues *) PG_GETARG_POINTER(1);
+	ScanKey		key = (ScanKey) PG_GETARG_POINTER(2);
+	Oid			colloid = PG_GET_COLLATION(),
+				subtype;
+	Datum		unionval;
+	AttrNumber	attno;
+	Datum		query;
+	FmgrInfo   *finfo;
+	Datum		result;
+
+	Assert(key->sk_attno == column->bv_attno);
+
+	/* Handle IS NULL/IS NOT NULL tests. */
+	if (key->sk_flags & SK_ISNULL)
+	{
+		if (key->sk_flags & SK_SEARCHNULL)
+		{
+			if (column->bv_allnulls || column->bv_hasnulls)
+				PG_RETURN_BOOL(true);
+			PG_RETURN_BOOL(false);
+		}
+
+		/*
+		 * For IS NOT NULL, we can only skip ranges that are known to have
+		 * only nulls.
+		 */
+		Assert(key->sk_flags & SK_SEARCHNOTNULL);
+		PG_RETURN_BOOL(!column->bv_allnulls);
+	}
+
+	/* If it is all nulls, it cannot possibly be consistent. */
+	if (column->bv_allnulls)
+		PG_RETURN_BOOL(false);
+
+	/* It has to be checked, if it contains elements that are not mergeable. */
+	if (DatumGetBool(column->bv_values[INCLUSION_UNMERGEABLE]))
+		PG_RETURN_BOOL(true);
+
+	attno = key->sk_attno;
+	subtype = key->sk_subtype;
+	query = key->sk_argument;
+	unionval = column->bv_values[INCLUSION_UNION];
+	switch (key->sk_strategy)
+	{
+			/*
+			 * Placement strategies
+			 *
+			 * These are implemented by logically negating the result of the
+			 * converse placement operator; for this to work, the converse
+			 * operator must be part of the opclass.  An error will be thrown
+			 * by inclusion_get_strategy_procinfo() if the required strategy
+			 * is not part of the opclass.
+			 *
+			 * These all return false if either argument is empty, so there is
+			 * no need to check for empty elements.
+			 */
+
+		case RTLeftStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+												  RTOverRightStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		case RTOverLeftStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTRightStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		case RTOverRightStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTLeftStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		case RTRightStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTOverLeftStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		case RTBelowStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+												  RTOverAboveStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		case RTOverBelowStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTAboveStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		case RTOverAboveStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTBelowStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		case RTAboveStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+												  RTOverBelowStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+			/*
+			 * Overlap and contains strategies
+			 *
+			 * These strategies are simple enough that we can simply call the
+			 * operator and return its result.  Empty elements don't change
+			 * the result.
+			 */
+
+		case RTOverlapStrategyNumber:
+		case RTContainsStrategyNumber:
+		case RTOldContainsStrategyNumber:
+		case RTContainsElemStrategyNumber:
+		case RTSubStrategyNumber:
+		case RTSubEqualStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													key->sk_strategy);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_DATUM(result);
+
+			/*
+			 * Contained by strategies
+			 *
+			 * We cannot just call the original operator for the contained by
+			 * strategies because some elements can be contained even though
+			 * the union is not; instead we use the overlap operator.
+			 *
+			 * We check for empty elements separately as they are not merged
+			 * to the union but contained by everything.
+			 */
+
+		case RTContainedByStrategyNumber:
+		case RTOldContainedByStrategyNumber:
+		case RTSuperStrategyNumber:
+		case RTSuperEqualStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTOverlapStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			if (DatumGetBool(result))
+				PG_RETURN_BOOL(true);
+
+			PG_RETURN_DATUM(column->bv_values[INCLUSION_CONTAINS_EMPTY]);
+
+			/*
+			 * Adjacent strategy
+			 *
+			 * We test for overlap first but to be safe we need to call the
+			 * actual adjacent operator also.
+			 *
+			 * An empty element cannot be adjacent to any other, so there is
+			 * no need to check for it.
+			 */
+
+		case RTAdjacentStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTOverlapStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			if (DatumGetBool(result))
+				PG_RETURN_BOOL(true);
+
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTAdjacentStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_DATUM(result);
+
+			/*
+			 * Basic comparison strategies
+			 *
+			 * It is straightforward to support the equality strategies with
+			 * the contains operator.  Generally, inequality strategies do not
+			 * make much sense for the types which will be used with the
+			 * inclusion BRIN family of opclasses, but is is possible to
+			 * implement them with logical negation of the left-of and
+			 * right-of operators.
+			 *
+			 * NB: These strategies cannot be used with geometric datatypes
+			 * that use comparison of areas!  The only exception is the "same"
+			 * strategy.
+			 *
+			 * Empty elements are considered to be less than the others.  We
+			 * cannot use the empty support function to check the query is an
+			 * empty element, because the query can be another data type than
+			 * the empty support function argument.  So we will return true,
+			 * if there is a possibility that empty elements will change the
+			 * result.
+			 */
+
+		case RTLessStrategyNumber:
+		case RTLessEqualStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTRightStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			if (!DatumGetBool(result))
+				PG_RETURN_BOOL(true);
+
+			PG_RETURN_DATUM(column->bv_values[INCLUSION_CONTAINS_EMPTY]);
+
+		case RTSameStrategyNumber:
+		case RTEqualStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTContainsStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			if (DatumGetBool(result))
+				PG_RETURN_BOOL(true);
+
+			PG_RETURN_DATUM(column->bv_values[INCLUSION_CONTAINS_EMPTY]);
+
+		case RTGreaterEqualStrategyNumber:
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTLeftStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			if (!DatumGetBool(result))
+				PG_RETURN_BOOL(true);
+
+			PG_RETURN_DATUM(column->bv_values[INCLUSION_CONTAINS_EMPTY]);
+
+		case RTGreaterStrategyNumber:
+			/* no need to check for empty elements */
+			finfo = inclusion_get_strategy_procinfo(bdesc, attno, subtype,
+													RTLeftStrategyNumber);
+			result = FunctionCall2Coll(finfo, colloid, unionval, query);
+			PG_RETURN_BOOL(!DatumGetBool(result));
+
+		default:
+			/* shouldn't happen */
+			elog(ERROR, "invalid strategy number %d", key->sk_strategy);
+			PG_RETURN_BOOL(false);
+	}
+}
+
+/*
+ * BRIN inclusion union function
+ *
+ * Given two BrinValues, update the first of them as a union of the summary
+ * values contained in both.  The second one is untouched.
+ */
+Datum
+brin_inclusion_union(PG_FUNCTION_ARGS)
+{
+	BrinDesc   *bdesc = (BrinDesc *) PG_GETARG_POINTER(0);
+	BrinValues *col_a = (BrinValues *) PG_GETARG_POINTER(1);
+	BrinValues *col_b = (BrinValues *) PG_GETARG_POINTER(2);
+	Oid			colloid = PG_GET_COLLATION();
+	AttrNumber	attno;
+	Form_pg_attribute attr;
+	FmgrInfo   *finfo;
+	Datum		result;
+
+	Assert(col_a->bv_attno == col_b->bv_attno);
+
+	/* Adjust "hasnulls". */
+	if (!col_a->bv_hasnulls && col_b->bv_hasnulls)
+		col_a->bv_hasnulls = true;
+
+	/* If there are no values in B, there's nothing left to do. */
+	if (col_b->bv_allnulls)
+		PG_RETURN_VOID();
+
+	attno = col_a->bv_attno;
+	attr = bdesc->bd_tupdesc->attrs[attno - 1];
+
+	/*
+	 * Adjust "allnulls".  If A doesn't have values, just copy the values from
+	 * B into A, and we're done.  We cannot run the operators in this case,
+	 * because values in A might contain garbage.  Note we already established
+	 * that B contains values.
+	 */
+	if (col_a->bv_allnulls)
+	{
+		col_a->bv_allnulls = false;
+		col_a->bv_values[INCLUSION_UNION] =
+			datumCopy(col_b->bv_values[INCLUSION_UNION],
+					  attr->attbyval, attr->attlen);
+		col_a->bv_values[INCLUSION_UNMERGEABLE] =
+			col_b->bv_values[INCLUSION_UNMERGEABLE];
+		col_a->bv_values[INCLUSION_CONTAINS_EMPTY] =
+			col_b->bv_values[INCLUSION_CONTAINS_EMPTY];
+		PG_RETURN_VOID();
+	}
+
+	/* If B includes empty elements, mark A similarly, if needed. */
+	if (!DatumGetBool(col_a->bv_values[INCLUSION_CONTAINS_EMPTY]) &&
+		DatumGetBool(col_b->bv_values[INCLUSION_CONTAINS_EMPTY]))
+		col_a->bv_values[INCLUSION_CONTAINS_EMPTY] = BoolGetDatum(true);
+
+	/* Check if A includes elements that are not mergeable. */
+	if (DatumGetBool(col_a->bv_values[INCLUSION_UNMERGEABLE]))
+		PG_RETURN_VOID();
+
+	/* If B includes elements that are not mergeable, mark A similarly. */
+	if (DatumGetBool(col_b->bv_values[INCLUSION_UNMERGEABLE]))
+	{
+		col_a->bv_values[INCLUSION_UNMERGEABLE] = BoolGetDatum(true);
+		PG_RETURN_VOID();
+	}
+
+	/* Check if A and B are mergeable; if not, mark A unmergeable. */
+	finfo = inclusion_get_procinfo(bdesc, attno, PROCNUM_MERGEABLE);
+	if (finfo != NULL &&
+		!DatumGetBool(FunctionCall2Coll(finfo, colloid,
+										col_a->bv_values[INCLUSION_UNION],
+										col_b->bv_values[INCLUSION_UNION])))
+	{
+		col_a->bv_values[INCLUSION_UNMERGEABLE] = BoolGetDatum(true);
+		PG_RETURN_VOID();
+	}
+
+	/* Finally, merge B to A. */
+	finfo = inclusion_get_procinfo(bdesc, attno, PROCNUM_MERGE);
+	Assert(finfo != NULL);
+	result = FunctionCall2Coll(finfo, colloid,
+							   col_a->bv_values[INCLUSION_UNION],
+							   col_b->bv_values[INCLUSION_UNION]);
+	if (!attr->attbyval)
+		pfree(DatumGetPointer(col_a->bv_values[INCLUSION_UNION]));
+	col_a->bv_values[INCLUSION_UNION] = result;
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Cache and return inclusion opclass support procedure
+ *
+ * Return the procedure corresponding to the given function support number
+ * or null if it is not exists.
+ */
+static FmgrInfo *
+inclusion_get_procinfo(BrinDesc *bdesc, uint16 attno, uint16 procnum)
+{
+	InclusionOpaque *opaque;
+	uint16		basenum = procnum - PROCNUM_BASE;
+
+	/*
+	 * We cache these in the opaque struct, to avoid repetitive syscache
+	 * lookups.
+	 */
+	opaque = (InclusionOpaque *) bdesc->bd_info[attno - 1]->oi_opaque;
+
+	/*
+	 * If we already searched for this proc and didn't find it, don't bother
+	 * searching again.
+	 */
+	if (opaque->extra_proc_missing[basenum])
+		return NULL;
+
+	if (opaque->extra_procinfos[basenum].fn_oid == InvalidOid)
+	{
+		if (RegProcedureIsValid(index_getprocid(bdesc->bd_index, attno,
+												procnum)))
+		{
+			fmgr_info_copy(&opaque->extra_procinfos[basenum],
+						   index_getprocinfo(bdesc->bd_index, attno, procnum),
+						   bdesc->bd_context);
+		}
+		else
+		{
+			opaque->extra_proc_missing[basenum] = true;
+			return NULL;
+		}
+	}
+
+	return &opaque->extra_procinfos[basenum];
+}
+
+/*
+ * Cache and return the procedure of the given strategy
+ *
+ * Return the procedure corresponding to the given sub-type and strategy
+ * number.  The data type of the index will be used as the left hand side of
+ * the operator and the given sub-type will be used as the right hand side.
+ * Throws an error if the pg_amop row does not exist, but that should not
+ * happen with a properly configured opclass.
+ *
+ * It always throws an error when the data type of the opclass is different
+ * from the data type of the column or the expression.  That happens when the
+ * column data type has implicit cast to the opclass data type.  We don't
+ * bother casting types, because this situation can easily be avoided by
+ * setting storage data type to that of the opclass.  The same problem does not
+ * apply to the data type of the right hand side, because the type in the
+ * ScanKey always matches the opclass' one.
+ *
+ * Note: this function mirrors minmax_get_strategy_procinfo; if changes are
+ * made here, see that function too.
+ */
+static FmgrInfo *
+inclusion_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno, Oid subtype,
+								uint16 strategynum)
+{
+	InclusionOpaque *opaque;
+
+	Assert(strategynum >= 1 &&
+		   strategynum <= RTMaxStrategyNumber);
+
+	opaque = (InclusionOpaque *) bdesc->bd_info[attno - 1]->oi_opaque;
+
+	/*
+	 * We cache the procedures for the last sub-type in the opaque struct, to
+	 * avoid repetitive syscache lookups.  If the sub-type is changed,
+	 * invalidate all the cached entries.
+	 */
+	if (opaque->cached_subtype != subtype)
+	{
+		uint16		i;
+
+		for (i = 1; i <= RTMaxStrategyNumber; i++)
+			opaque->strategy_procinfos[i - 1].fn_oid = InvalidOid;
+		opaque->cached_subtype = subtype;
+	}
+
+	if (opaque->strategy_procinfos[strategynum - 1].fn_oid == InvalidOid)
+	{
+		Form_pg_attribute attr;
+		HeapTuple	tuple;
+		Oid			opfamily,
+					oprid;
+		bool		isNull;
+
+		opfamily = bdesc->bd_index->rd_opfamily[attno - 1];
+		attr = bdesc->bd_tupdesc->attrs[attno - 1];
+		tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily),
+								ObjectIdGetDatum(attr->atttypid),
+								ObjectIdGetDatum(subtype),
+								Int16GetDatum(strategynum));
+
+		if (!HeapTupleIsValid(tuple))
+			elog(ERROR, "missing operator %d(%u,%u) in opfamily %u",
+				 strategynum, attr->atttypid, subtype, opfamily);
+
+		oprid = DatumGetObjectId(SysCacheGetAttr(AMOPSTRATEGY, tuple,
+											 Anum_pg_amop_amopopr, &isNull));
+		ReleaseSysCache(tuple);
+		Assert(!isNull && RegProcedureIsValid(oprid));
+
+		fmgr_info_cxt(get_opcode(oprid),
+					  &opaque->strategy_procinfos[strategynum - 1],
+					  bdesc->bd_context);
+	}
+
+	return &opaque->strategy_procinfos[strategynum - 1];
+}
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index 299d6f7bf6..7cd98887c0 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -13,37 +13,27 @@
 #include "access/genam.h"
 #include "access/brin_internal.h"
 #include "access/brin_tuple.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "catalog/pg_type.h"
+#include "catalog/pg_amop.h"
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
+#include "utils/rel.h"
 #include "utils/syscache.h"
 
 
-/*
- * Procedure numbers must not collide with BRIN_PROCNUM defines in
- * brin_internal.h.  Note we only need inequality functions.
- */
-#define		MINMAX_NUM_PROCNUMS		4	/* # support procs we need */
-#define		PROCNUM_LESS			11
-#define		PROCNUM_LESSEQUAL		12
-#define		PROCNUM_GREATEREQUAL	13
-#define		PROCNUM_GREATER			14
-
-/*
- * Subtract this from procnum to obtain index in MinmaxOpaque arrays
- * (Must be equal to minimum of private procnums)
- */
-#define		PROCNUM_BASE			11
-
 typedef struct MinmaxOpaque
 {
-	FmgrInfo	operators[MINMAX_NUM_PROCNUMS];
-	bool		inited[MINMAX_NUM_PROCNUMS];
+	Oid			cached_subtype;
+	FmgrInfo	strategy_procinfos[BTMaxStrategyNumber];
 } MinmaxOpaque;
 
-static FmgrInfo *minmax_get_procinfo(BrinDesc *bdesc, uint16 attno,
-					uint16 procnum);
+Datum		brin_minmax_opcinfo(PG_FUNCTION_ARGS);
+Datum		brin_minmax_add_value(PG_FUNCTION_ARGS);
+Datum		brin_minmax_consistent(PG_FUNCTION_ARGS);
+Datum		brin_minmax_union(PG_FUNCTION_ARGS);
+static FmgrInfo *minmax_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno,
+							 Oid subtype, uint16 strategynum);
 
 
 Datum
@@ -53,8 +43,8 @@ brin_minmax_opcinfo(PG_FUNCTION_ARGS)
 	BrinOpcInfo *result;
 
 	/*
-	 * opaque->operators is initialized lazily, as indicated by 'inited' which
-	 * is initialized to all false by palloc0.
+	 * opaque->strategy_procinfos is initialized lazily; here it is set to
+	 * all-uninitialized by palloc0 which sets fn_oid to InvalidOid.
 	 */
 
 	result = palloc0(MAXALIGN(SizeofBrinOpcInfo(2)) +
@@ -62,8 +52,8 @@ brin_minmax_opcinfo(PG_FUNCTION_ARGS)
 	result->oi_nstored = 2;
 	result->oi_opaque = (MinmaxOpaque *)
 		MAXALIGN((char *) result + SizeofBrinOpcInfo(2));
-	result->oi_typids[0] = typoid;
-	result->oi_typids[1] = typoid;
+	result->oi_typcache[0] = result->oi_typcache[1] =
+		lookup_type_cache(typoid, 0);
 
 	PG_RETURN_POINTER(result);
 }
@@ -122,7 +112,8 @@ brin_minmax_add_value(PG_FUNCTION_ARGS)
 	 * and update them accordingly.  First check if it's less than the
 	 * existing minimum.
 	 */
-	cmpFn = minmax_get_procinfo(bdesc, attno, PROCNUM_LESS);
+	cmpFn = minmax_get_strategy_procinfo(bdesc, attno, attr->atttypid,
+										 BTLessStrategyNumber);
 	compar = FunctionCall2Coll(cmpFn, colloid, newval, column->bv_values[0]);
 	if (DatumGetBool(compar))
 	{
@@ -135,7 +126,8 @@ brin_minmax_add_value(PG_FUNCTION_ARGS)
 	/*
 	 * And now compare it to the existing maximum.
 	 */
-	cmpFn = minmax_get_procinfo(bdesc, attno, PROCNUM_GREATER);
+	cmpFn = minmax_get_strategy_procinfo(bdesc, attno, attr->atttypid,
+										 BTGreaterStrategyNumber);
 	compar = FunctionCall2Coll(cmpFn, colloid, newval, column->bv_values[1]);
 	if (DatumGetBool(compar))
 	{
@@ -159,10 +151,12 @@ brin_minmax_consistent(PG_FUNCTION_ARGS)
 	BrinDesc   *bdesc = (BrinDesc *) PG_GETARG_POINTER(0);
 	BrinValues *column = (BrinValues *) PG_GETARG_POINTER(1);
 	ScanKey		key = (ScanKey) PG_GETARG_POINTER(2);
-	Oid			colloid = PG_GET_COLLATION();
+	Oid			colloid = PG_GET_COLLATION(),
+				subtype;
 	AttrNumber	attno;
 	Datum		value;
 	Datum		matches;
+	FmgrInfo   *finfo;
 
 	Assert(key->sk_attno == column->bv_attno);
 
@@ -189,18 +183,16 @@ brin_minmax_consistent(PG_FUNCTION_ARGS)
 		PG_RETURN_BOOL(false);
 
 	attno = key->sk_attno;
+	subtype = key->sk_subtype;
 	value = key->sk_argument;
 	switch (key->sk_strategy)
 	{
 		case BTLessStrategyNumber:
-			matches = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-															PROCNUM_LESS),
-										colloid, column->bv_values[0], value);
-			break;
 		case BTLessEqualStrategyNumber:
-			matches = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-														  PROCNUM_LESSEQUAL),
-										colloid, column->bv_values[0], value);
+			finfo = minmax_get_strategy_procinfo(bdesc, attno, subtype,
+												 key->sk_strategy);
+			matches = FunctionCall2Coll(finfo, colloid, column->bv_values[0],
+										value);
 			break;
 		case BTEqualStrategyNumber:
 
@@ -209,25 +201,24 @@ brin_minmax_consistent(PG_FUNCTION_ARGS)
 			 * the current page range if the minimum value in the range <=
 			 * scan key, and the maximum value >= scan key.
 			 */
-			matches = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-														  PROCNUM_LESSEQUAL),
-										colloid, column->bv_values[0], value);
+			finfo = minmax_get_strategy_procinfo(bdesc, attno, subtype,
+												 BTLessEqualStrategyNumber);
+			matches = FunctionCall2Coll(finfo, colloid, column->bv_values[0],
+										value);
 			if (!DatumGetBool(matches))
 				break;
 			/* max() >= scankey */
-			matches = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-													   PROCNUM_GREATEREQUAL),
-										colloid, column->bv_values[1], value);
+			finfo = minmax_get_strategy_procinfo(bdesc, attno, subtype,
+											   BTGreaterEqualStrategyNumber);
+			matches = FunctionCall2Coll(finfo, colloid, column->bv_values[1],
+										value);
 			break;
 		case BTGreaterEqualStrategyNumber:
-			matches = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-													   PROCNUM_GREATEREQUAL),
-										colloid, column->bv_values[1], value);
-			break;
 		case BTGreaterStrategyNumber:
-			matches = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-															PROCNUM_GREATER),
-										colloid, column->bv_values[1], value);
+			finfo = minmax_get_strategy_procinfo(bdesc, attno, subtype,
+												 key->sk_strategy);
+			matches = FunctionCall2Coll(finfo, colloid, column->bv_values[1],
+										value);
 			break;
 		default:
 			/* shouldn't happen */
@@ -252,6 +243,7 @@ brin_minmax_union(PG_FUNCTION_ARGS)
 	Oid			colloid = PG_GET_COLLATION();
 	AttrNumber	attno;
 	Form_pg_attribute attr;
+	FmgrInfo   *finfo;
 	bool		needsadj;
 
 	Assert(col_a->bv_attno == col_b->bv_attno);
@@ -268,10 +260,10 @@ brin_minmax_union(PG_FUNCTION_ARGS)
 	attr = bdesc->bd_tupdesc->attrs[attno - 1];
 
 	/*
-	 * Adjust "allnulls".  If A doesn't have values, just copy the values
-	 * from B into A, and we're done.  We cannot run the operators in this
-	 * case, because values in A might contain garbage.  Note we already
-	 * established that B contains values.
+	 * Adjust "allnulls".  If A doesn't have values, just copy the values from
+	 * B into A, and we're done.  We cannot run the operators in this case,
+	 * because values in A might contain garbage.  Note we already established
+	 * that B contains values.
 	 */
 	if (col_a->bv_allnulls)
 	{
@@ -284,9 +276,10 @@ brin_minmax_union(PG_FUNCTION_ARGS)
 	}
 
 	/* Adjust minimum, if B's min is less than A's min */
-	needsadj = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-													 PROCNUM_LESS),
-						  colloid, col_b->bv_values[0], col_a->bv_values[0]);
+	finfo = minmax_get_strategy_procinfo(bdesc, attno, attr->atttypid,
+										 BTLessStrategyNumber);
+	needsadj = FunctionCall2Coll(finfo, colloid, col_b->bv_values[0],
+								 col_a->bv_values[0]);
 	if (needsadj)
 	{
 		if (!attr->attbyval)
@@ -296,9 +289,10 @@ brin_minmax_union(PG_FUNCTION_ARGS)
 	}
 
 	/* Adjust maximum, if B's max is greater than A's max */
-	needsadj = FunctionCall2Coll(minmax_get_procinfo(bdesc, attno,
-													 PROCNUM_GREATER),
-						  colloid, col_b->bv_values[1], col_a->bv_values[1]);
+	finfo = minmax_get_strategy_procinfo(bdesc, attno, attr->atttypid,
+										 BTGreaterStrategyNumber);
+	needsadj = FunctionCall2Coll(finfo, colloid, col_b->bv_values[1],
+								 col_a->bv_values[1]);
 	if (needsadj)
 	{
 		if (!attr->attbyval)
@@ -311,27 +305,64 @@ brin_minmax_union(PG_FUNCTION_ARGS)
 }
 
 /*
- * Return the procedure corresponding to the given function support number.
+ * Cache and return the procedure for the given strategy.
+ *
+ * Note: this function mirrors inclusion_get_strategy_procinfo; see notes
+ * there.  If changes are made here, see that function too.
  */
 static FmgrInfo *
-minmax_get_procinfo(BrinDesc *bdesc, uint16 attno, uint16 procnum)
+minmax_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno, Oid subtype,
+							 uint16 strategynum)
 {
 	MinmaxOpaque *opaque;
-	uint16		basenum = procnum - PROCNUM_BASE;
+
+	Assert(strategynum >= 1 &&
+		   strategynum <= BTMaxStrategyNumber);
 
 	opaque = (MinmaxOpaque *) bdesc->bd_info[attno - 1]->oi_opaque;
 
 	/*
-	 * We cache these in the opaque struct, to avoid repetitive syscache
-	 * lookups.
+	 * We cache the procedures for the previous subtype in the opaque struct,
+	 * to avoid repetitive syscache lookups.  If the subtype changed,
+	 * invalidate all the cached entries.
 	 */
-	if (!opaque->inited[basenum])
+	if (opaque->cached_subtype != subtype)
+	{
+		uint16		i;
+
+		for (i = 1; i <= BTMaxStrategyNumber; i++)
+			opaque->strategy_procinfos[i - 1].fn_oid = InvalidOid;
+		opaque->cached_subtype = subtype;
+	}
+
+	if (opaque->strategy_procinfos[strategynum - 1].fn_oid == InvalidOid)
 	{
-		fmgr_info_copy(&opaque->operators[basenum],
-					   index_getprocinfo(bdesc->bd_index, attno, procnum),
-					   bdesc->bd_context);
-		opaque->inited[basenum] = true;
+		Form_pg_attribute attr;
+		HeapTuple	tuple;
+		Oid			opfamily,
+					oprid;
+		bool		isNull;
+
+		opfamily = bdesc->bd_index->rd_opfamily[attno - 1];
+		attr = bdesc->bd_tupdesc->attrs[attno - 1];
+		tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily),
+								ObjectIdGetDatum(attr->atttypid),
+								ObjectIdGetDatum(subtype),
+								Int16GetDatum(strategynum));
+
+		if (!HeapTupleIsValid(tuple))
+			elog(ERROR, "missing operator %d(%u,%u) in opfamily %u",
+				 strategynum, attr->atttypid, subtype, opfamily);
+
+		oprid = DatumGetObjectId(SysCacheGetAttr(AMOPSTRATEGY, tuple,
+											 Anum_pg_amop_amopopr, &isNull));
+		ReleaseSysCache(tuple);
+		Assert(!isNull && RegProcedureIsValid(oprid));
+
+		fmgr_info_cxt(get_opcode(oprid),
+					  &opaque->strategy_procinfos[strategynum - 1],
+					  bdesc->bd_context);
 	}
 
-	return &opaque->operators[basenum];
+	return &opaque->strategy_procinfos[strategynum - 1];
 }
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index acb64bde4f..0b257d913b 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -55,7 +55,7 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
 	Buffer		newbuf;
 	bool		extended = false;
 
-	newsz = MAXALIGN(newsz);
+	Assert(newsz == MAXALIGN(newsz));
 
 	/* make sure the revmap is long enough to contain the entry we need */
 	brinRevmapExtend(revmap, heapBlk);
@@ -273,7 +273,7 @@ brin_doinsert(Relation idxrel, BlockNumber pagesPerRange,
 	ItemPointerData tid;
 	bool		extended = false;
 
-	itemsz = MAXALIGN(itemsz);
+	Assert(itemsz == MAXALIGN(itemsz));
 
 	/* Make sure the revmap is long enough to contain the entry we need */
 	brinRevmapExtend(revmap, heapBlk);
@@ -492,9 +492,9 @@ brin_evacuate_page(Relation idxRel, BlockNumber pagesPerRange,
 /*
  * Return a pinned and exclusively locked buffer which can be used to insert an
  * index item of size itemsz.  If oldbuf is a valid buffer, it is also locked
- * (in a order determined to avoid deadlocks.)
+ * (in an order determined to avoid deadlocks.)
  *
- * If there's no existing page with enough free space to accomodate the new
+ * If there's no existing page with enough free space to accommodate the new
  * item, the relation is extended.  If this happens, *extended is set to true.
  *
  * If we find that the old page is no longer a regular index page (because
diff --git a/src/backend/access/brin/brin_revmap.c b/src/backend/access/brin/brin_revmap.c
index 80795eca65..62d440f76b 100644
--- a/src/backend/access/brin/brin_revmap.c
+++ b/src/backend/access/brin/brin_revmap.c
@@ -48,7 +48,7 @@ struct BrinRevmap
 {
 	Relation	rm_irel;
 	BlockNumber rm_pagesPerRange;
-	BlockNumber rm_lastRevmapPage; /* cached from the metapage */
+	BlockNumber rm_lastRevmapPage;		/* cached from the metapage */
 	Buffer		rm_metaBuf;
 	Buffer		rm_currBuf;
 };
@@ -57,7 +57,7 @@ struct BrinRevmap
 
 
 static BlockNumber revmap_get_blkno(BrinRevmap *revmap,
-				  BlockNumber heapBlk);
+				 BlockNumber heapBlk);
 static Buffer revmap_get_buffer(BrinRevmap *revmap, BlockNumber heapBlk);
 static BlockNumber revmap_extend_and_get_blkno(BrinRevmap *revmap,
 							BlockNumber heapBlk);
@@ -110,7 +110,7 @@ brinRevmapTerminate(BrinRevmap *revmap)
 void
 brinRevmapExtend(BrinRevmap *revmap, BlockNumber heapBlk)
 {
-	BlockNumber	mapBlk PG_USED_FOR_ASSERTS_ONLY;
+	BlockNumber mapBlk PG_USED_FOR_ASSERTS_ONLY;
 
 	mapBlk = revmap_extend_and_get_blkno(revmap, heapBlk);
 
@@ -245,7 +245,7 @@ brinGetTupleForHeapBlock(BrinRevmap *revmap, BlockNumber heapBlk,
 		if (ItemPointerIsValid(&previptr) && ItemPointerEquals(&previptr, iptr))
 			ereport(ERROR,
 					(errcode(ERRCODE_INDEX_CORRUPTED),
-					 errmsg_internal("corrupted BRIN index: inconsistent range map")));
+			errmsg_internal("corrupted BRIN index: inconsistent range map")));
 		previptr = *iptr;
 
 		blk = ItemPointerGetBlockNumber(iptr);
@@ -356,7 +356,7 @@ revmap_get_buffer(BrinRevmap *revmap, BlockNumber heapBlk)
 static BlockNumber
 revmap_extend_and_get_blkno(BrinRevmap *revmap, BlockNumber heapBlk)
 {
-	BlockNumber	targetblk;
+	BlockNumber targetblk;
 
 	/* obtain revmap block number, skip 1 for metapage block */
 	targetblk = HEAPBLK_TO_REVMAP_BLK(revmap->rm_pagesPerRange, heapBlk) + 1;
@@ -445,10 +445,10 @@ revmap_physical_extend(BrinRevmap *revmap)
 	if (!PageIsNew(page) && !BRIN_IS_REGULAR_PAGE(page))
 		ereport(ERROR,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
-				 errmsg("unexpected page type 0x%04X in BRIN index \"%s\" block %u",
-						BrinPageType(page),
-						RelationGetRelationName(irel),
-						BufferGetBlockNumber(buf))));
+		  errmsg("unexpected page type 0x%04X in BRIN index \"%s\" block %u",
+				 BrinPageType(page),
+				 RelationGetRelationName(irel),
+				 BufferGetBlockNumber(buf))));
 
 	/* If the page is in use, evacuate it and restart */
 	if (brin_start_evacuating_page(irel, buf))
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 93f00f6a8f..5a7462b59c 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -68,7 +68,7 @@ brtuple_disk_tupdesc(BrinDesc *brdesc)
 		{
 			for (j = 0; j < brdesc->bd_info[i]->oi_nstored; j++)
 				TupleDescInitEntry(tupdesc, attno++, NULL,
-								   brdesc->bd_info[i]->oi_typids[j],
+								 brdesc->bd_info[i]->oi_typcache[j]->type_id,
 								   -1, 0);
 		}
 
@@ -103,9 +103,10 @@ brin_form_tuple(BrinDesc *brdesc, BlockNumber blkno, BrinMemTuple *tuple,
 
 	Assert(brdesc->bd_totalstored > 0);
 
-	values = palloc(sizeof(Datum) * brdesc->bd_totalstored);
-	nulls = palloc0(sizeof(bool) * brdesc->bd_totalstored);
-	phony_nullbitmap = palloc(sizeof(bits8) * BITMAPLEN(brdesc->bd_totalstored));
+	values = (Datum *) palloc(sizeof(Datum) * brdesc->bd_totalstored);
+	nulls = (bool *) palloc0(sizeof(bool) * brdesc->bd_totalstored);
+	phony_nullbitmap = (bits8 *)
+		palloc(sizeof(bits8) * BITMAPLEN(brdesc->bd_totalstored));
 
 	/*
 	 * Set up the values/nulls arrays for heap_fill_tuple
@@ -144,6 +145,9 @@ brin_form_tuple(BrinDesc *brdesc, BlockNumber blkno, BrinMemTuple *tuple,
 			values[idxattno++] = tuple->bt_columns[keyno].bv_values[datumno];
 	}
 
+	/* Assert we did not overrun temp arrays */
+	Assert(idxattno <= brdesc->bd_totalstored);
+
 	/* compute total space needed */
 	len = SizeOfBrinTuple;
 	if (anynulls)
@@ -160,12 +164,15 @@ brin_form_tuple(BrinDesc *brdesc, BlockNumber blkno, BrinMemTuple *tuple,
 
 	data_len = heap_compute_data_size(brtuple_disk_tupdesc(brdesc),
 									  values, nulls);
-
 	len += data_len;
 
+	len = MAXALIGN(len);
+
 	rettuple = palloc0(len);
 	rettuple->bt_blkno = blkno;
 	rettuple->bt_info = hoff;
+
+	/* Assert that hoff fits in the space available */
 	Assert((rettuple->bt_info & BRIN_OFFSET_MASK) == hoff);
 
 	/*
@@ -304,7 +311,7 @@ brin_free_tuple(BrinTuple *tuple)
 }
 
 /*
- * Create an palloc'd copy of a BrinTuple.
+ * Create a palloc'd copy of a BrinTuple.
  */
 BrinTuple *
 brin_copy_tuple(BrinTuple *tuple, Size len)
@@ -444,8 +451,8 @@ brin_deform_tuple(BrinDesc *brdesc, BrinTuple *tuple)
 		for (i = 0; i < brdesc->bd_info[keyno]->oi_nstored; i++)
 			dtup->bt_columns[keyno].bv_values[i] =
 				datumCopy(values[valueno++],
-						  brdesc->bd_tupdesc->attrs[keyno]->attbyval,
-						  brdesc->bd_tupdesc->attrs[keyno]->attlen);
+						  brdesc->bd_info[keyno]->oi_typcache[i]->typbyval,
+						  brdesc->bd_info[keyno]->oi_typcache[i]->typlen);
 
 		dtup->bt_columns[keyno].bv_hasnulls = hasnulls[keyno];
 		dtup->bt_columns[keyno].bv_allnulls = false;
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index d759a6898c..9a03496a32 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -72,6 +72,8 @@
 #include "lib/stringinfo.h"
 #include "utils/memutils.h"
 #endif
+#include "utils/expandeddatum.h"
+
 
 /* Does att's datatype allow packing into the 1-byte-header varlena format? */
 #define ATT_IS_PACKABLE(att) \
@@ -104,13 +106,15 @@ heap_compute_data_size(TupleDesc tupleDesc,
 	for (i = 0; i < numberOfAttributes; i++)
 	{
 		Datum		val;
+		Form_pg_attribute atti;
 
 		if (isnull[i])
 			continue;
 
 		val = values[i];
+		atti = att[i];
 
-		if (ATT_IS_PACKABLE(att[i]) &&
+		if (ATT_IS_PACKABLE(atti) &&
 			VARATT_CAN_MAKE_SHORT(DatumGetPointer(val)))
 		{
 			/*
@@ -119,11 +123,21 @@ heap_compute_data_size(TupleDesc tupleDesc,
 			 */
 			data_length += VARATT_CONVERTED_SHORT_SIZE(DatumGetPointer(val));
 		}
+		else if (atti->attlen == -1 &&
+				 VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(val)))
+		{
+			/*
+			 * we want to flatten the expanded value so that the constructed
+			 * tuple doesn't depend on it
+			 */
+			data_length = att_align_nominal(data_length, atti->attalign);
+			data_length += EOH_get_flat_size(DatumGetEOHP(val));
+		}
 		else
 		{
-			data_length = att_align_datum(data_length, att[i]->attalign,
-										  att[i]->attlen, val);
-			data_length = att_addlength_datum(data_length, att[i]->attlen,
+			data_length = att_align_datum(data_length, atti->attalign,
+										  atti->attlen, val);
+			data_length = att_addlength_datum(data_length, atti->attlen,
 											  val);
 		}
 	}
@@ -214,10 +228,26 @@ heap_fill_tuple(TupleDesc tupleDesc,
 			*infomask |= HEAP_HASVARWIDTH;
 			if (VARATT_IS_EXTERNAL(val))
 			{
-				*infomask |= HEAP_HASEXTERNAL;
-				/* no alignment, since it's short by definition */
-				data_length = VARSIZE_EXTERNAL(val);
-				memcpy(data, val, data_length);
+				if (VARATT_IS_EXTERNAL_EXPANDED(val))
+				{
+					/*
+					 * we want to flatten the expanded value so that the
+					 * constructed tuple doesn't depend on it
+					 */
+					ExpandedObjectHeader *eoh = DatumGetEOHP(values[i]);
+
+					data = (char *) att_align_nominal(data,
+													  att[i]->attalign);
+					data_length = EOH_get_flat_size(eoh);
+					EOH_flatten_into(eoh, data, data_length);
+				}
+				else
+				{
+					*infomask |= HEAP_HASEXTERNAL;
+					/* no alignment, since it's short by definition */
+					data_length = VARSIZE_EXTERNAL(val);
+					memcpy(data, val, data_length);
+				}
 			}
 			else if (VARATT_IS_SHORT(val))
 			{
@@ -755,6 +785,8 @@ heap_form_tuple(TupleDesc tupleDescriptor,
 	HeapTupleHeaderSetDatumLength(td, len);
 	HeapTupleHeaderSetTypeId(td, tupleDescriptor->tdtypeid);
 	HeapTupleHeaderSetTypMod(td, tupleDescriptor->tdtypmod);
+	/* We also make sure that t_ctid is invalid unless explicitly set */
+	ItemPointerSetInvalid(&(td->t_ctid));
 
 	HeapTupleHeaderSetNatts(td, numberOfAttributes);
 	td->t_hoff = hoff;
diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c
index 9c26e77866..9220b5fccc 100644
--- a/src/backend/access/gin/ginarrayproc.c
+++ b/src/backend/access/gin/ginarrayproc.c
@@ -14,7 +14,7 @@
 #include "postgres.h"
 
 #include "access/gin.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 5b6aa93e2c..3f92c56d3c 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -313,7 +313,7 @@ ginFindParents(GinBtree btree, GinBtreeStack *stack)
  * the parent needs to be updated. (a root split returns true as it doesn't
  * need any further action by the caller to complete)
  *
- * When inserting a downlink to a internal page, 'childbuf' contains the
+ * When inserting a downlink to an internal page, 'childbuf' contains the
  * child page that was split. Its GIN_INCOMPLETE_SPLIT flag will be cleared
  * atomically with the insert. Also, the existing item at the given location
  * is updated to point to 'updateblkno'.
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
index 3e2b8b5fed..54b2db88a6 100644
--- a/src/backend/access/gin/ginget.c
+++ b/src/backend/access/gin/ginget.c
@@ -1785,7 +1785,8 @@ gingetbitmap(PG_FUNCTION_ARGS)
 	/*
 	 * Set up the scan keys, and check for unsatisfiable query.
 	 */
-	ginFreeScanKeys(so); /* there should be no keys yet, but just to be sure */
+	ginFreeScanKeys(so);		/* there should be no keys yet, but just to be
+								 * sure */
 	ginNewScanKey(scan);
 
 	if (GinIsVoidRes(scan))
diff --git a/src/backend/access/gin/ginpostinglist.c b/src/backend/access/gin/ginpostinglist.c
index 6337b1a8fc..e6d7c1a078 100644
--- a/src/backend/access/gin/ginpostinglist.c
+++ b/src/backend/access/gin/ginpostinglist.c
@@ -23,7 +23,7 @@
 /*
  * For encoding purposes, item pointers are represented as 64-bit unsigned
  * integers. The lowest 11 bits represent the offset number, and the next
- * lowest 32 bits are the block number. That leaves 17 bits unused, ie.
+ * lowest 32 bits are the block number. That leaves 17 bits unused, i.e.
  * only 43 low bits are used.
  *
  * These 43-bit integers are encoded using varbyte encoding. In each byte,
@@ -51,16 +51,16 @@
  * Removing number is actually replacement of two numbers with their sum. We
  * have to prove that varbyte encoding of a sum can't be longer than varbyte
  * encoding of its summands. Sum of two numbers is at most one bit wider than
- * than the larger of the summands. Widening a number by one bit enlarges its
- * length in varbyte encoding by at most one byte. Therefore, varbyte encoding
- * of sum is at most one byte longer than varbyte encoding of larger summand.
- * Lesser summand is at least one byte, so the sum cannot take more space than
- * the summands, Q.E.D.
+ * the larger of the summands. Widening a number by one bit enlarges its length
+ * in varbyte encoding by at most one byte. Therefore, varbyte encoding of sum
+ * is at most one byte longer than varbyte encoding of larger summand. Lesser
+ * summand is at least one byte, so the sum cannot take more space than the
+ * summands, Q.E.D.
  *
  * This property greatly simplifies VACUUM, which can assume that posting
  * lists always fit on the same page after vacuuming. Note that even though
  * that holds for removing items from a posting list, you must also be
- * careful to not cause expansion e.g when merging uncompressed items on the
+ * careful to not cause expansion e.g. when merging uncompressed items on the
  * page into the compressed lists, when vacuuming.
  */
 
diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index 445466b447..cb4e32fe66 100644
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -527,7 +527,7 @@ ginoptions(PG_FUNCTION_ARGS)
 	static const relopt_parse_elt tab[] = {
 		{"fastupdate", RELOPT_TYPE_BOOL, offsetof(GinOptions, useFastUpdate)},
 		{"gin_pending_list_limit", RELOPT_TYPE_INT, offsetof(GinOptions,
-																pendingListCleanupSize)}
+													 pendingListCleanupSize)}
 	};
 
 	options = parseRelOptions(reloptions, validate, RELOPT_KIND_GIN,
diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c
index bea7055604..ea85c4e2c0 100644
--- a/src/backend/access/gin/ginxlog.c
+++ b/src/backend/access/gin/ginxlog.c
@@ -409,7 +409,7 @@ ginRedoSplit(XLogReaderState *record)
 
 /*
  * VACUUM_PAGE record contains simply a full image of the page, similar to
- * a XLOG_FPI record.
+ * an XLOG_FPI record.
  */
 static void
 ginRedoVacuumPage(XLogReaderState *record)
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 96b7701633..0e499598a4 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -1407,7 +1407,7 @@ initGISTstate(Relation index)
 		/* opclasses are not required to provide a Fetch method */
 		if (OidIsValid(index_getprocid(index, i + 1, GIST_FETCH_PROC)))
 			fmgr_info_copy(&(giststate->fetchFn[i]),
-						 index_getprocinfo(index, i + 1, GIST_FETCH_PROC),
+						   index_getprocinfo(index, i + 1, GIST_FETCH_PROC),
 						   scanCxt);
 		else
 			giststate->fetchFn[i].fn_oid = InvalidOid;
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index e4c00c2c9f..20f695cee4 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -16,6 +16,7 @@
 
 #include "access/gist_private.h"
 #include "access/relscan.h"
+#include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "lib/pairingheap.h"
@@ -30,10 +31,12 @@
  * The index tuple might represent either a heap tuple or a lower index page,
  * depending on whether the containing page is a leaf page or not.
  *
- * On success return for a heap tuple, *recheck_p is set to indicate
- * whether recheck is needed.  We recheck if any of the consistent() functions
- * request it.  recheck is not interesting when examining a non-leaf entry,
- * since we must visit the lower index page if there's any doubt.
+ * On success return for a heap tuple, *recheck_p is set to indicate whether
+ * the quals need to be rechecked.  We recheck if any of the consistent()
+ * functions request it.  recheck is not interesting when examining a non-leaf
+ * entry, since we must visit the lower index page if there's any doubt.
+ * Similarly, *recheck_distances_p is set to indicate whether the distances
+ * need to be rechecked, and it is also ignored for non-leaf entries.
  *
  * If we are doing an ordered scan, so->distances[] is filled with distance
  * data from the distance() functions before returning success.
@@ -50,7 +53,8 @@ gistindex_keytest(IndexScanDesc scan,
 				  IndexTuple tuple,
 				  Page page,
 				  OffsetNumber offset,
-				  bool *recheck_p)
+				  bool *recheck_p,
+				  bool *recheck_distances_p)
 {
 	GISTScanOpaque so = (GISTScanOpaque) scan->opaque;
 	GISTSTATE  *giststate = so->giststate;
@@ -60,6 +64,7 @@ gistindex_keytest(IndexScanDesc scan,
 	Relation	r = scan->indexRelation;
 
 	*recheck_p = false;
+	*recheck_distances_p = false;
 
 	/*
 	 * If it's a leftover invalid tuple from pre-9.1, treat it as a match with
@@ -176,6 +181,7 @@ gistindex_keytest(IndexScanDesc scan,
 		else
 		{
 			Datum		dist;
+			bool		recheck;
 			GISTENTRY	de;
 
 			gistdentryinit(giststate, key->sk_attno - 1, &de,
@@ -185,24 +191,28 @@ gistindex_keytest(IndexScanDesc scan,
 			/*
 			 * Call the Distance function to evaluate the distance.  The
 			 * arguments are the index datum (as a GISTENTRY*), the comparison
-			 * datum, and the ordering operator's strategy number and subtype
-			 * from pg_amop.
+			 * datum, the ordering operator's strategy number and subtype from
+			 * pg_amop, and the recheck flag.
 			 *
 			 * (Presently there's no need to pass the subtype since it'll
 			 * always be zero, but might as well pass it for possible future
 			 * use.)
 			 *
-			 * Note that Distance functions don't get a recheck argument. We
-			 * can't tolerate lossy distance calculations on leaf tuples;
-			 * there is no opportunity to re-sort the tuples afterwards.
+			 * If the function sets the recheck flag, the returned distance is
+			 * a lower bound on the true distance and needs to be rechecked.
+			 * We initialize the flag to 'false'.  This flag was added in
+			 * version 9.5; distance functions written before that won't know
+			 * about the flag, but are expected to never be lossy.
 			 */
-			dist = FunctionCall4Coll(&key->sk_func,
+			recheck = false;
+			dist = FunctionCall5Coll(&key->sk_func,
 									 key->sk_collation,
 									 PointerGetDatum(&de),
 									 key->sk_argument,
 									 Int32GetDatum(key->sk_strategy),
-									 ObjectIdGetDatum(key->sk_subtype));
-
+									 ObjectIdGetDatum(key->sk_subtype),
+									 PointerGetDatum(&recheck));
+			*recheck_distances_p |= recheck;
 			*distance_p = DatumGetFloat8(dist);
 		}
 
@@ -304,6 +314,7 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
 		IndexTuple	it = (IndexTuple) PageGetItem(page, PageGetItemId(page, i));
 		bool		match;
 		bool		recheck;
+		bool		recheck_distances;
 
 		/*
 		 * Must call gistindex_keytest in tempCxt, and clean up any leftover
@@ -311,7 +322,8 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
 		 */
 		oldcxt = MemoryContextSwitchTo(so->giststate->tempCxt);
 
-		match = gistindex_keytest(scan, it, page, i, &recheck);
+		match = gistindex_keytest(scan, it, page, i,
+								  &recheck, &recheck_distances);
 
 		MemoryContextSwitchTo(oldcxt);
 		MemoryContextReset(so->giststate->tempCxt);
@@ -369,6 +381,7 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
 				item->blkno = InvalidBlockNumber;
 				item->data.heap.heapPtr = it->t_tid;
 				item->data.heap.recheck = recheck;
+				item->data.heap.recheckDistances = recheck_distances;
 
 				/*
 				 * In an index-only scan, also fetch the data from the tuple.
@@ -434,6 +447,7 @@ getNextNearest(IndexScanDesc scan)
 {
 	GISTScanOpaque so = (GISTScanOpaque) scan->opaque;
 	bool		res = false;
+	int			i;
 
 	if (scan->xs_itup)
 	{
@@ -454,6 +468,45 @@ getNextNearest(IndexScanDesc scan)
 			/* found a heap item at currently minimal distance */
 			scan->xs_ctup.t_self = item->data.heap.heapPtr;
 			scan->xs_recheck = item->data.heap.recheck;
+			scan->xs_recheckorderby = item->data.heap.recheckDistances;
+			for (i = 0; i < scan->numberOfOrderBys; i++)
+			{
+				if (so->orderByTypes[i] == FLOAT8OID)
+				{
+#ifndef USE_FLOAT8_BYVAL
+					/* must free any old value to avoid memory leakage */
+					if (!scan->xs_orderbynulls[i])
+						pfree(DatumGetPointer(scan->xs_orderbyvals[i]));
+#endif
+					scan->xs_orderbyvals[i] = Float8GetDatum(item->distances[i]);
+					scan->xs_orderbynulls[i] = false;
+				}
+				else if (so->orderByTypes[i] == FLOAT4OID)
+				{
+					/* convert distance function's result to ORDER BY type */
+#ifndef USE_FLOAT4_BYVAL
+					/* must free any old value to avoid memory leakage */
+					if (!scan->xs_orderbynulls[i])
+						pfree(DatumGetPointer(scan->xs_orderbyvals[i]));
+#endif
+					scan->xs_orderbyvals[i] = Float4GetDatum((float4) item->distances[i]);
+					scan->xs_orderbynulls[i] = false;
+				}
+				else
+				{
+					/*
+					 * If the ordering operator's return value is anything
+					 * else, we don't know how to convert the float8 bound
+					 * calculated by the distance function to that.  The
+					 * executor won't actually need the order by values we
+					 * return here, if there are no lossy results, so only
+					 * insist on converting if the *recheck flag is set.
+					 */
+					if (scan->xs_recheckorderby)
+						elog(ERROR, "GiST operator family's FOR ORDER BY operator must return float8 or float4 if the distance function is lossy");
+					scan->xs_orderbynulls[i] = true;
+				}
+			}
 
 			/* in an index-only scan, also return the reconstructed tuple. */
 			if (scan->xs_want_itup)
diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c
index 9d21e3fb94..4cea3f1be1 100644
--- a/src/backend/access/gist/gistproc.c
+++ b/src/backend/access/gist/gistproc.c
@@ -18,7 +18,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "utils/geo_decls.h"
 
 
@@ -1478,3 +1478,40 @@ gist_point_distance(PG_FUNCTION_ARGS)
 
 	PG_RETURN_FLOAT8(distance);
 }
+
+/*
+ * The inexact GiST distance method for geometric types that store bounding
+ * boxes.
+ *
+ * Compute lossy distance from point to index entries.  The result is inexact
+ * because index entries are bounding boxes, not the exact shapes of the
+ * indexed geometric types.  We use distance from point to MBR of index entry.
+ * This is a lower bound estimate of distance from point to indexed geometric
+ * type.
+ */
+Datum
+gist_bbox_distance(PG_FUNCTION_ARGS)
+{
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
+	bool	   *recheck = (bool *) PG_GETARG_POINTER(4);
+	double		distance;
+	StrategyNumber strategyGroup = strategy / GeoStrategyNumberOffset;
+
+	/* Bounding box distance is always inexact. */
+	*recheck = true;
+
+	switch (strategyGroup)
+	{
+		case PointStrategyNumberGroup:
+			distance = computeDistance(false,
+									   DatumGetBoxP(entry->key),
+									   PG_GETARG_POINT_P(1));
+			break;
+		default:
+			elog(ERROR, "unknown strategy number: %d", strategy);
+			distance = 0.0;		/* keep compiler quiet */
+	}
+
+	PG_RETURN_FLOAT8(distance);
+}
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 6f65398230..ad39294875 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -17,6 +17,7 @@
 #include "access/gist_private.h"
 #include "access/gistscan.h"
 #include "access/relscan.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 
@@ -85,6 +86,12 @@ gistbeginscan(PG_FUNCTION_ARGS)
 	/* workspaces with size dependent on numberOfOrderBys: */
 	so->distances = palloc(sizeof(double) * scan->numberOfOrderBys);
 	so->qual_ok = true;			/* in case there are zero keys */
+	if (scan->numberOfOrderBys > 0)
+	{
+		scan->xs_orderbyvals = palloc0(sizeof(Datum) * scan->numberOfOrderBys);
+		scan->xs_orderbynulls = palloc(sizeof(bool) * scan->numberOfOrderBys);
+		memset(scan->xs_orderbynulls, true, sizeof(bool) * scan->numberOfOrderBys);
+	}
 
 	scan->opaque = so;
 
@@ -147,8 +154,8 @@ gistrescan(PG_FUNCTION_ARGS)
 	}
 
 	/*
-	 * If we're doing an index-only scan, on the first call, also initialize
-	 * a tuple descriptor to represent the returned index tuples and create a
+	 * If we're doing an index-only scan, on the first call, also initialize a
+	 * tuple descriptor to represent the returned index tuples and create a
 	 * memory context to hold them during the scan.
 	 */
 	if (scan->xs_want_itup && !scan->xs_itupdesc)
@@ -162,7 +169,7 @@ gistrescan(PG_FUNCTION_ARGS)
 		 * descriptor. Instead, construct a descriptor with the original data
 		 * types.
 		 */
-		natts =  RelationGetNumberOfAttributes(scan->indexRelation);
+		natts = RelationGetNumberOfAttributes(scan->indexRelation);
 		so->giststate->fetchTupdesc = CreateTemplateTupleDesc(natts, false);
 		for (attno = 1; attno <= natts; attno++)
 		{
@@ -258,6 +265,8 @@ gistrescan(PG_FUNCTION_ARGS)
 		memmove(scan->orderByData, orderbys,
 				scan->numberOfOrderBys * sizeof(ScanKeyData));
 
+		so->orderByTypes = (Oid *) palloc(scan->numberOfOrderBys * sizeof(Oid));
+
 		/*
 		 * Modify the order-by key so that the Distance method is called for
 		 * all comparisons. The original operator is passed to the Distance
@@ -278,6 +287,20 @@ gistrescan(PG_FUNCTION_ARGS)
 
 			fmgr_info_copy(&(skey->sk_func), finfo, so->giststate->scanCxt);
 
+			/*
+			 * Look up the datatype returned by the original ordering
+			 * operator. GiST always uses a float8 for the distance function,
+			 * but the ordering operator could be anything else.
+			 *
+			 * XXX: The distance function is only allowed to be lossy if the
+			 * ordering operator's result type is float4 or float8.  Otherwise
+			 * we don't know how to return the distance to the executor.  But
+			 * we cannot check that here, as we won't know if the distance
+			 * function is lossy until it returns *recheck = true for the
+			 * first time.
+			 */
+			so->orderByTypes[i] = get_func_rettype(skey->sk_func.fn_oid);
+
 			/* Restore prior fn_extra pointers, if not first time */
 			if (!first_time)
 				skey->sk_func.fn_extra = fn_extras[i];
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index bf9fbf30a8..7d596a3e2e 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -583,7 +583,7 @@ gistFormTuple(GISTSTATE *giststate, Relation r,
 						  isleaf);
 			cep = (GISTENTRY *)
 				DatumGetPointer(FunctionCall1Coll(&giststate->compressFn[i],
-										   giststate->supportCollation[i],
+											  giststate->supportCollation[i],
 												  PointerGetDatum(&centry)));
 			compatt[i] = cep->key;
 		}
diff --git a/src/backend/access/heap/README.tuplock b/src/backend/access/heap/README.tuplock
index cb022e0eb9..10b8d78ab7 100644
--- a/src/backend/access/heap/README.tuplock
+++ b/src/backend/access/heap/README.tuplock
@@ -9,7 +9,7 @@ is implemented by storing locking information in the tuple header: a tuple is
 marked as locked by setting the current transaction's XID as its XMAX, and
 setting additional infomask bits to distinguish this case from the more normal
 case of having deleted the tuple.  When multiple transactions concurrently
-lock a tuple, a MultiXact is used; see below.  This mechanism can accomodate
+lock a tuple, a MultiXact is used; see below.  This mechanism can accommodate
 arbitrarily large numbers of tuples being locked simultaneously.
 
 When it is necessary to wait for a tuple-level lock to be released, the basic
@@ -100,11 +100,12 @@ that pg_multixact needs to retain pages of its data until we're certain that
 the MultiXacts in them are no longer of interest.
 
 VACUUM is in charge of removing old MultiXacts at the time of tuple freezing.
-This works in the same way that pg_clog segments are removed: we have a
-pg_class column that stores the earliest multixact that could possibly be
-stored in the table; the minimum of all such values is stored in a pg_database
-column.  VACUUM computes the minimum across all pg_database values, and
-removes pg_multixact segments older than the minimum.
+The lower bound used by vacuum (that is, the value below which all multixacts
+are removed) is stored as pg_class.relminmxid for each table; the minimum of
+all such values is stored in pg_database.datminmxid.  The minimum across
+all databases, in turn, is recorded in checkpoint records, and CHECKPOINT
+removes pg_multixact/ segments older than that value once the checkpoint
+record has been flushed.
 
 Infomask Bits
 -------------
@@ -124,14 +125,15 @@ The following infomask bits are applicable:
   the XMAX is a plain Xid that locked the tuple, as well.
 
 - HEAP_XMAX_KEYSHR_LOCK
+- HEAP_XMAX_SHR_LOCK
 - HEAP_XMAX_EXCL_LOCK
   These bits indicate the strength of the lock acquired; they are useful when
   the XMAX is not a MultiXactId.  If it's a multi, the info is to be found in
   the member flags.  If HEAP_XMAX_IS_MULTI is not set and HEAP_XMAX_LOCK_ONLY
   is set, then one of these *must* be set as well.
-  Note there is no infomask bit for a SELECT FOR SHARE lock.  Also there is no
-  separate bit for a SELECT FOR NO KEY UPDATE lock; this is implemented by the
-  HEAP_KEYS_UPDATED bit.
+
+  Note that HEAP_XMAX_EXCL_LOCK does not distinguish FOR NO KEY UPDATE from
+  FOR UPDATE; this is implemented by the HEAP_KEYS_UPDATED bit.
 
 - HEAP_KEYS_UPDATED
   This bit lives in t_infomask2.  If set, indicates that the XMAX updated
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index ea382e5cfe..2ab4d0871d 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -42,6 +42,7 @@
 #include "access/heapam_xlog.h"
 #include "access/hio.h"
 #include "access/multixact.h"
+#include "access/parallel.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
 #include "access/transam.h"
@@ -82,8 +83,9 @@ bool		synchronize_seqscans = true;
 static HeapScanDesc heap_beginscan_internal(Relation relation,
 						Snapshot snapshot,
 						int nkeys, ScanKey key,
-						bool allow_strat, bool allow_sync,
-						bool is_bitmapscan, bool temp_snap);
+					  bool allow_strat, bool allow_sync, bool allow_pagemode,
+						bool is_bitmapscan, bool is_samplescan,
+						bool temp_snap);
 static HeapTuple heap_prepare_insert(Relation relation, HeapTuple tup,
 					TransactionId xid, CommandId cid, int options);
 static XLogRecPtr log_heap_update(Relation reln, Buffer oldbuf,
@@ -296,9 +298,10 @@ initscan(HeapScanDesc scan, ScanKey key, bool is_rescan)
 
 	/*
 	 * Currently, we don't have a stats counter for bitmap heap scans (but the
-	 * underlying bitmap index scans will be counted).
+	 * underlying bitmap index scans will be counted) or sample scans (we only
+	 * update stats for tuple fetches there)
 	 */
-	if (!scan->rs_bitmapscan)
+	if (!scan->rs_bitmapscan && !scan->rs_samplescan)
 		pgstat_count_heap_scan(scan->rs_rd);
 }
 
@@ -317,7 +320,7 @@ heap_setscanlimits(HeapScanDesc scan, BlockNumber startBlk, BlockNumber numBlks)
  * In page-at-a-time mode it performs additional work, namely determining
  * which tuples on the page are visible.
  */
-static void
+void
 heapgetpage(HeapScanDesc scan, BlockNumber page)
 {
 	Buffer		buffer;
@@ -1054,7 +1057,13 @@ relation_open(Oid relationId, LOCKMODE lockmode)
 
 	/* Make note that we've accessed a temporary relation */
 	if (RelationUsesLocalBuffers(r))
+	{
+		if (IsParallelWorker())
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+					 errmsg("cannot access temporary tables during a parallel operation")));
 		MyXactAccessedTempRel = true;
+	}
 
 	pgstat_initstats(r);
 
@@ -1100,7 +1109,13 @@ try_relation_open(Oid relationId, LOCKMODE lockmode)
 
 	/* Make note that we've accessed a temporary relation */
 	if (RelationUsesLocalBuffers(r))
+	{
+		if (IsParallelWorker())
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+					 errmsg("cannot access temporary tables during a parallel operation")));
 		MyXactAccessedTempRel = true;
+	}
 
 	pgstat_initstats(r);
 
@@ -1300,6 +1315,9 @@ heap_openrv_extended(const RangeVar *relation, LOCKMODE lockmode,
  * HeapScanDesc for a bitmap heap scan.  Although that scan technology is
  * really quite unlike a standard seqscan, there is just enough commonality
  * to make it worth using the same data structure.
+ *
+ * heap_beginscan_samplingscan is alternate entry point for setting up a
+ * HeapScanDesc for a TABLESAMPLE scan.
  * ----------------
  */
 HeapScanDesc
@@ -1307,7 +1325,7 @@ heap_beginscan(Relation relation, Snapshot snapshot,
 			   int nkeys, ScanKey key)
 {
 	return heap_beginscan_internal(relation, snapshot, nkeys, key,
-								   true, true, false, false);
+								   true, true, true, false, false, false);
 }
 
 HeapScanDesc
@@ -1317,7 +1335,7 @@ heap_beginscan_catalog(Relation relation, int nkeys, ScanKey key)
 	Snapshot	snapshot = RegisterSnapshot(GetCatalogSnapshot(relid));
 
 	return heap_beginscan_internal(relation, snapshot, nkeys, key,
-								   true, true, false, true);
+								   true, true, true, false, false, true);
 }
 
 HeapScanDesc
@@ -1326,7 +1344,8 @@ heap_beginscan_strat(Relation relation, Snapshot snapshot,
 					 bool allow_strat, bool allow_sync)
 {
 	return heap_beginscan_internal(relation, snapshot, nkeys, key,
-								   allow_strat, allow_sync, false, false);
+								   allow_strat, allow_sync, true,
+								   false, false, false);
 }
 
 HeapScanDesc
@@ -1334,14 +1353,24 @@ heap_beginscan_bm(Relation relation, Snapshot snapshot,
 				  int nkeys, ScanKey key)
 {
 	return heap_beginscan_internal(relation, snapshot, nkeys, key,
-								   false, false, true, false);
+								   false, false, true, true, false, false);
+}
+
+HeapScanDesc
+heap_beginscan_sampling(Relation relation, Snapshot snapshot,
+						int nkeys, ScanKey key,
+						bool allow_strat, bool allow_pagemode)
+{
+	return heap_beginscan_internal(relation, snapshot, nkeys, key,
+								   allow_strat, false, allow_pagemode,
+								   false, true, false);
 }
 
 static HeapScanDesc
 heap_beginscan_internal(Relation relation, Snapshot snapshot,
 						int nkeys, ScanKey key,
-						bool allow_strat, bool allow_sync,
-						bool is_bitmapscan, bool temp_snap)
+					  bool allow_strat, bool allow_sync, bool allow_pagemode,
+					  bool is_bitmapscan, bool is_samplescan, bool temp_snap)
 {
 	HeapScanDesc scan;
 
@@ -1363,6 +1392,7 @@ heap_beginscan_internal(Relation relation, Snapshot snapshot,
 	scan->rs_snapshot = snapshot;
 	scan->rs_nkeys = nkeys;
 	scan->rs_bitmapscan = is_bitmapscan;
+	scan->rs_samplescan = is_samplescan;
 	scan->rs_strategy = NULL;	/* set in initscan */
 	scan->rs_allow_strat = allow_strat;
 	scan->rs_allow_sync = allow_sync;
@@ -1371,7 +1401,7 @@ heap_beginscan_internal(Relation relation, Snapshot snapshot,
 	/*
 	 * we can use page-at-a-time mode if it's an MVCC-safe snapshot
 	 */
-	scan->rs_pageatatime = IsMVCCSnapshot(snapshot);
+	scan->rs_pageatatime = allow_pagemode && IsMVCCSnapshot(snapshot);
 
 	/*
 	 * For a seqscan in a serializable transaction, acquire a predicate lock
@@ -2061,8 +2091,17 @@ FreeBulkInsertState(BulkInsertState bistate)
  * This causes rows to be frozen, which is an MVCC violation and
  * requires explicit options chosen by user.
  *
- * Note that these options will be applied when inserting into the heap's
- * TOAST table, too, if the tuple requires any out-of-line data.
+ * HEAP_INSERT_IS_SPECULATIVE is used on so-called "speculative insertions",
+ * which can be backed out afterwards without aborting the whole transaction.
+ * Other sessions can wait for the speculative insertion to be confirmed,
+ * turning it into a regular tuple, or aborted, as if it never existed.
+ * Speculatively inserted tuples behave as "value locks" of short duration,
+ * used to implement INSERT .. ON CONFLICT.
+ *
+ * Note that most of these options will be applied when inserting into the
+ * heap's TOAST table, too, if the tuple requires any out-of-line data.  Only
+ * HEAP_INSERT_IS_SPECULATIVE is explicitly ignored, as the toast data does
+ * not partake in speculative insertion.
  *
  * The BulkInsertState object (if any; bistate can be NULL for default
  * behavior) is also just passed through to RelationGetBufferForTuple.
@@ -2115,7 +2154,8 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	/* NO EREPORT(ERROR) from here till changes are logged */
 	START_CRIT_SECTION();
 
-	RelationPutHeapTuple(relation, buffer, heaptup);
+	RelationPutHeapTuple(relation, buffer, heaptup,
+						 (options & HEAP_INSERT_SPECULATIVE) != 0);
 
 	if (PageIsAllVisible(BufferGetPage(buffer)))
 	{
@@ -2169,7 +2209,11 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 		}
 
 		xlrec.offnum = ItemPointerGetOffsetNumber(&heaptup->t_self);
-		xlrec.flags = all_visible_cleared ? XLOG_HEAP_ALL_VISIBLE_CLEARED : 0;
+		xlrec.flags = 0;
+		if (all_visible_cleared)
+			xlrec.flags |= XLH_INSERT_ALL_VISIBLE_CLEARED;
+		if (options & HEAP_INSERT_SPECULATIVE)
+			xlrec.flags |= XLH_INSERT_IS_SPECULATIVE;
 		Assert(ItemPointerGetBlockNumber(&heaptup->t_self) == BufferGetBlockNumber(buffer));
 
 		/*
@@ -2179,7 +2223,7 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 		 */
 		if (RelationIsLogicallyLogged(relation))
 		{
-			xlrec.flags |= XLOG_HEAP_CONTAINS_NEW_TUPLE;
+			xlrec.flags |= XLH_INSERT_CONTAINS_NEW_TUPLE;
 			bufflags |= REGBUF_KEEP_DATA;
 		}
 
@@ -2202,6 +2246,9 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 							(char *) heaptup->t_data + SizeofHeapTupleHeader,
 							heaptup->t_len - SizeofHeapTupleHeader);
 
+		/* filtering by origin on a row level is much more efficient */
+		XLogIncludeOrigin();
+
 		recptr = XLogInsert(RM_HEAP_ID, info);
 
 		PageSetLSN(page, recptr);
@@ -2221,6 +2268,7 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	 */
 	CacheInvalidateHeapTuple(relation, heaptup, NULL);
 
+	/* Note: speculative insertions are counted too, even if aborted later */
 	pgstat_count_heap_insert(relation, 1);
 
 	/*
@@ -2247,6 +2295,17 @@ static HeapTuple
 heap_prepare_insert(Relation relation, HeapTuple tup, TransactionId xid,
 					CommandId cid, int options)
 {
+	/*
+	 * For now, parallel operations are required to be strictly read-only.
+	 * Unlike heap_update() and heap_delete(), an insert should never create a
+	 * combo CID, so it might be possible to relax this restriction, but not
+	 * without more thought and testing.
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+				 errmsg("cannot insert tuples during a parallel operation")));
+
 	if (relation->rd_rel->relhasoids)
 	{
 #ifdef NOT_USED
@@ -2384,7 +2443,7 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 		 * RelationGetBufferForTuple has ensured that the first tuple fits.
 		 * Put that on the page, and then as many other tuples as fit.
 		 */
-		RelationPutHeapTuple(relation, buffer, heaptuples[ndone]);
+		RelationPutHeapTuple(relation, buffer, heaptuples[ndone], false);
 		for (nthispage = 1; ndone + nthispage < ntuples; nthispage++)
 		{
 			HeapTuple	heaptup = heaptuples[ndone + nthispage];
@@ -2392,7 +2451,7 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 			if (PageGetHeapFreeSpace(page) < MAXALIGN(heaptup->t_len) + saveFreeSpace)
 				break;
 
-			RelationPutHeapTuple(relation, buffer, heaptup);
+			RelationPutHeapTuple(relation, buffer, heaptup, false);
 
 			/*
 			 * We don't use heap_multi_insert for catalog tuples yet, but
@@ -2452,7 +2511,7 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 			/* the rest of the scratch space is used for tuple data */
 			tupledata = scratchptr;
 
-			xlrec->flags = all_visible_cleared ? XLOG_HEAP_ALL_VISIBLE_CLEARED : 0;
+			xlrec->flags = all_visible_cleared ? XLH_INSERT_ALL_VISIBLE_CLEARED : 0;
 			xlrec->ntuples = nthispage;
 
 			/*
@@ -2487,7 +2546,7 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 			Assert((scratchptr - scratch) < BLCKSZ);
 
 			if (need_tuple_data)
-				xlrec->flags |= XLOG_HEAP_CONTAINS_NEW_TUPLE;
+				xlrec->flags |= XLH_INSERT_CONTAINS_NEW_TUPLE;
 
 			/*
 			 * Signal that this is the last xl_heap_multi_insert record
@@ -2495,7 +2554,7 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 			 * decoding so it knows when to cleanup temporary data.
 			 */
 			if (ndone + nthispage == ntuples)
-				xlrec->flags |= XLOG_HEAP_LAST_MULTI_INSERT;
+				xlrec->flags |= XLH_INSERT_LAST_IN_MULTI;
 
 			if (init)
 			{
@@ -2515,6 +2574,10 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 			XLogRegisterBuffer(0, buffer, REGBUF_STANDARD | bufflags);
 
 			XLogRegisterBufData(0, tupledata, totaldatalen);
+
+			/* filtering by origin on a row level is much more efficient */
+			XLogIncludeOrigin();
+
 			recptr = XLogInsert(RM_HEAP2_ID, info);
 
 			PageSetLSN(page, recptr);
@@ -2657,6 +2720,16 @@ heap_delete(Relation relation, ItemPointer tid,
 
 	Assert(ItemPointerIsValid(tid));
 
+	/*
+	 * Forbid this during a parallel operation, lets it allocate a combocid.
+	 * Other workers might need that combocid for visibility checks, and we
+	 * have no provision for broadcasting it to them.
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+				 errmsg("cannot delete tuples during a parallel operation")));
+
 	block = ItemPointerGetBlockNumber(tid);
 	buffer = ReadBuffer(relation, block);
 	page = BufferGetPage(buffer);
@@ -2711,8 +2784,8 @@ l1:
 		infomask = tp.t_data->t_infomask;
 
 		/*
-		 * Sleep until concurrent transaction ends -- except when there's a single
-		 * locker and it's our own transaction.  Note we don't care
+		 * Sleep until concurrent transaction ends -- except when there's a
+		 * single locker and it's our own transaction.  Note we don't care
 		 * which lock mode the locker has, because we need the strongest one.
 		 *
 		 * Before sleeping, we need to acquire tuple lock to establish our
@@ -2765,8 +2838,8 @@ l1:
 		else if (!TransactionIdIsCurrentTransactionId(xwait))
 		{
 			/*
-			 * Wait for regular transaction to end; but first, acquire
-			 * tuple lock.
+			 * Wait for regular transaction to end; but first, acquire tuple
+			 * lock.
 			 */
 			LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 			heap_acquire_tuplock(relation, &(tp.t_self), LockTupleExclusive,
@@ -2889,7 +2962,12 @@ l1:
 
 	MarkBufferDirty(buffer);
 
-	/* XLOG stuff */
+	/*
+	 * XLOG stuff
+	 *
+	 * NB: heap_abort_speculative() uses the same xlog record and replay
+	 * routines.
+	 */
 	if (RelationNeedsWAL(relation))
 	{
 		xl_heap_delete xlrec;
@@ -2899,7 +2977,7 @@ l1:
 		if (RelationIsAccessibleInLogicalDecoding(relation))
 			log_heap_new_cid(relation, &tp);
 
-		xlrec.flags = all_visible_cleared ? XLOG_HEAP_ALL_VISIBLE_CLEARED : 0;
+		xlrec.flags = all_visible_cleared ? XLH_DELETE_ALL_VISIBLE_CLEARED : 0;
 		xlrec.infobits_set = compute_infobits(tp.t_data->t_infomask,
 											  tp.t_data->t_infomask2);
 		xlrec.offnum = ItemPointerGetOffsetNumber(&tp.t_self);
@@ -2908,9 +2986,9 @@ l1:
 		if (old_key_tuple != NULL)
 		{
 			if (relation->rd_rel->relreplident == REPLICA_IDENTITY_FULL)
-				xlrec.flags |= XLOG_HEAP_CONTAINS_OLD_TUPLE;
+				xlrec.flags |= XLH_DELETE_CONTAINS_OLD_TUPLE;
 			else
-				xlrec.flags |= XLOG_HEAP_CONTAINS_OLD_KEY;
+				xlrec.flags |= XLH_DELETE_CONTAINS_OLD_KEY;
 		}
 
 		XLogBeginInsert();
@@ -2936,6 +3014,9 @@ l1:
 							 - SizeofHeapTupleHeader);
 		}
 
+		/* filtering by origin on a row level is much more efficient */
+		XLogIncludeOrigin();
+
 		recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_DELETE);
 
 		PageSetLSN(page, recptr);
@@ -3106,6 +3187,16 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 	Assert(ItemPointerIsValid(otid));
 
 	/*
+	 * Forbid this during a parallel operation, lets it allocate a combocid.
+	 * Other workers might need that combocid for visibility checks, and we
+	 * have no provision for broadcasting it to them.
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+				 errmsg("cannot update tuples during a parallel operation")));
+
+	/*
 	 * Fetch the list of attributes to be checked for HOT update.  This is
 	 * wasted effort if we fail to update or have to put the new tuple on a
 	 * different page.  But we must compute the list before obtaining buffer
@@ -3261,8 +3352,8 @@ l2:
 		 *
 		 * Before sleeping, we need to acquire tuple lock to establish our
 		 * priority for the tuple (see heap_lock_tuple).  LockTuple will
-		 * release us when we are next-in-line for the tuple.  Note we must not
-		 * acquire the tuple lock until we're sure we're going to sleep;
+		 * release us when we are next-in-line for the tuple.  Note we must
+		 * not acquire the tuple lock until we're sure we're going to sleep;
 		 * otherwise we're open for race conditions with other transactions
 		 * holding the tuple lock which sleep on us.
 		 *
@@ -3299,8 +3390,8 @@ l2:
 				 */
 				if (xmax_infomask_changed(oldtup.t_data->t_infomask,
 										  infomask) ||
-					!TransactionIdEquals(HeapTupleHeaderGetRawXmax(oldtup.t_data),
-										 xwait))
+				!TransactionIdEquals(HeapTupleHeaderGetRawXmax(oldtup.t_data),
+									 xwait))
 					goto l2;
 			}
 
@@ -3350,9 +3441,9 @@ l2:
 		else if (HEAP_XMAX_IS_KEYSHR_LOCKED(infomask) && key_intact)
 		{
 			/*
-			 * If it's just a key-share locker, and we're not changing the
-			 * key columns, we don't need to wait for it to end; but we
-			 * need to preserve it as locker.
+			 * If it's just a key-share locker, and we're not changing the key
+			 * columns, we don't need to wait for it to end; but we need to
+			 * preserve it as locker.
 			 */
 			checked_lockers = true;
 			locker_remains = true;
@@ -3361,8 +3452,8 @@ l2:
 		else
 		{
 			/*
-			 * Wait for regular transaction to end; but first, acquire
-			 * tuple lock.
+			 * Wait for regular transaction to end; but first, acquire tuple
+			 * lock.
 			 */
 			LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 			heap_acquire_tuplock(relation, &(oldtup.t_self), *lockmode,
@@ -3379,7 +3470,7 @@ l2:
 			 */
 			if (xmax_infomask_changed(oldtup.t_data->t_infomask, infomask) ||
 				!TransactionIdEquals(xwait,
-									 HeapTupleHeaderGetRawXmax(oldtup.t_data)))
+								   HeapTupleHeaderGetRawXmax(oldtup.t_data)))
 				goto l2;
 
 			/* Otherwise check if it committed or aborted */
@@ -3707,7 +3798,7 @@ l2:
 		HeapTupleClearHeapOnly(newtup);
 	}
 
-	RelationPutHeapTuple(relation, newbuf, heaptup);	/* insert new tuple */
+	RelationPutHeapTuple(relation, newbuf, heaptup, false);		/* insert new tuple */
 
 	if (!already_marked)
 	{
@@ -4101,14 +4192,16 @@ get_mxact_status_for_lock(LockTupleMode mode, bool is_update)
  *
  * Function result may be:
  *	HeapTupleMayBeUpdated: lock was successfully acquired
+ *	HeapTupleInvisible: lock failed because tuple was never visible to us
  *	HeapTupleSelfUpdated: lock failed because tuple updated by self
  *	HeapTupleUpdated: lock failed because tuple updated by other xact
  *	HeapTupleWouldBlock: lock couldn't be acquired and wait_policy is skip
  *
- * In the failure cases, the routine fills *hufd with the tuple's t_ctid,
- * t_xmax (resolving a possible MultiXact, if necessary), and t_cmax
- * (the last only for HeapTupleSelfUpdated, since we
- * cannot obtain cmax from a combocid generated by another transaction).
+ * In the failure cases other than HeapTupleInvisible, the routine fills
+ * *hufd with the tuple's t_ctid, t_xmax (resolving a possible MultiXact,
+ * if necessary), and t_cmax (the last only for HeapTupleSelfUpdated,
+ * since we cannot obtain cmax from a combocid generated by another
+ * transaction).
  * See comments for struct HeapUpdateFailureData for additional info.
  *
  * See README.tuplock for a thorough explanation of this mechanism.
@@ -4150,8 +4243,15 @@ l3:
 
 	if (result == HeapTupleInvisible)
 	{
-		UnlockReleaseBuffer(*buffer);
-		elog(ERROR, "attempted to lock invisible tuple");
+		LockBuffer(*buffer, BUFFER_LOCK_UNLOCK);
+
+		/*
+		 * This is possible, but only when locking a tuple for ON CONFLICT
+		 * UPDATE.  We return this value here rather than throwing an error in
+		 * order to give that case the opportunity to throw a more specific
+		 * error.
+		 */
+		return HeapTupleInvisible;
 	}
 	else if (result == HeapTupleBeingUpdated)
 	{
@@ -4402,7 +4502,7 @@ l3:
 		if (require_sleep && !(infomask & HEAP_XMAX_IS_MULTI) &&
 			TransactionIdIsCurrentTransactionId(xwait))
 		{
-			 /* ... but if the xmax changed in the meantime, start over */
+			/* ... but if the xmax changed in the meantime, start over */
 			LockBuffer(*buffer, BUFFER_LOCK_EXCLUSIVE);
 			if (xmax_infomask_changed(tuple->t_data->t_infomask, infomask) ||
 				!TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple->t_data),
@@ -4426,8 +4526,8 @@ l3:
 			 * for the tuple.  We must do this even if we are share-locking.
 			 *
 			 * If we are forced to "start over" below, we keep the tuple lock;
-			 * this arranges that we stay at the head of the line while rechecking
-			 * tuple state.
+			 * this arranges that we stay at the head of the line while
+			 * rechecking tuple state.
 			 */
 			if (!heap_acquire_tuplock(relation, tid, mode, wait_policy,
 									  &have_tuple_lock))
@@ -4455,11 +4555,11 @@ l3:
 				{
 					case LockWaitBlock:
 						MultiXactIdWait((MultiXactId) xwait, status, infomask,
-										relation, &tuple->t_self, XLTW_Lock, NULL);
+								  relation, &tuple->t_self, XLTW_Lock, NULL);
 						break;
 					case LockWaitSkip:
 						if (!ConditionalMultiXactIdWait((MultiXactId) xwait,
-														status, infomask, relation,
+												  status, infomask, relation,
 														NULL))
 						{
 							result = HeapTupleWouldBlock;
@@ -4470,12 +4570,12 @@ l3:
 						break;
 					case LockWaitError:
 						if (!ConditionalMultiXactIdWait((MultiXactId) xwait,
-														status, infomask, relation,
+												  status, infomask, relation,
 														NULL))
 							ereport(ERROR,
 									(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
 									 errmsg("could not obtain lock on row in relation \"%s\"",
-											RelationGetRelationName(relation))));
+										RelationGetRelationName(relation))));
 
 						break;
 				}
@@ -4513,7 +4613,7 @@ l3:
 							ereport(ERROR,
 									(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
 									 errmsg("could not obtain lock on row in relation \"%s\"",
-											RelationGetRelationName(relation))));
+										RelationGetRelationName(relation))));
 						break;
 				}
 			}
@@ -4538,9 +4638,9 @@ l3:
 			LockBuffer(*buffer, BUFFER_LOCK_EXCLUSIVE);
 
 			/*
-			 * xwait is done, but if xwait had just locked the tuple then
-			 * some other xact could update this tuple before we get to
-			 * this point.  Check for xmax change, and start over if so.
+			 * xwait is done, but if xwait had just locked the tuple then some
+			 * other xact could update this tuple before we get to this point.
+			 * Check for xmax change, and start over if so.
 			 */
 			if (xmax_infomask_changed(tuple->t_data->t_infomask, infomask) ||
 				!TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple->t_data),
@@ -4553,9 +4653,9 @@ l3:
 				 * Otherwise check if it committed or aborted.  Note we cannot
 				 * be here if the tuple was only locked by somebody who didn't
 				 * conflict with us; that would have been handled above.  So
-				 * that transaction must necessarily be gone by now.  But don't
-				 * check for this in the multixact case, because some locker
-				 * transactions might still be running.
+				 * that transaction must necessarily be gone by now.  But
+				 * don't check for this in the multixact case, because some
+				 * locker transactions might still be running.
 				 */
 				UpdateXmaxHintBits(tuple->t_data, *buffer, xwait);
 			}
@@ -4675,6 +4775,8 @@ failed:
 											  tuple->t_data->t_infomask2);
 		XLogRegisterData((char *) &xlrec, SizeOfHeapLock);
 
+		/* we don't decode row locks atm, so no need to log the origin */
+
 		recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_LOCK);
 
 		PageSetLSN(page, recptr);
@@ -4733,8 +4835,8 @@ heap_acquire_tuplock(Relation relation, ItemPointer tid, LockTupleMode mode,
 			if (!ConditionalLockTupleTuplock(relation, tid, mode))
 				ereport(ERROR,
 						(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
-						 errmsg("could not obtain lock on row in relation \"%s\"",
-								RelationGetRelationName(relation))));
+					errmsg("could not obtain lock on row in relation \"%s\"",
+						   RelationGetRelationName(relation))));
 			break;
 	}
 	*have_tuple_lock = true;
@@ -5030,7 +5132,7 @@ l5:
 /*
  * Subroutine for heap_lock_updated_tuple_rec.
  *
- * Given an hypothetical multixact status held by the transaction identified
+ * Given a hypothetical multixact status held by the transaction identified
  * with the given xid, does the current transaction need to wait, fail, or can
  * it continue if it wanted to acquire a lock of the given mode?  "needwait"
  * is set to true if waiting is necessary; if it can continue, then
@@ -5386,6 +5488,234 @@ heap_lock_updated_tuple(Relation rel, HeapTuple tuple, ItemPointer ctid,
 	return HeapTupleMayBeUpdated;
 }
 
+/*
+ *	heap_finish_speculative - mark speculative insertion as successful
+ *
+ * To successfully finish a speculative insertion we have to clear speculative
+ * token from tuple.  To do so the t_ctid field, which will contain a
+ * speculative token value, is modified in place to point to the tuple itself,
+ * which is characteristic of a newly inserted ordinary tuple.
+ *
+ * NB: It is not ok to commit without either finishing or aborting a
+ * speculative insertion.  We could treat speculative tuples of committed
+ * transactions implicitly as completed, but then we would have to be prepared
+ * to deal with speculative tokens on committed tuples.  That wouldn't be
+ * difficult - no-one looks at the ctid field of a tuple with invalid xmax -
+ * but clearing the token at completion isn't very expensive either.
+ * An explicit confirmation WAL record also makes logical decoding simpler.
+ */
+void
+heap_finish_speculative(Relation relation, HeapTuple tuple)
+{
+	Buffer		buffer;
+	Page		page;
+	OffsetNumber offnum;
+	ItemId		lp = NULL;
+	HeapTupleHeader htup;
+
+	buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(&(tuple->t_self)));
+	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
+	page = (Page) BufferGetPage(buffer);
+
+	offnum = ItemPointerGetOffsetNumber(&(tuple->t_self));
+	if (PageGetMaxOffsetNumber(page) >= offnum)
+		lp = PageGetItemId(page, offnum);
+
+	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsNormal(lp))
+		elog(ERROR, "heap_confirm_insert: invalid lp");
+
+	htup = (HeapTupleHeader) PageGetItem(page, lp);
+
+	/* SpecTokenOffsetNumber should be distinguishable from any real offset */
+	StaticAssertStmt(MaxOffsetNumber < SpecTokenOffsetNumber,
+					 "invalid speculative token constant");
+
+	/* NO EREPORT(ERROR) from here till changes are logged */
+	START_CRIT_SECTION();
+
+	Assert(HeapTupleHeaderIsSpeculative(tuple->t_data));
+
+	MarkBufferDirty(buffer);
+
+	/*
+	 * Replace the speculative insertion token with a real t_ctid, pointing to
+	 * itself like it does on regular tuples.
+	 */
+	htup->t_ctid = tuple->t_self;
+
+	/* XLOG stuff */
+	if (RelationNeedsWAL(relation))
+	{
+		xl_heap_confirm xlrec;
+		XLogRecPtr	recptr;
+
+		xlrec.offnum = ItemPointerGetOffsetNumber(&tuple->t_self);
+
+		XLogBeginInsert();
+
+		/* We want the same filtering on this as on a plain insert */
+		XLogIncludeOrigin();
+
+		XLogRegisterData((char *) &xlrec, SizeOfHeapConfirm);
+		XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
+
+		recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_CONFIRM);
+
+		PageSetLSN(page, recptr);
+	}
+
+	END_CRIT_SECTION();
+
+	UnlockReleaseBuffer(buffer);
+}
+
+/*
+ *	heap_abort_speculative - kill a speculatively inserted tuple
+ *
+ * Marks a tuple that was speculatively inserted in the same command as dead,
+ * by setting its xmin as invalid.  That makes it immediately appear as dead
+ * to all transactions, including our own.  In particular, it makes
+ * HeapTupleSatisfiesDirty() regard the tuple as dead, so that another backend
+ * inserting a duplicate key value won't unnecessarily wait for our whole
+ * transaction to finish (it'll just wait for our speculative insertion to
+ * finish).
+ *
+ * Killing the tuple prevents "unprincipled deadlocks", which are deadlocks
+ * that arise due to a mutual dependency that is not user visible.  By
+ * definition, unprincipled deadlocks cannot be prevented by the user
+ * reordering lock acquisition in client code, because the implementation level
+ * lock acquisitions are not under the user's direct control.  If speculative
+ * inserters did not take this precaution, then under high concurrency they
+ * could deadlock with each other, which would not be acceptable.
+ *
+ * This is somewhat redundant with heap_delete, but we prefer to have a
+ * dedicated routine with stripped down requirements.
+ *
+ * This routine does not affect logical decoding as it only looks at
+ * confirmation records.
+ */
+void
+heap_abort_speculative(Relation relation, HeapTuple tuple)
+{
+	TransactionId xid = GetCurrentTransactionId();
+	ItemPointer tid = &(tuple->t_self);
+	ItemId		lp;
+	HeapTupleData tp;
+	Page		page;
+	BlockNumber block;
+	Buffer		buffer;
+
+	Assert(ItemPointerIsValid(tid));
+
+	block = ItemPointerGetBlockNumber(tid);
+	buffer = ReadBuffer(relation, block);
+	page = BufferGetPage(buffer);
+
+	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
+
+	/*
+	 * Page can't be all visible, we just inserted into it, and are still
+	 * running.
+	 */
+	Assert(!PageIsAllVisible(page));
+
+	lp = PageGetItemId(page, ItemPointerGetOffsetNumber(tid));
+	Assert(ItemIdIsNormal(lp));
+
+	tp.t_tableOid = RelationGetRelid(relation);
+	tp.t_data = (HeapTupleHeader) PageGetItem(page, lp);
+	tp.t_len = ItemIdGetLength(lp);
+	tp.t_self = *tid;
+
+	/*
+	 * Sanity check that the tuple really is a speculatively inserted tuple,
+	 * inserted by us.
+	 */
+	if (tp.t_data->t_choice.t_heap.t_xmin != xid)
+		elog(ERROR, "attempted to kill a tuple inserted by another transaction");
+	if (!HeapTupleHeaderIsSpeculative(tp.t_data))
+		elog(ERROR, "attempted to kill a non-speculative tuple");
+	Assert(!HeapTupleHeaderIsHeapOnly(tp.t_data));
+
+	/*
+	 * No need to check for serializable conflicts here.  There is never a
+	 * need for a combocid, either.  No need to extract replica identity, or
+	 * do anything special with infomask bits.
+	 */
+
+	START_CRIT_SECTION();
+
+	/*
+	 * The tuple will become DEAD immediately.  Flag that this page
+	 * immediately is a candidate for pruning by setting xmin to
+	 * RecentGlobalXmin.  That's not pretty, but it doesn't seem worth
+	 * inventing a nicer API for this.
+	 */
+	Assert(TransactionIdIsValid(RecentGlobalXmin));
+	PageSetPrunable(page, RecentGlobalXmin);
+
+	/* store transaction information of xact deleting the tuple */
+	tp.t_data->t_infomask &= ~(HEAP_XMAX_BITS | HEAP_MOVED);
+	tp.t_data->t_infomask2 &= ~HEAP_KEYS_UPDATED;
+
+	/*
+	 * Set the tuple header xmin to InvalidTransactionId.  This makes the
+	 * tuple immediately invisible everyone.  (In particular, to any
+	 * transactions waiting on the speculative token, woken up later.)
+	 */
+	HeapTupleHeaderSetXmin(tp.t_data, InvalidTransactionId);
+
+	/* Clear the speculative insertion token too */
+	tp.t_data->t_ctid = tp.t_self;
+
+	MarkBufferDirty(buffer);
+
+	/*
+	 * XLOG stuff
+	 *
+	 * The WAL records generated here match heap_delete().  The same recovery
+	 * routines are used.
+	 */
+	if (RelationNeedsWAL(relation))
+	{
+		xl_heap_delete xlrec;
+		XLogRecPtr	recptr;
+
+		xlrec.flags = XLH_DELETE_IS_SUPER;
+		xlrec.infobits_set = compute_infobits(tp.t_data->t_infomask,
+											  tp.t_data->t_infomask2);
+		xlrec.offnum = ItemPointerGetOffsetNumber(&tp.t_self);
+		xlrec.xmax = xid;
+
+		XLogBeginInsert();
+		XLogRegisterData((char *) &xlrec, SizeOfHeapDelete);
+		XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
+
+		/* No replica identity & replication origin logged */
+
+		recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_DELETE);
+
+		PageSetLSN(page, recptr);
+	}
+
+	END_CRIT_SECTION();
+
+	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
+
+	if (HeapTupleHasExternal(&tp))
+		toast_delete(relation, &tp);
+
+	/*
+	 * Never need to mark tuple for invalidation, since catalogs don't support
+	 * speculative insertion
+	 */
+
+	/* Now we can release the buffer */
+	ReleaseBuffer(buffer);
+
+	/* count deletion, as we counted the insertion too */
+	pgstat_count_heap_delete(relation);
+}
 
 /*
  * heap_inplace_update - update a tuple "in place" (ie, overwrite it)
@@ -5413,6 +5743,17 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
 	uint32		oldlen;
 	uint32		newlen;
 
+	/*
+	 * For now, parallel operations are required to be strictly read-only.
+	 * Unlike a regular update, this should never create a combo CID, so it
+	 * might be possible to relax this restriction, but not without more
+	 * thought and testing.  It's not clear that it would be useful, anyway.
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+				 errmsg("cannot update tuples during a parallel operation")));
+
 	buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(&(tuple->t_self)));
 	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
 	page = (Page) BufferGetPage(buffer);
@@ -5454,6 +5795,8 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
 		XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
 		XLogRegisterBufData(0, (char *) htup + htup->t_hoff, newlen);
 
+		/* inplace updates aren't decoded atm, don't log the origin */
+
 		recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_INPLACE);
 
 		PageSetLSN(page, recptr);
@@ -6129,23 +6472,23 @@ static bool
 DoesMultiXactIdConflict(MultiXactId multi, uint16 infomask,
 						LockTupleMode lockmode)
 {
-	bool	allow_old;
-	int		nmembers;
+	bool		allow_old;
+	int			nmembers;
 	MultiXactMember *members;
-	bool	result = false;
-	LOCKMODE wanted = tupleLockExtraInfo[lockmode].hwlock;
+	bool		result = false;
+	LOCKMODE	wanted = tupleLockExtraInfo[lockmode].hwlock;
 
 	allow_old = !(infomask & HEAP_LOCK_MASK) && HEAP_XMAX_IS_LOCKED_ONLY(infomask);
 	nmembers = GetMultiXactIdMembers(multi, &members, allow_old,
 									 HEAP_XMAX_IS_LOCKED_ONLY(infomask));
 	if (nmembers >= 0)
 	{
-		int		i;
+		int			i;
 
 		for (i = 0; i < nmembers; i++)
 		{
-			TransactionId		memxid;
-			LOCKMODE			memlockmode;
+			TransactionId memxid;
+			LOCKMODE	memlockmode;
 
 			memlockmode = LOCKMODE_from_mxstatus(members[i].status);
 
@@ -6688,22 +7031,22 @@ log_heap_update(Relation reln, Buffer oldbuf,
 	/* Prepare main WAL data chain */
 	xlrec.flags = 0;
 	if (all_visible_cleared)
-		xlrec.flags |= XLOG_HEAP_ALL_VISIBLE_CLEARED;
+		xlrec.flags |= XLH_UPDATE_OLD_ALL_VISIBLE_CLEARED;
 	if (new_all_visible_cleared)
-		xlrec.flags |= XLOG_HEAP_NEW_ALL_VISIBLE_CLEARED;
+		xlrec.flags |= XLH_UPDATE_NEW_ALL_VISIBLE_CLEARED;
 	if (prefixlen > 0)
-		xlrec.flags |= XLOG_HEAP_PREFIX_FROM_OLD;
+		xlrec.flags |= XLH_UPDATE_PREFIX_FROM_OLD;
 	if (suffixlen > 0)
-		xlrec.flags |= XLOG_HEAP_SUFFIX_FROM_OLD;
+		xlrec.flags |= XLH_UPDATE_SUFFIX_FROM_OLD;
 	if (need_tuple_data)
 	{
-		xlrec.flags |= XLOG_HEAP_CONTAINS_NEW_TUPLE;
+		xlrec.flags |= XLH_UPDATE_CONTAINS_NEW_TUPLE;
 		if (old_key_tuple)
 		{
 			if (reln->rd_rel->relreplident == REPLICA_IDENTITY_FULL)
-				xlrec.flags |= XLOG_HEAP_CONTAINS_OLD_TUPLE;
+				xlrec.flags |= XLH_UPDATE_CONTAINS_OLD_TUPLE;
 			else
-				xlrec.flags |= XLOG_HEAP_CONTAINS_OLD_KEY;
+				xlrec.flags |= XLH_UPDATE_CONTAINS_OLD_KEY;
 		}
 	}
 
@@ -6775,7 +7118,7 @@ log_heap_update(Relation reln, Buffer oldbuf,
 	{
 		XLogRegisterBufData(0,
 							((char *) newtup->t_data) + SizeofHeapTupleHeader,
-							newtup->t_len - SizeofHeapTupleHeader - suffixlen);
+						  newtup->t_len - SizeofHeapTupleHeader - suffixlen);
 	}
 	else
 	{
@@ -6787,8 +7130,8 @@ log_heap_update(Relation reln, Buffer oldbuf,
 		if (newtup->t_data->t_hoff - SizeofHeapTupleHeader > 0)
 		{
 			XLogRegisterBufData(0,
-								((char *) newtup->t_data) + SizeofHeapTupleHeader,
-								newtup->t_data->t_hoff - SizeofHeapTupleHeader);
+						   ((char *) newtup->t_data) + SizeofHeapTupleHeader,
+							 newtup->t_data->t_hoff - SizeofHeapTupleHeader);
 		}
 
 		/* data after common prefix */
@@ -6812,13 +7155,16 @@ log_heap_update(Relation reln, Buffer oldbuf,
 						 old_key_tuple->t_len - SizeofHeapTupleHeader);
 	}
 
+	/* filtering by origin on a row level is much more efficient */
+	XLogIncludeOrigin();
+
 	recptr = XLogInsert(RM_HEAP_ID, info);
 
 	return recptr;
 }
 
 /*
- * Perform XLogInsert of a XLOG_HEAP2_NEW_CID record
+ * Perform XLogInsert of an XLOG_HEAP2_NEW_CID record
  *
  * This is only used in wal_level >= WAL_LEVEL_LOGICAL, and only for catalog
  * tuples.
@@ -6858,7 +7204,7 @@ log_heap_new_cid(Relation relation, HeapTuple tup)
 		 *
 		 * We need to check for LOCK ONLY because multixacts might be
 		 * transferred to the new tuple in case of FOR KEY SHARE updates in
-		 * which case there will be a xmax, although the tuple just got
+		 * which case there will be an xmax, although the tuple just got
 		 * inserted.
 		 */
 		if (hdr->t_infomask & HEAP_XMAX_INVALID ||
@@ -6885,6 +7231,8 @@ log_heap_new_cid(Relation relation, HeapTuple tup)
 	XLogBeginInsert();
 	XLogRegisterData((char *) &xlrec, SizeOfHeapNewCid);
 
+	/* will be looked at irrespective of origin */
+
 	recptr = XLogInsert(RM_HEAP2_ID, XLOG_HEAP2_NEW_CID);
 
 	return recptr;
@@ -6894,7 +7242,7 @@ log_heap_new_cid(Relation relation, HeapTuple tup)
  * Build a heap tuple representing the configured REPLICA IDENTITY to represent
  * the old tuple in a UPDATE or DELETE.
  *
- * Returns NULL if there's no need to log a identity or if there's no suitable
+ * Returns NULL if there's no need to log an identity or if there's no suitable
  * key in the Relation relation.
  */
 static HeapTuple
@@ -6966,8 +7314,8 @@ ExtractReplicaIdentity(Relation relation, HeapTuple tp, bool key_changed, bool *
 		{
 			/*
 			 * The OID column can appear in an index definition, but that's
-			 * OK, becuse we always copy the OID if present (see below). Other
-			 * system columns may not.
+			 * OK, because we always copy the OID if present (see below).
+			 * Other system columns may not.
 			 */
 			if (attno == ObjectIdAttributeNumber)
 				continue;
@@ -7329,7 +7677,7 @@ heap_xlog_delete(XLogReaderState *record)
 	 * The visibility map may need to be fixed even if the heap page is
 	 * already up-to-date.
 	 */
-	if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+	if (xlrec->flags & XLH_DELETE_ALL_VISIBLE_CLEARED)
 	{
 		Relation	reln = CreateFakeRelcacheEntry(target_node);
 		Buffer		vmbuffer = InvalidBuffer;
@@ -7357,13 +7705,16 @@ heap_xlog_delete(XLogReaderState *record)
 		HeapTupleHeaderClearHotUpdated(htup);
 		fix_infomask_from_infobits(xlrec->infobits_set,
 								   &htup->t_infomask, &htup->t_infomask2);
-		HeapTupleHeaderSetXmax(htup, xlrec->xmax);
+		if (!(xlrec->flags & XLH_DELETE_IS_SUPER))
+			HeapTupleHeaderSetXmax(htup, xlrec->xmax);
+		else
+			HeapTupleHeaderSetXmin(htup, InvalidTransactionId);
 		HeapTupleHeaderSetCmax(htup, FirstCommandId, false);
 
 		/* Mark the page as a candidate for pruning */
 		PageSetPrunable(page, XLogRecGetXid(record));
 
-		if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+		if (xlrec->flags & XLH_DELETE_ALL_VISIBLE_CLEARED)
 			PageClearAllVisible(page);
 
 		/* Make sure there is no forward chain link in t_ctid */
@@ -7404,7 +7755,7 @@ heap_xlog_insert(XLogReaderState *record)
 	 * The visibility map may need to be fixed even if the heap page is
 	 * already up-to-date.
 	 */
-	if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+	if (xlrec->flags & XLH_INSERT_ALL_VISIBLE_CLEARED)
 	{
 		Relation	reln = CreateFakeRelcacheEntry(target_node);
 		Buffer		vmbuffer = InvalidBuffer;
@@ -7467,7 +7818,7 @@ heap_xlog_insert(XLogReaderState *record)
 
 		PageSetLSN(page, lsn);
 
-		if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+		if (xlrec->flags & XLH_INSERT_ALL_VISIBLE_CLEARED)
 			PageClearAllVisible(page);
 
 		MarkBufferDirty(buffer);
@@ -7524,7 +7875,7 @@ heap_xlog_multi_insert(XLogReaderState *record)
 	 * The visibility map may need to be fixed even if the heap page is
 	 * already up-to-date.
 	 */
-	if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+	if (xlrec->flags & XLH_INSERT_ALL_VISIBLE_CLEARED)
 	{
 		Relation	reln = CreateFakeRelcacheEntry(rnode);
 		Buffer		vmbuffer = InvalidBuffer;
@@ -7606,7 +7957,7 @@ heap_xlog_multi_insert(XLogReaderState *record)
 
 		PageSetLSN(page, lsn);
 
-		if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+		if (xlrec->flags & XLH_INSERT_ALL_VISIBLE_CLEARED)
 			PageClearAllVisible(page);
 
 		MarkBufferDirty(buffer);
@@ -7679,7 +8030,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
 	 * The visibility map may need to be fixed even if the heap page is
 	 * already up-to-date.
 	 */
-	if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+	if (xlrec->flags & XLH_UPDATE_OLD_ALL_VISIBLE_CLEARED)
 	{
 		Relation	reln = CreateFakeRelcacheEntry(rnode);
 		Buffer		vmbuffer = InvalidBuffer;
@@ -7734,7 +8085,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
 		/* Mark the page as a candidate for pruning */
 		PageSetPrunable(page, XLogRecGetXid(record));
 
-		if (xlrec->flags & XLOG_HEAP_ALL_VISIBLE_CLEARED)
+		if (xlrec->flags & XLH_UPDATE_OLD_ALL_VISIBLE_CLEARED)
 			PageClearAllVisible(page);
 
 		PageSetLSN(page, lsn);
@@ -7763,7 +8114,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
 	 * The visibility map may need to be fixed even if the heap page is
 	 * already up-to-date.
 	 */
-	if (xlrec->flags & XLOG_HEAP_NEW_ALL_VISIBLE_CLEARED)
+	if (xlrec->flags & XLH_UPDATE_NEW_ALL_VISIBLE_CLEARED)
 	{
 		Relation	reln = CreateFakeRelcacheEntry(rnode);
 		Buffer		vmbuffer = InvalidBuffer;
@@ -7791,13 +8142,13 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
 		if (PageGetMaxOffsetNumber(page) + 1 < offnum)
 			elog(PANIC, "heap_update_redo: invalid max offset number");
 
-		if (xlrec->flags & XLOG_HEAP_PREFIX_FROM_OLD)
+		if (xlrec->flags & XLH_UPDATE_PREFIX_FROM_OLD)
 		{
 			Assert(newblk == oldblk);
 			memcpy(&prefixlen, recdata, sizeof(uint16));
 			recdata += sizeof(uint16);
 		}
-		if (xlrec->flags & XLOG_HEAP_SUFFIX_FROM_OLD)
+		if (xlrec->flags & XLH_UPDATE_SUFFIX_FROM_OLD)
 		{
 			Assert(newblk == oldblk);
 			memcpy(&suffixlen, recdata, sizeof(uint16));
@@ -7869,7 +8220,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
 		if (offnum == InvalidOffsetNumber)
 			elog(PANIC, "heap_update_redo: failed to add tuple");
 
-		if (xlrec->flags & XLOG_HEAP_NEW_ALL_VISIBLE_CLEARED)
+		if (xlrec->flags & XLH_UPDATE_NEW_ALL_VISIBLE_CLEARED)
 			PageClearAllVisible(page);
 
 		freespace = PageGetHeapFreeSpace(page); /* needed to update FSM below */
@@ -7903,6 +8254,42 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
 }
 
 static void
+heap_xlog_confirm(XLogReaderState *record)
+{
+	XLogRecPtr	lsn = record->EndRecPtr;
+	xl_heap_confirm *xlrec = (xl_heap_confirm *) XLogRecGetData(record);
+	Buffer		buffer;
+	Page		page;
+	OffsetNumber offnum;
+	ItemId		lp = NULL;
+	HeapTupleHeader htup;
+
+	if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO)
+	{
+		page = BufferGetPage(buffer);
+
+		offnum = xlrec->offnum;
+		if (PageGetMaxOffsetNumber(page) >= offnum)
+			lp = PageGetItemId(page, offnum);
+
+		if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsNormal(lp))
+			elog(PANIC, "heap_confirm_redo: invalid lp");
+
+		htup = (HeapTupleHeader) PageGetItem(page, lp);
+
+		/*
+		 * Confirm tuple as actually inserted
+		 */
+		ItemPointerSet(&htup->t_ctid, BufferGetBlockNumber(buffer), offnum);
+
+		PageSetLSN(page, lsn);
+		MarkBufferDirty(buffer);
+	}
+	if (BufferIsValid(buffer))
+		UnlockReleaseBuffer(buffer);
+}
+
+static void
 heap_xlog_lock(XLogReaderState *record)
 {
 	XLogRecPtr	lsn = record->EndRecPtr;
@@ -8052,6 +8439,9 @@ heap_redo(XLogReaderState *record)
 		case XLOG_HEAP_HOT_UPDATE:
 			heap_xlog_update(record, true);
 			break;
+		case XLOG_HEAP_CONFIRM:
+			heap_xlog_confirm(record);
+			break;
 		case XLOG_HEAP_LOCK:
 			heap_xlog_lock(record);
 			break;
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 6d091f63af..6db73bf9d0 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -35,12 +35,17 @@
 void
 RelationPutHeapTuple(Relation relation,
 					 Buffer buffer,
-					 HeapTuple tuple)
+					 HeapTuple tuple,
+					 bool token)
 {
 	Page		pageHeader;
 	OffsetNumber offnum;
-	ItemId		itemId;
-	Item		item;
+
+	/*
+	 * A tuple that's being inserted speculatively should already have its
+	 * token set.
+	 */
+	Assert(!token || HeapTupleHeaderIsSpeculative(tuple->t_data));
 
 	/* Add the tuple to the page */
 	pageHeader = BufferGetPage(buffer);
@@ -54,10 +59,18 @@ RelationPutHeapTuple(Relation relation,
 	/* Update tuple->t_self to the actual position where it was stored */
 	ItemPointerSet(&(tuple->t_self), BufferGetBlockNumber(buffer), offnum);
 
-	/* Insert the correct position into CTID of the stored tuple, too */
-	itemId = PageGetItemId(pageHeader, offnum);
-	item = PageGetItem(pageHeader, itemId);
-	((HeapTupleHeader) item)->t_ctid = tuple->t_self;
+	/*
+	 * Insert the correct position into CTID of the stored tuple, too (unless
+	 * this is a speculative insertion, in which case the token is held in
+	 * CTID field instead)
+	 */
+	if (!token)
+	{
+		ItemId		itemId = PageGetItemId(pageHeader, offnum);
+		Item		item = PageGetItem(pageHeader, itemId);
+
+		((HeapTupleHeader) item)->t_ctid = tuple->t_self;
+	}
 }
 
 /*
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index af5c158fc6..bcce3e35d5 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -195,7 +195,7 @@ typedef struct
 typedef OldToNewMappingData *OldToNewMapping;
 
 /*
- * In-Memory data for a xid that might need logical remapping entries
+ * In-Memory data for an xid that might need logical remapping entries
  * to be logged.
  */
 typedef struct RewriteMappingFile
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c
index 50d36a5d24..bdfc0b22bb 100644
--- a/src/backend/access/heap/tuptoaster.c
+++ b/src/backend/access/heap/tuptoaster.c
@@ -37,6 +37,7 @@
 #include "catalog/catalog.h"
 #include "common/pg_lzcompress.h"
 #include "miscadmin.h"
+#include "utils/expandeddatum.h"
 #include "utils/fmgroids.h"
 #include "utils/rel.h"
 #include "utils/typcache.h"
@@ -130,6 +131,19 @@ heap_tuple_fetch_attr(struct varlena * attr)
 		result = (struct varlena *) palloc(VARSIZE_ANY(attr));
 		memcpy(result, attr, VARSIZE_ANY(attr));
 	}
+	else if (VARATT_IS_EXTERNAL_EXPANDED(attr))
+	{
+		/*
+		 * This is an expanded-object pointer --- get flat format
+		 */
+		ExpandedObjectHeader *eoh;
+		Size		resultsize;
+
+		eoh = DatumGetEOHP(PointerGetDatum(attr));
+		resultsize = EOH_get_flat_size(eoh);
+		result = (struct varlena *) palloc(resultsize);
+		EOH_flatten_into(eoh, (void *) result, resultsize);
+	}
 	else
 	{
 		/*
@@ -196,6 +210,15 @@ heap_tuple_untoast_attr(struct varlena * attr)
 			attr = result;
 		}
 	}
+	else if (VARATT_IS_EXTERNAL_EXPANDED(attr))
+	{
+		/*
+		 * This is an expanded-object pointer --- get flat format
+		 */
+		attr = heap_tuple_fetch_attr(attr);
+		/* flatteners are not allowed to produce compressed/short output */
+		Assert(!VARATT_IS_EXTENDED(attr));
+	}
 	else if (VARATT_IS_COMPRESSED(attr))
 	{
 		/*
@@ -263,6 +286,11 @@ heap_tuple_untoast_attr_slice(struct varlena * attr,
 		return heap_tuple_untoast_attr_slice(redirect.pointer,
 											 sliceoffset, slicelength);
 	}
+	else if (VARATT_IS_EXTERNAL_EXPANDED(attr))
+	{
+		/* pass it off to heap_tuple_fetch_attr to flatten */
+		preslice = heap_tuple_fetch_attr(attr);
+	}
 	else
 		preslice = attr;
 
@@ -344,6 +372,10 @@ toast_raw_datum_size(Datum value)
 
 		return toast_raw_datum_size(PointerGetDatum(toast_pointer.pointer));
 	}
+	else if (VARATT_IS_EXTERNAL_EXPANDED(attr))
+	{
+		result = EOH_get_flat_size(DatumGetEOHP(value));
+	}
 	else if (VARATT_IS_COMPRESSED(attr))
 	{
 		/* here, va_rawsize is just the payload size */
@@ -400,6 +432,10 @@ toast_datum_size(Datum value)
 
 		return toast_datum_size(PointerGetDatum(toast_pointer.pointer));
 	}
+	else if (VARATT_IS_EXTERNAL_EXPANDED(attr))
+	{
+		result = EOH_get_flat_size(DatumGetEOHP(value));
+	}
 	else if (VARATT_IS_SHORT(attr))
 	{
 		result = VARSIZE_SHORT(attr);
@@ -523,6 +559,14 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	bool		toast_delold[MaxHeapAttributeNumber];
 
 	/*
+	 * Ignore the INSERT_SPECULATIVE option. Speculative insertions/super
+	 * deletions just normally insert/delete the toast values. It seems
+	 * easiest to deal with that here, instead on, potentially, multiple
+	 * callers.
+	 */
+	options &= ~HEAP_INSERT_SPECULATIVE;
+
+	/*
 	 * We should only ever be called for tuples of plain relations or
 	 * materialized views --- recursing on a toast rel is bad news.
 	 */
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index e6e4d28b74..1043362f91 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -185,11 +185,11 @@ BuildIndexValueDescription(Relation indexRelation,
 	 * Check permissions- if the user does not have access to view all of the
 	 * key columns then return NULL to avoid leaking data.
 	 *
-	 * First check if RLS is enabled for the relation.  If so, return NULL
-	 * to avoid leaking data.
+	 * First check if RLS is enabled for the relation.  If so, return NULL to
+	 * avoid leaking data.
 	 *
-	 * Next we need to check table-level SELECT access and then, if
-	 * there is no access there, check column-level permissions.
+	 * Next we need to check table-level SELECT access and then, if there is
+	 * no access there, check column-level permissions.
 	 */
 
 	/*
@@ -215,18 +215,18 @@ BuildIndexValueDescription(Relation indexRelation,
 	if (aclresult != ACLCHECK_OK)
 	{
 		/*
-		 * No table-level access, so step through the columns in the
-		 * index and make sure the user has SELECT rights on all of them.
+		 * No table-level access, so step through the columns in the index and
+		 * make sure the user has SELECT rights on all of them.
 		 */
 		for (keyno = 0; keyno < idxrec->indnatts; keyno++)
 		{
 			AttrNumber	attnum = idxrec->indkey.values[keyno];
 
 			/*
-			 * Note that if attnum == InvalidAttrNumber, then this is an
-			 * index based on an expression and we return no detail rather
-			 * than try to figure out what column(s) the expression includes
-			 * and if the user has SELECT rights on them.
+			 * Note that if attnum == InvalidAttrNumber, then this is an index
+			 * based on an expression and we return no detail rather than try
+			 * to figure out what column(s) the expression includes and if the
+			 * user has SELECT rights on them.
 			 */
 			if (attnum == InvalidAttrNumber ||
 				pg_attribute_aclcheck(indrelid, attnum, GetUserId(),
diff --git a/src/backend/access/nbtree/README b/src/backend/access/nbtree/README
index 5c0bc79484..7055c242d2 100644
--- a/src/backend/access/nbtree/README
+++ b/src/backend/access/nbtree/README
@@ -470,7 +470,7 @@ not be seen under normal circumstances; only if insertion to the parent
 has failed for some reason.
 
 We flag the left page, even though it's the right page that's missing the
-downlink, beacuse it's more convenient to know already when following the
+downlink, because it's more convenient to know already when following the
 right-link from the left page to the right page that it will need to have
 its downlink inserted to the parent.
 
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index ef68a7145f..77c2fdf90b 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -51,7 +51,8 @@ static Buffer _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf);
 static TransactionId _bt_check_unique(Relation rel, IndexTuple itup,
 				 Relation heapRel, Buffer buf, OffsetNumber offset,
 				 ScanKey itup_scankey,
-				 IndexUniqueCheck checkUnique, bool *is_unique);
+				 IndexUniqueCheck checkUnique, bool *is_unique,
+				 uint32 *speculativeToken);
 static void _bt_findinsertloc(Relation rel,
 				  Buffer *bufptr,
 				  OffsetNumber *offsetptr,
@@ -160,16 +161,27 @@ top:
 	if (checkUnique != UNIQUE_CHECK_NO)
 	{
 		TransactionId xwait;
+		uint32		speculativeToken;
 
 		offset = _bt_binsrch(rel, buf, natts, itup_scankey, false);
 		xwait = _bt_check_unique(rel, itup, heapRel, buf, offset, itup_scankey,
-								 checkUnique, &is_unique);
+								 checkUnique, &is_unique, &speculativeToken);
 
 		if (TransactionIdIsValid(xwait))
 		{
 			/* Have to wait for the other guy ... */
 			_bt_relbuf(rel, buf);
-			XactLockTableWait(xwait, rel, &itup->t_tid, XLTW_InsertIndex);
+
+			/*
+			 * If it's a speculative insertion, wait for it to finish (ie. to
+			 * go ahead with the insertion, or kill the tuple).  Otherwise
+			 * wait for the transaction to finish as usual.
+			 */
+			if (speculativeToken)
+				SpeculativeInsertionWait(xwait, speculativeToken);
+			else
+				XactLockTableWait(xwait, rel, &itup->t_tid, XLTW_InsertIndex);
+
 			/* start over... */
 			_bt_freestack(stack);
 			goto top;
@@ -213,7 +225,10 @@ top:
  *
  * Returns InvalidTransactionId if there is no conflict, else an xact ID
  * we must wait for to see if it commits a conflicting tuple.   If an actual
- * conflict is detected, no return --- just ereport().
+ * conflict is detected, no return --- just ereport().  If an xact ID is
+ * returned, and the conflicting tuple still has a speculative insertion in
+ * progress, *speculativeToken is set to non-zero, and the caller can wait for
+ * the verdict on the insertion using SpeculativeInsertionWait().
  *
  * However, if checkUnique == UNIQUE_CHECK_PARTIAL, we always return
  * InvalidTransactionId because we don't want to wait.  In this case we
@@ -223,7 +238,8 @@ top:
 static TransactionId
 _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 				 Buffer buf, OffsetNumber offset, ScanKey itup_scankey,
-				 IndexUniqueCheck checkUnique, bool *is_unique)
+				 IndexUniqueCheck checkUnique, bool *is_unique,
+				 uint32 *speculativeToken)
 {
 	TupleDesc	itupdesc = RelationGetDescr(rel);
 	int			natts = rel->rd_rel->relnatts;
@@ -340,6 +356,7 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 						if (nbuf != InvalidBuffer)
 							_bt_relbuf(rel, nbuf);
 						/* Tell _bt_doinsert to wait... */
+						*speculativeToken = SnapshotDirty.speculativeToken;
 						return xwait;
 					}
 
@@ -401,8 +418,8 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 								(errcode(ERRCODE_UNIQUE_VIOLATION),
 								 errmsg("duplicate key value violates unique constraint \"%s\"",
 										RelationGetRelationName(rel)),
-								 key_desc ? errdetail("Key %s already exists.",
-													  key_desc) : 0,
+							   key_desc ? errdetail("Key %s already exists.",
+													key_desc) : 0,
 								 errtableconstraint(heapRel,
 											 RelationGetRelationName(rel))));
 					}
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 0f4128253f..6e65db91eb 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -1233,6 +1233,7 @@ _bt_pagedel(Relation rel, Buffer buf)
 					lbuf = _bt_getbuf(rel, leftsib, BT_READ);
 					lpage = BufferGetPage(lbuf);
 					lopaque = (BTPageOpaque) PageGetSpecialPointer(lpage);
+
 					/*
 					 * If the left sibling is split again by another backend,
 					 * after we released the lock, we know that the first
@@ -1345,11 +1346,11 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
 	leafrightsib = opaque->btpo_next;
 
 	/*
-	 * Before attempting to lock the parent page, check that the right
-	 * sibling is not in half-dead state.  A half-dead right sibling would
-	 * have no downlink in the parent, which would be highly confusing later
-	 * when we delete the downlink that follows the current page's downlink.
-	 * (I believe the deletion would work correctly, but it would fail the
+	 * Before attempting to lock the parent page, check that the right sibling
+	 * is not in half-dead state.  A half-dead right sibling would have no
+	 * downlink in the parent, which would be highly confusing later when we
+	 * delete the downlink that follows the current page's downlink. (I
+	 * believe the deletion would work correctly, but it would fail the
 	 * cross-check we make that the following downlink points to the right
 	 * sibling of the delete page.)
 	 */
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 9a6dcdd4b1..9431ab5d04 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -40,9 +40,8 @@ typedef struct
 	BTSpool    *spool;
 
 	/*
-	 * spool2 is needed only when the index is an unique index. Dead tuples
-	 * are put into spool2 instead of spool in order to avoid uniqueness
-	 * check.
+	 * spool2 is needed only when the index is a unique index. Dead tuples are
+	 * put into spool2 instead of spool in order to avoid uniqueness check.
 	 */
 	BTSpool    *spool2;
 	double		indtuples;
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index fcb614b942..d69a0577a8 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -118,7 +118,7 @@ _bt_search(Relation rel, int keysz, ScanKey scankey, bool nextkey,
 		 * In write-mode, allow _bt_moveright to finish any incomplete splits
 		 * along the way.  Strictly speaking, we'd only need to finish an
 		 * incomplete split on the leaf page we're about to insert to, not on
-		 * any of the upper levels (they is taken care of in _bt_getstackbuf,
+		 * any of the upper levels (they are taken care of in _bt_getstackbuf,
 		 * if the leaf page is split and we insert to the parent page).  But
 		 * this is a good opportunity to finish splits of internal pages too.
 		 */
@@ -1027,10 +1027,10 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 		offnum = OffsetNumberPrev(offnum);
 
 	/*
-	 * By here the scan position is now set for the first key.  If all
-	 * further tuples are expected to match we set the SK_BT_MATCHED flag
-	 * to avoid re-checking the scan key later.  This is a big win for
-	 * slow key matches though is still significant even for fast datatypes.
+	 * By here the scan position is now set for the first key.  If all further
+	 * tuples are expected to match we set the SK_BT_MATCHED flag to avoid
+	 * re-checking the scan key later.  This is a big win for slow key matches
+	 * though is still significant even for fast datatypes.
 	 */
 	switch (startKeys[0]->sk_strategy)
 	{
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 625f490af8..f95f67ad4b 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -742,7 +742,7 @@ _bt_load(BTWriteState *wstate, BTSpool *btspool, BTSpool *btspool2)
 			{
 				for (i = 1; i <= keysz; i++)
 				{
-					SortSupport	entry;
+					SortSupport entry;
 					Datum		attrDatum1,
 								attrDatum2;
 					bool		isNull1,
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index d1589f05ef..91331bad65 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -1430,8 +1430,8 @@ _bt_checkkeys(IndexScanDesc scan,
 		Datum		test;
 
 		/*
-		 * If the scan key has already matched we can skip this key, as
-		 * long as the index tuple does not contain NULL values.
+		 * If the scan key has already matched we can skip this key, as long
+		 * as the index tuple does not contain NULL values.
 		 */
 		if (key->sk_flags & SK_BT_MATCHED && !IndexTupleHasNulls(tuple))
 			continue;
@@ -1740,7 +1740,7 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, TupleDesc tupdesc,
  * any items from the page, and so there is no need to search left from the
  * recorded offset.  (This observation also guarantees that the item is still
  * the right one to delete, which might otherwise be questionable since heap
- * TIDs can get recycled.)  This holds true even if the page has been modified
+ * TIDs can get recycled.)	This holds true even if the page has been modified
  * by inserts and page splits, so there is no need to consult the LSN.
  *
  * If the pin was released after reading the page, then we re-read it.  If it
diff --git a/src/backend/access/rmgrdesc/Makefile b/src/backend/access/rmgrdesc/Makefile
index d18e8ec998..654d3c54e6 100644
--- a/src/backend/access/rmgrdesc/Makefile
+++ b/src/backend/access/rmgrdesc/Makefile
@@ -8,9 +8,9 @@ subdir = src/backend/access/rmgrdesc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = brindesc.o clogdesc.o committsdesc.o dbasedesc.o gindesc.o gistdesc.o \
-	   hashdesc.o heapdesc.o \
-	   mxactdesc.o nbtdesc.o relmapdesc.o seqdesc.o smgrdesc.o spgdesc.o \
+OBJS = barrierdesc.o brindesc.o clogdesc.o committsdesc.o dbasedesc.o gindesc.o gistdesc.o \
+	   hashdesc.o heapdesc.o mxactdesc.o nbtdesc.o relmapdesc.o \
+	   replorigindesc.o seqdesc.o smgrdesc.o spgdesc.o \
 	   standbydesc.o tblspcdesc.o xactdesc.o xlogdesc.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/rmgrdesc/barrierdesc.c b/src/backend/access/rmgrdesc/barrierdesc.c
new file mode 100644
index 0000000000..931fbc4fe0
--- /dev/null
+++ b/src/backend/access/rmgrdesc/barrierdesc.c
@@ -0,0 +1,32 @@
+/*-------------------------------------------------------------------------
+ *
+ * barrierdesc.c
+ *	  rmgr descriptor routines for backend/pgxc/barrier/barrier.c
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/access/rmgrdesc/barrierdesc.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+#include "pgxc/barrier.h"
+
+void
+barrier_desc(StringInfo buf, XLogReaderState *record)
+{
+	char       *rec = XLogRecGetData(record);
+	uint8       info = XLogRecGetInfo(record);
+
+	Assert(info == XLOG_BARRIER_CREATE);
+	appendStringInfo(buf, "BARRIER %s", rec);
+}
+
+const char *
+barrier_identify(uint8 info)
+{
+	return "CREATE";
+}
diff --git a/src/backend/access/rmgrdesc/committsdesc.c b/src/backend/access/rmgrdesc/committsdesc.c
index 088fd1bc8b..59975eae9a 100644
--- a/src/backend/access/rmgrdesc/committsdesc.c
+++ b/src/backend/access/rmgrdesc/committsdesc.c
@@ -1,14 +1,14 @@
 /*-------------------------------------------------------------------------
  *
  * committsdesc.c
- *    rmgr descriptor routines for access/transam/commit_ts.c
+ *	  rmgr descriptor routines for access/transam/commit_ts.c
  *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *    src/backend/access/rmgrdesc/committsdesc.c
+ *	  src/backend/access/rmgrdesc/committsdesc.c
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,7 @@ commit_ts_desc(StringInfo buf, XLogReaderState *record)
 	else if (info == COMMIT_TS_SETTS)
 	{
 		xl_commit_ts_set *xlrec = (xl_commit_ts_set *) rec;
-		int		nsubxids;
+		int			nsubxids;
 
 		appendStringInfo(buf, "set %s/%d for: %u",
 						 timestamptz_to_str(xlrec->timestamp),
@@ -51,7 +51,7 @@ commit_ts_desc(StringInfo buf, XLogReaderState *record)
 					sizeof(TransactionId));
 		if (nsubxids > 0)
 		{
-			int		i;
+			int			i;
 			TransactionId *subxids;
 
 			subxids = palloc(sizeof(TransactionId) * nsubxids);
diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c
index 4f06a2637a..f4a1b002cf 100644
--- a/src/backend/access/rmgrdesc/heapdesc.c
+++ b/src/backend/access/rmgrdesc/heapdesc.c
@@ -75,6 +75,12 @@ heap_desc(StringInfo buf, XLogReaderState *record)
 						 xlrec->new_offnum,
 						 xlrec->new_xmax);
 	}
+	else if (info == XLOG_HEAP_CONFIRM)
+	{
+		xl_heap_confirm *xlrec = (xl_heap_confirm *) rec;
+
+		appendStringInfo(buf, "off %u", xlrec->offnum);
+	}
 	else if (info == XLOG_HEAP_LOCK)
 	{
 		xl_heap_lock *xlrec = (xl_heap_lock *) rec;
@@ -177,6 +183,9 @@ heap_identify(uint8 info)
 		case XLOG_HEAP_HOT_UPDATE | XLOG_HEAP_INIT_PAGE:
 			id = "HOT_UPDATE+INIT";
 			break;
+		case XLOG_HEAP_CONFIRM:
+			id = "HEAP_CONFIRM";
+			break;
 		case XLOG_HEAP_LOCK:
 			id = "LOCK";
 			break;
diff --git a/src/backend/access/rmgrdesc/replorigindesc.c b/src/backend/access/rmgrdesc/replorigindesc.c
new file mode 100644
index 0000000000..60cf0f679d
--- /dev/null
+++ b/src/backend/access/rmgrdesc/replorigindesc.c
@@ -0,0 +1,63 @@
+/*-------------------------------------------------------------------------
+ *
+ * replorigindesc.c
+ *	  rmgr descriptor routines for replication/logical/replication_origin.c
+ *
+ * Portions Copyright (c) 2015, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/access/rmgrdesc/replorigindesc.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "replication/origin.h"
+
+void
+replorigin_desc(StringInfo buf, XLogReaderState *record)
+{
+	char	   *rec = XLogRecGetData(record);
+	uint8		info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
+
+	switch (info)
+	{
+		case XLOG_REPLORIGIN_SET:
+			{
+				xl_replorigin_set *xlrec;
+
+				xlrec = (xl_replorigin_set *) rec;
+
+				appendStringInfo(buf, "set %u; lsn %X/%X; force: %d",
+								 xlrec->node_id,
+								 (uint32) (xlrec->remote_lsn >> 32),
+								 (uint32) xlrec->remote_lsn,
+								 xlrec->force);
+				break;
+			}
+		case XLOG_REPLORIGIN_DROP:
+			{
+				xl_replorigin_drop *xlrec;
+
+				xlrec = (xl_replorigin_drop *) rec;
+
+				appendStringInfo(buf, "drop %u", xlrec->node_id);
+				break;
+			}
+	}
+}
+
+const char *
+replorigin_identify(uint8 info)
+{
+	switch (info)
+	{
+		case XLOG_REPLORIGIN_SET:
+			return "SET";
+		case XLOG_REPLORIGIN_DROP:
+			return "DROP";
+		default:
+			return NULL;
+	}
+}
diff --git a/src/backend/access/rmgrdesc/smgrdesc.c b/src/backend/access/rmgrdesc/smgrdesc.c
index 4ae08b1988..56d02c325c 100644
--- a/src/backend/access/rmgrdesc/smgrdesc.c
+++ b/src/backend/access/rmgrdesc/smgrdesc.c
@@ -29,7 +29,7 @@ smgr_desc(StringInfo buf, XLogReaderState *record)
 		xl_smgr_create *xlrec = (xl_smgr_create *) rec;
 		char	   *path = relpathperm(xlrec->rnode, xlrec->forkNum);
 
-		appendStringInfo(buf, "%s", path);
+		appendStringInfoString(buf, path);
 		pfree(path);
 	}
 	else if (info == XLOG_SMGR_TRUNCATE)
diff --git a/src/backend/access/rmgrdesc/xactdesc.c b/src/backend/access/rmgrdesc/xactdesc.c
index b036b6d524..7b5f983050 100644
--- a/src/backend/access/rmgrdesc/xactdesc.c
+++ b/src/backend/access/rmgrdesc/xactdesc.c
@@ -21,7 +21,7 @@
 #include "utils/timestamp.h"
 
 /*
- * Parse the WAL format of a xact commit and abort records into a easier to
+ * Parse the WAL format of an xact commit and abort records into an easier to
  * understand format.
  *
  * This routines are in xactdesc.c because they're accessed in backend (when
@@ -37,7 +37,8 @@ ParseCommitRecord(uint8 info, xl_xact_commit *xlrec, xl_xact_parsed_commit *pars
 
 	memset(parsed, 0, sizeof(*parsed));
 
-	parsed->xinfo = 0; /* default, if no XLOG_XACT_HAS_INFO is present */
+	parsed->xinfo = 0;			/* default, if no XLOG_XACT_HAS_INFO is
+								 * present */
 
 	parsed->xact_time = xlrec->xact_time;
 
@@ -62,7 +63,7 @@ ParseCommitRecord(uint8 info, xl_xact_commit *xlrec, xl_xact_parsed_commit *pars
 
 	if (parsed->xinfo & XACT_XINFO_HAS_SUBXACTS)
 	{
-		xl_xact_subxacts   *xl_subxacts = (xl_xact_subxacts *) data;
+		xl_xact_subxacts *xl_subxacts = (xl_xact_subxacts *) data;
 
 		parsed->nsubxacts = xl_subxacts->nsubxacts;
 		parsed->subxacts = xl_subxacts->subxacts;
@@ -101,6 +102,19 @@ ParseCommitRecord(uint8 info, xl_xact_commit *xlrec, xl_xact_parsed_commit *pars
 
 		data += sizeof(xl_xact_twophase);
 	}
+
+	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
+	{
+		xl_xact_origin xl_origin;
+
+		/* we're only guaranteed 4 byte alignment, so copy onto stack */
+		memcpy(&xl_origin, data, sizeof(xl_origin));
+
+		parsed->origin_lsn = xl_origin.origin_lsn;
+		parsed->origin_timestamp = xl_origin.origin_timestamp;
+
+		data += sizeof(xl_xact_origin);
+	}
 }
 
 void
@@ -110,7 +124,8 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec, xl_xact_parsed_abort *parsed)
 
 	memset(parsed, 0, sizeof(*parsed));
 
-	parsed->xinfo = 0; /* default, if no XLOG_XACT_HAS_INFO is present */
+	parsed->xinfo = 0;			/* default, if no XLOG_XACT_HAS_INFO is
+								 * present */
 
 	parsed->xact_time = xlrec->xact_time;
 
@@ -125,7 +140,7 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec, xl_xact_parsed_abort *parsed)
 
 	if (parsed->xinfo & XACT_XINFO_HAS_SUBXACTS)
 	{
-		xl_xact_subxacts   *xl_subxacts = (xl_xact_subxacts *) data;
+		xl_xact_subxacts *xl_subxacts = (xl_xact_subxacts *) data;
 
 		parsed->nsubxacts = xl_subxacts->nsubxacts;
 		parsed->subxacts = xl_subxacts->subxacts;
@@ -156,7 +171,7 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec, xl_xact_parsed_abort *parsed)
 }
 
 static void
-xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec)
+xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, RepOriginId origin_id)
 {
 	xl_xact_parsed_commit parsed;
 	int			i;
@@ -218,6 +233,15 @@ xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec)
 
 	if (XactCompletionForceSyncCommit(parsed.xinfo))
 		appendStringInfo(buf, "; sync");
+
+	if (parsed.xinfo & XACT_XINFO_HAS_ORIGIN)
+	{
+		appendStringInfo(buf, "; origin: node %u, lsn %X/%X, at %s",
+						 origin_id,
+						 (uint32) (parsed.origin_lsn >> 32),
+						 (uint32) parsed.origin_lsn,
+						 timestamptz_to_str(parsed.origin_timestamp));
+	}
 }
 
 static void
@@ -274,7 +298,8 @@ xact_desc(StringInfo buf, XLogReaderState *record)
 	{
 		xl_xact_commit *xlrec = (xl_xact_commit *) rec;
 
-		xact_desc_commit(buf, XLogRecGetInfo(record), xlrec);
+		xact_desc_commit(buf, XLogRecGetInfo(record), xlrec,
+						 XLogRecGetOrigin(record));
 	}
 	else if (info == XLOG_XACT_ABORT || info == XLOG_XACT_ABORT_PREPARED)
 	{
diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c
index 2c432f3e2a..4f2913683a 100644
--- a/src/backend/access/rmgrdesc/xlogdesc.c
+++ b/src/backend/access/rmgrdesc/xlogdesc.c
@@ -75,7 +75,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record)
 	{
 		xl_restore_point *xlrec = (xl_restore_point *) rec;
 
-		appendStringInfo(buf, "%s", xlrec->rp_name);
+		appendStringInfoString(buf, xlrec->rp_name);
 	}
 	else if (info == XLOG_FPI || info == XLOG_FPI_FOR_HINT)
 	{
@@ -125,7 +125,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record)
 		bool		fpw;
 
 		memcpy(&fpw, rec, sizeof(bool));
-		appendStringInfo(buf, "%s", fpw ? "true" : "false");
+		appendStringInfoString(buf, fpw ? "true" : "false");
 	}
 	else if (info == XLOG_END_OF_RECOVERY)
 	{
diff --git a/src/backend/access/spgist/spgkdtreeproc.c b/src/backend/access/spgist/spgkdtreeproc.c
index 6ea0954efb..88c0df2589 100644
--- a/src/backend/access/spgist/spgkdtreeproc.c
+++ b/src/backend/access/spgist/spgkdtreeproc.c
@@ -15,8 +15,8 @@
 
 #include "postgres.h"
 
-#include "access/gist.h"		/* for RTree strategy numbers */
 #include "access/spgist.h"
+#include "access/stratnum.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/geo_decls.h"
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index e4b8888de8..a5f93614df 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -15,8 +15,8 @@
 
 #include "postgres.h"
 
-#include "access/gist.h"		/* for RTree strategy numbers */
 #include "access/spgist.h"
+#include "access/stratnum.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/geo_decls.h"
diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c
index 06c6944fc7..8a0d9098c5 100644
--- a/src/backend/access/spgist/spgscan.c
+++ b/src/backend/access/spgist/spgscan.c
@@ -658,6 +658,7 @@ Datum
 spgcanreturn(PG_FUNCTION_ARGS)
 {
 	Relation	index = (Relation) PG_GETARG_POINTER(0);
+
 	/* int			i = PG_GETARG_INT32(1); */
 	SpGistCache *cache;
 
diff --git a/src/backend/access/tablesample/Makefile b/src/backend/access/tablesample/Makefile
new file mode 100644
index 0000000000..46eeb59f9c
--- /dev/null
+++ b/src/backend/access/tablesample/Makefile
@@ -0,0 +1,17 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/tablesample
+#
+# IDENTIFICATION
+#    src/backend/utils/tablesample/Makefile
+#
+#-------------------------------------------------------------------------
+
+subdir = src/backend/access/tablesample
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
+
+OBJS = tablesample.o system.o bernoulli.o
+
+include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/tablesample/bernoulli.c b/src/backend/access/tablesample/bernoulli.c
new file mode 100644
index 0000000000..0a53900822
--- /dev/null
+++ b/src/backend/access/tablesample/bernoulli.c
@@ -0,0 +1,233 @@
+/*-------------------------------------------------------------------------
+ *
+ * bernoulli.c
+ *	  interface routines for BERNOULLI tablesample method
+ *
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/tablesample/bernoulli.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+
+#include "access/tablesample.h"
+#include "access/relscan.h"
+#include "nodes/execnodes.h"
+#include "nodes/relation.h"
+#include "optimizer/clauses.h"
+#include "storage/bufmgr.h"
+#include "utils/sampling.h"
+
+
+/* tsdesc */
+typedef struct
+{
+	uint32		seed;			/* random seed */
+	BlockNumber startblock;		/* starting block, we use ths for syncscan
+								 * support */
+	BlockNumber nblocks;		/* number of blocks */
+	BlockNumber blockno;		/* current block */
+	float4		probability;	/* probabilty that tuple will be returned
+								 * (0.0-1.0) */
+	OffsetNumber lt;			/* last tuple returned from current block */
+	SamplerRandomState randstate;		/* random generator tsdesc */
+} BernoulliSamplerData;
+
+/*
+ * Initialize the state.
+ */
+Datum
+tsm_bernoulli_init(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	uint32		seed = PG_GETARG_UINT32(1);
+	float4		percent = PG_ARGISNULL(2) ? -1 : PG_GETARG_FLOAT4(2);
+	HeapScanDesc scan = tsdesc->heapScan;
+	BernoulliSamplerData *sampler;
+
+	if (percent < 0 || percent > 100)
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("invalid sample size"),
+				 errhint("Sample size must be numeric value between 0 and 100 (inclusive).")));
+
+	sampler = palloc0(sizeof(BernoulliSamplerData));
+
+	/* Remember initial values for reinit */
+	sampler->seed = seed;
+	sampler->startblock = scan->rs_startblock;
+	sampler->nblocks = scan->rs_nblocks;
+	sampler->blockno = InvalidBlockNumber;
+	sampler->probability = percent / 100;
+	sampler->lt = InvalidOffsetNumber;
+	sampler_random_init_state(sampler->seed, sampler->randstate);
+
+	tsdesc->tsmdata = (void *) sampler;
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Get next block number to read or InvalidBlockNumber if we are at the
+ * end of the relation.
+ */
+Datum
+tsm_bernoulli_nextblock(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	BernoulliSamplerData *sampler = (BernoulliSamplerData *) tsdesc->tsmdata;
+
+	/*
+	 * Bernoulli sampling scans all blocks on the table and supports syncscan
+	 * so loop from startblock to startblock instead of from 0 to nblocks.
+	 */
+	if (sampler->blockno == InvalidBlockNumber)
+		sampler->blockno = sampler->startblock;
+	else
+	{
+		sampler->blockno++;
+
+		if (sampler->blockno >= sampler->nblocks)
+			sampler->blockno = 0;
+
+		if (sampler->blockno == sampler->startblock)
+			PG_RETURN_UINT32(InvalidBlockNumber);
+	}
+
+	PG_RETURN_UINT32(sampler->blockno);
+}
+
+/*
+ * Get next tuple from current block.
+ *
+ * This method implements the main logic in bernoulli sampling.
+ * The algorithm simply generates new random number (in 0.0-1.0 range) and if
+ * it falls within user specified probability (in the same range) return the
+ * tuple offset.
+ *
+ * It is ok here to return tuple offset without knowing if tuple is visible
+ * and not check it via examinetuple. The reason for that is that we do the
+ * coinflip (random number generation) for every tuple in the table. Since all
+ * tuples have same probability of being returned the visible and invisible
+ * tuples will be returned in same ratio as they have in the actual table.
+ * This means that there is no skew towards either visible or invisible tuples
+ * and the number of visible tuples returned from the executor node should
+ * match the fraction of visible tuples which was specified by user.
+ *
+ * This is faster than doing the coinflip in examinetuple because we don't
+ * have to do visibility checks on uninteresting tuples.
+ *
+ * If we reach end of the block return InvalidOffsetNumber which tells
+ * SampleScan to go to next block.
+ */
+Datum
+tsm_bernoulli_nexttuple(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	OffsetNumber maxoffset = PG_GETARG_UINT16(2);
+	BernoulliSamplerData *sampler = (BernoulliSamplerData *) tsdesc->tsmdata;
+	OffsetNumber tupoffset = sampler->lt;
+	float4		probability = sampler->probability;
+
+	if (tupoffset == InvalidOffsetNumber)
+		tupoffset = FirstOffsetNumber;
+	else
+		tupoffset++;
+
+	/*
+	 * Loop over tuple offsets until the random generator returns value that
+	 * is within the probability of returning the tuple or until we reach end
+	 * of the block.
+	 *
+	 * (This is our implementation of bernoulli trial)
+	 */
+	while (sampler_random_fract(sampler->randstate) > probability)
+	{
+		tupoffset++;
+
+		if (tupoffset > maxoffset)
+			break;
+	}
+
+	if (tupoffset > maxoffset)
+		/* Tell SampleScan that we want next block. */
+		tupoffset = InvalidOffsetNumber;
+
+	sampler->lt = tupoffset;
+
+	PG_RETURN_UINT16(tupoffset);
+}
+
+/*
+ * Cleanup method.
+ */
+Datum
+tsm_bernoulli_end(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+
+	pfree(tsdesc->tsmdata);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Reset tsdesc (called by ReScan).
+ */
+Datum
+tsm_bernoulli_reset(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	BernoulliSamplerData *sampler = (BernoulliSamplerData *) tsdesc->tsmdata;
+
+	sampler->blockno = InvalidBlockNumber;
+	sampler->lt = InvalidOffsetNumber;
+	sampler_random_init_state(sampler->seed, sampler->randstate);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Costing function.
+ */
+Datum
+tsm_bernoulli_cost(PG_FUNCTION_ARGS)
+{
+	PlannerInfo *root = (PlannerInfo *) PG_GETARG_POINTER(0);
+	Path	   *path = (Path *) PG_GETARG_POINTER(1);
+	RelOptInfo *baserel = (RelOptInfo *) PG_GETARG_POINTER(2);
+	List	   *args = (List *) PG_GETARG_POINTER(3);
+	BlockNumber *pages = (BlockNumber *) PG_GETARG_POINTER(4);
+	double	   *tuples = (double *) PG_GETARG_POINTER(5);
+	Node	   *pctnode;
+	float4		samplesize;
+
+	*pages = baserel->pages;
+
+	pctnode = linitial(args);
+	pctnode = estimate_expression_value(root, pctnode);
+
+	if (IsA(pctnode, RelabelType))
+		pctnode = (Node *) ((RelabelType *) pctnode)->arg;
+
+	if (IsA(pctnode, Const))
+	{
+		samplesize = DatumGetFloat4(((Const *) pctnode)->constvalue);
+		samplesize /= 100.0;
+	}
+	else
+	{
+		/* Default samplesize if the estimation didn't return Const. */
+		samplesize = 0.1f;
+	}
+
+	*tuples = path->rows * samplesize;
+	path->rows = *tuples;
+
+	PG_RETURN_VOID();
+}
diff --git a/src/backend/access/tablesample/system.c b/src/backend/access/tablesample/system.c
new file mode 100644
index 0000000000..1d834369a4
--- /dev/null
+++ b/src/backend/access/tablesample/system.c
@@ -0,0 +1,186 @@
+/*-------------------------------------------------------------------------
+ *
+ * system.c
+ *	  interface routines for system tablesample method
+ *
+ *
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/tablesample/system.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+
+#include "access/tablesample.h"
+#include "access/relscan.h"
+#include "nodes/execnodes.h"
+#include "nodes/relation.h"
+#include "optimizer/clauses.h"
+#include "storage/bufmgr.h"
+#include "utils/sampling.h"
+
+
+/*
+ * State
+ */
+typedef struct
+{
+	BlockSamplerData bs;
+	uint32		seed;			/* random seed */
+	BlockNumber nblocks;		/* number of block in relation */
+	int			samplesize;		/* number of blocks to return */
+	OffsetNumber lt;			/* last tuple returned from current block */
+} SystemSamplerData;
+
+
+/*
+ * Initializes the state.
+ */
+Datum
+tsm_system_init(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	uint32		seed = PG_GETARG_UINT32(1);
+	float4		percent = PG_ARGISNULL(2) ? -1 : PG_GETARG_FLOAT4(2);
+	HeapScanDesc scan = tsdesc->heapScan;
+	SystemSamplerData *sampler;
+
+	if (percent < 0 || percent > 100)
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("invalid sample size"),
+				 errhint("Sample size must be numeric value between 0 and 100 (inclusive).")));
+
+	sampler = palloc0(sizeof(SystemSamplerData));
+
+	/* Remember initial values for reinit */
+	sampler->seed = seed;
+	sampler->nblocks = scan->rs_nblocks;
+	sampler->samplesize = 1 + (int) (sampler->nblocks * (percent / 100.0));
+	sampler->lt = InvalidOffsetNumber;
+
+	BlockSampler_Init(&sampler->bs, sampler->nblocks, sampler->samplesize,
+					  sampler->seed);
+
+	tsdesc->tsmdata = (void *) sampler;
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Get next block number or InvalidBlockNumber when we're done.
+ *
+ * Uses the same logic as ANALYZE for picking the random blocks.
+ */
+Datum
+tsm_system_nextblock(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+	BlockNumber blockno;
+
+	if (!BlockSampler_HasMore(&sampler->bs))
+		PG_RETURN_UINT32(InvalidBlockNumber);
+
+	blockno = BlockSampler_Next(&sampler->bs);
+
+	PG_RETURN_UINT32(blockno);
+}
+
+/*
+ * Get next tuple offset in current block or InvalidOffsetNumber if we are done
+ * with this block.
+ */
+Datum
+tsm_system_nexttuple(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	OffsetNumber maxoffset = PG_GETARG_UINT16(2);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+	OffsetNumber tupoffset = sampler->lt;
+
+	if (tupoffset == InvalidOffsetNumber)
+		tupoffset = FirstOffsetNumber;
+	else
+		tupoffset++;
+
+	if (tupoffset > maxoffset)
+		tupoffset = InvalidOffsetNumber;
+
+	sampler->lt = tupoffset;
+
+	PG_RETURN_UINT16(tupoffset);
+}
+
+/*
+ * Cleanup method.
+ */
+Datum
+tsm_system_end(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+
+	pfree(tsdesc->tsmdata);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Reset state (called by ReScan).
+ */
+Datum
+tsm_system_reset(PG_FUNCTION_ARGS)
+{
+	TableSampleDesc *tsdesc = (TableSampleDesc *) PG_GETARG_POINTER(0);
+	SystemSamplerData *sampler = (SystemSamplerData *) tsdesc->tsmdata;
+
+	sampler->lt = InvalidOffsetNumber;
+	BlockSampler_Init(&sampler->bs, sampler->nblocks, sampler->samplesize,
+					  sampler->seed);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Costing function.
+ */
+Datum
+tsm_system_cost(PG_FUNCTION_ARGS)
+{
+	PlannerInfo *root = (PlannerInfo *) PG_GETARG_POINTER(0);
+	Path	   *path = (Path *) PG_GETARG_POINTER(1);
+	RelOptInfo *baserel = (RelOptInfo *) PG_GETARG_POINTER(2);
+	List	   *args = (List *) PG_GETARG_POINTER(3);
+	BlockNumber *pages = (BlockNumber *) PG_GETARG_POINTER(4);
+	double	   *tuples = (double *) PG_GETARG_POINTER(5);
+	Node	   *pctnode;
+	float4		samplesize;
+
+	pctnode = linitial(args);
+	pctnode = estimate_expression_value(root, pctnode);
+
+	if (IsA(pctnode, RelabelType))
+		pctnode = (Node *) ((RelabelType *) pctnode)->arg;
+
+	if (IsA(pctnode, Const))
+	{
+		samplesize = DatumGetFloat4(((Const *) pctnode)->constvalue);
+		samplesize /= 100.0;
+	}
+	else
+	{
+		/* Default samplesize if the estimation didn't return Const. */
+		samplesize = 0.1f;
+	}
+
+	*pages = baserel->pages * samplesize;
+	*tuples = path->rows * samplesize;
+	path->rows = *tuples;
+
+	PG_RETURN_VOID();
+}
diff --git a/src/backend/access/tablesample/tablesample.c b/src/backend/access/tablesample/tablesample.c
new file mode 100644
index 0000000000..44a24340f6
--- /dev/null
+++ b/src/backend/access/tablesample/tablesample.c
@@ -0,0 +1,371 @@
+/*-------------------------------------------------------------------------
+ *
+ * tablesample.c
+ *		  TABLESAMPLE internal API
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *		  src/backend/access/tablesample/tablesample.c
+ *
+ * TABLESAMPLE is the SQL standard clause for sampling the relations.
+ *
+ * The API is interface between the Executor and the TABLESAMPLE Methods.
+ *
+ * TABLESAMPLE Methods are implementations of actual sampling algorithms which
+ * can be used for returning a sample of the source relation.
+ * Methods don't read the table directly but are asked for block number and
+ * tuple offset which they want to examine (or return) and the tablesample
+ * interface implemented here does the reading for them.
+ *
+ * We currently only support sampling of the physical relations, but in the
+ * future we might extend the API to support subqueries as well.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "access/tablesample.h"
+
+#include "catalog/pg_tablesample_method.h"
+#include "miscadmin.h"
+#include "pgstat.h"
+#include "storage/bufmgr.h"
+#include "storage/predicate.h"
+#include "utils/rel.h"
+#include "utils/tqual.h"
+
+
+static bool SampleTupleVisible(HeapTuple tuple, OffsetNumber tupoffset, HeapScanDesc scan);
+
+
+/*
+ * Initialize the TABLESAMPLE Descriptor and the TABLESAMPLE Method.
+ */
+TableSampleDesc *
+tablesample_init(SampleScanState *scanstate, TableSampleClause *tablesample)
+{
+	FunctionCallInfoData fcinfo;
+	int			i;
+	List	   *args = tablesample->args;
+	ListCell   *arg;
+	ExprContext *econtext = scanstate->ss.ps.ps_ExprContext;
+	TableSampleDesc *tsdesc = (TableSampleDesc *) palloc0(sizeof(TableSampleDesc));
+
+	/* Load functions */
+	fmgr_info(tablesample->tsminit, &(tsdesc->tsminit));
+	fmgr_info(tablesample->tsmnextblock, &(tsdesc->tsmnextblock));
+	fmgr_info(tablesample->tsmnexttuple, &(tsdesc->tsmnexttuple));
+	if (OidIsValid(tablesample->tsmexaminetuple))
+		fmgr_info(tablesample->tsmexaminetuple, &(tsdesc->tsmexaminetuple));
+	else
+		tsdesc->tsmexaminetuple.fn_oid = InvalidOid;
+	fmgr_info(tablesample->tsmreset, &(tsdesc->tsmreset));
+	fmgr_info(tablesample->tsmend, &(tsdesc->tsmend));
+
+	InitFunctionCallInfoData(fcinfo, &tsdesc->tsminit,
+							 list_length(args) + 2,
+							 InvalidOid, NULL, NULL);
+
+	tsdesc->tupDesc = scanstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor;
+	tsdesc->heapScan = scanstate->ss.ss_currentScanDesc;
+
+	/* First argument for init function is always TableSampleDesc */
+	fcinfo.arg[0] = PointerGetDatum(tsdesc);
+	fcinfo.argnull[0] = false;
+
+	/*
+	 * Second arg for init function is always REPEATABLE.
+	 *
+	 * If tablesample->repeatable is NULL then REPEATABLE clause was not
+	 * specified, and we insert a random value as default.
+	 *
+	 * When specified, the expression cannot evaluate to NULL.
+	 */
+	if (tablesample->repeatable)
+	{
+		ExprState  *argstate = ExecInitExpr((Expr *) tablesample->repeatable,
+											(PlanState *) scanstate);
+
+		fcinfo.arg[1] = ExecEvalExpr(argstate, econtext,
+									 &fcinfo.argnull[1], NULL);
+		if (fcinfo.argnull[1])
+			ereport(ERROR,
+					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+				errmsg("REPEATABLE clause must be NOT NULL numeric value")));
+	}
+	else
+	{
+		fcinfo.arg[1] = UInt32GetDatum(random());
+		fcinfo.argnull[1] = false;
+	}
+
+	/* Rest of the arguments come from user.  */
+	i = 2;
+	foreach(arg, args)
+	{
+		Expr	   *argexpr = (Expr *) lfirst(arg);
+		ExprState  *argstate = ExecInitExpr(argexpr, (PlanState *) scanstate);
+
+		if (argstate == NULL)
+		{
+			fcinfo.argnull[i] = true;
+			fcinfo.arg[i] = (Datum) 0;;
+		}
+
+		fcinfo.arg[i] = ExecEvalExpr(argstate, econtext,
+									 &fcinfo.argnull[i], NULL);
+		i++;
+	}
+	Assert(i == fcinfo.nargs);
+
+	(void) FunctionCallInvoke(&fcinfo);
+
+	return tsdesc;
+}
+
+/*
+ * Get next tuple from TABLESAMPLE Method.
+ */
+HeapTuple
+tablesample_getnext(TableSampleDesc *desc)
+{
+	HeapScanDesc scan = desc->heapScan;
+	HeapTuple	tuple = &(scan->rs_ctup);
+	bool		pagemode = scan->rs_pageatatime;
+	BlockNumber blockno;
+	Page		page;
+	bool		page_all_visible;
+	ItemId		itemid;
+	OffsetNumber tupoffset,
+				maxoffset;
+
+	if (!scan->rs_inited)
+	{
+		/*
+		 * return null immediately if relation is empty
+		 */
+		if (scan->rs_nblocks == 0)
+		{
+			Assert(!BufferIsValid(scan->rs_cbuf));
+			tuple->t_data = NULL;
+			return NULL;
+		}
+		blockno = DatumGetInt32(FunctionCall1(&desc->tsmnextblock,
+											  PointerGetDatum(desc)));
+		if (!BlockNumberIsValid(blockno))
+		{
+			tuple->t_data = NULL;
+			return NULL;
+		}
+
+		heapgetpage(scan, blockno);
+		scan->rs_inited = true;
+	}
+	else
+	{
+		/* continue from previously returned page/tuple */
+		blockno = scan->rs_cblock;		/* current page */
+	}
+
+	/*
+	 * When pagemode is disabled, the scan will do visibility checks for each
+	 * tuple it finds so the buffer needs to be locked.
+	 */
+	if (!pagemode)
+		LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
+
+	page = (Page) BufferGetPage(scan->rs_cbuf);
+	page_all_visible = PageIsAllVisible(page);
+	maxoffset = PageGetMaxOffsetNumber(page);
+
+	for (;;)
+	{
+		CHECK_FOR_INTERRUPTS();
+
+		tupoffset = DatumGetUInt16(FunctionCall3(&desc->tsmnexttuple,
+												 PointerGetDatum(desc),
+												 UInt32GetDatum(blockno),
+												 UInt16GetDatum(maxoffset)));
+
+		if (OffsetNumberIsValid(tupoffset))
+		{
+			bool		visible;
+			bool		found;
+
+			/* Skip invalid tuple pointers. */
+			itemid = PageGetItemId(page, tupoffset);
+			if (!ItemIdIsNormal(itemid))
+				continue;
+
+			tuple->t_data = (HeapTupleHeader) PageGetItem((Page) page, itemid);
+			tuple->t_len = ItemIdGetLength(itemid);
+			ItemPointerSet(&(tuple->t_self), blockno, tupoffset);
+
+			if (page_all_visible)
+				visible = true;
+			else
+				visible = SampleTupleVisible(tuple, tupoffset, scan);
+
+			/*
+			 * Let the sampling method examine the actual tuple and decide if
+			 * we should return it.
+			 *
+			 * Note that we let it examine even invisible tuples for
+			 * statistical purposes, but not return them since user should
+			 * never see invisible tuples.
+			 */
+			if (OidIsValid(desc->tsmexaminetuple.fn_oid))
+			{
+				found = DatumGetBool(FunctionCall4(&desc->tsmexaminetuple,
+												   PointerGetDatum(desc),
+												   UInt32GetDatum(blockno),
+												   PointerGetDatum(tuple),
+												   BoolGetDatum(visible)));
+				/* Should not happen if sampling method is well written. */
+				if (found && !visible)
+					elog(ERROR, "Sampling method wanted to return invisible tuple");
+			}
+			else
+				found = visible;
+
+			/* Found visible tuple, return it. */
+			if (found)
+			{
+				if (!pagemode)
+					LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
+				break;
+			}
+			else
+			{
+				/* Try next tuple from same page. */
+				continue;
+			}
+		}
+
+
+		if (!pagemode)
+			LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
+
+		blockno = DatumGetInt32(FunctionCall1(&desc->tsmnextblock,
+											  PointerGetDatum(desc)));
+
+		/*
+		 * Report our new scan position for synchronization purposes. We don't
+		 * do that when moving backwards, however. That would just mess up any
+		 * other forward-moving scanners.
+		 *
+		 * Note: we do this before checking for end of scan so that the final
+		 * state of the position hint is back at the start of the rel.  That's
+		 * not strictly necessary, but otherwise when you run the same query
+		 * multiple times the starting position would shift a little bit
+		 * backwards on every invocation, which is confusing. We don't
+		 * guarantee any specific ordering in general, though.
+		 */
+		if (scan->rs_syncscan)
+			ss_report_location(scan->rs_rd, BlockNumberIsValid(blockno) ?
+							   blockno : scan->rs_startblock);
+
+		/*
+		 * Reached end of scan.
+		 */
+		if (!BlockNumberIsValid(blockno))
+		{
+			if (BufferIsValid(scan->rs_cbuf))
+				ReleaseBuffer(scan->rs_cbuf);
+			scan->rs_cbuf = InvalidBuffer;
+			scan->rs_cblock = InvalidBlockNumber;
+			tuple->t_data = NULL;
+			scan->rs_inited = false;
+			return NULL;
+		}
+
+		heapgetpage(scan, blockno);
+
+		if (!pagemode)
+			LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
+
+		page = (Page) BufferGetPage(scan->rs_cbuf);
+		page_all_visible = PageIsAllVisible(page);
+		maxoffset = PageGetMaxOffsetNumber(page);
+	}
+
+	pgstat_count_heap_getnext(scan->rs_rd);
+
+	return &(scan->rs_ctup);
+}
+
+/*
+ * Reset the sampling to starting state
+ */
+void
+tablesample_reset(TableSampleDesc *desc)
+{
+	(void) FunctionCall1(&desc->tsmreset, PointerGetDatum(desc));
+}
+
+/*
+ * Signal the sampling method that the scan has finished.
+ */
+void
+tablesample_end(TableSampleDesc *desc)
+{
+	(void) FunctionCall1(&desc->tsmend, PointerGetDatum(desc));
+}
+
+/*
+ * Check visibility of the tuple.
+ */
+static bool
+SampleTupleVisible(HeapTuple tuple, OffsetNumber tupoffset, HeapScanDesc scan)
+{
+	/*
+	 * If this scan is reading whole pages at a time, there is already
+	 * visibility info present in rs_vistuples so we can just search it for
+	 * the tupoffset.
+	 */
+	if (scan->rs_pageatatime)
+	{
+		int			start = 0,
+					end = scan->rs_ntuples - 1;
+
+		/*
+		 * Do the binary search over rs_vistuples, it's already sorted by
+		 * OffsetNumber so we don't need to do any sorting ourselves here.
+		 *
+		 * We could use bsearch() here but it's slower for integers because of
+		 * the function call overhead and because it needs boiler plate code
+		 * it would not save us anything code-wise anyway.
+		 */
+		while (start <= end)
+		{
+			int			mid = start + (end - start) / 2;
+			OffsetNumber curoffset = scan->rs_vistuples[mid];
+
+			if (curoffset == tupoffset)
+				return true;
+			else if (curoffset > tupoffset)
+				end = mid - 1;
+			else
+				start = mid + 1;
+		}
+
+		return false;
+	}
+	else
+	{
+		/* No pagemode, we have to check the tuple itself. */
+		Snapshot	snapshot = scan->rs_snapshot;
+		Buffer		buffer = scan->rs_cbuf;
+
+		bool		visible = HeapTupleSatisfiesVisibility(tuple, snapshot, buffer);
+
+		CheckForSerializableConflictOut(visible, scan->rs_rd, tuple, buffer,
+										snapshot);
+
+		return visible;
+	}
+}
diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile
index 80042d369e..630be963ee 100644
--- a/src/backend/access/transam/Makefile
+++ b/src/backend/access/transam/Makefile
@@ -12,7 +12,7 @@ subdir = src/backend/access/transam
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = clog.o commit_ts.o multixact.o rmgr.o slru.o subtrans.o \
+OBJS = clog.o commit_ts.o multixact.o parallel.o rmgr.o slru.o subtrans.o \
 	timeline.o transam.o twophase.o twophase_rmgr.o varsup.o \
 	xact.o xlog.o xlogarchive.o xlogfuncs.o \
 	xloginsert.o xlogreader.o xlogutils.o gtm.o
diff --git a/src/backend/access/transam/README.parallel b/src/backend/access/transam/README.parallel
new file mode 100644
index 0000000000..10051863fe
--- /dev/null
+++ b/src/backend/access/transam/README.parallel
@@ -0,0 +1,223 @@
+Overview
+========
+
+PostgreSQL provides some simple facilities to make writing parallel algorithms
+easier.  Using a data structure called a ParallelContext, you can arrange to
+launch background worker processes, initialize their state to match that of
+the backend which initiated parallelism, communicate with them via dynamic
+shared memory, and write reasonably complex code that can run either in the
+user backend or in one of the parallel workers without needing to be aware of
+where it's running.
+
+The backend which starts a parallel operation (hereafter, the initiating
+backend) starts by creating a dynamic shared memory segment which will last
+for the lifetime of the parallel operation.  This dynamic shared memory segment
+will contain (1) a shm_mq that can be used to transport errors (and other
+messages reported via elog/ereport) from the worker back to the initiating
+backend; (2) serialized representations of the initiating backend's private
+state, so that the worker can synchronize its state with of the initiating
+backend; and (3) any other data structures which a particular user of the
+ParallelContext data structure may wish to add for its own purposes.  Once
+the initiating backend has initialized the dynamic shared memory segment, it
+asks the postmaster to launch the appropriate number of parallel workers.
+These workers then connect to the dynamic shared memory segment, initiate
+their state, and then invoke the appropriate entrypoint, as further detailed
+below.
+
+Error Reporting
+===============
+
+When started, each parallel worker begins by attaching the dynamic shared
+memory segment and locating the shm_mq to be used for error reporting; it
+redirects all of its protocol messages to this shm_mq.  Prior to this point,
+any failure of the background worker will not be reported to the initiating
+backend; from the point of view of the initiating backend, the worker simply
+failed to start.  The initiating backend must anyway be prepared to cope
+with fewer parallel workers than it originally requested, so catering to
+this case imposes no additional burden.
+
+Whenever a new message (or partial message; very large messages may wrap) is
+sent to the error-reporting queue, PROCSIG_PARALLEL_MESSAGE is sent to the
+initiating backend.  This causes the next CHECK_FOR_INTERRUPTS() in the
+initiating backend to read and rethrow the message.  For the most part, this
+makes error reporting in parallel mode "just work".  Of course, to work
+properly, it is important that the code the initiating backend is executing
+CHECK_FOR_INTERRUPTS() regularly and avoid blocking interrupt processing for
+long periods of time, but those are good things to do anyway.
+
+(A currently-unsolved problem is that some messages may get written to the
+system log twice, once in the backend where the report was originally
+generated, and again when the initiating backend rethrows the message.  If
+we decide to suppress one of these reports, it should probably be second one;
+otherwise, if the worker is for some reason unable to propagate the message
+back to the initiating backend, the message will be lost altogether.)
+
+State Sharing
+=============
+
+It's possible to write C code which works correctly without parallelism, but
+which fails when parallelism is used.  No parallel infrastructure can
+completely eliminate this problem, because any global variable is a risk.
+There's no general mechanism for ensuring that every global variable in the
+worker will have the same value that it does in the initiating backend; even
+if we could ensure that, some function we're calling could update the variable
+after each call, and only the backend where that update is performed will see
+the new value.  Similar problems can arise with any more-complex data
+structure we might choose to use.  For example, a pseudo-random number
+generator should, given a particular seed value, produce the same predictable
+series of values every time.  But it does this by relying on some private
+state which won't automatically be shared between cooperating backends.  A
+parallel-safe PRNG would need to store its state in dynamic shared memory, and
+would require locking.  The parallelism infrastructure has no way of knowing
+whether the user intends to call code that has this sort of problem, and can't
+do anything about it anyway.
+
+Instead, we take a more pragmatic approach. First, we try to make as many of
+the operations that are safe outside of parallel mode work correctly in
+parallel mode as well.  Second, we try to prohibit common unsafe operations
+via suitable error checks.  These checks are intended to catch 100% of
+unsafe things that a user might do from the SQL interface, but code written
+in C can do unsafe things that won't trigger these checks.  The error checks
+are engaged via EnterParallelMode(), which should be called before creating
+a parallel context, and disarmed via ExitParallelMode(), which should be
+called after all parallel contexts have been destroyed.  The most
+significant restriction imposed by parallel mode is that all operations must
+be strictly read-only; we allow no writes to the database and no DDL.  We
+might try to relax these restrictions in the future.
+
+To make as many operations as possible safe in parallel mode, we try to copy
+the most important pieces of state from the initiating backend to each parallel
+worker.  This includes:
+
+  - The set of libraries dynamically loaded by dfmgr.c.
+
+  - The authenticated user ID and current database.  Each parallel worker
+    will connect to the same database as the initiating backend, using the
+    same user ID.
+
+  - The values of all GUCs.  Accordingly, permanent changes to the value of
+    any GUC are forbidden while in parallel mode; but temporary changes,
+    such as entering a function with non-NULL proconfig, are OK.
+
+  - The current subtransaction's XID, the top-level transaction's XID, and
+    the list of XIDs considered current (that is, they are in-progress or
+    subcommitted).  This information is needed to ensure that tuple visibility
+    checks return the same results in the worker as they do in the
+    initiating backend.  See also the section Transaction Integration, below.
+
+  - The combo CID mappings.  This is needed to ensure consistent answers to
+    tuple visibility checks.  The need to synchronize this data structure is
+    a major reason why we can't support writes in parallel mode: such writes
+    might create new combo CIDs, and we have no way to let other workers
+    (or the initiating backend) know about them.
+
+  - The transaction snapshot.
+
+  - The active snapshot, which might be different from the transaction
+    snapshot.
+
+  - The currently active user ID and security context.  Note that this is
+    the fourth user ID we restore: the initial step of binding to the correct
+    database also involves restoring the authenticated user ID.  When GUC
+    values are restored, this incidentally sets SessionUserId and OuterUserId
+    to the correct values.  This final step restores CurrentUserId.
+
+To prevent undetected or unprincipled deadlocks when running in parallel mode,
+this could should eventually handle heavyweight locks in some way.  This is
+not implemented yet.
+
+Transaction Integration
+=======================
+
+Regardless of what the TransactionState stack looks like in the parallel
+leader, each parallel worker ends up with a stack of depth 1.  This stack
+entry is marked with the special transaction block state
+TBLOCK_PARALLEL_INPROGRESS so that it's not confused with an ordinary
+toplevel transaction.  The XID of this TransactionState is set to the XID of
+the innermost currently-active subtransaction in the initiating backend.  The
+initiating backend's toplevel XID, and the XIDs of all current (in-progress
+or subcommitted) XIDs are stored separately from the TransactionState stack,
+but in such a way that GetTopTransactionId(), GetTopTransactionIdIfAny(), and
+TransactionIdIsCurrentTransactionId() return the same values that they would
+in the initiating backend.  We could copy the entire transaction state stack,
+but most of it would be useless: for example, you can't roll back to a
+savepoint from within a parallel worker, and there are no resources to
+associated with the memory contexts or resource owners of intermediate
+subtransactions.
+
+No meaningful change to the transaction state can be made while in parallel
+mode.  No XIDs can be assigned, and no subtransactions can start or end,
+because we have no way of communicating these state changes to cooperating
+backends, or of synchronizing them.  It's clearly unworkable for the initiating
+backend to exit any transaction or subtransaction that was in progress when
+parallelism was started before all parallel workers have exited; and it's even
+more clearly crazy for a parallel worker to try to subcommit or subabort the
+current subtransaction and execute in some other transaction context than was
+present in the initiating backend.  It might be practical to allow internal
+sub-transactions (e.g. to implement a PL/pgsql EXCEPTION block) to be used in
+parallel mode, provided that they are XID-less, because other backends
+wouldn't really need to know about those transactions or do anything
+differently because of them.  Right now, we don't even allow that.
+
+At the end of a parallel operation, which can happen either because it
+completed successfully or because it was interrupted by an error, parallel
+workers associated with that operation exit.  In the error case, transaction
+abort processing in the parallel leader kills of any remaining workers, and
+the parallel leader then waits for them to die.  In the case of a successful
+parallel operation, the parallel leader does not send any signals, but must
+wait for workers to complete and exit of their own volition.  In either
+case, it is very important that all workers actually exit before the
+parallel leader cleans up the (sub)transaction in which they were created;
+otherwise, chaos can ensue.  For example, if the leader is rolling back the
+transaction that created the relation being scanned by a worker, the
+relation could disappear while the worker is still busy scanning it.  That's
+not safe.
+
+Generally, the cleanup performed by each worker at this point is similar to
+top-level commit or abort.  Each backend has its own resource owners: buffer
+pins, catcache or relcache reference counts, tuple descriptors, and so on
+are managed separately by each backend, and must free them before exiting.
+There are, however, some important differences between parallel worker
+commit or abort and a real top-level transaction commit or abort.  Most
+importantly:
+
+  - No commit or abort record is written; the initiating backend is
+    responsible for this.
+
+  - Cleanup of pg_temp namespaces is not done.  Parallel workers cannot
+    safely access the initiating backend's pg_temp namespace, and should
+    not create one of their own.
+
+Coding Conventions
+===================
+
+Before beginning any parallel operation, call EnterParallelMode(); after all
+parallel operations are completed, call ExitParallelMode().  To actually
+parallelize a particular operation, use a ParallelContext.  The basic coding
+pattern looks like this:
+
+	EnterParallelMode();		/* prohibit unsafe state changes */
+
+	pcxt = CreateParallelContext(entrypoint, nworkers);
+
+	/* Allow space for application-specific data here. */
+	shm_toc_estimate_chunk(&pcxt->estimator, size);
+	shm_toc_estimate_keys(&pcxt->estimator, keys);
+
+	InitializeParallelDSM(pcxt);	/* create DSM and copy state to it */
+
+	/* Store the data for which we reserved space. */
+	space = shm_toc_allocate(pcxt->toc, size);
+	shm_toc_insert(pcxt->toc, key, space);
+
+	LaunchParallelWorkers(pcxt);
+
+	/* do parallel stuff */
+
+	WaitForParallelWorkersToFinish(pcxt);
+
+	/* read any final results from dynamic shared memory */
+
+	DestroyParallelContext(pcxt);
+
+	ExitParallelMode();
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
index dc23ab27b6..5ad35c0d7f 100644
--- a/src/backend/access/transam/commit_ts.c
+++ b/src/backend/access/transam/commit_ts.c
@@ -49,23 +49,23 @@
  */
 
 /*
- * We need 8+4 bytes per xact.  Note that enlarging this struct might mean
+ * We need 8+2 bytes per xact.  Note that enlarging this struct might mean
  * the largest possible file name is more than 5 chars long; see
  * SlruScanDirectory.
  */
 typedef struct CommitTimestampEntry
 {
-	TimestampTz		time;
-	CommitTsNodeId	nodeid;
+	TimestampTz time;
+	RepOriginId nodeid;
 } CommitTimestampEntry;
 
 #define SizeOfCommitTimestampEntry (offsetof(CommitTimestampEntry, nodeid) + \
-									sizeof(CommitTsNodeId))
+									sizeof(RepOriginId))
 
 #define COMMIT_TS_XACTS_PER_PAGE \
 	(BLCKSZ / SizeOfCommitTimestampEntry)
 
-#define TransactionIdToCTsPage(xid)	\
+#define TransactionIdToCTsPage(xid) \
 	((xid) / (TransactionId) COMMIT_TS_XACTS_PER_PAGE)
 #define TransactionIdToCTsEntry(xid)	\
 	((xid) % (TransactionId) COMMIT_TS_XACTS_PER_PAGE)
@@ -83,53 +83,28 @@ static SlruCtlData CommitTsCtlData;
  */
 typedef struct CommitTimestampShared
 {
-	TransactionId	xidLastCommit;
+	TransactionId xidLastCommit;
 	CommitTimestampEntry dataLastCommit;
 } CommitTimestampShared;
 
-CommitTimestampShared	*commitTsShared;
+CommitTimestampShared *commitTsShared;
 
 
 /* GUC variable */
-bool	track_commit_timestamp;
-
-static CommitTsNodeId default_node_id = InvalidCommitTsNodeId;
+bool		track_commit_timestamp;
 
 static void SetXidCommitTsInPage(TransactionId xid, int nsubxids,
 					 TransactionId *subxids, TimestampTz ts,
-					 CommitTsNodeId nodeid, int pageno);
+					 RepOriginId nodeid, int pageno);
 static void TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts,
-						  CommitTsNodeId nodeid, int slotno);
+						 RepOriginId nodeid, int slotno);
 static int	ZeroCommitTsPage(int pageno, bool writeXlog);
 static bool CommitTsPagePrecedes(int page1, int page2);
 static void WriteZeroPageXlogRec(int pageno);
 static void WriteTruncateXlogRec(int pageno);
 static void WriteSetTimestampXlogRec(TransactionId mainxid, int nsubxids,
 						 TransactionId *subxids, TimestampTz timestamp,
-						 CommitTsNodeId nodeid);
-
-
-/*
- * CommitTsSetDefaultNodeId
- *
- * Set default nodeid for current backend.
- */
-void
-CommitTsSetDefaultNodeId(CommitTsNodeId nodeid)
-{
-	default_node_id = nodeid;
-}
-
-/*
- * CommitTsGetDefaultNodeId
- *
- * Set default nodeid for current backend.
- */
-CommitTsNodeId
-CommitTsGetDefaultNodeId(void)
-{
-	return default_node_id;
-}
+						 RepOriginId nodeid);
 
 /*
  * TransactionTreeSetCommitTsData
@@ -147,7 +122,7 @@ CommitTsGetDefaultNodeId(void)
  * subtrans implementation changes in the future, we might want to revisit the
  * decision of storing timestamp info for each subxid.
  *
- * The do_xlog parameter tells us whether to include a XLog record of this
+ * The do_xlog parameter tells us whether to include an XLog record of this
  * or not.  Normal path through RecordTransactionCommit() will be related
  * to a transaction commit XLog record, and so should pass "false" here.
  * Other callers probably want to pass true, so that the given values persist
@@ -156,7 +131,7 @@ CommitTsGetDefaultNodeId(void)
 void
 TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
 							   TransactionId *subxids, TimestampTz timestamp,
-							   CommitTsNodeId nodeid, bool do_xlog)
+							   RepOriginId nodeid, bool do_xlog)
 {
 	int			i;
 	TransactionId headxid;
@@ -166,8 +141,8 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
 		return;
 
 	/*
-	 * Comply with the WAL-before-data rule: if caller specified it wants
-	 * this value to be recorded in WAL, do so before touching the data.
+	 * Comply with the WAL-before-data rule: if caller specified it wants this
+	 * value to be recorded in WAL, do so before touching the data.
 	 */
 	if (do_xlog)
 		WriteSetTimestampXlogRec(xid, nsubxids, subxids, timestamp, nodeid);
@@ -184,9 +159,9 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
 	/*
 	 * We split the xids to set the timestamp to in groups belonging to the
 	 * same SLRU page; the first element in each such set is its head.  The
-	 * first group has the main XID as the head; subsequent sets use the
-	 * first subxid not on the previous page as head.  This way, we only have
-	 * to lock/modify each SLRU page once.
+	 * first group has the main XID as the head; subsequent sets use the first
+	 * subxid not on the previous page as head.  This way, we only have to
+	 * lock/modify each SLRU page once.
 	 */
 	for (i = 0, headxid = xid;;)
 	{
@@ -208,8 +183,8 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
 			break;
 
 		/*
-		 * Set the new head and skip over it, as well as over the subxids
-		 * we just wrote.
+		 * Set the new head and skip over it, as well as over the subxids we
+		 * just wrote.
 		 */
 		headxid = subxids[j];
 		i += j - i + 1;
@@ -234,7 +209,7 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
 static void
 SetXidCommitTsInPage(TransactionId xid, int nsubxids,
 					 TransactionId *subxids, TimestampTz ts,
-					 CommitTsNodeId nodeid, int pageno)
+					 RepOriginId nodeid, int pageno)
 {
 	int			slotno;
 	int			i;
@@ -259,7 +234,7 @@ SetXidCommitTsInPage(TransactionId xid, int nsubxids,
  */
 static void
 TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts,
-						 CommitTsNodeId nodeid, int slotno)
+						 RepOriginId nodeid, int slotno)
 {
 	int			entryno = TransactionIdToCTsEntry(xid);
 	CommitTimestampEntry entry;
@@ -282,7 +257,7 @@ TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts,
  */
 bool
 TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
-							 CommitTsNodeId *nodeid)
+							 RepOriginId *nodeid)
 {
 	int			pageno = TransactionIdToCTsPage(xid);
 	int			entryno = TransactionIdToCTsEntry(xid);
@@ -296,14 +271,14 @@ TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("could not get commit timestamp data"),
-				 errhint("Make sure the configuration parameter \"%s\" is set.",
-						 "track_commit_timestamp")));
+			  errhint("Make sure the configuration parameter \"%s\" is set.",
+					  "track_commit_timestamp")));
 
 	/* error if the given Xid doesn't normally commit */
 	if (!TransactionIdIsNormal(xid))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("cannot retrieve commit timestamp for transaction %u", xid)));
+		errmsg("cannot retrieve commit timestamp for transaction %u", xid)));
 
 	/*
 	 * Return empty if the requested value is outside our valid range.
@@ -322,7 +297,7 @@ TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
 		if (ts)
 			*ts = 0;
 		if (nodeid)
-			*nodeid = InvalidCommitTsNodeId;
+			*nodeid = InvalidRepOriginId;
 		return false;
 	}
 
@@ -373,17 +348,17 @@ TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
  * as NULL if not wanted.
  */
 TransactionId
-GetLatestCommitTsData(TimestampTz *ts, CommitTsNodeId *nodeid)
+GetLatestCommitTsData(TimestampTz *ts, RepOriginId *nodeid)
 {
-	TransactionId	xid;
+	TransactionId xid;
 
 	/* Error if module not enabled */
 	if (!track_commit_timestamp)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("could not get commit timestamp data"),
-				 errhint("Make sure the configuration parameter \"%s\" is set.",
-						 "track_commit_timestamp")));
+			  errhint("Make sure the configuration parameter \"%s\" is set.",
+					  "track_commit_timestamp")));
 
 	LWLockAcquire(CommitTsLock, LW_SHARED);
 	xid = commitTsShared->xidLastCommit;
@@ -402,9 +377,9 @@ GetLatestCommitTsData(TimestampTz *ts, CommitTsNodeId *nodeid)
 Datum
 pg_xact_commit_timestamp(PG_FUNCTION_ARGS)
 {
-	TransactionId	xid = PG_GETARG_UINT32(0);
-	TimestampTz		ts;
-	bool			found;
+	TransactionId xid = PG_GETARG_UINT32(0);
+	TimestampTz ts;
+	bool		found;
 
 	found = TransactionIdGetCommitTsData(xid, &ts, NULL);
 
@@ -418,11 +393,11 @@ pg_xact_commit_timestamp(PG_FUNCTION_ARGS)
 Datum
 pg_last_committed_xact(PG_FUNCTION_ARGS)
 {
-	TransactionId	xid;
-	TimestampTz		ts;
-	Datum       values[2];
-	bool        nulls[2];
-	TupleDesc   tupdesc;
+	TransactionId xid;
+	TimestampTz ts;
+	Datum		values[2];
+	bool		nulls[2];
+	TupleDesc	tupdesc;
 	HeapTuple	htup;
 
 	/* and construct a tuple with our data */
@@ -487,7 +462,7 @@ CommitTsShmemSize(void)
 void
 CommitTsShmemInit(void)
 {
-	bool	found;
+	bool		found;
 
 	CommitTsCtl->PagePrecedes = CommitTsPagePrecedes;
 	SimpleLruInit(CommitTsCtl, "CommitTs Ctl", CommitTsShmemBuffers(), 0,
@@ -503,7 +478,7 @@ CommitTsShmemInit(void)
 
 		commitTsShared->xidLastCommit = InvalidTransactionId;
 		TIMESTAMP_NOBEGIN(commitTsShared->dataLastCommit.time);
-		commitTsShared->dataLastCommit.nodeid = InvalidCommitTsNodeId;
+		commitTsShared->dataLastCommit.nodeid = InvalidRepOriginId;
 	}
 	else
 		Assert(found);
@@ -520,8 +495,8 @@ BootStrapCommitTs(void)
 {
 	/*
 	 * Nothing to do here at present, unlike most other SLRU modules; segments
-	 * are created when the server is started with this module enabled.
-	 * See StartupCommitTs.
+	 * are created when the server is started with this module enabled. See
+	 * StartupCommitTs.
 	 */
 }
 
@@ -586,9 +561,9 @@ CompleteCommitTsInitialization(void)
 
 /*
  * Activate this module whenever necessary.
- * 		This must happen during postmaster or standalong-backend startup,
- * 		or during WAL replay anytime the track_commit_timestamp setting is
- * 		changed in the master.
+ *		This must happen during postmaster or standalong-backend startup,
+ *		or during WAL replay anytime the track_commit_timestamp setting is
+ *		changed in the master.
  *
  * The reason why this SLRU needs separate activation/deactivation functions is
  * that it can be enabled/disabled during start and the activation/deactivation
@@ -637,7 +612,7 @@ ActivateCommitTs(void)
 	/* Finally, create the current segment file, if necessary */
 	if (!SimpleLruDoesPhysicalPageExist(CommitTsCtl, pageno))
 	{
-		int		slotno;
+		int			slotno;
 
 		LWLockAcquire(CommitTsControlLock, LW_EXCLUSIVE);
 		slotno = ZeroCommitTsPage(pageno, false);
@@ -857,9 +832,9 @@ WriteTruncateXlogRec(int pageno)
 static void
 WriteSetTimestampXlogRec(TransactionId mainxid, int nsubxids,
 						 TransactionId *subxids, TimestampTz timestamp,
-						 CommitTsNodeId nodeid)
+						 RepOriginId nodeid)
 {
-	xl_commit_ts_set	record;
+	xl_commit_ts_set record;
 
 	record.timestamp = timestamp;
 	record.nodeid = nodeid;
@@ -932,7 +907,7 @@ commit_ts_redo(XLogReaderState *record)
 			subxids = NULL;
 
 		TransactionTreeSetCommitTsData(setts->mainxid, nsubxids, subxids,
-									   setts->timestamp, setts->nodeid, false);
+									 setts->timestamp, setts->nodeid, false);
 		if (subxids)
 			pfree(subxids);
 	}
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 3dbf6b9210..9568ff1ddb 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -168,6 +168,11 @@
 	(MXOffsetToFlagsOffset(xid) + MULTIXACT_FLAGBYTES_PER_GROUP + \
 	 ((xid) % MULTIXACT_MEMBERS_PER_MEMBERGROUP) * sizeof(TransactionId))
 
+/* Multixact members wraparound thresholds. */
+#define MULTIXACT_MEMBER_SAFE_THRESHOLD		(MaxMultiXactOffset / 2)
+#define MULTIXACT_MEMBER_DANGER_THRESHOLD	\
+	(MaxMultiXactOffset - MaxMultiXactOffset / 4)
+
 
 /*
  * Links to shared-memory data structures for MultiXact control
@@ -199,6 +204,7 @@ typedef struct MultiXactStateData
 	 */
 	MultiXactId oldestMultiXactId;
 	Oid			oldestMultiXactDB;
+	MultiXactOffset oldestOffset;
 
 	/*
 	 * This is what the previous checkpoint stored as the truncate position.
@@ -213,6 +219,9 @@ typedef struct MultiXactStateData
 	MultiXactId multiStopLimit;
 	MultiXactId multiWrapLimit;
 
+	/* support for members anti-wraparound measures */
+	MultiXactOffset offsetStopLimit;
+
 	/*
 	 * Per-backend data starts here.  We have two arrays stored in the area
 	 * immediately following the MultiXactStateData struct. Each is indexed by
@@ -341,6 +350,10 @@ static bool MultiXactOffsetPrecedes(MultiXactOffset offset1,
 						MultiXactOffset offset2);
 static void ExtendMultiXactOffset(MultiXactId multi);
 static void ExtendMultiXactMember(MultiXactOffset offset, int nmembers);
+static void DetermineSafeOldestOffset(MultiXactId oldestMXact);
+static bool MultiXactOffsetWouldWrap(MultiXactOffset boundary,
+						 MultiXactOffset start, uint32 distance);
+static MultiXactOffset find_multixact_start(MultiXactId multi);
 static void WriteMZeroPageXlogRec(int pageno, uint8 info);
 
 
@@ -942,14 +955,17 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
 	 * against catastrophic data loss due to multixact wraparound.  The basic
 	 * rules are:
 	 *
-	 * If we're past multiVacLimit, start trying to force autovacuum cycles.
+	 * If we're past multiVacLimit or the safe threshold for member storage space,
+	 * start trying to force autovacuum cycles.
 	 * If we're past multiWarnLimit, start issuing warnings.
 	 * If we're past multiStopLimit, refuse to create new MultiXactIds.
 	 *
 	 * Note these are pretty much the same protections in GetNewTransactionId.
 	 *----------
 	 */
-	if (!MultiXactIdPrecedes(result, MultiXactState->multiVacLimit))
+	if (!MultiXactIdPrecedes(result, MultiXactState->multiVacLimit) ||
+		(MultiXactState->nextOffset - MultiXactState->oldestOffset
+		 > MULTIXACT_MEMBER_SAFE_THRESHOLD))
 	{
 		/*
 		 * For safety's sake, we release MultiXactGenLock while sending
@@ -967,7 +983,7 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
 
 		/*
 		 * To avoid swamping the postmaster with signals, we issue the autovac
-		 * request only once per 64K transaction starts.  This still gives
+		 * request only once per 64K multis generated.  This still gives
 		 * plenty of chances before we get into real trouble.
 		 */
 		if (IsUnderPostmaster && (result % 65536) == 0)
@@ -1043,6 +1059,47 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
 	else
 		*offset = nextOffset;
 
+	/*----------
+	 * Protect against overrun of the members space as well, with the
+	 * following rules:
+	 *
+	 * If we're past offsetStopLimit, refuse to generate more multis.
+	 * If we're close to offsetStopLimit, emit a warning.
+	 *
+	 * Arbitrarily, we start emitting warnings when we're 20 segments or less
+	 * from offsetStopLimit.
+	 *
+	 * Note we haven't updated the shared state yet, so if we fail at this
+	 * point, the multixact ID we grabbed can still be used by the next guy.
+	 *
+	 * Note that there is no point in forcing autovacuum runs here: the
+	 * multixact freeze settings would have to be reduced for that to have any
+	 * effect.
+	 *----------
+	 */
+#define OFFSET_WARN_SEGMENTS	20
+	if (MultiXactOffsetWouldWrap(MultiXactState->offsetStopLimit, nextOffset,
+								 nmembers))
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("multixact \"members\" limit exceeded"),
+				 errdetail_plural("This command would create a multixact with %u members, but the remaining space is only enough for %u member.",
+								  "This command would create a multixact with %u members, but the remaining space is only enough for %u members.",
+							MultiXactState->offsetStopLimit - nextOffset - 1,
+								  nmembers,
+						   MultiXactState->offsetStopLimit - nextOffset - 1),
+				 errhint("Execute a database-wide VACUUM in database with OID %u with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.",
+						 MultiXactState->oldestMultiXactDB)));
+	else if (MultiXactOffsetWouldWrap(MultiXactState->offsetStopLimit,
+									  nextOffset,
+									  nmembers + MULTIXACT_MEMBERS_PER_PAGE * SLRU_PAGES_PER_SEGMENT * OFFSET_WARN_SEGMENTS))
+		ereport(WARNING,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("database with OID %u must be vacuumed before %d more multixact members are used",
+						MultiXactState->oldestMultiXactDB,
+					MultiXactState->offsetStopLimit - nextOffset + nmembers),
+				 errhint("Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.")));
+
 	ExtendMultiXactMember(nextOffset, nmembers);
 
 	/*
@@ -1133,9 +1190,9 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 	MultiXactIdSetOldestVisible();
 
 	/*
-	 * If we know the multi is used only for locking and not for updates,
-	 * then we can skip checking if the value is older than our oldest
-	 * visible multi.  It cannot possibly still be running.
+	 * If we know the multi is used only for locking and not for updates, then
+	 * we can skip checking if the value is older than our oldest visible
+	 * multi.  It cannot possibly still be running.
 	 */
 	if (onlyLock &&
 		MultiXactIdPrecedes(multi, OldestVisibleMXactId[MyBackendId]))
@@ -1150,14 +1207,14 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 	 *
 	 * An ID older than MultiXactState->oldestMultiXactId cannot possibly be
 	 * useful; it has already been removed, or will be removed shortly, by
-	 * truncation.  Returning the wrong values could lead
-	 * to an incorrect visibility result.  However, to support pg_upgrade we
-	 * need to allow an empty set to be returned regardless, if the caller is
-	 * willing to accept it; the caller is expected to check that it's an
-	 * allowed condition (such as ensuring that the infomask bits set on the
-	 * tuple are consistent with the pg_upgrade scenario).  If the caller is
-	 * expecting this to be called only on recently created multis, then we
-	 * raise an error.
+	 * truncation.  Returning the wrong values could lead to an incorrect
+	 * visibility result.  However, to support pg_upgrade we need to allow an
+	 * empty set to be returned regardless, if the caller is willing to accept
+	 * it; the caller is expected to check that it's an allowed condition
+	 * (such as ensuring that the infomask bits set on the tuple are
+	 * consistent with the pg_upgrade scenario).  If the caller is expecting
+	 * this to be called only on recently created multis, then we raise an
+	 * error.
 	 *
 	 * Conversely, an ID >= nextMXact shouldn't ever be seen here; if it is
 	 * seen, it implies undetected ID wraparound has occurred.  This raises a
@@ -1899,6 +1956,12 @@ StartupMultiXact(void)
 	 */
 	pageno = MXOffsetToMemberPage(offset);
 	MultiXactMemberCtl->shared->latest_page_number = pageno;
+
+	/*
+	 * compute the oldest member we need to keep around to avoid old member
+	 * data overrun.
+	 */
+	DetermineSafeOldestOffset(MultiXactState->oldestMultiXactId);
 }
 
 /*
@@ -1916,14 +1979,6 @@ TrimMultiXact(void)
 	int			entryno;
 	int			flagsoff;
 
-	/*
-	 * During a binary upgrade, make sure that the offsets SLRU is large
-	 * enough to contain the next value that would be created. It's fine to do
-	 * this here and not in StartupMultiXact() since binary upgrades should
-	 * never need crash recovery.
-	 */
-	if (IsBinaryUpgrade)
-		MaybeExtendOffsetSlru();
 
 	/* Clean up offsets state */
 	LWLockAcquire(MultiXactOffsetControlLock, LW_EXCLUSIVE);
@@ -2062,6 +2117,20 @@ MultiXactSetNextMXact(MultiXactId nextMulti,
 	MultiXactState->nextMXact = nextMulti;
 	MultiXactState->nextOffset = nextMultiOffset;
 	LWLockRelease(MultiXactGenLock);
+
+	/*
+	 * During a binary upgrade, make sure that the offsets SLRU is large
+	 * enough to contain the next value that would be created.
+	 *
+	 * We need to do this pretty early during the first startup in binary
+	 * upgrade mode: before StartupMultiXact() in fact, because this routine
+	 * is called even before that by StartupXLOG().  And we can't do it
+	 * earlier than at this point, because during that first call of this
+	 * routine we determine the MultiXactState->nextMXact value that
+	 * MaybeExtendOffsetSlru needs.
+	 */
+	if (IsBinaryUpgrade)
+		MaybeExtendOffsetSlru();
 }
 
 /*
@@ -2077,17 +2146,17 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid)
 	MultiXactId multiStopLimit;
 	MultiXactId multiWrapLimit;
 	MultiXactId curMulti;
+	MultiXactOffset oldestOffset;
+	MultiXactOffset nextOffset;
 
 	Assert(MultiXactIdIsValid(oldest_datminmxid));
 
 	/*
-	 * Since multixacts wrap differently from transaction IDs, this logic is
-	 * not entirely correct: in some scenarios we could go for longer than 2
-	 * billion multixacts without seeing any data loss, and in some others we
-	 * could get in trouble before that if the new pg_multixact/members data
-	 * stomps on the previous cycle's data.  For lack of a better mechanism we
-	 * use the same logic as for transaction IDs, that is, start taking action
-	 * halfway around the oldest potentially-existing multixact.
+	 * We pretend that a wrap will happen halfway through the multixact ID
+	 * space, but that's not really true, because multixacts wrap differently
+	 * from transaction IDs.  Note that, separately from any concern about
+	 * multixact IDs wrapping, we must ensure that multixact members do not
+	 * wrap.  Limits for that are set in DetermineSafeOldestOffset, not here.
 	 */
 	multiWrapLimit = oldest_datminmxid + (MaxMultiXactId >> 1);
 	if (multiWrapLimit < FirstMultiXactId)
@@ -2099,7 +2168,7 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid)
 	 *
 	 * Note: This differs from the magic number used in
 	 * SetTransactionIdLimit() since vacuum itself will never generate new
-	 * multis.
+	 * multis.  XXX actually it does, if it needs to freeze old multis.
 	 */
 	multiStopLimit = multiWrapLimit - 100;
 	if (multiStopLimit < FirstMultiXactId)
@@ -2131,6 +2200,35 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid)
 	if (multiVacLimit < FirstMultiXactId)
 		multiVacLimit += FirstMultiXactId;
 
+	/*
+	 * Determine the offset of the oldest multixact that might still be
+	 * referenced.  Normally, we can read the offset from the multixact
+	 * itself, but there's an important special case: if there are no
+	 * multixacts in existence at all, oldest_datminmxid obviously can't point
+	 * to one.  It will instead point to the multixact ID that will be
+	 * assigned the next time one is needed.
+	 *
+	 * NB: oldest_dataminmxid is the oldest multixact that might still be
+	 * referenced from a table, unlike in DetermineSafeOldestOffset, where we
+	 * do this same computation based on the oldest value that might still
+	 * exist in the SLRU.  This is because here we're trying to compute a
+	 * threshold for activating autovacuum, which can only remove references
+	 * to multixacts, whereas there we are computing a threshold for creating
+	 * new multixacts, which requires the old ones to have first been
+	 * truncated away by a checkpoint.
+	 */
+	LWLockAcquire(MultiXactGenLock, LW_SHARED);
+	if (MultiXactState->nextMXact == oldest_datminmxid)
+	{
+		oldestOffset = MultiXactState->nextOffset;
+		LWLockRelease(MultiXactGenLock);
+	}
+	else
+	{
+		LWLockRelease(MultiXactGenLock);
+		oldestOffset = find_multixact_start(oldest_datminmxid);
+	}
+
 	/* Grab lock for just long enough to set the new limit values */
 	LWLockAcquire(MultiXactGenLock, LW_EXCLUSIVE);
 	MultiXactState->oldestMultiXactId = oldest_datminmxid;
@@ -2139,7 +2237,9 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid)
 	MultiXactState->multiWarnLimit = multiWarnLimit;
 	MultiXactState->multiStopLimit = multiStopLimit;
 	MultiXactState->multiWrapLimit = multiWrapLimit;
+	MultiXactState->oldestOffset = oldestOffset;
 	curMulti = MultiXactState->nextMXact;
+	nextOffset = MultiXactState->nextOffset;
 	LWLockRelease(MultiXactGenLock);
 
 	/* Log the info */
@@ -2154,7 +2254,8 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid)
 	 * database, it'll call here, and we'll signal the postmaster to start
 	 * another iteration immediately if there are still any old databases.
 	 */
-	if (MultiXactIdPrecedes(multiVacLimit, curMulti) &&
+	if ((MultiXactIdPrecedes(multiVacLimit, curMulti) ||
+		 (nextOffset - oldestOffset > MULTIXACT_MEMBER_SAFE_THRESHOLD)) &&
 		IsUnderPostmaster && !InRecovery)
 		SendPostmasterSignal(PMSIGNAL_START_AUTOVAC_LAUNCHER);
 
@@ -2228,7 +2329,8 @@ MultiXactAdvanceNextMXact(MultiXactId minMulti,
 
 /*
  * Update our oldestMultiXactId value, but only if it's more recent than
- * what we had.
+ * what we had.  However, even if not, always update the oldest multixact
+ * offset limit.
  */
 void
 MultiXactAdvanceOldest(MultiXactId oldestMulti, Oid oldestMultiDB)
@@ -2402,6 +2504,206 @@ GetOldestMultiXactId(void)
 }
 
 /*
+ * Based on the given oldest MultiXactId, determine what's the oldest member
+ * offset and install the limit info in MultiXactState, where it can be used to
+ * prevent overrun of old data in the members SLRU area.
+ */
+static void
+DetermineSafeOldestOffset(MultiXactId oldestMXact)
+{
+	MultiXactOffset oldestOffset;
+
+	/*
+	 * Determine the offset of the oldest multixact.  Normally, we can read
+	 * the offset from the multixact itself, but there's an important special
+	 * case: if there are no multixacts in existence at all, oldestMXact
+	 * obviously can't point to one.  It will instead point to the multixact
+	 * ID that will be assigned the next time one is needed.
+	 *
+	 * NB: oldestMXact should be the oldest multixact that still exists in the
+	 * SLRU, unlike in SetMultiXactIdLimit, where we do this same computation
+	 * based on the oldest value that might be referenced in a table.
+	 */
+	LWLockAcquire(MultiXactGenLock, LW_SHARED);
+	if (MultiXactState->nextMXact == oldestMXact)
+	{
+		oldestOffset = MultiXactState->nextOffset;
+		LWLockRelease(MultiXactGenLock);
+	}
+	else
+	{
+		LWLockRelease(MultiXactGenLock);
+		oldestOffset = find_multixact_start(oldestMXact);
+	}
+
+	/* move back to start of the corresponding segment */
+	oldestOffset -= oldestOffset %
+		(MULTIXACT_MEMBERS_PER_PAGE * SLRU_PAGES_PER_SEGMENT);
+
+	LWLockAcquire(MultiXactGenLock, LW_EXCLUSIVE);
+	/* always leave one segment before the wraparound point */
+	MultiXactState->offsetStopLimit = oldestOffset -
+		(MULTIXACT_MEMBERS_PER_PAGE * SLRU_PAGES_PER_SEGMENT);
+	LWLockRelease(MultiXactGenLock);
+}
+
+/*
+ * Return whether adding "distance" to "start" would move past "boundary".
+ *
+ * We use this to determine whether the addition is "wrapping around" the
+ * boundary point, hence the name.  The reason we don't want to use the regular
+ * 2^31-modulo arithmetic here is that we want to be able to use the whole of
+ * the 2^32-1 space here, allowing for more multixacts that would fit
+ * otherwise.  See also SlruScanDirCbRemoveMembers.
+ */
+static bool
+MultiXactOffsetWouldWrap(MultiXactOffset boundary, MultiXactOffset start,
+						 uint32 distance)
+{
+	MultiXactOffset finish;
+
+	/*
+	 * Note that offset number 0 is not used (see GetMultiXactIdMembers), so
+	 * if the addition wraps around the UINT_MAX boundary, skip that value.
+	 */
+	finish = start + distance;
+	if (finish < start)
+		finish++;
+
+	/*-----------------------------------------------------------------------
+	 * When the boundary is numerically greater than the starting point, any
+	 * value numerically between the two is not wrapped:
+	 *
+	 *	<----S----B---->
+	 *	[---)			 = F wrapped past B (and UINT_MAX)
+	 *		 [---)		 = F not wrapped
+	 *			  [----] = F wrapped past B
+	 *
+	 * When the boundary is numerically less than the starting point (i.e. the
+	 * UINT_MAX wraparound occurs somewhere in between) then all values in
+	 * between are wrapped:
+	 *
+	 *	<----B----S---->
+	 *	[---)			 = F not wrapped past B (but wrapped past UINT_MAX)
+	 *		 [---)		 = F wrapped past B (and UINT_MAX)
+	 *			  [----] = F not wrapped
+	 *-----------------------------------------------------------------------
+	 */
+	if (start < boundary)
+		return finish >= boundary || finish < start;
+	else
+		return finish >= boundary && finish < start;
+}
+
+/*
+ * Find the starting offset of the given MultiXactId.
+ */
+static MultiXactOffset
+find_multixact_start(MultiXactId multi)
+{
+	MultiXactOffset offset;
+	int			pageno;
+	int			entryno;
+	int			slotno;
+	MultiXactOffset *offptr;
+
+	pageno = MultiXactIdToOffsetPage(multi);
+	entryno = MultiXactIdToOffsetEntry(multi);
+
+	/* lock is acquired by SimpleLruReadPage_ReadOnly */
+	slotno = SimpleLruReadPage_ReadOnly(MultiXactOffsetCtl, pageno, multi);
+	offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
+	offptr += entryno;
+	offset = *offptr;
+	LWLockRelease(MultiXactOffsetControlLock);
+
+	return offset;
+}
+
+/*
+ * Determine how many multixacts, and how many multixact members, currently
+ * exist.
+ */
+static void
+ReadMultiXactCounts(uint32 *multixacts, MultiXactOffset *members)
+{
+	MultiXactOffset nextOffset;
+	MultiXactOffset oldestOffset;
+	MultiXactId oldestMultiXactId;
+	MultiXactId nextMultiXactId;
+
+	LWLockAcquire(MultiXactGenLock, LW_SHARED);
+	nextOffset = MultiXactState->nextOffset;
+	oldestMultiXactId = MultiXactState->oldestMultiXactId;
+	nextMultiXactId = MultiXactState->nextMXact;
+	oldestOffset = MultiXactState->oldestOffset;
+	LWLockRelease(MultiXactGenLock);
+
+	*members = nextOffset - oldestOffset;
+	*multixacts = nextMultiXactId - oldestMultiXactId;
+}
+
+/*
+ * Multixact members can be removed once the multixacts that refer to them
+ * are older than every datminxmid.  autovacuum_multixact_freeze_max_age and
+ * vacuum_multixact_freeze_table_age work together to make sure we never have
+ * too many multixacts; we hope that, at least under normal circumstances,
+ * this will also be sufficient to keep us from using too many offsets.
+ * However, if the average multixact has many members, we might exhaust the
+ * members space while still using few enough members that these limits fail
+ * to trigger full table scans for relminmxid advancement.  At that point,
+ * we'd have no choice but to start failing multixact-creating operations
+ * with an error.
+ *
+ * To prevent that, if more than a threshold portion of the members space is
+ * used, we effectively reduce autovacuum_multixact_freeze_max_age and
+ * to a value just less than the number of multixacts in use.  We hope that
+ * this will quickly trigger autovacuuming on the table or tables with the
+ * oldest relminmxid, thus allowing datminmxid values to advance and removing
+ * some members.
+ *
+ * As the fraction of the member space currently in use grows, we become
+ * more aggressive in clamping this value.  That not only causes autovacuum
+ * to ramp up, but also makes any manual vacuums the user issues more
+ * aggressive.  This happens because vacuum_set_xid_limits() clamps the
+ * freeze table and and the minimum freeze age based on the effective
+ * autovacuum_multixact_freeze_max_age this function returns.  In the worst
+ * case, we'll claim the freeze_max_age to zero, and every vacuum of any
+ * table will try to freeze every multixact.
+ *
+ * It's possible that these thresholds should be user-tunable, but for now
+ * we keep it simple.
+ */
+int
+MultiXactMemberFreezeThreshold(void)
+{
+	MultiXactOffset members;
+	uint32		multixacts;
+	uint32		victim_multixacts;
+	double		fraction;
+
+	ReadMultiXactCounts(&multixacts, &members);
+
+	/* If member space utilization is low, no special action is required. */
+	if (members <= MULTIXACT_MEMBER_SAFE_THRESHOLD)
+		return autovacuum_multixact_freeze_max_age;
+
+	/*
+	 * Compute a target for relminmxid advancement.  The number of multixacts
+	 * we try to eliminate from the system is based on how far we are past
+	 * MULTIXACT_MEMBER_SAFE_THRESHOLD.
+	 */
+	fraction = (double) (members - MULTIXACT_MEMBER_SAFE_THRESHOLD) /
+		(MULTIXACT_MEMBER_DANGER_THRESHOLD - MULTIXACT_MEMBER_SAFE_THRESHOLD);
+	victim_multixacts = multixacts * fraction;
+
+	/* fraction could be > 1.0, but lowest possible freeze age is zero */
+	if (victim_multixacts > multixacts)
+		return 0;
+	return multixacts - victim_multixacts;
+}
+
+/*
  * SlruScanDirectory callback.
  *		This callback deletes segments that are outside the range determined by
  *		the given page numbers.
@@ -2497,7 +2799,7 @@ SlruScanDirCbFindEarliest(SlruCtl ctl, char *filename, int segpage, void *data)
 void
 TruncateMultiXact(void)
 {
-	MultiXactId		oldestMXact;
+	MultiXactId oldestMXact;
 	MultiXactOffset oldestOffset;
 	MultiXactOffset nextOffset;
 	mxtruncinfo trunc;
@@ -2533,26 +2835,7 @@ TruncateMultiXact(void)
 	 * First, compute the safe truncation point for MultiXactMember. This is
 	 * the starting offset of the oldest multixact.
 	 */
-	{
-		int			pageno;
-		int			slotno;
-		int			entryno;
-		MultiXactOffset *offptr;
-
-		/* lock is acquired by SimpleLruReadPage_ReadOnly */
-
-		pageno = MultiXactIdToOffsetPage(oldestMXact);
-		entryno = MultiXactIdToOffsetEntry(oldestMXact);
-
-		slotno = SimpleLruReadPage_ReadOnly(MultiXactOffsetCtl, pageno,
-											oldestMXact);
-		offptr = (MultiXactOffset *)
-			MultiXactOffsetCtl->shared->page_buffer[slotno];
-		offptr += entryno;
-		oldestOffset = *offptr;
-
-		LWLockRelease(MultiXactOffsetControlLock);
-	}
+	oldestOffset = find_multixact_start(oldestMXact);
 
 	/*
 	 * To truncate MultiXactMembers, we need to figure out the active page
@@ -2576,6 +2859,13 @@ TruncateMultiXact(void)
 	SimpleLruTruncate(MultiXactOffsetCtl,
 					  MultiXactIdToOffsetPage(oldestMXact));
 
+
+	/*
+	 * Now, and only now, we can advance the stop point for multixact members.
+	 * If we did it any sooner, the segments we deleted above might already
+	 * have been overwritten with new members.  That would be bad.
+	 */
+	DetermineSafeOldestOffset(oldestMXact);
 }
 
 /*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
new file mode 100644
index 0000000000..f4ba8518b1
--- /dev/null
+++ b/src/backend/access/transam/parallel.c
@@ -0,0 +1,1010 @@
+/*-------------------------------------------------------------------------
+ *
+ * parallel.c
+ *	  Infrastructure for launching parallel workers
+ *
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/access/transam/parallel.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "access/xact.h"
+#include "access/xlog.h"
+#include "access/parallel.h"
+#include "commands/async.h"
+#include "libpq/libpq.h"
+#include "libpq/pqformat.h"
+#include "libpq/pqmq.h"
+#include "miscadmin.h"
+#include "storage/ipc.h"
+#include "storage/sinval.h"
+#include "storage/spin.h"
+#include "tcop/tcopprot.h"
+#include "utils/combocid.h"
+#include "utils/guc.h"
+#include "utils/memutils.h"
+#include "utils/resowner.h"
+#include "utils/snapmgr.h"
+
+/*
+ * We don't want to waste a lot of memory on an error queue which, most of
+ * the time, will process only a handful of small messages.  However, it is
+ * desirable to make it large enough that a typical ErrorResponse can be sent
+ * without blocking.  That way, a worker that errors out can write the whole
+ * message into the queue and terminate without waiting for the user backend.
+ */
+#define PARALLEL_ERROR_QUEUE_SIZE			16384
+
+/* Magic number for parallel context TOC. */
+#define PARALLEL_MAGIC						0x50477c7c
+
+/*
+ * Magic numbers for parallel state sharing.  Higher-level code should use
+ * smaller values, leaving these very large ones for use by this module.
+ */
+#define PARALLEL_KEY_FIXED					UINT64CONST(0xFFFFFFFFFFFF0001)
+#define PARALLEL_KEY_ERROR_QUEUE			UINT64CONST(0xFFFFFFFFFFFF0002)
+#define PARALLEL_KEY_LIBRARY				UINT64CONST(0xFFFFFFFFFFFF0003)
+#define PARALLEL_KEY_GUC					UINT64CONST(0xFFFFFFFFFFFF0004)
+#define PARALLEL_KEY_COMBO_CID				UINT64CONST(0xFFFFFFFFFFFF0005)
+#define PARALLEL_KEY_TRANSACTION_SNAPSHOT	UINT64CONST(0xFFFFFFFFFFFF0006)
+#define PARALLEL_KEY_ACTIVE_SNAPSHOT		UINT64CONST(0xFFFFFFFFFFFF0007)
+#define PARALLEL_KEY_TRANSACTION_STATE		UINT64CONST(0xFFFFFFFFFFFF0008)
+#define PARALLEL_KEY_EXTENSION_TRAMPOLINE	UINT64CONST(0xFFFFFFFFFFFF0009)
+
+/* Fixed-size parallel state. */
+typedef struct FixedParallelState
+{
+	/* Fixed-size state that workers must restore. */
+	Oid			database_id;
+	Oid			authenticated_user_id;
+	Oid			current_user_id;
+	int			sec_context;
+	PGPROC	   *parallel_master_pgproc;
+	pid_t		parallel_master_pid;
+	BackendId	parallel_master_backend_id;
+
+	/* Entrypoint for parallel workers. */
+	parallel_worker_main_type entrypoint;
+
+	/* Mutex protects remaining fields. */
+	slock_t		mutex;
+
+	/* Track whether workers have attached. */
+	int			workers_expected;
+	int			workers_attached;
+
+	/* Maximum XactLastRecEnd of any worker. */
+	XLogRecPtr	last_xlog_end;
+} FixedParallelState;
+
+/*
+ * Our parallel worker number.  We initialize this to -1, meaning that we are
+ * not a parallel worker.  In parallel workers, it will be set to a value >= 0
+ * and < the number of workers before any user code is invoked; each parallel
+ * worker will get a different parallel worker number.
+ */
+int			ParallelWorkerNumber = -1;
+
+/* Is there a parallel message pending which we need to receive? */
+bool		ParallelMessagePending = false;
+
+/* Pointer to our fixed parallel state. */
+static FixedParallelState *MyFixedParallelState;
+
+/* List of active parallel contexts. */
+static dlist_head pcxt_list = DLIST_STATIC_INIT(pcxt_list);
+
+/* Private functions. */
+static void HandleParallelMessage(ParallelContext *, int, StringInfo msg);
+static void ParallelErrorContext(void *arg);
+static void ParallelExtensionTrampoline(dsm_segment *seg, shm_toc *toc);
+static void ParallelWorkerMain(Datum main_arg);
+
+/*
+ * Establish a new parallel context.  This should be done after entering
+ * parallel mode, and (unless there is an error) the context should be
+ * destroyed before exiting the current subtransaction.
+ */
+ParallelContext *
+CreateParallelContext(parallel_worker_main_type entrypoint, int nworkers)
+{
+	MemoryContext oldcontext;
+	ParallelContext *pcxt;
+
+	/* It is unsafe to create a parallel context if not in parallel mode. */
+	Assert(IsInParallelMode());
+
+	/* Number of workers should be non-negative. */
+	Assert(nworkers >= 0);
+
+	/*
+	 * If dynamic shared memory is not available, we won't be able to use
+	 * background workers.
+	 */
+	if (dynamic_shared_memory_type == DSM_IMPL_NONE)
+		nworkers = 0;
+
+	/* We might be running in a short-lived memory context. */
+	oldcontext = MemoryContextSwitchTo(TopTransactionContext);
+
+	/* Initialize a new ParallelContext. */
+	pcxt = palloc0(sizeof(ParallelContext));
+	pcxt->subid = GetCurrentSubTransactionId();
+	pcxt->nworkers = nworkers;
+	pcxt->entrypoint = entrypoint;
+	pcxt->error_context_stack = error_context_stack;
+	shm_toc_initialize_estimator(&pcxt->estimator);
+	dlist_push_head(&pcxt_list, &pcxt->node);
+
+	/* Restore previous memory context. */
+	MemoryContextSwitchTo(oldcontext);
+
+	return pcxt;
+}
+
+/*
+ * Establish a new parallel context that calls a function provided by an
+ * extension.  This works around the fact that the library might get mapped
+ * at a different address in each backend.
+ */
+ParallelContext *
+CreateParallelContextForExternalFunction(char *library_name,
+										 char *function_name,
+										 int nworkers)
+{
+	MemoryContext oldcontext;
+	ParallelContext *pcxt;
+
+	/* We might be running in a very short-lived memory context. */
+	oldcontext = MemoryContextSwitchTo(TopTransactionContext);
+
+	/* Create the context. */
+	pcxt = CreateParallelContext(ParallelExtensionTrampoline, nworkers);
+	pcxt->library_name = pstrdup(library_name);
+	pcxt->function_name = pstrdup(function_name);
+
+	/* Restore previous memory context. */
+	MemoryContextSwitchTo(oldcontext);
+
+	return pcxt;
+}
+
+/*
+ * Establish the dynamic shared memory segment for a parallel context and
+ * copied state and other bookkeeping information that will need by parallel
+ * workers into it.
+ */
+void
+InitializeParallelDSM(ParallelContext *pcxt)
+{
+	MemoryContext oldcontext;
+	Size		library_len = 0;
+	Size		guc_len = 0;
+	Size		combocidlen = 0;
+	Size		tsnaplen = 0;
+	Size		asnaplen = 0;
+	Size		tstatelen = 0;
+	Size		segsize = 0;
+	int			i;
+	FixedParallelState *fps;
+	Snapshot	transaction_snapshot = GetTransactionSnapshot();
+	Snapshot	active_snapshot = GetActiveSnapshot();
+
+	/* We might be running in a very short-lived memory context. */
+	oldcontext = MemoryContextSwitchTo(TopTransactionContext);
+
+	/* Allow space to store the fixed-size parallel state. */
+	shm_toc_estimate_chunk(&pcxt->estimator, sizeof(FixedParallelState));
+	shm_toc_estimate_keys(&pcxt->estimator, 1);
+
+	/*
+	 * Normally, the user will have requested at least one worker process, but
+	 * if by chance they have not, we can skip a bunch of things here.
+	 */
+	if (pcxt->nworkers > 0)
+	{
+		/* Estimate space for various kinds of state sharing. */
+		library_len = EstimateLibraryStateSpace();
+		shm_toc_estimate_chunk(&pcxt->estimator, library_len);
+		guc_len = EstimateGUCStateSpace();
+		shm_toc_estimate_chunk(&pcxt->estimator, guc_len);
+		combocidlen = EstimateComboCIDStateSpace();
+		shm_toc_estimate_chunk(&pcxt->estimator, combocidlen);
+		tsnaplen = EstimateSnapshotSpace(transaction_snapshot);
+		shm_toc_estimate_chunk(&pcxt->estimator, tsnaplen);
+		asnaplen = EstimateSnapshotSpace(active_snapshot);
+		shm_toc_estimate_chunk(&pcxt->estimator, asnaplen);
+		tstatelen = EstimateTransactionStateSpace();
+		shm_toc_estimate_chunk(&pcxt->estimator, tstatelen);
+		/* If you add more chunks here, you probably need to add keys. */
+		shm_toc_estimate_keys(&pcxt->estimator, 6);
+
+		/* Estimate space need for error queues. */
+		StaticAssertStmt(BUFFERALIGN(PARALLEL_ERROR_QUEUE_SIZE) ==
+						 PARALLEL_ERROR_QUEUE_SIZE,
+						 "parallel error queue size not buffer-aligned");
+		shm_toc_estimate_chunk(&pcxt->estimator,
+							   PARALLEL_ERROR_QUEUE_SIZE * pcxt->nworkers);
+		shm_toc_estimate_keys(&pcxt->estimator, 1);
+
+		/* Estimate how much we'll need for extension entrypoint info. */
+		if (pcxt->library_name != NULL)
+		{
+			Assert(pcxt->entrypoint == ParallelExtensionTrampoline);
+			Assert(pcxt->function_name != NULL);
+			shm_toc_estimate_chunk(&pcxt->estimator, strlen(pcxt->library_name)
+								   + strlen(pcxt->function_name) + 2);
+			shm_toc_estimate_keys(&pcxt->estimator, 1);
+		}
+	}
+
+	/*
+	 * Create DSM and initialize with new table of contents.  But if the user
+	 * didn't request any workers, then don't bother creating a dynamic shared
+	 * memory segment; instead, just use backend-private memory.
+	 *
+	 * Also, if we can't create a dynamic shared memory segment because the
+	 * maximum number of segments have already been created, then fall back to
+	 * backend-private memory, and plan not to use any workers.  We hope this
+	 * won't happen very often, but it's better to abandon the use of
+	 * parallelism than to fail outright.
+	 */
+	segsize = shm_toc_estimate(&pcxt->estimator);
+	if (pcxt->nworkers != 0)
+		pcxt->seg = dsm_create(segsize, DSM_CREATE_NULL_IF_MAXSEGMENTS);
+	if (pcxt->seg != NULL)
+		pcxt->toc = shm_toc_create(PARALLEL_MAGIC,
+								   dsm_segment_address(pcxt->seg),
+								   segsize);
+	else
+	{
+		pcxt->nworkers = 0;
+		pcxt->private_memory = MemoryContextAlloc(TopMemoryContext, segsize);
+		pcxt->toc = shm_toc_create(PARALLEL_MAGIC, pcxt->private_memory,
+								   segsize);
+	}
+
+	/* Initialize fixed-size state in shared memory. */
+	fps = (FixedParallelState *)
+		shm_toc_allocate(pcxt->toc, sizeof(FixedParallelState));
+	fps->database_id = MyDatabaseId;
+	fps->authenticated_user_id = GetAuthenticatedUserId();
+	GetUserIdAndSecContext(&fps->current_user_id, &fps->sec_context);
+	fps->parallel_master_pgproc = MyProc;
+	fps->parallel_master_pid = MyProcPid;
+	fps->parallel_master_backend_id = MyBackendId;
+	fps->entrypoint = pcxt->entrypoint;
+	SpinLockInit(&fps->mutex);
+	fps->workers_expected = pcxt->nworkers;
+	fps->workers_attached = 0;
+	fps->last_xlog_end = 0;
+	shm_toc_insert(pcxt->toc, PARALLEL_KEY_FIXED, fps);
+
+	/* We can skip the rest of this if we're not budgeting for any workers. */
+	if (pcxt->nworkers > 0)
+	{
+		char	   *libraryspace;
+		char	   *gucspace;
+		char	   *combocidspace;
+		char	   *tsnapspace;
+		char	   *asnapspace;
+		char	   *tstatespace;
+		char	   *error_queue_space;
+
+		/* Serialize shared libraries we have loaded. */
+		libraryspace = shm_toc_allocate(pcxt->toc, library_len);
+		SerializeLibraryState(library_len, libraryspace);
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_LIBRARY, libraryspace);
+
+		/* Serialize GUC settings. */
+		gucspace = shm_toc_allocate(pcxt->toc, guc_len);
+		SerializeGUCState(guc_len, gucspace);
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_GUC, gucspace);
+
+		/* Serialize combo CID state. */
+		combocidspace = shm_toc_allocate(pcxt->toc, combocidlen);
+		SerializeComboCIDState(combocidlen, combocidspace);
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_COMBO_CID, combocidspace);
+
+		/* Serialize transaction snapshot and active snapshot. */
+		tsnapspace = shm_toc_allocate(pcxt->toc, tsnaplen);
+		SerializeSnapshot(transaction_snapshot, tsnapspace);
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_TRANSACTION_SNAPSHOT,
+					   tsnapspace);
+		asnapspace = shm_toc_allocate(pcxt->toc, asnaplen);
+		SerializeSnapshot(active_snapshot, asnapspace);
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_ACTIVE_SNAPSHOT, asnapspace);
+
+		/* Serialize transaction state. */
+		tstatespace = shm_toc_allocate(pcxt->toc, tstatelen);
+		SerializeTransactionState(tstatelen, tstatespace);
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_TRANSACTION_STATE, tstatespace);
+
+		/* Allocate space for worker information. */
+		pcxt->worker = palloc0(sizeof(ParallelWorkerInfo) * pcxt->nworkers);
+
+		/*
+		 * Establish error queues in dynamic shared memory.
+		 *
+		 * These queues should be used only for transmitting ErrorResponse,
+		 * NoticeResponse, and NotifyResponse protocol messages.  Tuple data
+		 * should be transmitted via separate (possibly larger?) queues.
+		 */
+		error_queue_space =
+			shm_toc_allocate(pcxt->toc,
+							 PARALLEL_ERROR_QUEUE_SIZE * pcxt->nworkers);
+		for (i = 0; i < pcxt->nworkers; ++i)
+		{
+			char	   *start;
+			shm_mq	   *mq;
+
+			start = error_queue_space + i * PARALLEL_ERROR_QUEUE_SIZE;
+			mq = shm_mq_create(start, PARALLEL_ERROR_QUEUE_SIZE);
+			shm_mq_set_receiver(mq, MyProc);
+			pcxt->worker[i].error_mqh = shm_mq_attach(mq, pcxt->seg, NULL);
+		}
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_ERROR_QUEUE, error_queue_space);
+
+		/* Serialize extension entrypoint information. */
+		if (pcxt->library_name != NULL)
+		{
+			Size		lnamelen = strlen(pcxt->library_name);
+			char	   *extensionstate;
+
+			extensionstate = shm_toc_allocate(pcxt->toc, lnamelen
+										  + strlen(pcxt->function_name) + 2);
+			strcpy(extensionstate, pcxt->library_name);
+			strcpy(extensionstate + lnamelen + 1, pcxt->function_name);
+			shm_toc_insert(pcxt->toc, PARALLEL_KEY_EXTENSION_TRAMPOLINE,
+						   extensionstate);
+		}
+	}
+
+	/* Restore previous memory context. */
+	MemoryContextSwitchTo(oldcontext);
+}
+
+/*
+ * Launch parallel workers.
+ */
+void
+LaunchParallelWorkers(ParallelContext *pcxt)
+{
+	MemoryContext oldcontext;
+	BackgroundWorker worker;
+	int			i;
+	bool		any_registrations_failed = false;
+
+	/* Skip this if we have no workers. */
+	if (pcxt->nworkers == 0)
+		return;
+
+	/* If we do have workers, we'd better have a DSM segment. */
+	Assert(pcxt->seg != NULL);
+
+	/* We might be running in a short-lived memory context. */
+	oldcontext = MemoryContextSwitchTo(TopTransactionContext);
+
+	/* Configure a worker. */
+	snprintf(worker.bgw_name, BGW_MAXLEN, "parallel worker for PID %d",
+			 MyProcPid);
+	worker.bgw_flags =
+		BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
+	worker.bgw_start_time = BgWorkerStart_ConsistentState;
+	worker.bgw_restart_time = BGW_NEVER_RESTART;
+	worker.bgw_main = ParallelWorkerMain;
+	worker.bgw_main_arg = UInt32GetDatum(dsm_segment_handle(pcxt->seg));
+	worker.bgw_notify_pid = MyProcPid;
+
+	/*
+	 * Start workers.
+	 *
+	 * The caller must be able to tolerate ending up with fewer workers than
+	 * expected, so there is no need to throw an error here if registration
+	 * fails.  It wouldn't help much anyway, because registering the worker in
+	 * no way guarantees that it will start up and initialize successfully.
+	 */
+	for (i = 0; i < pcxt->nworkers; ++i)
+	{
+		if (!any_registrations_failed &&
+			RegisterDynamicBackgroundWorker(&worker,
+											&pcxt->worker[i].bgwhandle))
+			shm_mq_set_handle(pcxt->worker[i].error_mqh,
+							  pcxt->worker[i].bgwhandle);
+		else
+		{
+			/*
+			 * If we weren't able to register the worker, then we've bumped up
+			 * against the max_worker_processes limit, and future
+			 * registrations will probably fail too, so arrange to skip them.
+			 * But we still have to execute this code for the remaining slots
+			 * to make sure that we forget about the error queues we budgeted
+			 * for those workers.  Otherwise, we'll wait for them to start,
+			 * but they never will.
+			 */
+			any_registrations_failed = true;
+			pcxt->worker[i].bgwhandle = NULL;
+			pcxt->worker[i].error_mqh = NULL;
+		}
+	}
+
+	/* Restore previous memory context. */
+	MemoryContextSwitchTo(oldcontext);
+}
+
+/*
+ * Wait for all workers to exit.
+ *
+ * Even if the parallel operation seems to have completed successfully, it's
+ * important to call this function afterwards.  We must not miss any errors
+ * the workers may have thrown during the parallel operation, or any that they
+ * may yet throw while shutting down.
+ *
+ * Also, we want to update our notion of XactLastRecEnd based on worker
+ * feedback.
+ */
+void
+WaitForParallelWorkersToFinish(ParallelContext *pcxt)
+{
+	for (;;)
+	{
+		bool		anyone_alive = false;
+		int			i;
+
+		/*
+		 * This will process any parallel messages that are pending, which may
+		 * change the outcome of the loop that follows.  It may also throw an
+		 * error propagated from a worker.
+		 */
+		CHECK_FOR_INTERRUPTS();
+
+		for (i = 0; i < pcxt->nworkers; ++i)
+		{
+			if (pcxt->worker[i].error_mqh != NULL)
+			{
+				anyone_alive = true;
+				break;
+			}
+		}
+
+		if (!anyone_alive)
+			break;
+
+		WaitLatch(&MyProc->procLatch, WL_LATCH_SET, -1);
+		ResetLatch(&MyProc->procLatch);
+	}
+
+	if (pcxt->toc != NULL)
+	{
+		FixedParallelState *fps;
+
+		fps = shm_toc_lookup(pcxt->toc, PARALLEL_KEY_FIXED);
+		if (fps->last_xlog_end > XactLastRecEnd)
+			XactLastRecEnd = fps->last_xlog_end;
+	}
+}
+
+/*
+ * Destroy a parallel context.
+ *
+ * If expecting a clean exit, you should use WaitForParallelWorkersToFinish()
+ * first, before calling this function.  When this function is invoked, any
+ * remaining workers are forcibly killed; the dynamic shared memory segment
+ * is unmapped; and we then wait (uninterruptibly) for the workers to exit.
+ */
+void
+DestroyParallelContext(ParallelContext *pcxt)
+{
+	int			i;
+
+	/*
+	 * Be careful about order of operations here!  We remove the parallel
+	 * context from the list before we do anything else; otherwise, if an
+	 * error occurs during a subsequent step, we might try to nuke it again
+	 * from AtEOXact_Parallel or AtEOSubXact_Parallel.
+	 */
+	dlist_delete(&pcxt->node);
+
+	/* Kill each worker in turn, and forget their error queues. */
+	for (i = 0; i < pcxt->nworkers; ++i)
+	{
+		if (pcxt->worker[i].bgwhandle != NULL)
+			TerminateBackgroundWorker(pcxt->worker[i].bgwhandle);
+		if (pcxt->worker[i].error_mqh != NULL)
+		{
+			pfree(pcxt->worker[i].error_mqh);
+			pcxt->worker[i].error_mqh = NULL;
+		}
+	}
+
+	/*
+	 * If we have allocated a shared memory segment, detach it.  This will
+	 * implicitly detach the error queues, and any other shared memory queues,
+	 * stored there.
+	 */
+	if (pcxt->seg != NULL)
+	{
+		dsm_detach(pcxt->seg);
+		pcxt->seg = NULL;
+	}
+
+	/*
+	 * If this parallel context is actually in backend-private memory rather
+	 * than shared memory, free that memory instead.
+	 */
+	if (pcxt->private_memory != NULL)
+	{
+		pfree(pcxt->private_memory);
+		pcxt->private_memory = NULL;
+	}
+
+	/* Wait until the workers actually die. */
+	for (i = 0; i < pcxt->nworkers; ++i)
+	{
+		BgwHandleStatus status;
+
+		if (pcxt->worker[i].bgwhandle == NULL)
+			continue;
+
+		/*
+		 * We can't finish transaction commit or abort until all of the
+		 * workers are dead.  This means, in particular, that we can't respond
+		 * to interrupts at this stage.
+		 */
+		HOLD_INTERRUPTS();
+		status = WaitForBackgroundWorkerShutdown(pcxt->worker[i].bgwhandle);
+		RESUME_INTERRUPTS();
+
+		/*
+		 * If the postmaster kicked the bucket, we have no chance of cleaning
+		 * up safely -- we won't be able to tell when our workers are actually
+		 * dead.  This doesn't necessitate a PANIC since they will all abort
+		 * eventually, but we can't safely continue this session.
+		 */
+		if (status == BGWH_POSTMASTER_DIED)
+			ereport(FATAL,
+					(errcode(ERRCODE_ADMIN_SHUTDOWN),
+				 errmsg("postmaster exited during a parallel transaction")));
+
+		/* Release memory. */
+		pfree(pcxt->worker[i].bgwhandle);
+		pcxt->worker[i].bgwhandle = NULL;
+	}
+
+	/* Free the worker array itself. */
+	if (pcxt->worker != NULL)
+	{
+		pfree(pcxt->worker);
+		pcxt->worker = NULL;
+	}
+
+	/* Free memory. */
+	pfree(pcxt);
+}
+
+/*
+ * Are there any parallel contexts currently active?
+ */
+bool
+ParallelContextActive(void)
+{
+	return !dlist_is_empty(&pcxt_list);
+}
+
+/*
+ * Handle receipt of an interrupt indicating a parallel worker message.
+ */
+void
+HandleParallelMessageInterrupt(void)
+{
+	int			save_errno = errno;
+
+	InterruptPending = true;
+	ParallelMessagePending = true;
+	SetLatch(MyLatch);
+
+	errno = save_errno;
+}
+
+/*
+ * Handle any queued protocol messages received from parallel workers.
+ */
+void
+HandleParallelMessages(void)
+{
+	dlist_iter	iter;
+
+	ParallelMessagePending = false;
+
+	dlist_foreach(iter, &pcxt_list)
+	{
+		ParallelContext *pcxt;
+		int			i;
+		Size		nbytes;
+		void	   *data;
+
+		pcxt = dlist_container(ParallelContext, node, iter.cur);
+		if (pcxt->worker == NULL)
+			continue;
+
+		for (i = 0; i < pcxt->nworkers; ++i)
+		{
+			/*
+			 * Read as many messages as we can from each worker, but stop when
+			 * either (1) the error queue goes away, which can happen if we
+			 * receive a Terminate message from the worker; or (2) no more
+			 * messages can be read from the worker without blocking.
+			 */
+			while (pcxt->worker[i].error_mqh != NULL)
+			{
+				shm_mq_result res;
+
+				res = shm_mq_receive(pcxt->worker[i].error_mqh, &nbytes,
+									 &data, true);
+				if (res == SHM_MQ_WOULD_BLOCK)
+					break;
+				else if (res == SHM_MQ_SUCCESS)
+				{
+					StringInfoData msg;
+
+					initStringInfo(&msg);
+					appendBinaryStringInfo(&msg, data, nbytes);
+					HandleParallelMessage(pcxt, i, &msg);
+					pfree(msg.data);
+				}
+				else
+					ereport(ERROR,
+							(errcode(ERRCODE_INTERNAL_ERROR),	/* XXX: wrong errcode? */
+							 errmsg("lost connection to parallel worker")));
+
+				/* This might make the error queue go away. */
+				CHECK_FOR_INTERRUPTS();
+			}
+		}
+	}
+}
+
+/*
+ * Handle a single protocol message received from a single parallel worker.
+ */
+static void
+HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg)
+{
+	char		msgtype;
+
+	msgtype = pq_getmsgbyte(msg);
+
+	switch (msgtype)
+	{
+		case 'K':				/* BackendKeyData */
+			{
+				int32		pid = pq_getmsgint(msg, 4);
+
+				(void) pq_getmsgint(msg, 4);	/* discard cancel key */
+				(void) pq_getmsgend(msg);
+				pcxt->worker[i].pid = pid;
+				break;
+			}
+
+		case 'E':				/* ErrorResponse */
+		case 'N':				/* NoticeResponse */
+			{
+				ErrorData	edata;
+				ErrorContextCallback errctx;
+				ErrorContextCallback *save_error_context_stack;
+
+				/*
+				 * Rethrow the error using the error context callbacks that
+				 * were in effect when the context was created, not the
+				 * current ones.
+				 */
+				save_error_context_stack = error_context_stack;
+				errctx.callback = ParallelErrorContext;
+				errctx.arg = &pcxt->worker[i].pid;
+				errctx.previous = pcxt->error_context_stack;
+				error_context_stack = &errctx;
+
+				/* Parse ErrorReponse or NoticeResponse. */
+				pq_parse_errornotice(msg, &edata);
+
+				/* Death of a worker isn't enough justification for suicide. */
+				edata.elevel = Min(edata.elevel, ERROR);
+
+				/* Rethrow error or notice. */
+				ThrowErrorData(&edata);
+
+				/* Restore previous context. */
+				error_context_stack = save_error_context_stack;
+
+				break;
+			}
+
+		case 'A':				/* NotifyResponse */
+			{
+				/* Propagate NotifyResponse. */
+				pq_putmessage(msg->data[0], &msg->data[1], msg->len - 1);
+				break;
+			}
+
+		case 'X':				/* Terminate, indicating clean exit */
+			{
+				pfree(pcxt->worker[i].bgwhandle);
+				pfree(pcxt->worker[i].error_mqh);
+				pcxt->worker[i].bgwhandle = NULL;
+				pcxt->worker[i].error_mqh = NULL;
+				break;
+			}
+
+		default:
+			{
+				elog(ERROR, "unknown message type: %c (%d bytes)",
+					 msgtype, msg->len);
+			}
+	}
+}
+
+/*
+ * End-of-subtransaction cleanup for parallel contexts.
+ *
+ * Currently, it's forbidden to enter or leave a subtransaction while
+ * parallel mode is in effect, so we could just blow away everything.  But
+ * we may want to relax that restriction in the future, so this code
+ * contemplates that there may be multiple subtransaction IDs in pcxt_list.
+ */
+void
+AtEOSubXact_Parallel(bool isCommit, SubTransactionId mySubId)
+{
+	while (!dlist_is_empty(&pcxt_list))
+	{
+		ParallelContext *pcxt;
+
+		pcxt = dlist_head_element(ParallelContext, node, &pcxt_list);
+		if (pcxt->subid != mySubId)
+			break;
+		if (isCommit)
+			elog(WARNING, "leaked parallel context");
+		DestroyParallelContext(pcxt);
+	}
+}
+
+/*
+ * End-of-transaction cleanup for parallel contexts.
+ */
+void
+AtEOXact_Parallel(bool isCommit)
+{
+	while (!dlist_is_empty(&pcxt_list))
+	{
+		ParallelContext *pcxt;
+
+		pcxt = dlist_head_element(ParallelContext, node, &pcxt_list);
+		if (isCommit)
+			elog(WARNING, "leaked parallel context");
+		DestroyParallelContext(pcxt);
+	}
+}
+
+/*
+ * Main entrypoint for parallel workers.
+ */
+static void
+ParallelWorkerMain(Datum main_arg)
+{
+	dsm_segment *seg;
+	shm_toc    *toc;
+	FixedParallelState *fps;
+	char	   *error_queue_space;
+	shm_mq	   *mq;
+	shm_mq_handle *mqh;
+	char	   *libraryspace;
+	char	   *gucspace;
+	char	   *combocidspace;
+	char	   *tsnapspace;
+	char	   *asnapspace;
+	char	   *tstatespace;
+	StringInfoData msgbuf;
+
+	/* Establish signal handlers. */
+	pqsignal(SIGTERM, die);
+	BackgroundWorkerUnblockSignals();
+
+	/* Set up a memory context and resource owner. */
+	Assert(CurrentResourceOwner == NULL);
+	CurrentResourceOwner = ResourceOwnerCreate(NULL, "parallel toplevel");
+	CurrentMemoryContext = AllocSetContextCreate(TopMemoryContext,
+												 "parallel worker",
+												 ALLOCSET_DEFAULT_MINSIZE,
+												 ALLOCSET_DEFAULT_INITSIZE,
+												 ALLOCSET_DEFAULT_MAXSIZE);
+
+	/*
+	 * Now that we have a resource owner, we can attach to the dynamic shared
+	 * memory segment and read the table of contents.
+	 */
+	seg = dsm_attach(DatumGetUInt32(main_arg));
+	if (seg == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("unable to map dynamic shared memory segment")));
+	toc = shm_toc_attach(PARALLEL_MAGIC, dsm_segment_address(seg));
+	if (toc == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+			   errmsg("bad magic number in dynamic shared memory segment")));
+
+	/* Determine and set our worker number. */
+	fps = shm_toc_lookup(toc, PARALLEL_KEY_FIXED);
+	Assert(fps != NULL);
+	Assert(ParallelWorkerNumber == -1);
+	SpinLockAcquire(&fps->mutex);
+	if (fps->workers_attached < fps->workers_expected)
+		ParallelWorkerNumber = fps->workers_attached++;
+	SpinLockRelease(&fps->mutex);
+	if (ParallelWorkerNumber < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("too many parallel workers already attached")));
+	MyFixedParallelState = fps;
+
+	/*
+	 * Now that we have a worker number, we can find and attach to the error
+	 * queue provided for us.  That's good, because until we do that, any
+	 * errors that happen here will not be reported back to the process that
+	 * requested that this worker be launched.
+	 */
+	error_queue_space = shm_toc_lookup(toc, PARALLEL_KEY_ERROR_QUEUE);
+	mq = (shm_mq *) (error_queue_space +
+					 ParallelWorkerNumber * PARALLEL_ERROR_QUEUE_SIZE);
+	shm_mq_set_sender(mq, MyProc);
+	mqh = shm_mq_attach(mq, seg, NULL);
+	pq_redirect_to_shm_mq(mq, mqh);
+	pq_set_parallel_master(fps->parallel_master_pid,
+						   fps->parallel_master_backend_id);
+
+	/*
+	 * Send a BackendKeyData message to the process that initiated parallelism
+	 * so that it has access to our PID before it receives any other messages
+	 * from us.  Our cancel key is sent, too, since that's the way the
+	 * protocol message is defined, but it won't actually be used for anything
+	 * in this case.
+	 */
+	pq_beginmessage(&msgbuf, 'K');
+	pq_sendint(&msgbuf, (int32) MyProcPid, sizeof(int32));
+	pq_sendint(&msgbuf, (int32) MyCancelKey, sizeof(int32));
+	pq_endmessage(&msgbuf);
+
+	/*
+	 * Hooray! Primary initialization is complete.  Now, we need to set up our
+	 * backend-local state to match the original backend.
+	 */
+
+	/*
+	 * Load libraries that were loaded by original backend.  We want to do
+	 * this before restoring GUCs, because the libraries might define custom
+	 * variables.
+	 */
+	libraryspace = shm_toc_lookup(toc, PARALLEL_KEY_LIBRARY);
+	Assert(libraryspace != NULL);
+	RestoreLibraryState(libraryspace);
+
+	/* Restore database connection. */
+	BackgroundWorkerInitializeConnectionByOid(fps->database_id,
+											  fps->authenticated_user_id);
+
+	/* Restore GUC values from launching backend. */
+	gucspace = shm_toc_lookup(toc, PARALLEL_KEY_GUC);
+	Assert(gucspace != NULL);
+	StartTransactionCommand();
+	RestoreGUCState(gucspace);
+	CommitTransactionCommand();
+
+	/* Crank up a transaction state appropriate to a parallel worker. */
+	tstatespace = shm_toc_lookup(toc, PARALLEL_KEY_TRANSACTION_STATE);
+	StartParallelWorkerTransaction(tstatespace);
+
+	/* Restore combo CID state. */
+	combocidspace = shm_toc_lookup(toc, PARALLEL_KEY_COMBO_CID);
+	Assert(combocidspace != NULL);
+	RestoreComboCIDState(combocidspace);
+
+	/* Restore transaction snapshot. */
+	tsnapspace = shm_toc_lookup(toc, PARALLEL_KEY_TRANSACTION_SNAPSHOT);
+	Assert(tsnapspace != NULL);
+	RestoreTransactionSnapshot(RestoreSnapshot(tsnapspace),
+							   fps->parallel_master_pgproc);
+
+	/* Restore active snapshot. */
+	asnapspace = shm_toc_lookup(toc, PARALLEL_KEY_ACTIVE_SNAPSHOT);
+	Assert(asnapspace != NULL);
+	PushActiveSnapshot(RestoreSnapshot(asnapspace));
+
+	/* Restore user ID and security context. */
+	SetUserIdAndSecContext(fps->current_user_id, fps->sec_context);
+
+	/*
+	 * We've initialized all of our state now; nothing should change
+	 * hereafter.
+	 */
+	EnterParallelMode();
+
+	/*
+	 * Time to do the real work: invoke the caller-supplied code.
+	 *
+	 * If you get a crash at this line, see the comments for
+	 * ParallelExtensionTrampoline.
+	 */
+	fps->entrypoint(seg, toc);
+
+	/* Must exit parallel mode to pop active snapshot. */
+	ExitParallelMode();
+
+	/* Must pop active snapshot so resowner.c doesn't complain. */
+	PopActiveSnapshot();
+
+	/* Shut down the parallel-worker transaction. */
+	EndParallelWorkerTransaction();
+
+	/* Report success. */
+	pq_putmessage('X', NULL, 0);
+}
+
+/*
+ * It's unsafe for the entrypoint invoked by ParallelWorkerMain to be a
+ * function living in a dynamically loaded module, because the module might
+ * not be loaded in every process, or might be loaded but not at the same
+ * address.  To work around that problem, CreateParallelContextForExtension()
+ * arranges to call this function rather than calling the extension-provided
+ * function directly; and this function then looks up the real entrypoint and
+ * calls it.
+ */
+static void
+ParallelExtensionTrampoline(dsm_segment *seg, shm_toc *toc)
+{
+	char	   *extensionstate;
+	char	   *library_name;
+	char	   *function_name;
+	parallel_worker_main_type entrypt;
+
+	extensionstate = shm_toc_lookup(toc, PARALLEL_KEY_EXTENSION_TRAMPOLINE);
+	Assert(extensionstate != NULL);
+	library_name = extensionstate;
+	function_name = extensionstate + strlen(library_name) + 1;
+
+	entrypt = (parallel_worker_main_type)
+		load_external_function(library_name, function_name, true, NULL);
+	entrypt(seg, toc);
+}
+
+/*
+ * Give the user a hint that this is a message propagated from a parallel
+ * worker.  Otherwise, it can sometimes be confusing to understand what
+ * actually happened.
+ */
+static void
+ParallelErrorContext(void *arg)
+{
+	errcontext("parallel worker, pid %d", *(int32 *) arg);
+}
+
+/*
+ * Update shared memory with the ending location of the last WAL record we
+ * wrote, if it's greater than the value already stored there.
+ */
+void
+ParallelWorkerReportLastRecEnd(XLogRecPtr last_xlog_end)
+{
+	FixedParallelState *fps = MyFixedParallelState;
+
+	Assert(fps != NULL);
+	SpinLockAcquire(&fps->mutex);
+	if (fps->last_xlog_end < last_xlog_end)
+		fps->last_xlog_end = last_xlog_end;
+	SpinLockRelease(&fps->mutex);
+}
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
index af6d84041c..f24dfc7d1f 100644
--- a/src/backend/access/transam/rmgr.c
+++ b/src/backend/access/transam/rmgr.c
@@ -26,6 +26,7 @@
 #ifdef PGXC
 #include "pgxc/barrier.h"
 #endif
+#include "replication/origin.h"
 #include "storage/standby.h"
 #include "utils/relmapper.h"
 
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index cf98fe6b10..74a0e5e9d2 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -125,7 +125,7 @@ typedef struct GlobalTransactionData
 	TimestampTz prepared_at;	/* time of preparation */
 	XLogRecPtr	prepare_lsn;	/* XLOG offset of prepare record */
 	Oid			owner;			/* ID of user that executed the xact */
-	BackendId	locking_backend; /* backend currently working on the xact */
+	BackendId	locking_backend;	/* backend currently working on the xact */
 	bool		valid;			/* TRUE if PGPROC entry is in proc array */
 	char		gid[GIDSIZE];	/* The GID assigned to the prepared xact */
 }	GlobalTransactionData;
@@ -264,24 +264,24 @@ AtAbort_Twophase(void)
 		return;
 
 	/*
-	 * What to do with the locked global transaction entry?  If we were in
-	 * the process of preparing the transaction, but haven't written the WAL
+	 * What to do with the locked global transaction entry?  If we were in the
+	 * process of preparing the transaction, but haven't written the WAL
 	 * record and state file yet, the transaction must not be considered as
 	 * prepared.  Likewise, if we are in the process of finishing an
-	 * already-prepared transaction, and fail after having already written
-	 * the 2nd phase commit or rollback record to the WAL, the transaction
-	 * should not be considered as prepared anymore.  In those cases, just
-	 * remove the entry from shared memory.
+	 * already-prepared transaction, and fail after having already written the
+	 * 2nd phase commit or rollback record to the WAL, the transaction should
+	 * not be considered as prepared anymore.  In those cases, just remove the
+	 * entry from shared memory.
 	 *
-	 * Otherwise, the entry must be left in place so that the transaction
-	 * can be finished later, so just unlock it.
+	 * Otherwise, the entry must be left in place so that the transaction can
+	 * be finished later, so just unlock it.
 	 *
 	 * If we abort during prepare, after having written the WAL record, we
-	 * might not have transfered all locks and other state to the prepared
+	 * might not have transferred all locks and other state to the prepared
 	 * transaction yet.  Likewise, if we abort during commit or rollback,
-	 * after having written the WAL record, we might not have released
-	 * all the resources held by the transaction yet.  In those cases, the
-	 * in-memory state can be wrong, but it's too late to back out.
+	 * after having written the WAL record, we might not have released all the
+	 * resources held by the transaction yet.  In those cases, the in-memory
+	 * state can be wrong, but it's too late to back out.
 	 */
 	if (!MyLockedGxact->valid)
 	{
@@ -299,7 +299,7 @@ AtAbort_Twophase(void)
 }
 
 /*
- * This is called after we have finished transfering state to the prepared
+ * This is called after we have finished transferring state to the prepared
  * PGXACT entry.
  */
 void
@@ -416,8 +416,8 @@ MarkAsPreparing(TransactionId xid, const char *gid,
 	TwoPhaseState->prepXacts[TwoPhaseState->numPrepXacts++] = gxact;
 
 	/*
-	 * Remember that we have this GlobalTransaction entry locked for us.
-	 * If we abort after this, we must release it.
+	 * Remember that we have this GlobalTransaction entry locked for us. If we
+	 * abort after this, we must release it.
 	 */
 	MyLockedGxact = gxact;
 
@@ -507,8 +507,8 @@ LockGXact(const char *gid, Oid user)
 		if (gxact->locking_backend != InvalidBackendId)
 			ereport(ERROR,
 					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-					 errmsg("prepared transaction with identifier \"%s\" is busy",
-							gid)));
+				errmsg("prepared transaction with identifier \"%s\" is busy",
+					   gid)));
 
 		if (user != gxact->owner && !superuser_arg(user))
 			ereport(ERROR,
@@ -1457,8 +1457,8 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 
 	/*
 	 * In case we fail while running the callbacks, mark the gxact invalid so
-	 * no one else will try to commit/rollback, and so it will be recycled
-	 * if we fail after this point.  It is still locked by our backend so it
+	 * no one else will try to commit/rollback, and so it will be recycled if
+	 * we fail after this point.  It is still locked by our backend so it
 	 * won't go away yet.
 	 *
 	 * (We assume it's safe to do this without taking TwoPhaseStateLock.)
@@ -2088,6 +2088,13 @@ RecoverPreparedTransactions(void)
 			if (InHotStandby)
 				StandbyReleaseLockTree(xid, hdr->nsubxacts, subxids);
 
+			/*
+			 * We're done with recovering this transaction. Clear
+			 * MyLockedGxact, like we do in PrepareTransaction() during normal
+			 * operation.
+			 */
+			PostPrepare_Twophase();
+
 			pfree(buf);
 		}
 	}
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 8eaa663b88..21c3dadc47 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -133,6 +133,13 @@ GetNewTransactionId(bool isSubXact)
 #endif
 #endif /* PGXC */
 	/*
+	 * Workers synchronize transaction state at the beginning of each parallel
+	 * operation, so we can't account for new XIDs after that point.
+	 */
+	if (IsInParallelMode())
+		elog(ERROR, "cannot assign TransactionIds during a parallel operation");
+
+	/*
 	 * During bootstrap initialization, we return the special bootstrap
 	 * transaction id.
 	 */
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 967a777aba..a75c525a4b 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -42,6 +42,7 @@
 #endif
 #include "access/commit_ts.h"
 #include "access/multixact.h"
+#include "access/parallel.h"
 #include "access/subtrans.h"
 #include "access/transam.h"
 #include "access/twophase.h"
@@ -61,8 +62,10 @@
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "replication/logical.h"
 #include "replication/walsender.h"
 #include "replication/syncrep.h"
+#include "replication/origin.h"
 #include "storage/fd.h"
 #include "storage/lmgr.h"
 #include "storage/predicate.h"
@@ -70,6 +73,7 @@
 #include "storage/procarray.h"
 #include "storage/sinvaladt.h"
 #include "storage/smgr.h"
+#include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/combocid.h"
 #include "utils/guc.h"
@@ -102,6 +106,33 @@ bool		XactDeferrable;
 int			synchronous_commit = SYNCHRONOUS_COMMIT_ON;
 
 /*
+ * When running as a parallel worker, we place only a single
+ * TransactionStateData on the parallel worker's state stack, and the XID
+ * reflected there will be that of the *innermost* currently-active
+ * subtransaction in the backend that initiated paralllelism.  However,
+ * GetTopTransactionId() and TransactionIdIsCurrentTransactionId()
+ * need to return the same answers in the parallel worker as they would have
+ * in the user backend, so we need some additional bookkeeping.
+ *
+ * XactTopTransactionId stores the XID of our toplevel transaction, which
+ * will be the same as TopTransactionState.transactionId in an ordinary
+ * backend; but in a parallel backend, which does not have the entire
+ * transaction state, it will instead be copied from the backend that started
+ * the parallel operation.
+ *
+ * nParallelCurrentXids will be 0 and ParallelCurrentXids NULL in an ordinary
+ * backend, but in a parallel backend, nParallelCurrentXids will contain the
+ * number of XIDs that need to be considered current, and ParallelCurrentXids
+ * will contain the XIDs themselves.  This includes all XIDs that were current
+ * or sub-committed in the parent at the time the parallel operation began.
+ * The XIDs are stored sorted in numerical order (not logical order) to make
+ * lookups as fast as possible.
+ */
+TransactionId XactTopTransactionId = InvalidTransactionId;
+int			nParallelCurrentXids = 0;
+TransactionId *ParallelCurrentXids;
+
+/*
  * MyXactAccessedTempRel is set when a temporary relation is accessed.
  * We don't allow PREPARE TRANSACTION in that case.  (This is global
  * so that it can be set from heapam.c.)
@@ -137,6 +168,7 @@ typedef enum TBlockState
 	/* transaction block states */
 	TBLOCK_BEGIN,				/* starting transaction block */
 	TBLOCK_INPROGRESS,			/* live transaction */
+	TBLOCK_PARALLEL_INPROGRESS, /* live transaction inside parallel worker */
 	TBLOCK_END,					/* COMMIT received */
 	TBLOCK_ABORT,				/* failed xact, awaiting ROLLBACK */
 	TBLOCK_ABORT_END,			/* failed xact, ROLLBACK received */
@@ -189,6 +221,7 @@ typedef struct TransactionStateData
 	bool		prevXactReadOnly;		/* entry-time xact r/o state */
 	bool		startedInRecovery;		/* did we start in recovery? */
 	bool		didLogXid;		/* has xid been included in WAL record? */
+	int			parallelModeLevel;		/* Enter/ExitParallelMode counter */
 	struct TransactionStateData *parent;		/* back link to parent */
 } TransactionStateData;
 
@@ -228,12 +261,13 @@ static TransactionStateData TopTransactionStateData = {
 	false,						/* entry-time xact r/o state */
 	false,						/* startedInRecovery */
 	false,						/* didLogXid */
+	0,							/* parallelMode */
 	NULL						/* link to parent state block */
 };
 
 /*
  * unreportedXids holds XIDs of all subtransactions that have not yet been
- * reported in a XLOG_XACT_ASSIGNMENT record.
+ * reported in an XLOG_XACT_ASSIGNMENT record.
  */
 static int	nUnreportedXids;
 static TransactionId unreportedXids[PGPROC_MAX_CACHED_SUBXIDS];
@@ -453,9 +487,9 @@ IsAbortedTransactionBlockState(void)
 TransactionId
 GetTopTransactionId(void)
 {
-	if (!TransactionIdIsValid(TopTransactionStateData.transactionId))
+	if (!TransactionIdIsValid(XactTopTransactionId))
 		AssignTransactionId(&TopTransactionStateData);
-	return TopTransactionStateData.transactionId;
+	return XactTopTransactionId;
 }
 
 /*
@@ -468,7 +502,7 @@ GetTopTransactionId(void)
 TransactionId
 GetTopTransactionIdIfAny(void)
 {
-	return TopTransactionStateData.transactionId;
+	return XactTopTransactionId;
 }
 
 /*
@@ -598,6 +632,13 @@ AssignTransactionId(TransactionState s)
 	Assert(s->state == TRANS_INPROGRESS);
 
 	/*
+	 * Workers synchronize transaction state at the beginning of each parallel
+	 * operation, so we can't account for new XIDs at this point.
+	 */
+	if (IsInParallelMode())
+		elog(ERROR, "cannot assign XIDs during a parallel operation");
+
+	/*
 	 * Ensure parent(s) have XIDs, so that a child always has an XID later
 	 * than its parent.  Musn't recurse here, or we might get a stack overflow
 	 * if we're at the bottom of a huge stack of subtransactions none of which
@@ -629,7 +670,7 @@ AssignTransactionId(TransactionState s)
 	/*
 	 * When wal_level=logical, guarantee that a subtransaction's xid can only
 	 * be seen in the WAL stream if its toplevel xid has been logged before.
-	 * If necessary we log a xact_assignment record with fewer than
+	 * If necessary we log an xact_assignment record with fewer than
 	 * PGPROC_MAX_CACHED_SUBXIDS. Note that it is fine if didLogXid isn't set
 	 * for a transaction even though it appears in a WAL record, we just might
 	 * superfluously log something. That can happen when an xid is included
@@ -663,6 +704,8 @@ AssignTransactionId(TransactionState s)
 #else
 	s->transactionId = GetNewTransactionId(isSubXact);
 #endif /* PGXC */
+	if (!isSubXact)
+		XactTopTransactionId = s->transactionId;
 
 	if (isSubXact)
 		SubTransSetParent(s->transactionId, s->parent->transactionId, false);
@@ -854,7 +897,16 @@ GetCurrentCommandId(bool used)
 
 	/* this is global to a transaction, not subtransaction-local */
 	if (used)
+	{
+		/*
+		 * Forbid setting currentCommandIdUsed in parallel mode, because we
+		 * have no provision for communicating this back to the master.  We
+		 * could relax this restriction when currentCommandIdUsed was already
+		 * true at the start of the parallel operation.
+		 */
+		Assert(CurrentTransactionState->parallelModeLevel == 0);
 		currentCommandIdUsed = true;
+	}
 	return currentCommandId;
 }
 
@@ -1014,6 +1066,36 @@ TransactionIdIsCurrentTransactionId(TransactionId xid)
 #endif
 
 	/*
+	 * In parallel workers, the XIDs we must consider as current are stored in
+	 * ParallelCurrentXids rather than the transaction-state stack.  Note that
+	 * the XIDs in this array are sorted numerically rather than according to
+	 * transactionIdPrecedes order.
+	 */
+	if (nParallelCurrentXids > 0)
+	{
+		int			low,
+					high;
+
+		low = 0;
+		high = nParallelCurrentXids - 1;
+		while (low <= high)
+		{
+			int			middle;
+			TransactionId probe;
+
+			middle = low + (high - low) / 2;
+			probe = ParallelCurrentXids[middle];
+			if (probe == xid)
+				return true;
+			else if (probe < xid)
+				low = middle + 1;
+			else
+				high = middle - 1;
+		}
+		return false;
+	}
+
+	/*
 	 * We will return true for the Xid of the current subtransaction, any of
 	 * its subcommitted children, any of its parents, or any of their
 	 * previously subcommitted children.  However, a transaction being aborted
@@ -1067,6 +1149,48 @@ TransactionStartedDuringRecovery(void)
 }
 
 /*
+ *	EnterParallelMode
+ */
+void
+EnterParallelMode(void)
+{
+	TransactionState s = CurrentTransactionState;
+
+	Assert(s->parallelModeLevel >= 0);
+
+	++s->parallelModeLevel;
+}
+
+/*
+ *	ExitParallelMode
+ */
+void
+ExitParallelMode(void)
+{
+	TransactionState s = CurrentTransactionState;
+
+	Assert(s->parallelModeLevel > 0);
+	Assert(s->parallelModeLevel > 1 || !ParallelContextActive());
+
+	--s->parallelModeLevel;
+}
+
+/*
+ *	IsInParallelMode
+ *
+ * Are we in a parallel operation, as either the master or a worker?  Check
+ * this to prohibit operations that change backend-local state expected to
+ * match across all workers.  Mere caches usually don't require such a
+ * restriction.  State modified in a strict push/pop fashion, such as the
+ * active snapshot stack, is often fine.
+ */
+bool
+IsInParallelMode(void)
+{
+	return CurrentTransactionState->parallelModeLevel != 0;
+}
+
+/*
  *	CommandCounterIncrement
  */
 void
@@ -1080,6 +1204,14 @@ CommandCounterIncrement(void)
 	 */
 	if (currentCommandIdUsed)
 	{
+		/*
+		 * Workers synchronize transaction state at the beginning of each
+		 * parallel operation, so we can't account for new commands after that
+		 * point.
+		 */
+		if (IsInParallelMode())
+			elog(ERROR, "cannot start commands during a parallel operation");
+
 		currentCommandId += 1;
 		if (currentCommandId == InvalidCommandId)
 		{
@@ -1365,30 +1497,36 @@ RecordTransactionCommit(void)
 							nchildren, children, nrels, rels,
 							nmsgs, invalMessages,
 							RelcacheInitFileInval, forceSyncCommit,
-							InvalidTransactionId /* plain commit */);
-	}
+							InvalidTransactionId /* plain commit */ );
 
-	/*
-	 * We only need to log the commit timestamp separately if the node
-	 * identifier is a valid value; the commit record above already contains
-	 * the timestamp info otherwise, and will be used to load it.
-	 */
-	if (markXidCommitted)
-	{
-		CommitTsNodeId		node_id;
+		/*
+		 * Record plain commit ts if not replaying remote actions, or if no
+		 * timestamp is configured.
+		 */
+		if (replorigin_sesssion_origin == InvalidRepOriginId ||
+			replorigin_sesssion_origin == DoNotReplicateId ||
+			replorigin_sesssion_origin_timestamp == 0)
+			replorigin_sesssion_origin_timestamp = xactStopTimestamp;
+		else
+			replorigin_session_advance(replorigin_sesssion_origin_lsn,
+									   XactLastRecEnd);
 
-		node_id = CommitTsGetDefaultNodeId();
+		/*
+		 * We don't need to WAL log origin or timestamp here, the commit
+		 * record contains all the necessary information and will redo the SET
+		 * action during replay.
+		 */
 		TransactionTreeSetCommitTsData(xid, nchildren, children,
-									   xactStopTimestamp,
-									   node_id, node_id != InvalidCommitTsNodeId);
+									   replorigin_sesssion_origin_timestamp,
+									   replorigin_sesssion_origin, false);
 	}
 
 	/*
 	 * Check if we want to commit asynchronously.  We can allow the XLOG flush
 	 * to happen asynchronously if synchronous_commit=off, or if the current
 	 * transaction has not performed any WAL-logged operation or didn't assign
-	 * a xid.  The transaction can end up not writing any WAL, even if it has
-	 * a xid, if it only wrote to temporary and/or unlogged tables.  It can
+	 * an xid.  The transaction can end up not writing any WAL, even if it has
+	 * an xid, if it only wrote to temporary and/or unlogged tables.  It can
 	 * end up having written WAL without an xid if it did HOT pruning.  In
 	 * case of a crash, the loss of such a transaction will be irrelevant;
 	 * temp tables will be lost anyway, unlogged tables will be truncated and
@@ -1460,7 +1598,7 @@ RecordTransactionCommit(void)
 	/*
 	 * Wait for synchronous replication, if required. Similar to the decision
 	 * above about using committing asynchronously we only want to wait if
-	 * this backend assigned a xid and wrote WAL.  No need to wait if a xid
+	 * this backend assigned an xid and wrote WAL.  No need to wait if an xid
 	 * was assigned due to temporary/unlogged tables or due to HOT pruning.
 	 *
 	 * Note that at this stage we have marked clog, but still show as running
@@ -1469,9 +1607,11 @@ RecordTransactionCommit(void)
 	if (wrote_xlog && markXidCommitted)
 		SyncRepWaitForLSN(XactLastRecEnd);
 
+	/* remember end of last commit record */
+	XactLastCommitEnd = XactLastRecEnd;
+
 	/* Reset XactLastRecEnd until the next transaction writes something */
 	XactLastRecEnd = 0;
-
 cleanup:
 	/* Clean up local data */
 	if (rels)
@@ -1673,7 +1813,7 @@ RecordTransactionAbort(bool isSubXact)
 	RelFileNode *rels;
 	int			nchildren;
 	TransactionId *children;
-	TimestampTz	xact_time;
+	TimestampTz xact_time;
 
 	/*
 	 * If we haven't been assigned an XID, nobody will care whether we aborted
@@ -1952,6 +2092,8 @@ StartTransaction(void)
 	s = &TopTransactionStateData;
 	CurrentTransactionState = s;
 
+	Assert(XactTopTransactionId == InvalidTransactionId);
+
 	/*
 	 * check the current transaction state
 	 */
@@ -2114,6 +2256,9 @@ CommitTransaction(void)
 {
 	TransactionState s = CurrentTransactionState;
 	TransactionId latestXid;
+	bool		is_parallel_worker;
+
+	is_parallel_worker = (s->blockState == TBLOCK_PARALLEL_INPROGRESS);
 
 	ShowTransactionState("CommitTransaction");
 
@@ -2258,7 +2403,8 @@ CommitTransaction(void)
 			break;
 	}
 
-	CallXactCallbacks(XACT_EVENT_PRE_COMMIT);
+	CallXactCallbacks(is_parallel_worker ? XACT_EVENT_PARALLEL_PRE_COMMIT
+					  : XACT_EVENT_PRE_COMMIT);
 
 	/*
 	 * The remaining actions cannot call any user-defined code, so it's safe
@@ -2267,6 +2413,13 @@ CommitTransaction(void)
 	 * the transaction-abort path.
 	 */
 
+	/* If we might have parallel workers, clean them up now. */
+	if (IsInParallelMode())
+	{
+		AtEOXact_Parallel(true);
+		s->parallelModeLevel = 0;
+	}
+
 	/* Shut down the deferred-trigger manager */
 	AfterTriggerEndXact(true);
 
@@ -2357,10 +2510,28 @@ CommitTransaction(void)
 	 */
 	s->state = TRANS_COMMIT;
 
-	/*
-	 * Here is where we really truly commit.
-	 */
-	latestXid = RecordTransactionCommit();
+	if (!is_parallel_worker)
+	{
+		/*
+		 * We need to mark our XIDs as committed in pg_clog.  This is where we
+		 * durably commit.
+		 */
+		latestXid = RecordTransactionCommit();
+	}
+	else
+	{
+		/*
+		 * We must not mark our XID committed; the parallel master is
+		 * responsible for that.
+		 */
+		latestXid = InvalidTransactionId;
+
+		/*
+		 * Make sure the master will know about any WAL we wrote before it
+		 * commits.
+		 */
+		ParallelWorkerReportLastRecEnd(XactLastRecEnd);
+	}
 
 	TRACE_POSTGRESQL_TRANSACTION_COMMIT(MyProc->lxid);
 
@@ -2387,7 +2558,8 @@ CommitTransaction(void)
 	 * state.
 	 */
 
-	CallXactCallbacks(XACT_EVENT_COMMIT);
+	CallXactCallbacks(is_parallel_worker ? XACT_EVENT_PARALLEL_COMMIT
+					  : XACT_EVENT_COMMIT);
 
 #ifdef PGXC
 	/*
@@ -2454,7 +2626,7 @@ CommitTransaction(void)
 	AtEOXact_GUC(true, 1);
 	AtEOXact_SPI(true);
 	AtEOXact_on_commit_actions(true);
-	AtEOXact_Namespace(true);
+	AtEOXact_Namespace(true, is_parallel_worker);
 	AtEOXact_SMgr();
 	AtEOXact_Files();
 	AtEOXact_ComboCid();
@@ -2500,6 +2672,8 @@ CommitTransaction(void)
 	else
 		SetSendCommandId(false);
 #endif
+	XactTopTransactionId = InvalidTransactionId;
+	nParallelCurrentXids = 0;
 
 	/*
 	 * done with commit processing, set current transaction state back to
@@ -2628,6 +2802,8 @@ PrepareTransaction(void)
 #endif
 #endif
 
+	Assert(!IsInParallelMode());
+
 	ShowTransactionState("PrepareTransaction");
 
 	/*
@@ -2843,8 +3019,8 @@ PrepareTransaction(void)
 
 	/*
 	 * In normal commit-processing, this is all non-critical post-transaction
-	 * cleanup.  When the transaction is prepared, however, it's important that
-	 * the locks and other per-backend resources are transfered to the
+	 * cleanup.  When the transaction is prepared, however, it's important
+	 * that the locks and other per-backend resources are transferred to the
 	 * prepared transaction's PGPROC entry.  Note that if an error is raised
 	 * here, it's too late to abort the transaction. XXX: This probably should
 	 * be in a critical section, to force a PANIC if any of this fails, but
@@ -2885,9 +3061,8 @@ PrepareTransaction(void)
 
 	/*
 	 * Allow another backend to finish the transaction.  After
-	 * PostPrepare_Twophase(), the transaction is completely detached from
-	 * our backend.  The rest is just non-critical cleanup of backend-local
-	 * state.
+	 * PostPrepare_Twophase(), the transaction is completely detached from our
+	 * backend.  The rest is just non-critical cleanup of backend-local state.
 	 */
 	PostPrepare_Twophase();
 
@@ -2898,7 +3073,7 @@ PrepareTransaction(void)
 	AtEOXact_GUC(true, 1);
 	AtEOXact_SPI(true);
 	AtEOXact_on_commit_actions(true);
-	AtEOXact_Namespace(true);
+	AtEOXact_Namespace(true, false);
 	AtEOXact_SMgr();
 	AtEOXact_Files();
 	AtEOXact_ComboCid();
@@ -2930,6 +3105,9 @@ PrepareTransaction(void)
 	s->nChildXids = 0;
 	s->maxChildXids = 0;
 
+	XactTopTransactionId = InvalidTransactionId;
+	nParallelCurrentXids = 0;
+
 	/*
 	 * done with 1st phase commit processing, set current transaction state
 	 * back to default
@@ -2984,6 +3162,7 @@ AbortTransaction(void)
 {
 	TransactionState s = CurrentTransactionState;
 	TransactionId latestXid;
+	bool		is_parallel_worker;
 
 #ifdef PGXC
 	/*
@@ -3075,6 +3254,7 @@ AbortTransaction(void)
 	/*
 	 * check the current transaction state
 	 */
+	is_parallel_worker = (s->blockState == TBLOCK_PARALLEL_INPROGRESS);
 	if (s->state != TRANS_INPROGRESS && s->state != TRANS_PREPARE)
 		elog(WARNING, "AbortTransaction while in %s state",
 			 TransStateAsString(s->state));
@@ -3098,6 +3278,13 @@ AbortTransaction(void)
 	 */
 	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
 
+	/* If in parallel mode, clean up workers and exit parallel mode. */
+	if (IsInParallelMode())
+	{
+		AtEOXact_Parallel(false);
+		s->parallelModeLevel = 0;
+	}
+
 	/*
 	 * do abort processing
 	 */
@@ -3110,9 +3297,23 @@ AbortTransaction(void)
 
 	/*
 	 * Advertise the fact that we aborted in pg_clog (assuming that we got as
-	 * far as assigning an XID to advertise).
+	 * far as assigning an XID to advertise).  But if we're inside a parallel
+	 * worker, skip this; the user backend must be the one to write the abort
+	 * record.
 	 */
-	latestXid = RecordTransactionAbort(false);
+	if (!is_parallel_worker)
+		latestXid = RecordTransactionAbort(false);
+	else
+	{
+		latestXid = InvalidTransactionId;
+
+		/*
+		 * Since the parallel master won't get our value of XactLastRecEnd in
+		 * this case, we nudge WAL-writer ourselves in this case.  See related
+		 * comments in RecordTransactionAbort for why this matters.
+		 */
+		XLogSetAsyncXactLSN(XactLastRecEnd);
+	}
 
 	TRACE_POSTGRESQL_TRANSACTION_ABORT(MyProc->lxid);
 
@@ -3130,7 +3331,10 @@ AbortTransaction(void)
 	 */
 	if (TopTransactionResourceOwner != NULL)
 	{
-		CallXactCallbacks(XACT_EVENT_ABORT);
+		if (is_parallel_worker)
+			CallXactCallbacks(XACT_EVENT_PARALLEL_ABORT);
+		else
+			CallXactCallbacks(XACT_EVENT_ABORT);
 
 		ResourceOwnerRelease(TopTransactionResourceOwner,
 							 RESOURCE_RELEASE_BEFORE_LOCKS,
@@ -3151,7 +3355,7 @@ AbortTransaction(void)
 		AtEOXact_GUC(false, 1);
 		AtEOXact_SPI(false);
 		AtEOXact_on_commit_actions(false);
-		AtEOXact_Namespace(false);
+		AtEOXact_Namespace(false, is_parallel_worker);
 		AtEOXact_SMgr();
 		AtEOXact_Files();
 		AtEOXact_ComboCid();
@@ -3212,6 +3416,10 @@ CleanupTransaction(void)
 	s->childXids = NULL;
 	s->nChildXids = 0;
 	s->maxChildXids = 0;
+	s->parallelModeLevel = 0;
+
+	XactTopTransactionId = InvalidTransactionId;
+	nParallelCurrentXids = 0;
 
 	/*
 	 * done with abort processing, set current transaction state back to
@@ -3277,6 +3485,7 @@ StartTransactionCommand(void)
 			/* These cases are invalid. */
 		case TBLOCK_STARTED:
 		case TBLOCK_BEGIN:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_END:
 		case TBLOCK_SUBRELEASE:
@@ -3312,11 +3521,13 @@ CommitTransactionCommand(void)
 	switch (s->blockState)
 	{
 			/*
-			 * This shouldn't happen, because it means the previous
+			 * These shouldn't happen.  TBLOCK_DEFAULT means the previous
 			 * StartTransactionCommand didn't set the STARTED state
-			 * appropriately.
+			 * appropriately, while TBLOCK_PARALLEL_INPROGRESS should be ended
+			 * by EndParallelWorkerTranaction(), not this function.
 			 */
 		case TBLOCK_DEFAULT:
+		case TBLOCK_PARALLEL_INPROGRESS:
 			elog(FATAL, "CommitTransactionCommand: unexpected state %s",
 				 BlockStateAsString(s->blockState));
 			break;
@@ -3362,7 +3573,7 @@ CommitTransactionCommand(void)
 			/*
 			 * Here we are in the middle of a transaction block but one of the
 			 * commands caused an abort so we do nothing but remain in the
-			 * abort state.  Eventually we will get a ROLLBACK comand.
+			 * abort state.  Eventually we will get a ROLLBACK command.
 			 */
 		case TBLOCK_ABORT:
 		case TBLOCK_SUBABORT:
@@ -3598,6 +3809,7 @@ AbortCurrentTransaction(void)
 			 * ABORT state.  We will stay in ABORT until we get a ROLLBACK.
 			 */
 		case TBLOCK_INPROGRESS:
+		case TBLOCK_PARALLEL_INPROGRESS:
 			AbortTransaction();
 			s->blockState = TBLOCK_ABORT;
 			/* CleanupTransaction happens when we exit TBLOCK_ABORT_END */
@@ -4041,6 +4253,7 @@ BeginTransactionBlock(void)
 			 * Already a transaction block in progress.
 			 */
 		case TBLOCK_INPROGRESS:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBINPROGRESS:
 		case TBLOCK_ABORT:
 		case TBLOCK_SUBABORT:
@@ -4234,6 +4447,16 @@ EndTransactionBlock(void)
 			result = true;
 			break;
 
+			/*
+			 * The user issued a COMMIT that somehow ran inside a parallel
+			 * worker.  We can't cope with that.
+			 */
+		case TBLOCK_PARALLEL_INPROGRESS:
+			ereport(FATAL,
+					(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+					 errmsg("cannot commit during a parallel operation")));
+			break;
+
 			/* These cases are invalid. */
 		case TBLOCK_DEFAULT:
 		case TBLOCK_BEGIN:
@@ -4332,6 +4555,16 @@ UserAbortTransactionBlock(void)
 			s->blockState = TBLOCK_ABORT_PENDING;
 			break;
 
+			/*
+			 * The user issued an ABORT that somehow ran inside a parallel
+			 * worker.  We can't cope with that.
+			 */
+		case TBLOCK_PARALLEL_INPROGRESS:
+			ereport(FATAL,
+					(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+					 errmsg("cannot abort during a parallel operation")));
+			break;
+
 			/* These cases are invalid. */
 		case TBLOCK_DEFAULT:
 		case TBLOCK_BEGIN:
@@ -4366,6 +4599,18 @@ DefineSavepoint(char *name)
 {
 	TransactionState s = CurrentTransactionState;
 
+	/*
+	 * Workers synchronize transaction state at the beginning of each parallel
+	 * operation, so we can't account for new subtransactions after that
+	 * point.  (Note that this check will certainly error out if s->blockState
+	 * is TBLOCK_PARALLEL_INPROGRESS, so we can treat that as an invalid case
+	 * below.)
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+			errmsg("cannot define savepoints during a parallel operation")));
+
 	switch (s->blockState)
 	{
 		case TBLOCK_INPROGRESS:
@@ -4386,6 +4631,7 @@ DefineSavepoint(char *name)
 		case TBLOCK_DEFAULT:
 		case TBLOCK_STARTED:
 		case TBLOCK_BEGIN:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_END:
 		case TBLOCK_SUBRELEASE:
@@ -4420,6 +4666,18 @@ ReleaseSavepoint(List *options)
 	ListCell   *cell;
 	char	   *name = NULL;
 
+	/*
+	 * Workers synchronize transaction state at the beginning of each parallel
+	 * operation, so we can't account for transaction state change after that
+	 * point.  (Note that this check will certainly error out if s->blockState
+	 * is TBLOCK_PARALLEL_INPROGRESS, so we can treat that as an invalid case
+	 * below.)
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+		   errmsg("cannot release savepoints during a parallel operation")));
+
 	switch (s->blockState)
 	{
 			/*
@@ -4443,6 +4701,7 @@ ReleaseSavepoint(List *options)
 		case TBLOCK_DEFAULT:
 		case TBLOCK_STARTED:
 		case TBLOCK_BEGIN:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_END:
 		case TBLOCK_SUBRELEASE:
@@ -4520,6 +4779,18 @@ RollbackToSavepoint(List *options)
 	ListCell   *cell;
 	char	   *name = NULL;
 
+	/*
+	 * Workers synchronize transaction state at the beginning of each parallel
+	 * operation, so we can't account for transaction state change after that
+	 * point.  (Note that this check will certainly error out if s->blockState
+	 * is TBLOCK_PARALLEL_INPROGRESS, so we can treat that as an invalid case
+	 * below.)
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+		errmsg("cannot rollback to savepoints during a parallel operation")));
+
 	switch (s->blockState)
 	{
 			/*
@@ -4544,6 +4815,7 @@ RollbackToSavepoint(List *options)
 		case TBLOCK_DEFAULT:
 		case TBLOCK_STARTED:
 		case TBLOCK_BEGIN:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_END:
 		case TBLOCK_SUBRELEASE:
@@ -4633,6 +4905,20 @@ BeginInternalSubTransaction(char *name)
 	TransactionState s = CurrentTransactionState;
 
 	elog(ERROR, "Internal subtransactions not supported in Postgres-XL");
+	/*
+	 * Workers synchronize transaction state at the beginning of each parallel
+	 * operation, so we can't account for new subtransactions after that
+	 * point. We might be able to make an exception for the type of
+	 * subtransaction established by this function, which is typically used in
+	 * contexts where we're going to release or roll back the subtransaction
+	 * before proceeding further, so that no enduring change to the
+	 * transaction state occurs. For now, however, we prohibit this case along
+	 * with all the others.
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+		errmsg("cannot start subtransactions during a parallel operation")));
 
 	switch (s->blockState)
 	{
@@ -4656,6 +4942,7 @@ BeginInternalSubTransaction(char *name)
 			/* These cases are invalid. */
 		case TBLOCK_DEFAULT:
 		case TBLOCK_BEGIN:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_SUBRELEASE:
 		case TBLOCK_SUBCOMMIT:
@@ -4688,6 +4975,18 @@ ReleaseCurrentSubTransaction(void)
 {
 	TransactionState s = CurrentTransactionState;
 
+	/*
+	 * Workers synchronize transaction state at the beginning of each parallel
+	 * operation, so we can't account for commit of subtransactions after that
+	 * point.  This should not happen anyway.  Code calling this would
+	 * typically have called BeginInternalSubTransaction() first, failing
+	 * there.
+	 */
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+		errmsg("cannot commit subtransactions during a parallel operation")));
+
 	if (s->blockState != TBLOCK_SUBINPROGRESS)
 		elog(ERROR, "ReleaseCurrentSubTransaction: unexpected state %s",
 			 BlockStateAsString(s->blockState));
@@ -4710,6 +5009,14 @@ RollbackAndReleaseCurrentSubTransaction(void)
 {
 	TransactionState s = CurrentTransactionState;
 
+	/*
+	 * Unlike ReleaseCurrentSubTransaction(), this is nominally permitted
+	 * during parallel operations.  That's because we may be in the master,
+	 * recovering from an error thrown while we were in parallel mode.  We
+	 * won't reach here in a worker, because BeginInternalSubTransaction()
+	 * will have failed.
+	 */
+
 	switch (s->blockState)
 	{
 			/* Must be in a subtransaction */
@@ -4721,6 +5028,7 @@ RollbackAndReleaseCurrentSubTransaction(void)
 		case TBLOCK_DEFAULT:
 		case TBLOCK_STARTED:
 		case TBLOCK_BEGIN:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_INPROGRESS:
 		case TBLOCK_END:
@@ -4796,6 +5104,7 @@ AbortOutOfAnyTransaction(void)
 			case TBLOCK_STARTED:
 			case TBLOCK_BEGIN:
 			case TBLOCK_INPROGRESS:
+			case TBLOCK_PARALLEL_INPROGRESS:
 			case TBLOCK_END:
 			case TBLOCK_ABORT_PENDING:
 			case TBLOCK_PREPARE:
@@ -4887,6 +5196,7 @@ TransactionBlockStatusCode(void)
 		case TBLOCK_BEGIN:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_INPROGRESS:
+		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBINPROGRESS:
 		case TBLOCK_END:
 		case TBLOCK_SUBRELEASE:
@@ -4990,6 +5300,13 @@ CommitSubTransaction(void)
 	CallSubXactCallbacks(SUBXACT_EVENT_PRE_COMMIT_SUB, s->subTransactionId,
 						 s->parent->subTransactionId);
 
+	/* If in parallel mode, clean up workers and exit parallel mode. */
+	if (IsInParallelMode())
+	{
+		AtEOSubXact_Parallel(true, s->subTransactionId);
+		s->parallelModeLevel = 0;
+	}
+
 	/* Do the actual "commit", such as it is */
 	s->state = TRANS_COMMIT;
 
@@ -5143,6 +5460,13 @@ AbortSubTransaction(void)
 	 */
 	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
 
+	/* Exit from parallel mode, if necessary. */
+	if (IsInParallelMode())
+	{
+		AtEOSubXact_Parallel(false, s->subTransactionId);
+		s->parallelModeLevel = 0;
+	}
+
 	/*
 	 * We can skip all this stuff if the subxact failed before creating a
 	 * ResourceOwner...
@@ -5283,6 +5607,7 @@ PushTransaction(void)
 	s->blockState = TBLOCK_SUBBEGIN;
 	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
 	s->prevXactReadOnly = XactReadOnly;
+	s->parallelModeLevel = 0;
 
 	CurrentTransactionState = s;
 
@@ -5330,6 +5655,140 @@ PopTransaction(void)
 }
 
 /*
+ * EstimateTransactionStateSpace
+ *		Estimate the amount of space that will be needed by
+ *		SerializeTransactionState.  It would be OK to overestimate slightly,
+ *		but it's simple for us to work out the precise value, so we do.
+ */
+Size
+EstimateTransactionStateSpace(void)
+{
+	TransactionState s;
+	Size		nxids = 5;		/* iso level, deferrable, top & current XID,
+								 * XID count */
+
+	for (s = CurrentTransactionState; s != NULL; s = s->parent)
+	{
+		if (TransactionIdIsValid(s->transactionId))
+			nxids = add_size(nxids, 1);
+		nxids = add_size(nxids, s->nChildXids);
+	}
+
+	nxids = add_size(nxids, nParallelCurrentXids);
+	return mul_size(nxids, sizeof(TransactionId));
+}
+
+/*
+ * SerializeTransactionState
+ *		Write out relevant details of our transaction state that will be
+ *		needed by a parallel worker.
+ *
+ * We need to save and restore XactDeferrable, XactIsoLevel, and the XIDs
+ * associated with this transaction.  The first eight bytes of the result
+ * contain XactDeferrable and XactIsoLevel; the next eight bytes contain the
+ * XID of the top-level transaction and the XID of the current transaction
+ * (or, in each case, InvalidTransactionId if none).  After that, the next 4
+ * bytes contain a count of how many additional XIDs follow; this is followed
+ * by all of those XIDs one after another.  We emit the XIDs in sorted order
+ * for the convenience of the receiving process.
+ */
+void
+SerializeTransactionState(Size maxsize, char *start_address)
+{
+	TransactionState s;
+	Size		nxids = 0;
+	Size		i = 0;
+	TransactionId *workspace;
+	TransactionId *result = (TransactionId *) start_address;
+
+	Assert(maxsize >= 5 * sizeof(TransactionId));
+	result[0] = (TransactionId) XactIsoLevel;
+	result[1] = (TransactionId) XactDeferrable;
+	result[2] = XactTopTransactionId;
+	result[3] = CurrentTransactionState->transactionId;
+
+	/*
+	 * If we're running in a parallel worker and launching a parallel worker
+	 * of our own, we can just pass along the information that was passed to
+	 * us.
+	 */
+	if (nParallelCurrentXids > 0)
+	{
+		Assert(maxsize > (nParallelCurrentXids + 4) * sizeof(TransactionId));
+		result[4] = nParallelCurrentXids;
+		memcpy(&result[5], ParallelCurrentXids,
+			   nParallelCurrentXids * sizeof(TransactionId));
+		return;
+	}
+
+	/*
+	 * OK, we need to generate a sorted list of XIDs that our workers should
+	 * view as current.  First, figure out how many there are.
+	 */
+	for (s = CurrentTransactionState; s != NULL; s = s->parent)
+	{
+		if (TransactionIdIsValid(s->transactionId))
+			nxids = add_size(nxids, 1);
+		nxids = add_size(nxids, s->nChildXids);
+	}
+	Assert(nxids * sizeof(TransactionId) < maxsize);
+
+	/* Copy them to our scratch space. */
+	workspace = palloc(nxids * sizeof(TransactionId));
+	for (s = CurrentTransactionState; s != NULL; s = s->parent)
+	{
+		if (TransactionIdIsValid(s->transactionId))
+			workspace[i++] = s->transactionId;
+		memcpy(&workspace[i], s->childXids,
+			   s->nChildXids * sizeof(TransactionId));
+		i += s->nChildXids;
+	}
+	Assert(i == nxids);
+
+	/* Sort them. */
+	qsort(workspace, nxids, sizeof(TransactionId), xidComparator);
+
+	/* Copy data into output area. */
+	result[4] = (TransactionId) nxids;
+	memcpy(&result[5], workspace, nxids * sizeof(TransactionId));
+}
+
+/*
+ * StartParallelWorkerTransaction
+ *		Start a parallel worker transaction, restoring the relevant
+ *		transaction state serialized by SerializeTransactionState.
+ */
+void
+StartParallelWorkerTransaction(char *tstatespace)
+{
+	TransactionId *tstate = (TransactionId *) tstatespace;
+
+	Assert(CurrentTransactionState->blockState == TBLOCK_DEFAULT);
+	StartTransaction();
+
+	XactIsoLevel = (int) tstate[0];
+	XactDeferrable = (bool) tstate[1];
+	XactTopTransactionId = tstate[2];
+	CurrentTransactionState->transactionId = tstate[3];
+	nParallelCurrentXids = (int) tstate[4];
+	ParallelCurrentXids = &tstate[5];
+
+	CurrentTransactionState->blockState = TBLOCK_PARALLEL_INPROGRESS;
+}
+
+/*
+ * EndParallelWorkerTransaction
+ *		End a parallel worker transaction.
+ */
+void
+EndParallelWorkerTransaction(void)
+{
+	Assert(CurrentTransactionState->blockState == TBLOCK_PARALLEL_INPROGRESS);
+	CommitTransaction();
+	CurrentTransactionState->blockState = TBLOCK_DEFAULT;
+}
+
+/*
  * ShowTransactionState
  *		Debug support
  */
@@ -5399,6 +5858,8 @@ BlockStateAsString(TBlockState blockState)
 			return "BEGIN";
 		case TBLOCK_INPROGRESS:
 			return "INPROGRESS";
+		case TBLOCK_PARALLEL_INPROGRESS:
+			return "PARALLEL_INPROGRESS";
 		case TBLOCK_END:
 			return "END";
 		case TBLOCK_ABORT:
@@ -5491,21 +5952,22 @@ xactGetCommittedChildren(TransactionId **ptr)
  */
 XLogRecPtr
 XactLogCommitRecord(TimestampTz commit_time,
-					 int nsubxacts, TransactionId *subxacts,
-					 int nrels, RelFileNode *rels,
-					 int nmsgs, SharedInvalidationMessage *msgs,
-					 bool relcacheInval, bool forceSync,
-					 TransactionId twophase_xid)
-{
-	xl_xact_commit		xlrec;
-	xl_xact_xinfo		xl_xinfo;
-	xl_xact_dbinfo		xl_dbinfo;
-	xl_xact_subxacts	xl_subxacts;
+					int nsubxacts, TransactionId *subxacts,
+					int nrels, RelFileNode *rels,
+					int nmsgs, SharedInvalidationMessage *msgs,
+					bool relcacheInval, bool forceSync,
+					TransactionId twophase_xid)
+{
+	xl_xact_commit xlrec;
+	xl_xact_xinfo xl_xinfo;
+	xl_xact_dbinfo xl_dbinfo;
+	xl_xact_subxacts xl_subxacts;
 	xl_xact_relfilenodes xl_relfilenodes;
-	xl_xact_invals		xl_invals;
-	xl_xact_twophase	xl_twophase;
+	xl_xact_invals xl_invals;
+	xl_xact_twophase xl_twophase;
+	xl_xact_origin xl_origin;
 
-	uint8				info;
+	uint8		info;
 
 	Assert(CritSectionCount > 0);
 
@@ -5561,6 +6023,15 @@ XactLogCommitRecord(TimestampTz commit_time,
 		xl_twophase.xid = twophase_xid;
 	}
 
+	/* dump transaction origin information */
+	if (replorigin_sesssion_origin != InvalidRepOriginId)
+	{
+		xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
+
+		xl_origin.origin_lsn = replorigin_sesssion_origin_lsn;
+		xl_origin.origin_timestamp = replorigin_sesssion_origin_timestamp;
+	}
+
 	if (xl_xinfo.xinfo != 0)
 		info |= XLOG_XACT_HAS_INFO;
 
@@ -5602,6 +6073,12 @@ XactLogCommitRecord(TimestampTz commit_time,
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
 		XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
 
+	if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)
+		XLogRegisterData((char *) (&xl_origin), sizeof(xl_xact_origin));
+
+	/* we allow filtering by xacts */
+	XLogIncludeOrigin();
+
 	return XLogInsert(RM_XACT_ID, info);
 }
 
@@ -5613,17 +6090,17 @@ XactLogCommitRecord(TimestampTz commit_time,
  */
 XLogRecPtr
 XactLogAbortRecord(TimestampTz abort_time,
-					int nsubxacts, TransactionId *subxacts,
-					int nrels, RelFileNode *rels,
-					TransactionId twophase_xid)
+				   int nsubxacts, TransactionId *subxacts,
+				   int nrels, RelFileNode *rels,
+				   TransactionId twophase_xid)
 {
-	xl_xact_abort		xlrec;
-	xl_xact_xinfo		xl_xinfo;
-	xl_xact_subxacts	xl_subxacts;
+	xl_xact_abort xlrec;
+	xl_xact_xinfo xl_xinfo;
+	xl_xact_subxacts xl_subxacts;
 	xl_xact_relfilenodes xl_relfilenodes;
-	xl_xact_twophase	xl_twophase;
+	xl_xact_twophase xl_twophase;
 
-	uint8				info;
+	uint8		info;
 
 	Assert(CritSectionCount > 0);
 
@@ -5699,10 +6176,12 @@ XactLogAbortRecord(TimestampTz abort_time,
 static void
 xact_redo_commit(xl_xact_parsed_commit *parsed,
 				 TransactionId xid,
-				 XLogRecPtr lsn)
+				 XLogRecPtr lsn,
+				 RepOriginId origin_id)
 {
 	TransactionId max_xid;
 	int			i;
+	TimestampTz commit_time;
 
 	max_xid = TransactionIdLatest(xid, parsed->nsubxacts, parsed->subxacts);
 
@@ -5722,9 +6201,16 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		LWLockRelease(XidGenLock);
 	}
 
+	Assert(!!(parsed->xinfo & XACT_XINFO_HAS_ORIGIN) == (origin_id != InvalidRepOriginId));
+
+	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
+		commit_time = parsed->origin_timestamp;
+	else
+		commit_time = parsed->xact_time;
+
 	/* Set the transaction commit timestamp and metadata */
 	TransactionTreeSetCommitTsData(xid, parsed->nsubxacts, parsed->subxacts,
-								   parsed->xact_time, InvalidCommitTsNodeId,
+								   commit_time, origin_id,
 								   false);
 
 	if (standbyState == STANDBY_DISABLED)
@@ -5757,13 +6243,13 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		 * recovered. It's unlikely but it's good to be safe.
 		 */
 		TransactionIdAsyncCommitTree(
-			xid, parsed->nsubxacts, parsed->subxacts, lsn);
+							  xid, parsed->nsubxacts, parsed->subxacts, lsn);
 
 		/*
 		 * We must mark clog before we update the ProcArray.
 		 */
 		ExpireTreeKnownAssignedTransactionIds(
-			xid, parsed->nsubxacts, parsed->subxacts, max_xid);
+						  xid, parsed->nsubxacts, parsed->subxacts, max_xid);
 
 		/*
 		 * Send any cache invalidations attached to the commit. We must
@@ -5771,9 +6257,9 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		 * occurs in CommitTransaction().
 		 */
 		ProcessCommittedInvalidationMessages(
-			parsed->msgs, parsed->nmsgs,
-			XactCompletionRelcacheInitFileInval(parsed->xinfo),
-			parsed->dbId, parsed->tsId);
+											 parsed->msgs, parsed->nmsgs,
+						  XactCompletionRelcacheInitFileInval(parsed->xinfo),
+											 parsed->dbId, parsed->tsId);
 
 		/*
 		 * Release locks, if any. We do this for both two phase and normal one
@@ -5785,6 +6271,13 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		StandbyReleaseLockTree(xid, 0, NULL);
 	}
 
+	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
+	{
+		/* recover apply progress */
+		replorigin_advance(origin_id, parsed->origin_lsn, lsn,
+						   false /* backward */ , false /* WAL */ );
+	}
+
 	/* Make sure files supposed to be dropped are dropped */
 	if (parsed->nrels > 0)
 	{
@@ -5846,8 +6339,8 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 static void
 xact_redo_abort(xl_xact_parsed_abort *parsed, TransactionId xid)
 {
-	int				i;
-	TransactionId	max_xid;
+	int			i;
+	TransactionId max_xid;
 
 	/*
 	 * Make sure nextXid is beyond any XID mentioned in the record.
@@ -5894,7 +6387,7 @@ xact_redo_abort(xl_xact_parsed_abort *parsed, TransactionId xid)
 		 * We must update the ProcArray after we have marked clog.
 		 */
 		ExpireTreeKnownAssignedTransactionIds(
-			xid, parsed->nsubxacts, parsed->subxacts, max_xid);
+						  xid, parsed->nsubxacts, parsed->subxacts, max_xid);
 
 		/*
 		 * There are no flat files that need updating, nor invalidation
@@ -5940,13 +6433,13 @@ xact_redo(XLogReaderState *record)
 		{
 			Assert(!TransactionIdIsValid(parsed.twophase_xid));
 			xact_redo_commit(&parsed, XLogRecGetXid(record),
-							 record->EndRecPtr);
+							 record->EndRecPtr, XLogRecGetOrigin(record));
 		}
 		else
 		{
 			Assert(TransactionIdIsValid(parsed.twophase_xid));
 			xact_redo_commit(&parsed, parsed.twophase_xid,
-							 record->EndRecPtr);
+							 record->EndRecPtr, XLogRecGetOrigin(record));
 			RemoveTwoPhaseFile(parsed.twophase_xid, false);
 		}
 	}
@@ -5956,7 +6449,7 @@ xact_redo(XLogReaderState *record)
 		xl_xact_parsed_abort parsed;
 
 		ParseAbortRecord(XLogRecGetInfo(record), xlrec,
-						  &parsed);
+						 &parsed);
 
 		if (info == XLOG_XACT_ABORT)
 		{
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 8679b306fb..44304d2e6f 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -45,8 +45,10 @@
 #include "pgstat.h"
 #include "postmaster/bgwriter.h"
 #include "postmaster/startup.h"
+#include "replication/basebackup.h"
 #include "replication/logical.h"
 #include "replication/slot.h"
+#include "replication/origin.h"
 #include "replication/snapbuild.h"
 #include "replication/walreceiver.h"
 #include "replication/walsender.h"
@@ -82,12 +84,12 @@ extern uint32 bootstrap_data_checksum_version;
 
 
 /* User-settable parameters */
-int			max_wal_size = 64;		/* 1 GB */
-int			min_wal_size = 5;		/* 80 MB */
+int			max_wal_size = 64;	/* 1 GB */
+int			min_wal_size = 5;	/* 80 MB */
 int			wal_keep_segments = 0;
 int			XLOGbuffers = -1;
 int			XLogArchiveTimeout = 0;
-bool		XLogArchiveMode = false;
+int			XLogArchiveMode = ARCHIVE_MODE_OFF;
 char	   *XLogArchiveCommand = NULL;
 bool		EnableHotStandby = false;
 bool		fullPageWrites = true;
@@ -141,6 +143,24 @@ const struct config_enum_entry sync_method_options[] = {
 	{NULL, 0, false}
 };
 
+
+/*
+ * Although only "on", "off", and "always" are documented,
+ * we accept all the likely variants of "on" and "off".
+ */
+const struct config_enum_entry archive_mode_options[] = {
+	{"always", ARCHIVE_MODE_ALWAYS, false},
+	{"on", ARCHIVE_MODE_ON, false},
+	{"off", ARCHIVE_MODE_OFF, false},
+	{"true", ARCHIVE_MODE_ON, true},
+	{"false", ARCHIVE_MODE_OFF, true},
+	{"yes", ARCHIVE_MODE_ON, true},
+	{"no", ARCHIVE_MODE_OFF, true},
+	{"1", ARCHIVE_MODE_ON, true},
+	{"0", ARCHIVE_MODE_OFF, true},
+	{NULL, 0, false}
+};
+
 /*
  * Statistics for current checkpoint are collected in this global struct.
  * Because only the checkpointer or a stand-alone backend can perform
@@ -295,10 +315,19 @@ static TimeLineID curFileTLI;
  * end+1 of the last record, and is reset when we end a top-level transaction,
  * or start a new one; so it can be used to tell if the current transaction has
  * created any XLOG records.
+ *
+ * While in parallel mode, this may not be fully up to date.  When committing,
+ * a transaction can assume this covers all xlog records written either by the
+ * user backend or by any parallel worker which was present at any point during
+ * the transaction.  But when aborting, or when still in parallel mode, other
+ * parallel backends may have written WAL records at later LSNs than the value
+ * stored here.  The parallel leader advances its own copy, when necessary,
+ * in WaitForParallelWorkersToFinish.
  */
 static XLogRecPtr ProcLastRecPtr = InvalidXLogRecPtr;
 
 XLogRecPtr	XactLastRecEnd = InvalidXLogRecPtr;
+XLogRecPtr	XactLastCommitEnd = InvalidXLogRecPtr;
 
 /*
  * RedoRecPtr is this backend's local copy of the REDO record pointer
@@ -760,7 +789,7 @@ static MemoryContext walDebugCxt = NULL;
 #endif
 
 static void readRecoveryCommandFile(void);
-static void exitArchiveRecovery(TimeLineID endTLI, XLogSegNo endLogSegNo);
+static void exitArchiveRecovery(TimeLineID endTLI, XLogRecPtr endOfLog);
 static bool recoveryStopsBefore(XLogReaderState *record);
 static bool recoveryStopsAfter(XLogReaderState *record);
 static void recoveryPausesHere(void);
@@ -818,6 +847,8 @@ static void xlog_outdesc(StringInfo buf, XLogReaderState *record);
 static void pg_start_backup_callback(int code, Datum arg);
 static bool read_backup_label(XLogRecPtr *checkPointLoc,
 				  bool *backupEndRequired, bool *backupFromStandby);
+static bool read_tablespace_map(List **tablespaces);
+
 static void rm_redo_error_callback(void *arg);
 static int	get_sync_bit(int method);
 
@@ -922,14 +953,14 @@ XLogInsertRecord(XLogRecData *rdata, XLogRecPtr fpw_lsn)
 	/*
 	 * Check to see if my copy of RedoRecPtr or doPageWrites is out of date.
 	 * If so, may have to go back and have the caller recompute everything.
-	 * This can only happen just after a checkpoint, so it's better to be
-	 * slow in this case and fast otherwise.
+	 * This can only happen just after a checkpoint, so it's better to be slow
+	 * in this case and fast otherwise.
 	 *
 	 * If we aren't doing full-page writes then RedoRecPtr doesn't actually
 	 * affect the contents of the XLOG record, so we'll update our local copy
 	 * but not force a recomputation.  (If doPageWrites was just turned off,
-	 * we could recompute the record without full pages, but we choose not
-	 * to bother.)
+	 * we could recompute the record without full pages, but we choose not to
+	 * bother.)
 	 */
 	if (RedoRecPtr != Insert->RedoRecPtr)
 	{
@@ -941,8 +972,8 @@ XLogInsertRecord(XLogRecData *rdata, XLogRecPtr fpw_lsn)
 	if (fpw_lsn != InvalidXLogRecPtr && fpw_lsn <= RedoRecPtr && doPageWrites)
 	{
 		/*
-		 * Oops, some buffer now needs to be backed up that the caller
-		 * didn't back up.  Start over.
+		 * Oops, some buffer now needs to be backed up that the caller didn't
+		 * back up.  Start over.
 		 */
 		WALInsertLockRelease();
 		END_CRIT_SECTION();
@@ -1071,8 +1102,8 @@ XLogInsertRecord(XLogRecData *rdata, XLogRecPtr fpw_lsn)
 		{
 			appendStringInfo(&buf, "error decoding record: out of memory");
 		}
-		else if	(!DecodeXLogRecord(debug_reader, (XLogRecord *) recordBuf.data,
-							  &errormsg))
+		else if (!DecodeXLogRecord(debug_reader, (XLogRecord *) recordBuf.data,
+								   &errormsg))
 		{
 			appendStringInfo(&buf, "error decoding record: %s",
 							 errormsg ? errormsg : "no error message");
@@ -1903,11 +1934,11 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, bool opportunistic)
 		/*
 		 * Fill the new page's header
 		 */
-		NewPage   ->xlp_magic = XLOG_PAGE_MAGIC;
+		NewPage->xlp_magic = XLOG_PAGE_MAGIC;
 
 		/* NewPage->xlp_info = 0; */	/* done by memset */
-		NewPage   ->xlp_tli = ThisTimeLineID;
-		NewPage   ->xlp_pageaddr = NewPageBeginPtr;
+		NewPage->xlp_tli = ThisTimeLineID;
+		NewPage->xlp_pageaddr = NewPageBeginPtr;
 
 		/* NewPage->xlp_rem_len = 0; */	/* done by memset */
 
@@ -1925,7 +1956,7 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, bool opportunistic)
 		 * compress a few records.
 		 */
 		if (!Insert->forcePageWrites)
-			NewPage   ->xlp_info |= XLP_BKP_REMOVABLE;
+			NewPage->xlp_info |= XLP_BKP_REMOVABLE;
 
 		/*
 		 * If first page of an XLOG segment file, make it a long header.
@@ -1937,7 +1968,7 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, bool opportunistic)
 			NewLongPage->xlp_sysid = ControlFile->system_identifier;
 			NewLongPage->xlp_seg_size = XLogSegSize;
 			NewLongPage->xlp_xlog_blcksz = XLOG_BLCKSZ;
-			NewPage   ->xlp_info |= XLP_LONG_HEADER;
+			NewPage->xlp_info |= XLP_LONG_HEADER;
 		}
 
 		/*
@@ -1979,10 +2010,10 @@ CalculateCheckpointSegments(void)
 	 *
 	 * a) we keep WAL for two checkpoint cycles, back to the "prev" checkpoint.
 	 * b) during checkpoint, we consume checkpoint_completion_target *
-	 *    number of segments consumed between checkpoints.
+	 *	  number of segments consumed between checkpoints.
 	 *-------
 	 */
-	target = (double ) max_wal_size / (2.0 + CheckPointCompletionTarget);
+	target = (double) max_wal_size / (2.0 + CheckPointCompletionTarget);
 
 	/* round down */
 	CheckPointSegments = (int) target;
@@ -2023,15 +2054,15 @@ XLOGfileslop(XLogRecPtr PriorRedoPtr)
 	 * remove enough segments to stay below the maximum.
 	 */
 	minSegNo = PriorRedoPtr / XLOG_SEG_SIZE + min_wal_size - 1;
-	maxSegNo =  PriorRedoPtr / XLOG_SEG_SIZE + max_wal_size - 1;
+	maxSegNo = PriorRedoPtr / XLOG_SEG_SIZE + max_wal_size - 1;
 
 	/*
 	 * Between those limits, recycle enough segments to get us through to the
 	 * estimated end of next checkpoint.
 	 *
 	 * To estimate where the next checkpoint will finish, assume that the
-	 * system runs steadily consuming CheckPointDistanceEstimate
-	 * bytes between every checkpoint.
+	 * system runs steadily consuming CheckPointDistanceEstimate bytes between
+	 * every checkpoint.
 	 *
 	 * The reason this calculation is done from the prior checkpoint, not the
 	 * one that just finished, is that this behaves better if some checkpoint
@@ -2622,7 +2653,7 @@ XLogFlush(XLogRecPtr record)
 
 			/*
 			 * Re-check how far we can now flush the WAL. It's generally not
-			 * safe to call WaitXLogInsetionsToFinish while holding
+			 * safe to call WaitXLogInsertionsToFinish while holding
 			 * WALWriteLock, because an in-progress insertion might need to
 			 * also grab WALWriteLock to make progress. But we know that all
 			 * the insertions up to insertpos have already finished, because
@@ -2976,11 +3007,11 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)
 	/*
 	 * XXX: What should we use as max_segno? We used to use XLOGfileslop when
 	 * that was a constant, but that was always a bit dubious: normally, at a
-	 * checkpoint, XLOGfileslop was the offset from the checkpoint record,
-	 * but here, it was the offset from the insert location. We can't do the
+	 * checkpoint, XLOGfileslop was the offset from the checkpoint record, but
+	 * here, it was the offset from the insert location. We can't do the
 	 * normal XLOGfileslop calculation here because we don't have access to
-	 * the prior checkpoint's redo location. So somewhat arbitrarily, just
-	 * use CheckPointSegments.
+	 * the prior checkpoint's redo location. So somewhat arbitrarily, just use
+	 * CheckPointSegments.
 	 */
 	max_segno = logsegno + CheckPointSegments;
 	if (!InstallXLogFileSegment(&installed_segno, tmppath,
@@ -3012,24 +3043,22 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)
 }
 
 /*
- * Create a new XLOG file segment by copying a pre-existing one.
+ * Copy a WAL segment file in pg_xlog directory.
  *
- * destsegno: identify segment to be created.
+ * dstfname		destination filename
+ * srcfname		source filename
+ * upto			how much of the source file to copy? (the rest is filled with
+ *				zeros)
  *
- * srcTLI, srclog, srcseg: identify segment to be copied (could be from
- *		a different timeline)
+ * If dstfname is not given, the file is created with a temporary filename,
+ * which is returned.  Both filenames are relative to the pg_xlog directory.
  *
- * upto: how much of the source file to copy? (the rest is filled with zeros)
- *
- * Currently this is only used during recovery, and so there are no locking
- * considerations.  But we should be just as tense as XLogFileInit to avoid
- * emplacing a bogus file.
+ * NB: Any existing file with the same name will be overwritten!
  */
-static void
-XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
-			 int upto)
+static char *
+XLogFileCopy(char *dstfname, char *srcfname, int upto)
 {
-	char		path[MAXPGPATH];
+	char		srcpath[MAXPGPATH];
 	char		tmppath[MAXPGPATH];
 	char		buffer[XLOG_BLCKSZ];
 	int			srcfd;
@@ -3039,12 +3068,12 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
 	/*
 	 * Open the source file
 	 */
-	XLogFilePath(path, srcTLI, srcsegno);
-	srcfd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+	snprintf(srcpath, MAXPGPATH, XLOGDIR "/%s", srcfname);
+	srcfd = OpenTransientFile(srcpath, O_RDONLY | PG_BINARY, 0);
 	if (srcfd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
-				 errmsg("could not open file \"%s\": %m", path)));
+				 errmsg("could not open file \"%s\": %m", srcpath)));
 
 	/*
 	 * Copy into a temp file name.
@@ -3071,7 +3100,8 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
 		nread = upto - nbytes;
 
 		/*
-		 * The part that is not read from the source file is filled with zeros.
+		 * The part that is not read from the source file is filled with
+		 * zeros.
 		 */
 		if (nread < sizeof(buffer))
 			memset(buffer, 0, sizeof(buffer));
@@ -3086,10 +3116,12 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
 				if (errno != 0)
 					ereport(ERROR,
 							(errcode_for_file_access(),
-							 errmsg("could not read file \"%s\": %m", path)));
+							 errmsg("could not read file \"%s\": %m",
+									srcpath)));
 				else
 					ereport(ERROR,
-							(errmsg("not enough data in file \"%s\"", path)));
+							(errmsg("not enough data in file \"%s\"",
+									srcpath)));
 			}
 		}
 		errno = 0;
@@ -3123,10 +3155,24 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
 	CloseTransientFile(srcfd);
 
 	/*
-	 * Now move the segment into place with its final name.
+	 * Now move the segment into place with its final name.  (Or just return
+	 * the path to the file we created, if the caller wants to handle the rest
+	 * on its own.)
 	 */
-	if (!InstallXLogFileSegment(&destsegno, tmppath, false, 0, false))
-		elog(ERROR, "InstallXLogFileSegment should not have failed");
+	if (dstfname)
+	{
+		char		dstpath[MAXPGPATH];
+
+		snprintf(dstpath, MAXPGPATH, XLOGDIR "/%s", dstfname);
+		if (rename(tmppath, dstpath) < 0)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not rename file \"%s\" to \"%s\": %m",
+							tmppath, dstpath)));
+		return NULL;
+	}
+	else
+		return pstrdup(tmppath);
 }
 
 /*
@@ -3569,8 +3615,8 @@ RemoveOldXlogFiles(XLogSegNo segno, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr)
 	while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL)
 	{
 		/* Ignore files that are not XLOG segments */
-		if (strlen(xlde->d_name) != 24 ||
-			strspn(xlde->d_name, "0123456789ABCDEF") != 24)
+		if (!IsXLogFileName(xlde->d_name) &&
+			!IsPartialXLogFileName(xlde->d_name))
 			continue;
 
 		/*
@@ -3642,14 +3688,13 @@ RemoveNonParentXlogFiles(XLogRecPtr switchpoint, TimeLineID newTLI)
 	while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL)
 	{
 		/* Ignore files that are not XLOG segments */
-		if (strlen(xlde->d_name) != 24 ||
-			strspn(xlde->d_name, "0123456789ABCDEF") != 24)
+		if (!IsXLogFileName(xlde->d_name))
 			continue;
 
 		/*
 		 * Remove files that are on a timeline older than the new one we're
-		 * switching to, but with a segment number >= the first segment on
-		 * the new timeline.
+		 * switching to, but with a segment number >= the first segment on the
+		 * new timeline.
 		 */
 		if (strncmp(xlde->d_name, switchseg, 8) < 0 &&
 			strcmp(xlde->d_name + 8, switchseg + 8) > 0)
@@ -3726,12 +3771,13 @@ RemoveXlogFile(const char *segname, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr)
 						segname)));
 
 #ifdef WIN32
+
 		/*
 		 * On Windows, if another process (e.g another backend) holds the file
 		 * open in FILE_SHARE_DELETE mode, unlink will succeed, but the file
 		 * will still show up in directory listing until the last handle is
-		 * closed. To avoid confusing the lingering deleted file for a live WAL
-		 * file that needs to be archived, rename it before deleting it.
+		 * closed. To avoid confusing the lingering deleted file for a live
+		 * WAL file that needs to be archived, rename it before deleting it.
 		 *
 		 * If another process holds the file open without FILE_SHARE_DELETE
 		 * flag, rename will fail. We'll try again at the next checkpoint.
@@ -3741,8 +3787,8 @@ RemoveXlogFile(const char *segname, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr)
 		{
 			ereport(LOG,
 					(errcode_for_file_access(),
-				 errmsg("could not rename old transaction log file \"%s\": %m",
-							path)));
+			   errmsg("could not rename old transaction log file \"%s\": %m",
+					  path)));
 			return;
 		}
 		rc = unlink(newpath);
@@ -3753,8 +3799,8 @@ RemoveXlogFile(const char *segname, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr)
 		{
 			ereport(LOG,
 					(errcode_for_file_access(),
-				 errmsg("could not remove old transaction log file \"%s\": %m",
-							path)));
+			   errmsg("could not remove old transaction log file \"%s\": %m",
+					  path)));
 			return;
 		}
 		CheckpointStats.ckpt_segs_removed++;
@@ -3831,10 +3877,7 @@ CleanupBackupHistory(void)
 
 	while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL)
 	{
-		if (strlen(xlde->d_name) > 24 &&
-			strspn(xlde->d_name, "0123456789ABCDEF") == 24 &&
-			strcmp(xlde->d_name + strlen(xlde->d_name) - strlen(".backup"),
-				   ".backup") == 0)
+		if (IsBackupHistoryFileName(xlde->d_name))
 		{
 			if (XLogArchiveCheckDone(xlde->d_name))
 			{
@@ -4570,11 +4613,11 @@ XLOGShmemInit(void)
 	int			i;
 
 #ifdef WAL_DEBUG
+
 	/*
-	 * Create a memory context for WAL debugging that's exempt from the
-	 * normal "no pallocs in critical section" rule. Yes, that can lead to a
-	 * PANIC if an allocation fails, but wal_debug is not for production use
-	 * anyway.
+	 * Create a memory context for WAL debugging that's exempt from the normal
+	 * "no pallocs in critical section" rule. Yes, that can lead to a PANIC if
+	 * an allocation fails, but wal_debug is not for production use anyway.
 	 */
 	if (walDebugCxt == NULL)
 	{
@@ -5012,7 +5055,7 @@ readRecoveryCommandFile(void)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("invalid value for recovery parameter \"recovery_target\""),
-						 errhint("The only allowed value is \"immediate\".")));
+					   errhint("The only allowed value is \"immediate\".")));
 			ereport(DEBUG2,
 					(errmsg_internal("recovery_target = '%s'",
 									 item->value)));
@@ -5103,14 +5146,14 @@ readRecoveryCommandFile(void)
 	}
 
 	/*
-	 * Override any inconsistent requests. Not that this is a change
-	 * of behaviour in 9.5; prior to this we simply ignored a request
-	 * to pause if hot_standby = off, which was surprising behaviour.
+	 * Override any inconsistent requests. Not that this is a change of
+	 * behaviour in 9.5; prior to this we simply ignored a request to pause if
+	 * hot_standby = off, which was surprising behaviour.
 	 */
 	if (recoveryTargetAction == RECOVERY_TARGET_ACTION_PAUSE &&
 		recoveryTargetActionSet &&
-		standbyState == STANDBY_DISABLED)
-			recoveryTargetAction = RECOVERY_TARGET_ACTION_SHUTDOWN;
+		!EnableHotStandby)
+		recoveryTargetAction = RECOVERY_TARGET_ACTION_SHUTDOWN;
 
 	/* Enable fetching from archive recovery area */
 	ArchiveRecoveryRequested = true;
@@ -5192,26 +5235,30 @@ exitArchiveRecovery(TimeLineID endTLI, XLogRecPtr endOfLog)
 	 * happens in the middle of a segment, copy data from the last WAL segment
 	 * of the old timeline up to the switch point, to the starting WAL segment
 	 * on the new timeline.
-	 *
-	 * Notify the archiver that the last WAL segment of the old timeline is
-	 * ready to copy to archival storage if its .done file doesn't exist
-	 * (e.g., if it's the restored WAL file, it's expected to have .done file).
-	 * Otherwise, it is not archived for a while.
 	 */
 	if (endLogSegNo == startLogSegNo)
 	{
-		XLogFileCopy(startLogSegNo, endTLI, endLogSegNo,
-					 endOfLog % XLOG_SEG_SIZE);
+		char	   *tmpfname;
 
-		/* Create .ready file only when neither .ready nor .done files exist */
-		if (XLogArchivingActive())
-		{
-			XLogFileName(xlogfname, endTLI, endLogSegNo);
-			XLogArchiveCheckDone(xlogfname);
-		}
+		XLogFileName(xlogfname, endTLI, endLogSegNo);
+
+		/*
+		 * Make a copy of the file on the new timeline.
+		 *
+		 * Writing WAL isn't allowed yet, so there are no locking
+		 * considerations. But we should be just as tense as XLogFileInit to
+		 * avoid emplacing a bogus file.
+		 */
+		tmpfname = XLogFileCopy(NULL, xlogfname, endOfLog % XLOG_SEG_SIZE);
+		if (!InstallXLogFileSegment(&endLogSegNo, tmpfname, false, 0, false))
+			elog(ERROR, "InstallXLogFileSegment should not have failed");
 	}
 	else
 	{
+		/*
+		 * The switch happened at a segment boundary, so just create the next
+		 * segment on the new timeline.
+		 */
 		bool		use_existent = true;
 		int			fd;
 
@@ -5905,9 +5952,11 @@ StartupXLOG(void)
 	bool		wasShutdown;
 	bool		reachedStopPoint = false;
 	bool		haveBackupLabel = false;
+	bool		haveTblspcMap = false;
 	XLogRecPtr	RecPtr,
 				checkPointLoc,
 				EndOfLog;
+	TimeLineID	EndOfLogTLI;
 	TimeLineID	PrevTimeLineID;
 	XLogRecord *record;
 	TransactionId oldestActiveXID;
@@ -5978,14 +6027,16 @@ StartupXLOG(void)
 	ValidateXLOGDirectoryStructure();
 
 	/*
-	 * Clear out any old relcache cache files.  This is *necessary* if we do
-	 * any WAL replay, since that would probably result in the cache files
-	 * being out of sync with database reality.  In theory we could leave them
-	 * in place if the database had been cleanly shut down, but it seems
-	 * safest to just remove them always and let them be rebuilt during the
-	 * first backend startup.
+	 * If we previously crashed, there might be data which we had written,
+	 * intending to fsync it, but which we had not actually fsync'd yet.
+	 * Therefore, a power failure in the near future might cause earlier
+	 * unflushed writes to be lost, even though more recent data written to
+	 * disk from here on would be persisted.  To avoid that, fsync the entire
+	 * data directory.
 	 */
-	RelationCacheInitFileRemove();
+	if (ControlFile->state != DB_SHUTDOWNED &&
+		ControlFile->state != DB_SHUTDOWNED_IN_RECOVERY)
+		SyncDataDirectory();
 
 	/*
 	 * Initialize on the assumption we want to recover to the latest timeline
@@ -6062,6 +6113,8 @@ StartupXLOG(void)
 	if (read_backup_label(&checkPointLoc, &backupEndRequired,
 						  &backupFromStandby))
 	{
+		List	   *tablespaces = NIL;
+
 		/*
 		 * Archive recovery was requested, and thanks to the backup label
 		 * file, we know how far we need to replay to reach consistency. Enter
@@ -6106,6 +6159,59 @@ StartupXLOG(void)
 					 errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
 			wasShutdown = false;	/* keep compiler quiet */
 		}
+
+		/* read the tablespace_map file if present and create symlinks. */
+		if (read_tablespace_map(&tablespaces))
+		{
+			ListCell   *lc;
+			struct stat st;
+
+			foreach(lc, tablespaces)
+			{
+				tablespaceinfo *ti = lfirst(lc);
+				char	   *linkloc;
+
+				linkloc = psprintf("pg_tblspc/%s", ti->oid);
+
+				/*
+				 * Remove the existing symlink if any and Create the symlink
+				 * under PGDATA.  We need to use rmtree instead of rmdir as
+				 * the link location might contain directories or files
+				 * corresponding to the actual path. Some tar utilities do
+				 * things that way while extracting symlinks.
+				 */
+				if (lstat(linkloc, &st) == 0 && S_ISDIR(st.st_mode))
+				{
+					if (!rmtree(linkloc, true))
+						ereport(ERROR,
+								(errcode_for_file_access(),
+							  errmsg("could not remove directory \"%s\": %m",
+									 linkloc)));
+				}
+				else
+				{
+					if (unlink(linkloc) < 0 && errno != ENOENT)
+						ereport(ERROR,
+								(errcode_for_file_access(),
+						  errmsg("could not remove symbolic link \"%s\": %m",
+								 linkloc)));
+				}
+
+				if (symlink(ti->path, linkloc) < 0)
+					ereport(ERROR,
+							(errcode_for_file_access(),
+						  errmsg("could not create symbolic link \"%s\": %m",
+								 linkloc)));
+
+				pfree(ti->oid);
+				pfree(ti->path);
+				pfree(ti);
+			}
+
+			/* set flag to delete it later */
+			haveTblspcMap = true;
+		}
+
 		/* set flag to delete it later */
 		haveBackupLabel = true;
 	}
@@ -6180,6 +6286,20 @@ StartupXLOG(void)
 	}
 
 	/*
+	 * Clear out any old relcache cache files.  This is *necessary* if we do
+	 * any WAL replay, since that would probably result in the cache files
+	 * being out of sync with database reality.  In theory we could leave them
+	 * in place if the database had been cleanly shut down, but it seems
+	 * safest to just remove them always and let them be rebuilt during the
+	 * first backend startup.  These files needs to be removed from all
+	 * directories including pg_tblspc, however the symlinks are created only
+	 * after reading tablesapce_map file in case of archive recovery from
+	 * backup, so needs to clear old relcache files here after creating
+	 * symlinks.
+	 */
+	RelationCacheInitFileRemove();
+
+	/*
 	 * If the location of the checkpoint record is not on the expected
 	 * timeline in the history of the requested timeline, we cannot proceed:
 	 * the backup is not part of the history of the requested timeline.
@@ -6282,6 +6402,11 @@ StartupXLOG(void)
 	StartupMultiXact();
 
 	/*
+	 * Recover knowledge about replay progress of known replication partners.
+	 */
+	StartupReplicationOrigin();
+
+	/*
 	 * Initialize unlogged LSN. On a clean shutdown, it's restored from the
 	 * control file. On recovery, all unlogged relations are blown away, so
 	 * the unlogged LSN counter can be reset too.
@@ -6387,9 +6512,9 @@ StartupXLOG(void)
 		 * Also set backupEndPoint and use minRecoveryPoint as the backup end
 		 * location if we're starting recovery from a base backup which was
 		 * taken from a standby. In this case, the database system status in
-		 * pg_control must indicate that the database was already in
-		 * recovery. Usually that will be DB_IN_ARCHIVE_RECOVERY but also can
-		 * be DB_SHUTDOWNED_IN_RECOVERY if recovery previously was interrupted
+		 * pg_control must indicate that the database was already in recovery.
+		 * Usually that will be DB_IN_ARCHIVE_RECOVERY but also can be
+		 * DB_SHUTDOWNED_IN_RECOVERY if recovery previously was interrupted
 		 * before reaching this point; e.g. because restore_command or
 		 * primary_conninfo were faulty.
 		 *
@@ -6443,6 +6568,23 @@ StartupXLOG(void)
 								BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
 		}
 
+		/*
+		 * If there was a tablespace_map file, it's done its job and the
+		 * symlinks have been created.  We must get rid of the map file so
+		 * that if we crash during recovery, we don't create symlinks again.
+		 * It seems prudent though to just rename the file out of the way
+		 * rather than delete it completely.
+		 */
+		if (haveTblspcMap)
+		{
+			unlink(TABLESPACE_MAP_OLD);
+			if (rename(TABLESPACE_MAP, TABLESPACE_MAP_OLD) != 0)
+				ereport(FATAL,
+						(errcode_for_file_access(),
+						 errmsg("could not rename file \"%s\" to \"%s\": %m",
+								TABLESPACE_MAP, TABLESPACE_MAP_OLD)));
+		}
+
 		/* Check that the GUCs used to generate the WAL allow recovery */
 		CheckRequiredParameterValues();
 
@@ -6787,7 +6929,8 @@ StartupXLOG(void)
 				{
 					/*
 					 * Before we continue on the new timeline, clean up any
-					 * (possibly bogus) future WAL segments on the old timeline.
+					 * (possibly bogus) future WAL segments on the old
+					 * timeline.
 					 */
 					RemoveNonParentXlogFiles(EndRecPtr, ThisTimeLineID);
 
@@ -6818,32 +6961,33 @@ StartupXLOG(void)
 			{
 				if (!reachedConsistency)
 					ereport(FATAL,
-						(errmsg("requested recovery stop point is before consistent recovery point")));
+							(errmsg("requested recovery stop point is before consistent recovery point")));
 
 				/*
 				 * This is the last point where we can restart recovery with a
 				 * new recovery target, if we shutdown and begin again. After
-				 * this, Resource Managers may choose to do permanent corrective
-				 * actions at end of recovery.
+				 * this, Resource Managers may choose to do permanent
+				 * corrective actions at end of recovery.
 				 */
 				switch (recoveryTargetAction)
 				{
 					case RECOVERY_TARGET_ACTION_SHUTDOWN:
-							/*
-							 * exit with special return code to request shutdown
-							 * of postmaster.  Log messages issued from
-							 * postmaster.
-							 */
-							proc_exit(3);
+
+						/*
+						 * exit with special return code to request shutdown
+						 * of postmaster.  Log messages issued from
+						 * postmaster.
+						 */
+						proc_exit(3);
 
 					case RECOVERY_TARGET_ACTION_PAUSE:
-							SetRecoveryPause(true);
-							recoveryPausesHere();
+						SetRecoveryPause(true);
+						recoveryPausesHere();
 
-							/* drop into promote */
+						/* drop into promote */
 
 					case RECOVERY_TARGET_ACTION_PROMOTE:
-							break;
+						break;
 				}
 			}
 
@@ -6912,6 +7056,15 @@ StartupXLOG(void)
 	EndOfLog = EndRecPtr;
 
 	/*
+	 * EndOfLogTLI is the TLI in the filename of the XLOG segment containing
+	 * the end-of-log. It could be different from the timeline that EndOfLog
+	 * nominally belongs to, if there was a timeline switch in that segment,
+	 * and we were reading the old wAL from a segment belonging to a higher
+	 * timeline.
+	 */
+	EndOfLogTLI = xlogreader->readPageTLI;
+
+	/*
 	 * Complain if we did not roll forward far enough to render the backup
 	 * dump consistent.  Note: it is indeed okay to look at the local variable
 	 * minRecoveryPoint here, even though ControlFile->minRecoveryPoint might
@@ -7017,7 +7170,7 @@ StartupXLOG(void)
 	 * we will use that below.)
 	 */
 	if (ArchiveRecoveryRequested)
-		exitArchiveRecovery(xlogreader->readPageTLI, EndOfLog);
+		exitArchiveRecovery(EndOfLogTLI, EndOfLog);
 
 	/*
 	 * Prepare to write WAL starting at EndOfLog position, and init xlog
@@ -7148,12 +7301,82 @@ StartupXLOG(void)
 								   true);
 	}
 
-	/*
-	 * Clean up any (possibly bogus) future WAL segments on the old timeline.
-	 */
 	if (ArchiveRecoveryRequested)
+	{
+		/*
+		 * We switched to a new timeline. Clean up segments on the old
+		 * timeline.
+		 *
+		 * If there are any higher-numbered segments on the old timeline,
+		 * remove them. They might contain valid WAL, but they might also be
+		 * pre-allocated files containing garbage. In any case, they are not
+		 * part of the new timeline's history so we don't need them.
+		 */
 		RemoveNonParentXlogFiles(EndOfLog, ThisTimeLineID);
 
+		/*
+		 * If the switch happened in the middle of a segment, what to do with
+		 * the last, partial segment on the old timeline? If we don't archive
+		 * it, and the server that created the WAL never archives it either
+		 * (e.g. because it was hit by a meteor), it will never make it to the
+		 * archive. That's OK from our point of view, because the new segment
+		 * that we created with the new TLI contains all the WAL from the old
+		 * timeline up to the switch point. But if you later try to do PITR to
+		 * the "missing" WAL on the old timeline, recovery won't find it in
+		 * the archive. It's physically present in the new file with new TLI,
+		 * but recovery won't look there when it's recovering to the older
+		 * timeline. On the other hand, if we archive the partial segment, and
+		 * the original server on that timeline is still running and archives
+		 * the completed version of the same segment later, it will fail. (We
+		 * used to do that in 9.4 and below, and it caused such problems).
+		 *
+		 * As a compromise, we rename the last segment with the .partial
+		 * suffix, and archive it. Archive recovery will never try to read
+		 * .partial segments, so they will normally go unused. But in the odd
+		 * PITR case, the administrator can copy them manually to the pg_xlog
+		 * directory (removing the suffix). They can be useful in debugging,
+		 * too.
+		 *
+		 * If a .done or .ready file already exists for the old timeline,
+		 * however, we had already determined that the segment is complete, so
+		 * we can let it be archived normally. (In particular, if it was
+		 * restored from the archive to begin with, it's expected to have a
+		 * .done file).
+		 */
+		if (EndOfLog % XLOG_SEG_SIZE != 0 && XLogArchivingActive())
+		{
+			char		origfname[MAXFNAMELEN];
+			XLogSegNo	endLogSegNo;
+
+			XLByteToPrevSeg(EndOfLog, endLogSegNo);
+			XLogFileName(origfname, EndOfLogTLI, endLogSegNo);
+
+			if (!XLogArchiveIsReadyOrDone(origfname))
+			{
+				char		origpath[MAXPGPATH];
+				char		partialfname[MAXFNAMELEN];
+				char		partialpath[MAXPGPATH];
+
+				XLogFilePath(origpath, EndOfLogTLI, endLogSegNo);
+				snprintf(partialfname, MAXFNAMELEN, "%s.partial", origfname);
+				snprintf(partialpath, MAXPGPATH, "%s.partial", origpath);
+
+				/*
+				 * Make sure there's no .done or .ready file for the .partial
+				 * file.
+				 */
+				XLogArchiveCleanup(partialfname);
+
+				if (rename(origpath, partialpath) != 0)
+					ereport(ERROR,
+							(errcode_for_file_access(),
+						 errmsg("could not rename file \"%s\" to \"%s\": %m",
+								origpath, partialpath)));
+				XLogArchiveNotify(partialfname);
+			}
+		}
+	}
+
 	/*
 	 * Preallocate additional log files, if wanted.
 	 */
@@ -7222,8 +7445,8 @@ StartupXLOG(void)
 	XLogReportParameters();
 
 	/*
-	 * Local WAL inserts enabled, so it's time to finish initialization
-	 * of commit timestamp.
+	 * Local WAL inserts enabled, so it's time to finish initialization of
+	 * commit timestamp.
 	 */
 	CompleteCommitTsInitialization();
 
@@ -7817,7 +8040,7 @@ LogCheckpointStart(int flags, bool restartpoint)
 		 (flags & CHECKPOINT_WAIT) ? " wait" : "",
 		 (flags & CHECKPOINT_CAUSE_XLOG) ? " xlog" : "",
 		 (flags & CHECKPOINT_CAUSE_TIME) ? " time" : "",
-		 (flags & CHECKPOINT_FLUSH_ALL) ? " flush-all" :"");
+		 (flags & CHECKPOINT_FLUSH_ALL) ? " flush-all" : "");
 }
 
 /*
@@ -7912,8 +8135,8 @@ static void
 UpdateCheckPointDistanceEstimate(uint64 nbytes)
 {
 	/*
-	 * To estimate the number of segments consumed between checkpoints, keep
-	 * a moving average of the amount of WAL generated in previous checkpoint
+	 * To estimate the number of segments consumed between checkpoints, keep a
+	 * moving average of the amount of WAL generated in previous checkpoint
 	 * cycles. However, if the load is bursty, with quiet periods and busy
 	 * periods, we want to cater for the peak load. So instead of a plain
 	 * moving average, let the average decline slowly if the previous cycle
@@ -8471,6 +8694,7 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags)
 	CheckPointSnapBuild();
 	CheckPointLogicalRewriteHeap();
 	CheckPointBuffers(flags);	/* performs all required fsyncs */
+	CheckPointReplicationOrigin();
 	/* We deliberately delay 2PC checkpointing as long as possible */
 	CheckPointTwoPhase(checkPointRedo);
 }
@@ -8717,7 +8941,7 @@ CreateRestartPoint(int flags)
 	}
 
 	/*
-	 * Due to an historical accident multixact truncations are not WAL-logged,
+	 * Due to a historical accident multixact truncations are not WAL-logged,
 	 * but just performed everytime the mxact horizon is increased. So, unless
 	 * we explicitly execute truncations on a standby it will never clean out
 	 * /pg_multixact which obviously is bad, both because it uses space and
@@ -9328,8 +9552,8 @@ xlog_redo(XLogReaderState *record)
 		}
 
 		/*
-		 * Update the commit timestamp tracking. If there was a change
-		 * it needs to be activated or deactivated accordingly.
+		 * Update the commit timestamp tracking. If there was a change it
+		 * needs to be activated or deactivated accordingly.
 		 */
 		if (track_commit_timestamp != xlrec.track_commit_timestamp)
 		{
@@ -9338,6 +9562,7 @@ xlog_redo(XLogReaderState *record)
 			if (track_commit_timestamp)
 				ActivateCommitTs();
 			else
+
 				/*
 				 * We can't create a new WAL record here, but that's OK as
 				 * master did the WAL logging already and we will replay the
@@ -9593,16 +9818,27 @@ XLogFileNameP(TimeLineID tli, XLogSegNo segno)
  *
  * There are two kind of backups: exclusive and non-exclusive. An exclusive
  * backup is started with pg_start_backup(), and there can be only one active
- * at a time. The backup label file of an exclusive backup is written to
- * $PGDATA/backup_label, and it is removed by pg_stop_backup().
+ * at a time. The backup and tablespace map files of an exclusive backup are
+ * written to $PGDATA/backup_label and $PGDATA/tablespace_map, and they are
+ * removed by pg_stop_backup().
  *
  * A non-exclusive backup is used for the streaming base backups (see
  * src/backend/replication/basebackup.c). The difference to exclusive backups
- * is that the backup label file is not written to disk. Instead, its would-be
- * contents are returned in *labelfile, and the caller is responsible for
- * including it in the backup archive as 'backup_label'. There can be many
- * non-exclusive backups active at the same time, and they don't conflict
- * with an exclusive backup either.
+ * is that the backup label and tablespace map files are not written to disk.
+ * Instead, there would-be contents are returned in *labelfile and *tblspcmapfile,
+ * and the caller is responsible for including them in the backup archive as
+ * 'backup_label' and 'tablespace_map'. There can be many non-exclusive backups
+ * active at the same time, and they don't conflict with an exclusive backup
+ * either.
+ *
+ * tblspcmapfile is required mainly for tar format in windows as native windows
+ * utilities are not able to create symlinks while extracting files from tar.
+ * However for consistency, the same is used for all platforms.
+ *
+ * needtblspcmapfile is true for the cases (exclusive backup and for
+ * non-exclusive backup only when tar format is used for taking backup)
+ * when backup needs to generate tablespace_map file, it is used to
+ * embed escape character before newline character in tablespace path.
  *
  * Returns the minimum WAL position that must be present to restore from this
  * backup, and the corresponding timeline ID in *starttli_p.
@@ -9615,7 +9851,9 @@ XLogFileNameP(TimeLineID tli, XLogSegNo segno)
  */
 XLogRecPtr
 do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
-				   char **labelfile)
+				   char **labelfile, DIR *tblspcdir, List **tablespaces,
+				   char **tblspcmapfile, bool infotbssize,
+				   bool needtblspcmapfile)
 {
 	bool		exclusive = (labelfile == NULL);
 	bool		backup_started_in_recovery = false;
@@ -9629,6 +9867,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 	struct stat stat_buf;
 	FILE	   *fp;
 	StringInfoData labelfbuf;
+	StringInfoData tblspc_mapfbuf;
 
 	backup_started_in_recovery = RecoveryInProgress();
 
@@ -9700,6 +9939,9 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 	PG_ENSURE_ERROR_CLEANUP(pg_start_backup_callback, (Datum) BoolGetDatum(exclusive));
 	{
 		bool		gotUniqueStartpoint = false;
+		struct dirent *de;
+		tablespaceinfo *ti;
+		int			datadirpathlen;
 
 		/*
 		 * Force an XLOG file switch before the checkpoint, to ensure that the
@@ -9820,6 +10062,98 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 		XLogFileName(xlogfilename, ThisTimeLineID, _logSegNo);
 
 		/*
+		 * Construct tablespace_map file
+		 */
+		initStringInfo(&tblspc_mapfbuf);
+
+		datadirpathlen = strlen(DataDir);
+
+		/* Collect information about all tablespaces */
+		while ((de = ReadDir(tblspcdir, "pg_tblspc")) != NULL)
+		{
+			char		fullpath[MAXPGPATH];
+			char		linkpath[MAXPGPATH];
+			char	   *relpath = NULL;
+			int			rllen;
+			StringInfoData buflinkpath;
+			char	   *s = linkpath;
+
+			/* Skip special stuff */
+			if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
+				continue;
+
+			snprintf(fullpath, sizeof(fullpath), "pg_tblspc/%s", de->d_name);
+
+#if defined(HAVE_READLINK) || defined(WIN32)
+			rllen = readlink(fullpath, linkpath, sizeof(linkpath));
+			if (rllen < 0)
+			{
+				ereport(WARNING,
+						(errmsg("could not read symbolic link \"%s\": %m",
+								fullpath)));
+				continue;
+			}
+			else if (rllen >= sizeof(linkpath))
+			{
+				ereport(WARNING,
+						(errmsg("symbolic link \"%s\" target is too long",
+								fullpath)));
+				continue;
+			}
+			linkpath[rllen] = '\0';
+
+			/*
+			 * Add the escape character '\\' before newline in a string to
+			 * ensure that we can distinguish between the newline in the
+			 * tablespace path and end of line while reading tablespace_map
+			 * file during archive recovery.
+			 */
+			initStringInfo(&buflinkpath);
+
+			while (*s)
+			{
+				if ((*s == '\n' || *s == '\r') && needtblspcmapfile)
+					appendStringInfoChar(&buflinkpath, '\\');
+				appendStringInfoChar(&buflinkpath, *s++);
+			}
+
+
+			/*
+			 * Relpath holds the relative path of the tablespace directory
+			 * when it's located within PGDATA, or NULL if it's located
+			 * elsewhere.
+			 */
+			if (rllen > datadirpathlen &&
+				strncmp(linkpath, DataDir, datadirpathlen) == 0 &&
+				IS_DIR_SEP(linkpath[datadirpathlen]))
+				relpath = linkpath + datadirpathlen + 1;
+
+			ti = palloc(sizeof(tablespaceinfo));
+			ti->oid = pstrdup(de->d_name);
+			ti->path = pstrdup(buflinkpath.data);
+			ti->rpath = relpath ? pstrdup(relpath) : NULL;
+			ti->size = infotbssize ? sendTablespace(fullpath, true) : -1;
+
+			if (tablespaces)
+				*tablespaces = lappend(*tablespaces, ti);
+
+			appendStringInfo(&tblspc_mapfbuf, "%s %s\n", ti->oid, ti->path);
+
+			pfree(buflinkpath.data);
+#else
+
+			/*
+			 * If the platform does not have symbolic links, it should not be
+			 * possible to have tablespaces - clearly somebody else created
+			 * them. Warn about it and ignore.
+			 */
+			ereport(WARNING,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				  errmsg("tablespaces are not supported on this platform")));
+#endif
+		}
+
+		/*
 		 * Construct backup label file
 		 */
 		initStringInfo(&labelfbuf);
@@ -9882,9 +10216,51 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 						 errmsg("could not write file \"%s\": %m",
 								BACKUP_LABEL_FILE)));
 			pfree(labelfbuf.data);
+
+			/* Write backup tablespace_map file. */
+			if (tblspc_mapfbuf.len > 0)
+			{
+				if (stat(TABLESPACE_MAP, &stat_buf) != 0)
+				{
+					if (errno != ENOENT)
+						ereport(ERROR,
+								(errcode_for_file_access(),
+								 errmsg("could not stat file \"%s\": %m",
+										TABLESPACE_MAP)));
+				}
+				else
+					ereport(ERROR,
+						  (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+						   errmsg("a backup is already in progress"),
+						   errhint("If you're sure there is no backup in progress, remove file \"%s\" and try again.",
+								   TABLESPACE_MAP)));
+
+				fp = AllocateFile(TABLESPACE_MAP, "w");
+
+				if (!fp)
+					ereport(ERROR,
+							(errcode_for_file_access(),
+							 errmsg("could not create file \"%s\": %m",
+									TABLESPACE_MAP)));
+				if (fwrite(tblspc_mapfbuf.data, tblspc_mapfbuf.len, 1, fp) != 1 ||
+					fflush(fp) != 0 ||
+					pg_fsync(fileno(fp)) != 0 ||
+					ferror(fp) ||
+					FreeFile(fp))
+					ereport(ERROR,
+							(errcode_for_file_access(),
+							 errmsg("could not write file \"%s\": %m",
+									TABLESPACE_MAP)));
+			}
+
+			pfree(tblspc_mapfbuf.data);
 		}
 		else
+		{
 			*labelfile = labelfbuf.data;
+			if (tblspc_mapfbuf.len > 0)
+				*tblspcmapfile = tblspc_mapfbuf.data;
+		}
 	}
 	PG_END_ENSURE_ERROR_CLEANUP(pg_start_backup_callback, (Datum) BoolGetDatum(exclusive));
 
@@ -10055,6 +10431,12 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 					(errcode_for_file_access(),
 					 errmsg("could not remove file \"%s\": %m",
 							BACKUP_LABEL_FILE)));
+
+		/*
+		 * Remove tablespace_map file if present, it is created only if there
+		 * are tablespaces.
+		 */
+		unlink(TABLESPACE_MAP);
 	}
 
 	/*
@@ -10455,6 +10837,88 @@ read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired,
 }
 
 /*
+ * read_tablespace_map: check to see if a tablespace_map file is present
+ *
+ * If we see a tablespace_map file during recovery, we assume that we are
+ * recovering from a backup dump file, and we therefore need to create symlinks
+ * as per the information present in tablespace_map file.
+ *
+ * Returns TRUE if a tablespace_map file was found (and fills the link
+ * information for all the tablespace links present in file); returns FALSE
+ * if not.
+ */
+static bool
+read_tablespace_map(List **tablespaces)
+{
+	tablespaceinfo *ti;
+	FILE	   *lfp;
+	char		tbsoid[MAXPGPATH];
+	char	   *tbslinkpath;
+	char		str[MAXPGPATH];
+	int			ch,
+				prev_ch = -1,
+				i = 0,
+				n;
+
+	/*
+	 * See if tablespace_map file is present
+	 */
+	lfp = AllocateFile(TABLESPACE_MAP, "r");
+	if (!lfp)
+	{
+		if (errno != ENOENT)
+			ereport(FATAL,
+					(errcode_for_file_access(),
+					 errmsg("could not read file \"%s\": %m",
+							TABLESPACE_MAP)));
+		return false;			/* it's not there, all is fine */
+	}
+
+	/*
+	 * Read and parse the link name and path lines from tablespace_map file
+	 * (this code is pretty crude, but we are not expecting any variability in
+	 * the file format).  While taking backup we embed escape character '\\'
+	 * before newline in tablespace path, so that during reading of
+	 * tablespace_map file, we could distinguish newline in tablespace path
+	 * and end of line.  Now while reading tablespace_map file, remove the
+	 * escape character that has been added in tablespace path during backup.
+	 */
+	while ((ch = fgetc(lfp)) != EOF)
+	{
+		if ((ch == '\n' || ch == '\r') && prev_ch != '\\')
+		{
+			str[i] = '\0';
+			if (sscanf(str, "%s %n", tbsoid, &n) != 1)
+				ereport(FATAL,
+						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					 errmsg("invalid data in file \"%s\"", TABLESPACE_MAP)));
+			tbslinkpath = str + n;
+			i = 0;
+
+			ti = palloc(sizeof(tablespaceinfo));
+			ti->oid = pstrdup(tbsoid);
+			ti->path = pstrdup(tbslinkpath);
+
+			*tablespaces = lappend(*tablespaces, ti);
+			continue;
+		}
+		else if ((ch == '\n' || ch == '\r') && prev_ch == '\\')
+			str[i - 1] = ch;
+		else
+			str[i++] = ch;
+		prev_ch = ch;
+	}
+
+	if (ferror(lfp) || FreeFile(lfp))
+		ereport(FATAL,
+				(errcode_for_file_access(),
+				 errmsg("could not read file \"%s\": %m",
+						TABLESPACE_MAP)));
+
+	return true;
+}
+
+/*
  * Error context callback for errors occurring during rm_redo().
  */
 static void
@@ -10485,11 +10949,16 @@ BackupInProgress(void)
 }
 
 /*
- * CancelBackup: rename the "backup_label" file to cancel backup mode
+ * CancelBackup: rename the "backup_label" and "tablespace_map"
+ *				 files to cancel backup mode
  *
  * If the "backup_label" file exists, it will be renamed to "backup_label.old".
- * Note that this will render an online backup in progress useless.
- * To correctly finish an online backup, pg_stop_backup must be called.
+ * Similarly, if the "tablespace_map" file exists, it will be renamed to
+ * "tablespace_map.old".
+ *
+ * Note that this will render an online backup in progress
+ * useless. To correctly finish an online backup, pg_stop_backup must be
+ * called.
  */
 void
 CancelBackup(void)
@@ -10518,6 +10987,29 @@ CancelBackup(void)
 				 errdetail("Could not rename \"%s\" to \"%s\": %m.",
 						   BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
 	}
+
+	/* if the tablespace_map file is not there, return */
+	if (stat(TABLESPACE_MAP, &stat_buf) < 0)
+		return;
+
+	/* remove leftover file from previously canceled backup if it exists */
+	unlink(TABLESPACE_MAP_OLD);
+
+	if (rename(TABLESPACE_MAP, TABLESPACE_MAP_OLD) == 0)
+	{
+		ereport(LOG,
+				(errmsg("online backup mode canceled"),
+				 errdetail("\"%s\" was renamed to \"%s\".",
+						   TABLESPACE_MAP, TABLESPACE_MAP_OLD)));
+	}
+	else
+	{
+		ereport(WARNING,
+				(errcode_for_file_access(),
+				 errmsg("online backup mode was not canceled"),
+				 errdetail("Could not rename \"%s\" to \"%s\": %m.",
+						   TABLESPACE_MAP, TABLESPACE_MAP_OLD)));
+	}
 }
 
 /*
@@ -10705,8 +11197,8 @@ static bool
 WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
 							bool fetching_ckpt, XLogRecPtr tliRecPtr)
 {
-	static TimestampTz	last_fail_time = 0;
-	TimestampTz	now;
+	static TimestampTz last_fail_time = 0;
+	TimestampTz now;
 
 	/*-------
 	 * Standby mode is implemented by a state machine:
@@ -10860,9 +11352,10 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
 					 */
 					now = GetCurrentTimestamp();
 					if (!TimestampDifferenceExceeds(last_fail_time, now,
-													wal_retrieve_retry_interval))
+												wal_retrieve_retry_interval))
 					{
-						long		secs, wait_time;
+						long		secs,
+									wait_time;
 						int			usecs;
 
 						TimestampDifference(last_fail_time, now, &secs, &usecs);
@@ -10870,7 +11363,7 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
 							(secs * 1000 + usecs / 1000);
 
 						WaitLatch(&XLogCtl->recoveryWakeupLatch,
-								  WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
+							 WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
 								  wait_time);
 						ResetLatch(&XLogCtl->recoveryWakeupLatch);
 						now = GetCurrentTimestamp();
diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c
index f435f65e98..7af56a9a74 100644
--- a/src/backend/access/transam/xlogarchive.c
+++ b/src/backend/access/transam/xlogarchive.c
@@ -480,7 +480,10 @@ KeepFileRestoredFromArchive(char *path, char *xlogfname)
 	 * Create .done file forcibly to prevent the restored segment from being
 	 * archived again later.
 	 */
-	XLogArchiveForceDone(xlogfname);
+	if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
+		XLogArchiveForceDone(xlogfname);
+	else
+		XLogArchiveNotify(xlogfname);
 
 	/*
 	 * If the existing file was replaced, since walsenders might have it open,
@@ -695,6 +698,41 @@ XLogArchiveIsBusy(const char *xlog)
 }
 
 /*
+ * XLogArchiveIsReadyOrDone
+ *
+ * Check to see if an XLOG segment file has a .ready or .done file.
+ * This is similar to XLogArchiveIsBusy(), but returns true if the file
+ * is already archived or is about to be archived.
+ *
+ * This is currently only used at recovery.  During normal operation this
+ * would be racy: the file might get removed or marked with .ready as we're
+ * checking it, or immediately after we return.
+ */
+bool
+XLogArchiveIsReadyOrDone(const char *xlog)
+{
+	char		archiveStatusPath[MAXPGPATH];
+	struct stat stat_buf;
+
+	/* First check for .done --- this means archiver is done with it */
+	StatusFilePath(archiveStatusPath, xlog, ".done");
+	if (stat(archiveStatusPath, &stat_buf) == 0)
+		return true;
+
+	/* check for .ready --- this means archiver is still busy with it */
+	StatusFilePath(archiveStatusPath, xlog, ".ready");
+	if (stat(archiveStatusPath, &stat_buf) == 0)
+		return true;
+
+	/* Race condition --- maybe archiver just finished, so recheck */
+	StatusFilePath(archiveStatusPath, xlog, ".done");
+	if (stat(archiveStatusPath, &stat_buf) == 0)
+		return true;
+
+	return false;
+}
+
+/*
  * XLogArchiveIsReady
  *
  * Check to see if an XLOG segment file has an archive notification (.ready)
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 2179bf719e..329bb8ca25 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -51,6 +51,7 @@ pg_start_backup(PG_FUNCTION_ARGS)
 	bool		fast = PG_GETARG_BOOL(1);
 	char	   *backupidstr;
 	XLogRecPtr	startpoint;
+	DIR		   *dir;
 
 	backupidstr = text_to_cstring(backupid);
 
@@ -59,7 +60,16 @@ pg_start_backup(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 		   errmsg("must be superuser or replication role to run a backup")));
 
-	startpoint = do_pg_start_backup(backupidstr, fast, NULL, NULL);
+	/* Make sure we can open the directory with tablespaces in it */
+	dir = AllocateDir("pg_tblspc");
+	if (!dir)
+		ereport(ERROR,
+				(errmsg("could not open directory \"%s\": %m", "pg_tblspc")));
+
+	startpoint = do_pg_start_backup(backupidstr, fast, NULL, NULL,
+									dir, NULL, NULL, false, true);
+
+	FreeDir(dir);
 
 	PG_RETURN_LSN(startpoint);
 }
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 618f8792f8..b96c39ac65 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,13 +26,14 @@
 #include "catalog/pg_control.h"
 #include "common/pg_lzcompress.h"
 #include "miscadmin.h"
+#include "replication/origin.h"
 #include "storage/bufmgr.h"
 #include "storage/proc.h"
 #include "utils/memutils.h"
 #include "pg_trace.h"
 
 /* Buffer size required to store a compressed version of backup block image */
-#define PGLZ_MAX_BLCKSZ	PGLZ_MAX_OUTPUT(BLCKSZ)
+#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
 
 /*
  * For each block reference registered with XLogRegisterBuffer, we fill in
@@ -57,7 +58,7 @@ typedef struct
 
 	/* buffer to store a compressed version of backup block image */
 	char		compressed_page[PGLZ_MAX_BLCKSZ];
-}	registered_buffer;
+} registered_buffer;
 
 static registered_buffer *registered_buffers;
 static int	max_registered_buffers;		/* allocated size */
@@ -72,6 +73,9 @@ static XLogRecData *mainrdata_head;
 static XLogRecData *mainrdata_last = (XLogRecData *) &mainrdata_head;
 static uint32 mainrdata_len;	/* total # of bytes in chain */
 
+/* Should te in-progress insertion log the origin */
+static bool include_origin = false;
+
 /*
  * These are used to hold the record header while constructing a record.
  * 'hdr_scratch' is not a plain variable, but is palloc'd at initialization,
@@ -83,10 +87,12 @@ static uint32 mainrdata_len;	/* total # of bytes in chain */
 static XLogRecData hdr_rdt;
 static char *hdr_scratch = NULL;
 
+#define SizeOfXlogOrigin	(sizeof(RepOriginId) + sizeof(char))
+
 #define HEADER_SCRATCH_SIZE \
 	(SizeOfXLogRecord + \
 	 MaxSizeOfXLogRecordBlockHeader * (XLR_MAX_BLOCK_ID + 1) + \
-	 SizeOfXLogRecordDataHeaderLong)
+	 SizeOfXLogRecordDataHeaderLong + SizeOfXlogOrigin)
 
 /*
  * An array of XLogRecData structs, to hold registered data.
@@ -104,7 +110,7 @@ static XLogRecData *XLogRecordAssemble(RmgrId rmid, uint8 info,
 				   XLogRecPtr RedoRecPtr, bool doPageWrites,
 				   XLogRecPtr *fpw_lsn);
 static bool XLogCompressBackupBlock(char *page, uint16 hole_offset,
-									uint16 hole_length, char *dest, uint16 *dlen);
+						uint16 hole_length, char *dest, uint16 *dlen);
 
 /*
  * Begin constructing a WAL record. This must be called before the
@@ -193,6 +199,7 @@ XLogResetInsertion(void)
 	max_registered_block_id = 0;
 	mainrdata_len = 0;
 	mainrdata_last = (XLogRecData *) &mainrdata_head;
+	include_origin = false;
 	begininsert_called = false;
 }
 
@@ -375,6 +382,16 @@ XLogRegisterBufData(uint8 block_id, char *data, int len)
 }
 
 /*
+ * Should this record include the replication origin if one is set up?
+ */
+void
+XLogIncludeOrigin(void)
+{
+	Assert(begininsert_called);
+	include_origin = true;
+}
+
+/*
  * Insert an XLOG record having the specified RMID and info bytes, with the
  * body of the record being the data and buffer references registered earlier
  * with XLogRegister* calls.
@@ -585,7 +602,10 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
 											&compressed_len);
 			}
 
-			/* Fill in the remaining fields in the XLogRecordBlockHeader struct */
+			/*
+			 * Fill in the remaining fields in the XLogRecordBlockHeader
+			 * struct
+			 */
 			bkpb.fork_flags |= BKPBLOCK_HAS_IMAGE;
 
 			/*
@@ -650,10 +670,10 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
 		{
 			samerel = true;
 			bkpb.fork_flags |= BKPBLOCK_SAME_REL;
-			prev_regbuf = regbuf;
 		}
 		else
 			samerel = false;
+		prev_regbuf = regbuf;
 
 		/* Ok, copy the header to the scratch buffer */
 		memcpy(scratch, &bkpb, SizeOfXLogRecordBlockHeader);
@@ -678,6 +698,14 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
 		scratch += sizeof(BlockNumber);
 	}
 
+	/* followed by the record's origin, if any */
+	if (include_origin && replorigin_sesssion_origin != InvalidRepOriginId)
+	{
+		*(scratch++) = XLR_BLOCK_ID_ORIGIN;
+		memcpy(scratch, &replorigin_sesssion_origin, sizeof(replorigin_sesssion_origin));
+		scratch += sizeof(replorigin_sesssion_origin);
+	}
+
 	/* followed by main data, if any */
 	if (mainrdata_len > 0)
 	{
@@ -737,7 +765,7 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
  * the length of compressed block image.
  */
 static bool
-XLogCompressBackupBlock(char * page, uint16 hole_offset, uint16 hole_length,
+XLogCompressBackupBlock(char *page, uint16 hole_offset, uint16 hole_length,
 						char *dest, uint16 *dlen)
 {
 	int32		orig_len = BLCKSZ - hole_length;
@@ -765,16 +793,15 @@ XLogCompressBackupBlock(char * page, uint16 hole_offset, uint16 hole_length,
 		source = page;
 
 	/*
-	 * We recheck the actual size even if pglz_compress() reports success
-	 * and see if the number of bytes saved by compression is larger than
-	 * the length of extra data needed for the compressed version of block
-	 * image.
+	 * We recheck the actual size even if pglz_compress() reports success and
+	 * see if the number of bytes saved by compression is larger than the
+	 * length of extra data needed for the compressed version of block image.
 	 */
 	len = pglz_compress(source, orig_len, dest, PGLZ_strategy_default);
 	if (len >= 0 &&
 		len + extra_bytes < orig_len)
 	{
-		*dlen = (uint16) len;		/* successful compression */
+		*dlen = (uint16) len;	/* successful compression */
 		return true;
 	}
 	return false;
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index 77be1b8ef3..a9e926c5a2 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -21,6 +21,7 @@
 #include "access/xlogreader.h"
 #include "catalog/pg_control.h"
 #include "common/pg_lzcompress.h"
+#include "replication/origin.h"
 
 static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength);
 
@@ -975,6 +976,7 @@ DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, char **errormsg)
 	ResetDecoder(state);
 
 	state->decoded_record = record;
+	state->record_origin = InvalidRepOriginId;
 
 	ptr = (char *) record;
 	ptr += SizeOfXLogRecord;
@@ -1009,6 +1011,10 @@ DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, char **errormsg)
 			break;				/* by convention, the main data fragment is
 								 * always last */
 		}
+		else if (block_id == XLR_BLOCK_ID_ORIGIN)
+		{
+			COPY_HEADER_FIELD(&state->record_origin, sizeof(RepOriginId));
+		}
 		else if (block_id <= XLR_MAX_BLOCK_ID)
 		{
 			/* XLogRecordBlockHeader */
@@ -1080,50 +1086,53 @@ DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, char **errormsg)
 					 blk->bimg_len == BLCKSZ))
 				{
 					report_invalid_record(state,
-					  "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X",
+										  "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X",
 										  (unsigned int) blk->hole_offset,
 										  (unsigned int) blk->hole_length,
 										  (unsigned int) blk->bimg_len,
 										  (uint32) (state->ReadRecPtr >> 32), (uint32) state->ReadRecPtr);
 					goto err;
 				}
+
 				/*
-				 * cross-check that hole_offset == 0 and hole_length == 0
-				 * if the HAS_HOLE flag is not set.
+				 * cross-check that hole_offset == 0 and hole_length == 0 if
+				 * the HAS_HOLE flag is not set.
 				 */
 				if (!(blk->bimg_info & BKPIMAGE_HAS_HOLE) &&
 					(blk->hole_offset != 0 || blk->hole_length != 0))
 				{
 					report_invalid_record(state,
-					  "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X",
+										  "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X",
 										  (unsigned int) blk->hole_offset,
 										  (unsigned int) blk->hole_length,
 										  (uint32) (state->ReadRecPtr >> 32), (uint32) state->ReadRecPtr);
 					goto err;
 				}
+
 				/*
-				 * cross-check that bimg_len < BLCKSZ
-				 * if the IS_COMPRESSED flag is set.
+				 * cross-check that bimg_len < BLCKSZ if the IS_COMPRESSED
+				 * flag is set.
 				 */
 				if ((blk->bimg_info & BKPIMAGE_IS_COMPRESSED) &&
 					blk->bimg_len == BLCKSZ)
 				{
 					report_invalid_record(state,
-					  "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X",
+										  "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X",
 										  (unsigned int) blk->bimg_len,
 										  (uint32) (state->ReadRecPtr >> 32), (uint32) state->ReadRecPtr);
 					goto err;
 				}
+
 				/*
-				 * cross-check that bimg_len = BLCKSZ if neither
-				 * HAS_HOLE nor IS_COMPRESSED flag is set.
+				 * cross-check that bimg_len = BLCKSZ if neither HAS_HOLE nor
+				 * IS_COMPRESSED flag is set.
 				 */
 				if (!(blk->bimg_info & BKPIMAGE_HAS_HOLE) &&
 					!(blk->bimg_info & BKPIMAGE_IS_COMPRESSED) &&
 					blk->bimg_len != BLCKSZ)
 				{
 					report_invalid_record(state,
-					  "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X",
+										  "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X",
 										  (unsigned int) blk->data_len,
 										  (uint32) (state->ReadRecPtr >> 32), (uint32) state->ReadRecPtr);
 					goto err;
@@ -1288,8 +1297,8 @@ bool
 RestoreBlockImage(XLogReaderState *record, uint8 block_id, char *page)
 {
 	DecodedBkpBlock *bkpb;
-	char   *ptr;
-	char	tmp[BLCKSZ];
+	char	   *ptr;
+	char		tmp[BLCKSZ];
 
 	if (!record->blocks[block_id].in_use)
 		return false;
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 6e563b67e6..d8d1b06ff0 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -21,7 +21,6 @@
 #include "access/attnum.h"
 #include "access/htup.h"
 #include "access/itup.h"
-#include "access/skey.h"
 #include "access/tupdesc.h"
 #include "access/xact.h"
 #include "bootstrap/bootstrap.h"
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 72714f474b..e60d377ccc 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -18,7 +18,6 @@
 #include "access/attnum.h"
 #include "access/htup.h"
 #include "access/itup.h"
-#include "access/skey.h"
 #include "access/tupdesc.h"
 #include "bootstrap/bootstrap.h"
 #include "catalog/pg_am.h"
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index c732b7a300..e0253a6c00 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -124,6 +124,10 @@ static const struct typinfo TypInfo[] = {
 	F_REGPROCIN, F_REGPROCOUT},
 	{"regtype", REGTYPEOID, 0, 4, true, 'i', 'p', InvalidOid,
 	F_REGTYPEIN, F_REGTYPEOUT},
+	{"regrole", REGROLEOID, 0, 4, true, 'i', 'p', InvalidOid,
+	F_REGROLEIN, F_REGROLEOUT},
+	{"regnamespace", REGNAMESPACEOID, 0, 4, true, 'i', 'p', InvalidOid,
+	F_REGNAMESPACEIN, F_REGNAMESPACEOUT},
 	{"text", TEXTOID, 0, -1, false, 'i', 'x', DEFAULT_COLLATION_OID,
 	F_TEXTIN, F_TEXTOUT},
 	{"oid", OIDOID, 0, 4, true, 'i', 'p', InvalidOid,
@@ -426,6 +430,13 @@ AuxiliaryProcessMain(int argc, char *argv[])
 			proc_exit(1);		/* should never return */
 
 		case BootstrapProcess:
+
+			/*
+			 * There was a brief instant during which mode was Normal; this is
+			 * okay.  We need to be in bootstrap mode during BootStrapXLOG for
+			 * the sake of multixact initialization.
+			 */
+			SetProcessingMode(BootstrapProcessing);
 			bootstrap_signals();
 			BootStrapXLOG();
 			BootstrapModeMain();
@@ -488,8 +499,7 @@ BootstrapModeMain(void)
 	int			i;
 
 	Assert(!IsUnderPostmaster);
-
-	SetProcessingMode(BootstrapProcessing);
+	Assert(IsBootstrapProcessingMode());
 
 	/*
 	 * Do backend-like initialization for bootstrap mode
diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
index ac1dafb041..5e704181ec 100644
--- a/src/backend/catalog/Catalog.pm
+++ b/src/backend/catalog/Catalog.pm
@@ -189,7 +189,8 @@ sub Catalogs
 						}
 						else
 						{
-							die "unknown column option $attopt on column $attname"
+							die
+"unknown column option $attopt on column $attname";
 						}
 					}
 					push @{ $catalog{columns} }, \%row;
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 691031a308..d272675860 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -40,9 +40,9 @@ POSTGRES_BKI_SRCS = $(addprefix $(top_srcdir)/src/include/catalog/,\
 	pg_ts_parser.h pg_ts_template.h pg_extension.h \
 	pg_foreign_data_wrapper.h pg_foreign_server.h pg_user_mapping.h \
 	pgxc_class.h pgxc_node.h pgxc_group.h \
-	pg_foreign_table.h pg_policy.h \
-	pg_default_acl.h pg_seclabel.h pg_shseclabel.h pg_collation.h pg_range.h \
-	toasting.h indexing.h \
+	pg_foreign_table.h pg_policy.h pg_replication_origin.h \
+	pg_tablesample_method.h pg_default_acl.h pg_seclabel.h pg_shseclabel.h \
+	pg_collation.h pg_range.h pg_transform.h toasting.h indexing.h \
     )
 
 # location of Catalog.pm
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 8e75c27920..50a00cf8c8 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -48,6 +48,7 @@
 #include "catalog/pg_ts_config.h"
 #include "catalog/pg_ts_dict.h"
 #include "commands/dbcommands.h"
+#include "commands/event_trigger.h"
 #include "commands/proclang.h"
 #include "commands/tablespace.h"
 #include "foreign/foreign.h"
@@ -56,6 +57,7 @@
 #include "parser/parse_func.h"
 #include "parser/parse_type.h"
 #include "utils/acl.h"
+#include "utils/aclchk_internal.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
@@ -65,32 +67,6 @@
 
 
 /*
- * The information about one Grant/Revoke statement, in internal format: object
- * and grantees names have been turned into Oids, the privilege list is an
- * AclMode bitmask.  If 'privileges' is ACL_NO_RIGHTS (the 0 value) and
- * all_privs is true, 'privileges' will be internally set to the right kind of
- * ACL_ALL_RIGHTS_*, depending on the object type (NB - this will modify the
- * InternalGrant struct!)
- *
- * Note: 'all_privs' and 'privileges' represent object-level privileges only.
- * There might also be column-level privilege specifications, which are
- * represented in col_privs (this is a list of untransformed AccessPriv nodes).
- * Column privileges are only valid for objtype ACL_OBJECT_RELATION.
- */
-typedef struct
-{
-	bool		is_grant;
-	GrantObjectType objtype;
-	List	   *objects;
-	bool		all_privs;
-	AclMode		privileges;
-	List	   *col_privs;
-	List	   *grantees;
-	bool		grant_option;
-	DropBehavior behavior;
-} InternalGrant;
-
-/*
  * Internal format used by ALTER DEFAULT PRIVILEGES.
  */
 typedef struct
@@ -421,14 +397,14 @@ ExecuteGrantStmt(GrantStmt *stmt)
 	istmt.behavior = stmt->behavior;
 
 	/*
-	 * Convert the RoleSpec list into an Oid list.  Note that at this point
-	 * we insert an ACL_ID_PUBLIC into the list if appropriate, so downstream
+	 * Convert the RoleSpec list into an Oid list.  Note that at this point we
+	 * insert an ACL_ID_PUBLIC into the list if appropriate, so downstream
 	 * there shouldn't be any additional work needed to support this case.
 	 */
 	foreach(cell, stmt->grantees)
 	{
-		RoleSpec *grantee = (RoleSpec *) lfirst(cell);
-		Oid grantee_uid;
+		RoleSpec   *grantee = (RoleSpec *) lfirst(cell);
+		Oid			grantee_uid;
 
 		switch (grantee->roletype)
 		{
@@ -605,6 +581,15 @@ ExecGrantStmt_oids(InternalGrant *istmt)
 			elog(ERROR, "unrecognized GrantStmt.objtype: %d",
 				 (int) istmt->objtype);
 	}
+
+	/*
+	 * Pass the info to event triggers about the just-executed GRANT.  Note
+	 * that we prefer to do it after actually executing it, because that gives
+	 * the functions a chance to adjust the istmt with privileges actually
+	 * granted.
+	 */
+	if (EventTriggerSupportsGrantObjectType(istmt->objtype))
+		EventTriggerCollectGrant(istmt);
 }
 
 /*
@@ -907,14 +892,14 @@ ExecAlterDefaultPrivilegesStmt(AlterDefaultPrivilegesStmt *stmt)
 	iacls.behavior = action->behavior;
 
 	/*
-	 * Convert the RoleSpec list into an Oid list.  Note that at this point
-	 * we insert an ACL_ID_PUBLIC into the list if appropriate, so downstream
+	 * Convert the RoleSpec list into an Oid list.  Note that at this point we
+	 * insert an ACL_ID_PUBLIC into the list if appropriate, so downstream
 	 * there shouldn't be any additional work needed to support this case.
 	 */
 	foreach(cell, action->grantees)
 	{
-		RoleSpec *grantee = (RoleSpec *) lfirst(cell);
-		Oid grantee_uid;
+		RoleSpec   *grantee = (RoleSpec *) lfirst(cell);
+		Oid			grantee_uid;
 
 		switch (grantee->roletype)
 		{
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 745898e64c..4b8f12c41a 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -37,6 +37,7 @@
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_pltemplate.h"
 #include "catalog/pg_db_role_setting.h"
+#include "catalog/pg_replication_origin.h"
 #include "catalog/pg_shdepend.h"
 #include "catalog/pg_shdescription.h"
 #include "catalog/pg_shseclabel.h"
@@ -126,7 +127,7 @@ IsCatalogClass(Oid relid, Form_pg_class reltuple)
 	 * We could instead check whether the relation is pinned in pg_depend, but
 	 * this is noticeably cheaper and doesn't require catalog access.
 	 *
-	 * This test is safe since even a oid wraparound will preserve this
+	 * This test is safe since even an oid wraparound will preserve this
 	 * property (c.f. GetNewObjectId()) and it has the advantage that it works
 	 * correctly even if a user decides to create a relation in the pg_catalog
 	 * namespace.
@@ -238,7 +239,8 @@ IsSharedRelation(Oid relationId)
 		relationId == PgxcGroupRelationId ||
 		relationId == PgxcNodeRelationId ||
 #endif
-		relationId == DbRoleSettingRelationId)
+		relationId == DbRoleSettingRelationId ||
+		relationId == ReplicationOriginRelationId)
 		return true;
 	/* These are their indexes (see indexing.h) */
 	if (relationId == AuthIdRolnameIndexId ||
@@ -261,7 +263,9 @@ IsSharedRelation(Oid relationId)
 		relationId == PgxcGroupGroupNameIndexId ||
 		relationId == PgxcGroupOidIndexId ||
 #endif
-		relationId == DbRoleSettingDatidRolidIndexId)
+		relationId == DbRoleSettingDatidRolidIndexId ||
+		relationId == ReplicationOriginIdentIndex ||
+		relationId == ReplicationOriginNameIndex)
 		return true;
 	/* These are their toast tables and toast indexes (see toasting.h) */
 	if (relationId == PgShdescriptionToastTable ||
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 64c60d13a9..77f84cc8c9 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -53,6 +53,7 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_tablespace.h"
+#include "catalog/pg_transform.h"
 #include "catalog/pg_trigger.h"
 #include "catalog/pg_ts_config.h"
 #include "catalog/pg_ts_dict.h"
@@ -230,8 +231,8 @@ deleteObjectsInList(ObjectAddresses *targetObjects, Relation *depRel,
 		{
 			const ObjectAddress *thisobj = &targetObjects->refs[i];
 			const ObjectAddressExtra *extra = &targetObjects->extras[i];
-			bool	original = false;
-			bool	normal = false;
+			bool		original = false;
+			bool		normal = false;
 
 			if (extra->flags & DEPFLAG_ORIGINAL)
 				original = true;
@@ -1445,6 +1446,10 @@ doDeletion(const ObjectAddress *object, int flags)
 			RemovePolicyById(object->objectId);
 			break;
 
+		case OCLASS_TRANSFORM:
+			DropTransformById(object->objectId);
+			break;
+
 		default:
 			elog(ERROR, "unrecognized object class: %u",
 				 object->classId);
@@ -1777,6 +1782,24 @@ find_expr_references_walker(Node *node,
 						add_object_address(OCLASS_TSDICT, objoid, 0,
 										   context->addrs);
 					break;
+
+				case REGNAMESPACEOID:
+					objoid = DatumGetObjectId(con->constvalue);
+					if (SearchSysCacheExists1(NAMESPACEOID,
+											  ObjectIdGetDatum(objoid)))
+						add_object_address(OCLASS_SCHEMA, objoid, 0,
+										   context->addrs);
+					break;
+
+					/*
+					 * Dependencies for regrole should be shared among all
+					 * databases, so explicitly inhibit to have dependencies.
+					 */
+				case REGROLEOID:
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("constant of the type \'regrole\' cannot be used here")));
+					break;
 			}
 		}
 		return false;
@@ -2558,6 +2581,9 @@ getObjectClass(const ObjectAddress *object)
 
 		case PolicyRelationId:
 			return OCLASS_POLICY;
+
+		case TransformRelationId:
+			return OCLASS_TRANSFORM;
 	}
 
 	/* shouldn't get here */
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index b4f22502e0..b084d9216f 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -147,7 +147,7 @@ foreach my $catname (@{ $catalogs->{names} })
 	}
 	print BKI "\n )\n";
 
-	# open it, unless bootstrap case (create bootstrap does this automatically)
+   # open it, unless bootstrap case (create bootstrap does this automatically)
 	if ($catalog->{bootstrap} eq '')
 	{
 		print BKI "open $catname\n";
@@ -242,17 +242,17 @@ foreach my $catname (@{ $catalogs->{names} })
 			{
 				$attnum = 0;
 				my @SYS_ATTRS = (
-					{ name => 'ctid', type => 'tid' },
-					{ name => 'oid', type => 'oid' },
-					{ name => 'xmin', type => 'xid' },
-					{ name => 'cmin', type=> 'cid' },
-					{ name => 'xmax', type=> 'xid' },
-					{ name => 'cmax', type => 'cid' },
+					{ name => 'ctid',     type => 'tid' },
+					{ name => 'oid',      type => 'oid' },
+					{ name => 'xmin',     type => 'xid' },
+					{ name => 'cmin',     type => 'cid' },
+					{ name => 'xmax',     type => 'xid' },
+					{ name => 'cmax',     type => 'cid' },
 					{ name => 'tableoid', type => 'oid' }
 #PGXC_BEGIN
 					,{ name => 'xc_node_id', type => 'int4' }
-#PGXC_END
 					);
+#PGXC_END
 				foreach my $attr (@SYS_ATTRS)
 				{
 					$attnum--;
@@ -388,6 +388,7 @@ sub emit_pgattr_row
 			}
 			elsif ($priornotnull)
 			{
+
 				# attnotnull will automatically be set if the type is
 				# fixed-width and prior columns are all NOT NULL ---
 				# compare DefineAttr in bootstrap.c. oidvector and
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index ac3b785b5a..4246554d19 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -63,6 +63,7 @@
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
+#include "utils/pg_rusage.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
 #include "utils/snapmgr.h"
@@ -1665,6 +1666,10 @@ BuildIndexInfo(Relation index)
 	/* other info */
 	ii->ii_Unique = indexStruct->indisunique;
 	ii->ii_ReadyForInserts = IndexIsReady(indexStruct);
+	/* assume not doing speculative insertion for now */
+	ii->ii_UniqueOps = NULL;
+	ii->ii_UniqueProcs = NULL;
+	ii->ii_UniqueStrats = NULL;
 
 	/* initialize index-build state to default */
 	ii->ii_Concurrent = false;
@@ -1674,6 +1679,53 @@ BuildIndexInfo(Relation index)
 }
 
 /* ----------------
+ *		BuildSpeculativeIndexInfo
+ *			Add extra state to IndexInfo record
+ *
+ * For unique indexes, we usually don't want to add info to the IndexInfo for
+ * checking uniqueness, since the B-Tree AM handles that directly.  However,
+ * in the case of speculative insertion, additional support is required.
+ *
+ * Do this processing here rather than in BuildIndexInfo() to not incur the
+ * overhead in the common non-speculative cases.
+ * ----------------
+ */
+void
+BuildSpeculativeIndexInfo(Relation index, IndexInfo *ii)
+{
+	int			ncols = index->rd_rel->relnatts;
+	int			i;
+
+	/*
+	 * fetch info for checking unique indexes
+	 */
+	Assert(ii->ii_Unique);
+
+	if (index->rd_rel->relam != BTREE_AM_OID)
+		elog(ERROR, "unexpected non-btree speculative unique index");
+
+	ii->ii_UniqueOps = (Oid *) palloc(sizeof(Oid) * ncols);
+	ii->ii_UniqueProcs = (Oid *) palloc(sizeof(Oid) * ncols);
+	ii->ii_UniqueStrats = (uint16 *) palloc(sizeof(uint16) * ncols);
+
+	/*
+	 * We have to look up the operator's strategy number.  This provides a
+	 * cross-check that the operator does match the index.
+	 */
+	/* We need the func OIDs and strategy numbers too */
+	for (i = 0; i < ncols; i++)
+	{
+		ii->ii_UniqueStrats[i] = BTEqualStrategyNumber;
+		ii->ii_UniqueOps[i] =
+			get_opfamily_member(index->rd_opfamily[i],
+								index->rd_opcintype[i],
+								index->rd_opcintype[i],
+								ii->ii_UniqueStrats[i]);
+		ii->ii_UniqueProcs[i] = get_opcode(ii->ii_UniqueOps[i]);
+	}
+}
+
+/* ----------------
  *		FormIndexDatum
  *			Construct values[] and isnull[] arrays for a new index tuple.
  *
@@ -2612,7 +2664,7 @@ IndexCheckExclusion(Relation heapRelation,
 		check_exclusion_constraint(heapRelation,
 								   indexRelation, indexInfo,
 								   &(heapTuple->t_self), values, isnull,
-								   estate, true, false);
+								   estate, true);
 	}
 
 	heap_endscan(scan);
@@ -3133,13 +3185,17 @@ IndexGetRelation(Oid indexId, bool missing_ok)
  * reindex_index - This routine is used to recreate a single index
  */
 void
-reindex_index(Oid indexId, bool skip_constraint_checks, char persistence)
+reindex_index(Oid indexId, bool skip_constraint_checks, char persistence,
+			  int options)
 {
 	Relation	iRel,
 				heapRelation;
 	Oid			heapId;
 	IndexInfo  *indexInfo;
 	volatile bool skipped_constraint = false;
+	PGRUsage	ru0;
+
+	pg_rusage_init(&ru0);
 
 	/*
 	 * Open and lock the parent heap relation.  ShareLock is sufficient since
@@ -3283,6 +3339,14 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence)
 		heap_close(pg_index, RowExclusiveLock);
 	}
 
+	/* Log what we did */
+	if (options & REINDEXOPT_VERBOSE)
+		ereport(INFO,
+				(errmsg("index \"%s\" was reindexed",
+						get_rel_name(indexId)),
+				 errdetail("%s.",
+						   pg_rusage_show(&ru0))));
+
 	/* Close rels, but keep locks */
 	index_close(iRel, NoLock);
 	heap_close(heapRelation, NoLock);
@@ -3324,7 +3388,7 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence)
  * index rebuild.
  */
 bool
-reindex_relation(Oid relid, int flags)
+reindex_relation(Oid relid, int flags, int options)
 {
 	Relation	rel;
 	Oid			toast_relid;
@@ -3415,7 +3479,7 @@ reindex_relation(Oid relid, int flags)
 				RelationSetIndexList(rel, doneIndexes, InvalidOid);
 
 			reindex_index(indexOid, !(flags & REINDEX_REL_CHECK_CONSTRAINTS),
-						  persistence);
+						  persistence, options);
 
 			CommandCounterIncrement();
 
@@ -3450,7 +3514,7 @@ reindex_relation(Oid relid, int flags)
 	 * still hold the lock on the master table.
 	 */
 	if ((flags & REINDEX_REL_PROCESS_TOAST) && OidIsValid(toast_relid))
-		result |= reindex_relation(toast_relid, flags);
+		result |= reindex_relation(toast_relid, flags, options);
 
 	return result;
 }
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index fe123addac..0231084c7c 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -46,7 +46,7 @@ CatalogOpenIndexes(Relation heapRel)
 	resultRelInfo->ri_RelationDesc = heapRel;
 	resultRelInfo->ri_TrigDesc = NULL;	/* we don't fire triggers */
 
-	ExecOpenIndices(resultRelInfo);
+	ExecOpenIndices(resultRelInfo, false);
 
 	return resultRelInfo;
 }
diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql
index 3c6a049b6d..6e1b241956 100644
--- a/src/backend/catalog/information_schema.sql
+++ b/src/backend/catalog/information_schema.sql
@@ -1928,7 +1928,39 @@ GRANT SELECT ON tables TO PUBLIC;
  * TRANSFORMS view
  */
 
--- feature not supported
+CREATE VIEW transforms AS
+    SELECT CAST(current_database() AS sql_identifier) AS udt_catalog,
+           CAST(nt.nspname AS sql_identifier) AS udt_schema,
+           CAST(t.typname AS sql_identifier) AS udt_name,
+           CAST(current_database() AS sql_identifier) AS specific_catalog,
+           CAST(np.nspname AS sql_identifier) AS specific_schema,
+           CAST(p.proname || '_' || CAST(p.oid AS text) AS sql_identifier) AS specific_name,
+           CAST(l.lanname AS sql_identifier) AS group_name,
+           CAST('FROM SQL' AS character_data) AS transform_type
+    FROM pg_type t JOIN pg_transform x ON t.oid = x.trftype
+         JOIN pg_language l ON x.trflang = l.oid
+         JOIN pg_proc p ON x.trffromsql = p.oid
+         JOIN pg_namespace nt ON t.typnamespace = nt.oid
+         JOIN pg_namespace np ON p.pronamespace = np.oid
+
+  UNION
+
+    SELECT CAST(current_database() AS sql_identifier) AS udt_catalog,
+           CAST(nt.nspname AS sql_identifier) AS udt_schema,
+           CAST(t.typname AS sql_identifier) AS udt_name,
+           CAST(current_database() AS sql_identifier) AS specific_catalog,
+           CAST(np.nspname AS sql_identifier) AS specific_schema,
+           CAST(p.proname || '_' || CAST(p.oid AS text) AS sql_identifier) AS specific_name,
+           CAST(l.lanname AS sql_identifier) AS group_name,
+           CAST('TO SQL' AS character_data) AS transform_type
+    FROM pg_type t JOIN pg_transform x ON t.oid = x.trftype
+         JOIN pg_language l ON x.trflang = l.oid
+         JOIN pg_proc p ON x.trftosql = p.oid
+         JOIN pg_namespace nt ON t.typnamespace = nt.oid
+         JOIN pg_namespace np ON p.pronamespace = np.oid
+
+  ORDER BY udt_catalog, udt_schema, udt_name, group_name, transform_type  -- some sensible grouping for interactive use
+;
 
 
 /*
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index c9ec117a8f..c7a66ae730 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -25,6 +25,7 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
+#include "access/parallel.h"
 #include "access/xact.h"
 #ifdef PGXC
 #include "access/transam.h"
@@ -3018,7 +3019,7 @@ NameListToString(List *names)
 		if (IsA(name, String))
 			appendStringInfoString(&string, strVal(name));
 		else if (IsA(name, A_Star))
-			appendStringInfoString(&string, "*");
+			appendStringInfoChar(&string, '*');
 		else
 			elog(ERROR, "unexpected node type in name list: %d",
 				 (int) nodeTag(name));
@@ -3749,6 +3750,12 @@ InitTempTableNamespace(void)
 				(errcode(ERRCODE_READ_ONLY_SQL_TRANSACTION),
 				 errmsg("cannot create temporary tables during recovery")));
 
+	/* Parallel workers can't create temporary tables, either. */
+	if (IsParallelWorker())
+		ereport(ERROR,
+				(errcode(ERRCODE_READ_ONLY_SQL_TRANSACTION),
+				 errmsg("cannot create temporary tables in parallel mode")));
+
 #ifdef XCP
 	/*
 	 * In case of distributed session use MyFirstBackendId for temp objects
@@ -3835,7 +3842,7 @@ InitTempTableNamespace(void)
  * End-of-transaction cleanup for namespaces.
  */
 void
-AtEOXact_Namespace(bool isCommit)
+AtEOXact_Namespace(bool isCommit, bool parallel)
 {
 	/*
 	 * If we abort the transaction in which a temp namespace was selected,
@@ -3845,7 +3852,7 @@ AtEOXact_Namespace(bool isCommit)
 	 * at backend shutdown.  (We only want to register the callback once per
 	 * session, so this is a good place to do it.)
 	 */
-	if (myTempNamespaceSubID != InvalidSubTransactionId)
+	if (myTempNamespaceSubID != InvalidSubTransactionId && !parallel)
 	{
 		if (isCommit)
 #ifdef XCP
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 30cb699072..c37e38fa3b 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -45,6 +45,7 @@
 #include "catalog/pg_policy.h"
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_tablespace.h"
+#include "catalog/pg_transform.h"
 #include "catalog/pg_trigger.h"
 #include "catalog/pg_ts_config.h"
 #include "catalog/pg_ts_dict.h"
@@ -99,7 +100,7 @@ typedef struct
 	AclObjectKind acl_kind;		/* ACL_KIND_* of this object type */
 	bool		is_nsp_name_unique;		/* can the nsp/name combination (or
 										 * name alone, if there's no
-										 * namespace) be considered an unique
+										 * namespace) be considered a unique
 										 * identifier for an object of this
 										 * class? */
 } ObjectPropertyType;
@@ -335,6 +336,12 @@ static const ObjectPropertyType ObjectProperty[] =
 		true
 	},
 	{
+		TransformRelationId,
+		TransformOidIndexId,
+		TRFOID,
+		InvalidAttrNumber
+	},
+	{
 		TriggerRelationId,
 		TriggerOidIndexId,
 		-1,
@@ -446,89 +453,188 @@ static const struct object_type_map
 	const char *tm_name;
 	ObjectType	tm_type;
 }
-ObjectTypeMap[] =
+
+			ObjectTypeMap[] =
 {
 	/* OCLASS_CLASS, all kinds of relations */
-	{ "table", OBJECT_TABLE },
-	{ "index", OBJECT_INDEX },
-	{ "sequence", OBJECT_SEQUENCE },
-	{ "toast table", -1 },		/* unmapped */
-	{ "view", OBJECT_VIEW },
-	{ "materialized view", OBJECT_MATVIEW },
-	{ "composite type", -1 },	/* unmapped */
-	{ "foreign table", OBJECT_FOREIGN_TABLE },
-	{ "table column", OBJECT_COLUMN },
-	{ "index column", -1 },		/* unmapped */
-	{ "sequence column", -1 },	/* unmapped */
-	{ "toast table column", -1 },	/* unmapped */
-	{ "view column", -1 },		/* unmapped */
-	{ "materialized view column", -1 },	/* unmapped */
-	{ "composite type column", -1 },	/* unmapped */
-	{ "foreign table column", OBJECT_COLUMN },
+	{
+		"table", OBJECT_TABLE
+	},
+	{
+		"index", OBJECT_INDEX
+	},
+	{
+		"sequence", OBJECT_SEQUENCE
+	},
+	{
+		"toast table", -1
+	},							/* unmapped */
+	{
+		"view", OBJECT_VIEW
+	},
+	{
+		"materialized view", OBJECT_MATVIEW
+	},
+	{
+		"composite type", -1
+	},							/* unmapped */
+	{
+		"foreign table", OBJECT_FOREIGN_TABLE
+	},
+	{
+		"table column", OBJECT_COLUMN
+	},
+	{
+		"index column", -1
+	},							/* unmapped */
+	{
+		"sequence column", -1
+	},							/* unmapped */
+	{
+		"toast table column", -1
+	},							/* unmapped */
+	{
+		"view column", -1
+	},							/* unmapped */
+	{
+		"materialized view column", -1
+	},							/* unmapped */
+	{
+		"composite type column", -1
+	},							/* unmapped */
+	{
+		"foreign table column", OBJECT_COLUMN
+	},
 	/* OCLASS_PROC */
-	{ "aggregate", OBJECT_AGGREGATE },
-	{ "function", OBJECT_FUNCTION },
+	{
+		"aggregate", OBJECT_AGGREGATE
+	},
+	{
+		"function", OBJECT_FUNCTION
+	},
 	/* OCLASS_TYPE */
-	{ "type", OBJECT_TYPE },
+	{
+		"type", OBJECT_TYPE
+	},
 	/* OCLASS_CAST */
-	{ "cast", OBJECT_CAST },
+	{
+		"cast", OBJECT_CAST
+	},
 	/* OCLASS_COLLATION */
-	{ "collation", OBJECT_COLLATION },
+	{
+		"collation", OBJECT_COLLATION
+	},
 	/* OCLASS_CONSTRAINT */
-	{ "table constraint", OBJECT_TABCONSTRAINT },
-	{ "domain constraint", OBJECT_DOMCONSTRAINT },
+	{
+		"table constraint", OBJECT_TABCONSTRAINT
+	},
+	{
+		"domain constraint", OBJECT_DOMCONSTRAINT
+	},
 	/* OCLASS_CONVERSION */
-	{ "conversion", OBJECT_CONVERSION },
+	{
+		"conversion", OBJECT_CONVERSION
+	},
 	/* OCLASS_DEFAULT */
-	{ "default value", OBJECT_DEFAULT },
+	{
+		"default value", OBJECT_DEFAULT
+	},
 	/* OCLASS_LANGUAGE */
-	{ "language", OBJECT_LANGUAGE },
+	{
+		"language", OBJECT_LANGUAGE
+	},
 	/* OCLASS_LARGEOBJECT */
-	{ "large object", OBJECT_LARGEOBJECT },
+	{
+		"large object", OBJECT_LARGEOBJECT
+	},
 	/* OCLASS_OPERATOR */
-	{ "operator", OBJECT_OPERATOR },
+	{
+		"operator", OBJECT_OPERATOR
+	},
 	/* OCLASS_OPCLASS */
-	{ "operator class", OBJECT_OPCLASS },
+	{
+		"operator class", OBJECT_OPCLASS
+	},
 	/* OCLASS_OPFAMILY */
-	{ "operator family", OBJECT_OPFAMILY },
+	{
+		"operator family", OBJECT_OPFAMILY
+	},
 	/* OCLASS_AMOP */
-	{ "operator of access method", OBJECT_AMOP },
+	{
+		"operator of access method", OBJECT_AMOP
+	},
 	/* OCLASS_AMPROC */
-	{ "function of access method", OBJECT_AMPROC },
+	{
+		"function of access method", OBJECT_AMPROC
+	},
 	/* OCLASS_REWRITE */
-	{ "rule", OBJECT_RULE },
+	{
+		"rule", OBJECT_RULE
+	},
 	/* OCLASS_TRIGGER */
-	{ "trigger", OBJECT_TRIGGER },
+	{
+		"trigger", OBJECT_TRIGGER
+	},
 	/* OCLASS_SCHEMA */
-	{ "schema", OBJECT_SCHEMA },
+	{
+		"schema", OBJECT_SCHEMA
+	},
 	/* OCLASS_TSPARSER */
-	{ "text search parser", OBJECT_TSPARSER },
+	{
+		"text search parser", OBJECT_TSPARSER
+	},
 	/* OCLASS_TSDICT */
-	{ "text search dictionary", OBJECT_TSDICTIONARY },
+	{
+		"text search dictionary", OBJECT_TSDICTIONARY
+	},
 	/* OCLASS_TSTEMPLATE */
-	{ "text search template", OBJECT_TSTEMPLATE },
+	{
+		"text search template", OBJECT_TSTEMPLATE
+	},
 	/* OCLASS_TSCONFIG */
-	{ "text search configuration", OBJECT_TSCONFIGURATION },
+	{
+		"text search configuration", OBJECT_TSCONFIGURATION
+	},
 	/* OCLASS_ROLE */
-	{ "role", OBJECT_ROLE },
+	{
+		"role", OBJECT_ROLE
+	},
 	/* OCLASS_DATABASE */
-	{ "database", OBJECT_DATABASE },
+	{
+		"database", OBJECT_DATABASE
+	},
 	/* OCLASS_TBLSPACE */
-	{ "tablespace", OBJECT_TABLESPACE },
+	{
+		"tablespace", OBJECT_TABLESPACE
+	},
 	/* OCLASS_FDW */
-	{ "foreign-data wrapper", OBJECT_FDW },
+	{
+		"foreign-data wrapper", OBJECT_FDW
+	},
 	/* OCLASS_FOREIGN_SERVER */
-	{ "server", OBJECT_FOREIGN_SERVER },
+	{
+		"server", OBJECT_FOREIGN_SERVER
+	},
 	/* OCLASS_USER_MAPPING */
-	{ "user mapping", OBJECT_USER_MAPPING },
+	{
+		"user mapping", OBJECT_USER_MAPPING
+	},
 	/* OCLASS_DEFACL */
-	{ "default acl", OBJECT_DEFACL },
+	{
+		"default acl", OBJECT_DEFACL
+	},
 	/* OCLASS_EXTENSION */
-	{ "extension", OBJECT_EXTENSION },
+	{
+		"extension", OBJECT_EXTENSION
+	},
 	/* OCLASS_EVENT_TRIGGER */
-	{ "event trigger", OBJECT_EVENT_TRIGGER },
+	{
+		"event trigger", OBJECT_EVENT_TRIGGER
+	},
 	/* OCLASS_POLICY */
-	{ "policy", OBJECT_POLICY }
+	{
+		"policy", OBJECT_POLICY
+	}
 };
 
 const ObjectAddress InvalidObjectAddress =
@@ -660,16 +766,16 @@ get_object_address(ObjectType objtype, List *objname, List *objargs,
 				break;
 			case OBJECT_DOMCONSTRAINT:
 				{
-					ObjectAddress	domaddr;
-					char		   *constrname;
+					ObjectAddress domaddr;
+					char	   *constrname;
 
 					domaddr = get_object_address_type(OBJECT_DOMAIN,
-													  list_head(objname), missing_ok);
+											 list_head(objname), missing_ok);
 					constrname = strVal(linitial(objargs));
 
 					address.classId = ConstraintRelationId;
 					address.objectId = get_domain_constraint_oid(domaddr.objectId,
-															  constrname, missing_ok);
+													 constrname, missing_ok);
 					address.objectSubId = 0;
 
 				}
@@ -760,6 +866,19 @@ get_object_address(ObjectType objtype, List *objname, List *objargs,
 					address.objectSubId = 0;
 				}
 				break;
+			case OBJECT_TRANSFORM:
+				{
+					TypeName   *typename = (TypeName *) linitial(objname);
+					char	   *langname = strVal(linitial(objargs));
+					Oid			type_id = LookupTypeNameOid(NULL, typename, missing_ok);
+					Oid			lang_id = get_language_oid(langname, missing_ok);
+
+					address.classId = TransformRelationId;
+					address.objectId =
+						get_transform_oid(type_id, lang_id, missing_ok);
+					address.objectSubId = 0;
+				}
+				break;
 			case OBJECT_TSPARSER:
 				address.classId = TSParserRelationId;
 				address.objectId = get_ts_parser_oid(objname, missing_ok);
@@ -1266,8 +1385,8 @@ get_object_address_attrdef(ObjectType objtype, List *objname,
 	if (attnum != InvalidAttrNumber && tupdesc->constr != NULL)
 	{
 		Relation	attrdef;
-		ScanKeyData	keys[2];
-		SysScanDesc	scan;
+		ScanKeyData keys[2];
+		SysScanDesc scan;
 		HeapTuple	tup;
 
 		attrdef = relation_open(AttrDefaultRelationId, AccessShareLock);
@@ -1399,14 +1518,14 @@ static ObjectAddress
 get_object_address_opf_member(ObjectType objtype,
 							  List *objname, List *objargs, bool missing_ok)
 {
-	ObjectAddress	famaddr;
-	ObjectAddress	address;
-	ListCell *cell;
-	List   *copy;
-	char   *typenames[2];
-	Oid		typeoids[2];
-	int		membernum;
-	int		i;
+	ObjectAddress famaddr;
+	ObjectAddress address;
+	ListCell   *cell;
+	List	   *copy;
+	char	   *typenames[2];
+	Oid			typeoids[2];
+	int			membernum;
+	int			i;
 
 	/*
 	 * The last element of the objname list contains the strategy or procedure
@@ -1421,9 +1540,9 @@ get_object_address_opf_member(ObjectType objtype,
 
 	/* find out left/right type names and OIDs */
 	i = 0;
-	foreach (cell, objargs)
+	foreach(cell, objargs)
 	{
-		ObjectAddress	typaddr;
+		ObjectAddress typaddr;
 
 		typenames[i] = strVal(lfirst(cell));
 		typaddr = get_object_address_type(OBJECT_TYPE, cell, missing_ok);
@@ -1451,9 +1570,9 @@ get_object_address_opf_member(ObjectType objtype,
 					if (!missing_ok)
 						ereport(ERROR,
 								(errcode(ERRCODE_UNDEFINED_OBJECT),
-								 errmsg("operator %d (%s, %s) of %s does not exist",
-										membernum, typenames[0], typenames[1],
-										getObjectDescription(&famaddr))));
+						  errmsg("operator %d (%s, %s) of %s does not exist",
+								 membernum, typenames[0], typenames[1],
+								 getObjectDescription(&famaddr))));
 				}
 				else
 				{
@@ -1480,9 +1599,9 @@ get_object_address_opf_member(ObjectType objtype,
 					if (!missing_ok)
 						ereport(ERROR,
 								(errcode(ERRCODE_UNDEFINED_OBJECT),
-								 errmsg("function %d (%s, %s) of %s does not exist",
-										membernum, typenames[0], typenames[1],
-										getObjectDescription(&famaddr))));
+						  errmsg("function %d (%s, %s) of %s does not exist",
+								 membernum, typenames[0], typenames[1],
+								 getObjectDescription(&famaddr))));
 				}
 				else
 				{
@@ -1616,8 +1735,8 @@ get_object_address_defacl(List *objname, List *objargs, bool missing_ok)
 		default:
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("unrecognized default ACL object type %c", objtype),
-					 errhint("Valid object types are 'r', 'S', 'f', and 'T'.")));
+				  errmsg("unrecognized default ACL object type %c", objtype),
+				 errhint("Valid object types are 'r', 'S', 'f', and 'T'.")));
 	}
 
 	/*
@@ -1668,8 +1787,8 @@ not_found:
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
-					 errmsg("default ACL for user \"%s\" on %s does not exist",
-							username, objtype_str)));
+				   errmsg("default ACL for user \"%s\" on %s does not exist",
+						  username, objtype_str)));
 	}
 	return address;
 }
@@ -1681,11 +1800,11 @@ not_found:
 static List *
 textarray_to_strvaluelist(ArrayType *arr)
 {
-	Datum  *elems;
-	bool   *nulls;
-	int		nelems;
-	List   *list = NIL;
-	int		i;
+	Datum	   *elems;
+	bool	   *nulls;
+	int			nelems;
+	List	   *list = NIL;
+	int			i;
 
 	deconstruct_array(arr, TEXTOID, -1, false, 'i',
 					  &elems, &nulls, &nelems);
@@ -1708,18 +1827,18 @@ textarray_to_strvaluelist(ArrayType *arr)
 Datum
 pg_get_object_address(PG_FUNCTION_ARGS)
 {
-	char   *ttype = TextDatumGetCString(PG_GETARG_TEXT_P(0));
-	ArrayType *namearr = PG_GETARG_ARRAYTYPE_P(1);
-	ArrayType *argsarr = PG_GETARG_ARRAYTYPE_P(2);
-	int		itype;
-	ObjectType type;
-	List   *name;
-	List   *args;
+	char	   *ttype = TextDatumGetCString(PG_GETARG_TEXT_P(0));
+	ArrayType  *namearr = PG_GETARG_ARRAYTYPE_P(1);
+	ArrayType  *argsarr = PG_GETARG_ARRAYTYPE_P(2);
+	int			itype;
+	ObjectType	type;
+	List	   *name;
+	List	   *args;
 	ObjectAddress addr;
-	TupleDesc tupdesc;
-	Datum	values[3];
-	bool	nulls[3];
-	HeapTuple htup;
+	TupleDesc	tupdesc;
+	Datum		values[3];
+	bool		nulls[3];
+	HeapTuple	htup;
 	Relation	relation;
 
 	/* Decode object type, raise error if unknown */
@@ -1731,16 +1850,16 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 	type = (ObjectType) itype;
 
 	/*
-	 * Convert the text array to the representation appropriate for the
-	 * given object type.  Most use a simple string Values list, but there
-	 * are some exceptions.
+	 * Convert the text array to the representation appropriate for the given
+	 * object type.  Most use a simple string Values list, but there are some
+	 * exceptions.
 	 */
 	if (type == OBJECT_TYPE || type == OBJECT_DOMAIN || type == OBJECT_CAST ||
 		type == OBJECT_DOMCONSTRAINT)
 	{
-		Datum	*elems;
-		bool	*nulls;
-		int		nelems;
+		Datum	   *elems;
+		bool	   *nulls;
+		int			nelems;
 
 		deconstruct_array(namearr, TEXTOID, -1, false, 'i',
 						  &elems, &nulls, &nelems);
@@ -1792,10 +1911,10 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 		type == OBJECT_AMPROC)
 	{
 		/* in these cases, the args list must be of TypeName */
-		Datum  *elems;
-		bool   *nulls;
-		int		nelems;
-		int		i;
+		Datum	   *elems;
+		bool	   *nulls;
+		int			nelems;
+		int			i;
 
 		deconstruct_array(argsarr, TEXTOID, -1, false, 'i',
 						  &elems, &nulls, &nelems);
@@ -1806,9 +1925,9 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 			if (nulls[i])
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("name or argument lists may not contain nulls")));
+					errmsg("name or argument lists may not contain nulls")));
 			args = lappend(args,
-						   typeStringToTypeName(TextDatumGetCString(elems[i])));
+						typeStringToTypeName(TextDatumGetCString(elems[i])));
 		}
 	}
 	else
@@ -1830,7 +1949,7 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 			if (list_length(args) != 1)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("argument list length must be exactly %d", 1)));
+					  errmsg("argument list length must be exactly %d", 1)));
 			break;
 		case OBJECT_OPFAMILY:
 		case OBJECT_OPCLASS:
@@ -1850,7 +1969,7 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 			if (list_length(args) != 2)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("argument list length must be exactly %d", 2)));
+					  errmsg("argument list length must be exactly %d", 2)));
 			break;
 		default:
 			break;
@@ -2006,6 +2125,15 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
 									format_type_be(targettypeid))));
 			}
 			break;
+		case OBJECT_TRANSFORM:
+			{
+				TypeName   *typename = (TypeName *) linitial(objname);
+				Oid			typeid = typenameTypeId(NULL, typename);
+
+				if (!pg_type_ownercheck(typeid, roleid))
+					aclcheck_error_type(ACLCHECK_NOT_OWNER, typeid);
+			}
+			break;
 		case OBJECT_TABLESPACE:
 			if (!pg_tablespace_ownercheck(address.objectId, roleid))
 				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TABLESPACE,
@@ -2117,8 +2245,8 @@ read_objtype_from_string(const char *objtype)
 	}
 	if (i >= lengthof(ObjectTypeMap))
 		ereport(ERROR,
-			   (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				errmsg("unrecognized object type \"%s\"", objtype)));
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("unrecognized object type \"%s\"", objtype)));
 
 	return type;
 }
@@ -2467,19 +2595,10 @@ getObjectDescription(const ObjectAddress *object)
 			}
 
 		case OCLASS_LANGUAGE:
-			{
-				HeapTuple	langTup;
+			appendStringInfo(&buffer, _("language %s"),
+							 get_language_name(object->objectId, false));
+			break;
 
-				langTup = SearchSysCache1(LANGOID,
-										  ObjectIdGetDatum(object->objectId));
-				if (!HeapTupleIsValid(langTup))
-					elog(ERROR, "cache lookup failed for language %u",
-						 object->objectId);
-				appendStringInfo(&buffer, _("language %s"),
-				  NameStr(((Form_pg_language) GETSTRUCT(langTup))->lanname));
-				ReleaseSysCache(langTup);
-				break;
-			}
 		case OCLASS_LARGEOBJECT:
 			appendStringInfo(&buffer, _("large object %u"),
 							 object->objectId);
@@ -2667,6 +2786,27 @@ getObjectDescription(const ObjectAddress *object)
 				break;
 			}
 
+		case OCLASS_TRANSFORM:
+			{
+				HeapTuple	trfTup;
+				Form_pg_transform trfForm;
+
+				trfTup = SearchSysCache1(TRFOID,
+										 ObjectIdGetDatum(object->objectId));
+				if (!HeapTupleIsValid(trfTup))
+					elog(ERROR, "could not find tuple for transform %u",
+						 object->objectId);
+
+				trfForm = (Form_pg_transform) GETSTRUCT(trfTup);
+
+				appendStringInfo(&buffer, _("transform for %s language %s"),
+								 format_type_be(trfForm->trftype),
+								 get_language_name(trfForm->trflang, false));
+
+				ReleaseSysCache(trfTup);
+				break;
+			}
+
 		case OCLASS_TRIGGER:
 			{
 				Relation	trigDesc;
@@ -2777,7 +2917,7 @@ getObjectDescription(const ObjectAddress *object)
 		case OCLASS_ROLE:
 			{
 				appendStringInfo(&buffer, _("role %s"),
-								 GetUserNameFromId(object->objectId));
+								 GetUserNameFromId(object->objectId, false));
 				break;
 			}
 
@@ -2843,7 +2983,7 @@ getObjectDescription(const ObjectAddress *object)
 				ReleaseSysCache(tup);
 
 				if (OidIsValid(useid))
-					usename = GetUserNameFromId(useid);
+					usename = GetUserNameFromId(useid, false);
 				else
 					usename = "public";
 
@@ -2883,28 +3023,28 @@ getObjectDescription(const ObjectAddress *object)
 					case DEFACLOBJ_RELATION:
 						appendStringInfo(&buffer,
 										 _("default privileges on new relations belonging to role %s"),
-									  GetUserNameFromId(defacl->defaclrole));
+							   GetUserNameFromId(defacl->defaclrole, false));
 						break;
 					case DEFACLOBJ_SEQUENCE:
 						appendStringInfo(&buffer,
 										 _("default privileges on new sequences belonging to role %s"),
-									  GetUserNameFromId(defacl->defaclrole));
+							   GetUserNameFromId(defacl->defaclrole, false));
 						break;
 					case DEFACLOBJ_FUNCTION:
 						appendStringInfo(&buffer,
 										 _("default privileges on new functions belonging to role %s"),
-									  GetUserNameFromId(defacl->defaclrole));
+							   GetUserNameFromId(defacl->defaclrole, false));
 						break;
 					case DEFACLOBJ_TYPE:
 						appendStringInfo(&buffer,
 										 _("default privileges on new types belonging to role %s"),
-									  GetUserNameFromId(defacl->defaclrole));
+							   GetUserNameFromId(defacl->defaclrole, false));
 						break;
 					default:
 						/* shouldn't get here */
 						appendStringInfo(&buffer,
 								_("default privileges belonging to role %s"),
-									  GetUserNameFromId(defacl->defaclrole));
+							   GetUserNameFromId(defacl->defaclrole, false));
 						break;
 				}
 
@@ -2950,8 +3090,8 @@ getObjectDescription(const ObjectAddress *object)
 		case OCLASS_POLICY:
 			{
 				Relation	policy_rel;
-				ScanKeyData	skey[1];
-				SysScanDesc	sscan;
+				ScanKeyData skey[1];
+				SysScanDesc sscan;
 				HeapTuple	tuple;
 				Form_pg_policy form_policy;
 
@@ -3200,7 +3340,7 @@ pg_identify_object(PG_FUNCTION_ARGS)
 
 			/*
 			 * We only return the object name if it can be used (together with
-			 * the schema name, if any) as an unique identifier.
+			 * the schema name, if any) as a unique identifier.
 			 */
 			if (get_object_namensp_unique(address.classId))
 			{
@@ -3636,7 +3776,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 
 		case OCLASS_TYPE:
 			{
-				char *typeout;
+				char	   *typeout;
 
 				typeout = format_type_be_qualified(object->objectId);
 				appendStringInfoString(&buffer, typeout);
@@ -3729,7 +3869,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 
 					appendStringInfo(&buffer, "%s on %s",
 									 quote_identifier(NameStr(con->conname)),
-									 getObjectIdentityParts(&domain, objname, objargs));
+						  getObjectIdentityParts(&domain, objname, objargs));
 
 					if (objname)
 						*objargs = lappend(*objargs, pstrdup(NameStr(con->conname)));
@@ -3753,8 +3893,8 @@ getObjectIdentityParts(const ObjectAddress *object,
 				conForm = (Form_pg_conversion) GETSTRUCT(conTup);
 				schema = get_namespace_name_or_temp(conForm->connamespace);
 				appendStringInfoString(&buffer,
-								quote_qualified_identifier(schema,
-														   NameStr(conForm->conname)));
+									   quote_qualified_identifier(schema,
+												 NameStr(conForm->conname)));
 				if (objname)
 					*objname = list_make2(schema,
 										  pstrdup(NameStr(conForm->conname)));
@@ -3860,7 +4000,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 
 				appendStringInfo(&buffer, "%s USING %s",
 								 quote_qualified_identifier(schema,
-															NameStr(opcForm->opcname)),
+												  NameStr(opcForm->opcname)),
 								 quote_identifier(NameStr(amForm->amname)));
 				if (objname)
 					*objname = list_make3(pstrdup(NameStr(amForm->amname)),
@@ -3915,7 +4055,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 				if (objname)
 				{
 					*objname = lappend(*objname,
-									   psprintf("%d", amopForm->amopstrategy));
+									 psprintf("%d", amopForm->amopstrategy));
 					*objargs = list_make2(ltype, rtype);
 				}
 
@@ -4095,7 +4235,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 											  NameStr(formParser->prsname)));
 				if (objname)
 					*objname = list_make2(schema,
-										  pstrdup(NameStr(formParser->prsname)));
+									  pstrdup(NameStr(formParser->prsname)));
 				ReleaseSysCache(tup);
 				break;
 			}
@@ -4118,7 +4258,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 											   NameStr(formDict->dictname)));
 				if (objname)
 					*objname = list_make2(schema,
-										  pstrdup(NameStr(formDict->dictname)));
+									   pstrdup(NameStr(formDict->dictname)));
 				ReleaseSysCache(tup);
 				break;
 			}
@@ -4141,7 +4281,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 											   NameStr(formTmpl->tmplname)));
 				if (objname)
 					*objname = list_make2(schema,
-										  pstrdup(NameStr(formTmpl->tmplname)));
+									   pstrdup(NameStr(formTmpl->tmplname)));
 				ReleaseSysCache(tup);
 				break;
 			}
@@ -4173,7 +4313,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 			{
 				char	   *username;
 
-				username = GetUserNameFromId(object->objectId);
+				username = GetUserNameFromId(object->objectId, false);
 				if (objname)
 					*objname = list_make1(username);
 				appendStringInfoString(&buffer,
@@ -4254,7 +4394,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 				ReleaseSysCache(tup);
 
 				if (OidIsValid(useid))
-					usename = GetUserNameFromId(useid);
+					usename = GetUserNameFromId(useid, false);
 				else
 					usename = "public";
 
@@ -4298,7 +4438,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 
 				defacl = (Form_pg_default_acl) GETSTRUCT(tup);
 
-				username = GetUserNameFromId(defacl->defaclrole);
+				username = GetUserNameFromId(defacl->defaclrole, false);
 				appendStringInfo(&buffer,
 								 "for role %s",
 								 quote_identifier(username));
@@ -4469,10 +4609,10 @@ getRelationIdentity(StringInfo buffer, Oid relid, List **objname)
 ArrayType *
 strlist_to_textarray(List *list)
 {
-	ArrayType *arr;
-	Datum	*datums;
-	int		j = 0;
-	ListCell *cell;
+	ArrayType  *arr;
+	Datum	   *datums;
+	int			j = 0;
+	ListCell   *cell;
 	MemoryContext memcxt;
 	MemoryContext oldcxt;
 
@@ -4486,7 +4626,7 @@ strlist_to_textarray(List *list)
 	datums = palloc(sizeof(text *) * list_length(list));
 	foreach(cell, list)
 	{
-		char   *name = lfirst(cell);
+		char	   *name = lfirst(cell);
 
 		datums[j++] = CStringGetTextDatum(name);
 	}
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index cf7a3f6d52..723b82e2d4 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -618,6 +618,7 @@ AggregateCreate(const char *aggName,
 							 parameterModes,	/* parameterModes */
 							 parameterNames,	/* parameterNames */
 							 parameterDefaults, /* parameterDefaults */
+							 PointerGetDatum(NULL),		/* trftypes */
 							 PointerGetDatum(NULL),		/* proconfig */
 							 1, /* procost */
 							 0);	/* prorows */
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index c880486c4b..902b0a7297 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -346,7 +346,7 @@ restart:
 		if (!OidIsValid(binary_upgrade_next_pg_enum_oid))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("pg_enum OID value not set when in binary upgrade mode")));
+			errmsg("pg_enum OID value not set when in binary upgrade mode")));
 
 		/*
 		 * Use binary-upgrade override for pg_enum.oid, if supplied. During
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index c9f67e5361..b148e35915 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -28,7 +28,9 @@
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_proc_fn.h"
+#include "catalog/pg_transform.h"
 #include "catalog/pg_type.h"
+#include "commands/defrem.h"
 #include "executor/functions.h"
 #include "funcapi.h"
 #include "mb/pg_wchar.h"
@@ -69,7 +71,7 @@ static bool match_prosrc_to_literal(const char *prosrc, const char *literal,
 /* ----------------------------------------------------------------
  *		ProcedureCreate
  *
- * Note: allParameterTypes, parameterModes, parameterNames, and proconfig
+ * Note: allParameterTypes, parameterModes, parameterNames, trftypes, and proconfig
  * are either arrays of the proper types or NULL.  We declare them Datum,
  * not "ArrayType *", to avoid importing array.h into pg_proc_fn.h.
  * ----------------------------------------------------------------
@@ -96,6 +98,7 @@ ProcedureCreate(const char *procedureName,
 				Datum parameterModes,
 				Datum parameterNames,
 				List *parameterDefaults,
+				Datum trftypes,
 				Datum proconfig,
 				float4 procost,
 				float4 prorows)
@@ -126,6 +129,7 @@ ProcedureCreate(const char *procedureName,
 	ObjectAddress myself,
 				referenced;
 	int			i;
+	Oid			trfid;
 
 	/*
 	 * sanity checks
@@ -370,6 +374,10 @@ ProcedureCreate(const char *procedureName,
 		values[Anum_pg_proc_proargdefaults - 1] = CStringGetTextDatum(nodeToString(parameterDefaults));
 	else
 		nulls[Anum_pg_proc_proargdefaults - 1] = true;
+	if (trftypes != PointerGetDatum(NULL))
+		values[Anum_pg_proc_protrftypes - 1] = trftypes;
+	else
+		nulls[Anum_pg_proc_protrftypes - 1] = true;
 	values[Anum_pg_proc_prosrc - 1] = CStringGetTextDatum(prosrc);
 	if (probin)
 		values[Anum_pg_proc_probin - 1] = CStringGetTextDatum(probin);
@@ -634,6 +642,15 @@ ProcedureCreate(const char *procedureName,
 	referenced.objectSubId = 0;
 	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 
+	/* dependency on transform used by return type, if any */
+	if ((trfid = get_transform_oid(returnType, languageObjectId, true)))
+	{
+		referenced.classId = TransformRelationId;
+		referenced.objectId = trfid;
+		referenced.objectSubId = 0;
+		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+	}
+
 	/* dependency on parameter types */
 	for (i = 0; i < allParamCount; i++)
 	{
@@ -641,6 +658,15 @@ ProcedureCreate(const char *procedureName,
 		referenced.objectId = allParams[i];
 		referenced.objectSubId = 0;
 		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+		/* dependency on transform used by parameter type, if any */
+		if ((trfid = get_transform_oid(allParams[i], languageObjectId, true)))
+		{
+			referenced.classId = TransformRelationId;
+			referenced.objectId = trfid;
+			referenced.objectSubId = 0;
+			recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+		}
 	}
 
 	/* dependency on parameter default expressions */
@@ -1163,3 +1189,21 @@ fail:
 	*newcursorpos = newcp;
 	return false;
 }
+
+List *
+oid_array_to_list(Datum datum)
+{
+	ArrayType  *array = DatumGetArrayTypeP(datum);
+	Datum	   *values;
+	int			nelems;
+	int			i;
+	List	   *result = NIL;
+
+	deconstruct_array(array,
+					  OIDOID,
+					  sizeof(Oid), true, 'i',
+					  &values, NULL, &nelems);
+	for (i = 0; i < nelems; i++)
+		result = lappend_oid(result, values[i]);
+	return result;
+}
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 6ddb87bf00..34fe4e2474 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -67,7 +67,7 @@ typedef enum
 	LOCAL_OBJECT,
 	SHARED_OBJECT,
 	REMOTE_OBJECT
-} objectType;
+} SharedDependencyObjectType;
 
 static void getOidListDiff(Oid *list1, int *nlist1, Oid *list2, int *nlist2);
 static Oid	classIdGetDbId(Oid classId);
@@ -84,7 +84,8 @@ static void shdepDropDependency(Relation sdepRel,
 					bool drop_subobjects,
 					Oid refclassId, Oid refobjId,
 					SharedDependencyType deptype);
-static void storeObjectDescription(StringInfo descs, objectType type,
+static void storeObjectDescription(StringInfo descs,
+					   SharedDependencyObjectType type,
 					   ObjectAddress *object,
 					   SharedDependencyType deptype,
 					   int count);
@@ -1062,7 +1063,8 @@ shdepLockAndCheckObject(Oid classId, Oid objectId)
  * and count to be nonzero; deptype is not used in this case.
  */
 static void
-storeObjectDescription(StringInfo descs, objectType type,
+storeObjectDescription(StringInfo descs,
+					   SharedDependencyObjectType type,
 					   ObjectAddress *object,
 					   SharedDependencyType deptype,
 					   int count)
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 32453c3bb8..c4161b7b3f 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -133,7 +133,7 @@ TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId)
 		if (!OidIsValid(binary_upgrade_next_pg_type_oid))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("pg_type OID value not set when in binary upgrade mode")));
+			errmsg("pg_type OID value not set when in binary upgrade mode")));
 
 		HeapTupleSetOid(tup, binary_upgrade_next_pg_type_oid);
 		binary_upgrade_next_pg_type_oid = InvalidOid;
diff --git a/src/backend/catalog/sql_features.txt b/src/backend/catalog/sql_features.txt
index 332926424b..3da6010b9f 100644
--- a/src/backend/catalog/sql_features.txt
+++ b/src/backend/catalog/sql_features.txt
@@ -229,7 +229,7 @@ F311	Schema definition statement	02	CREATE TABLE for persistent base tables	YES
 F311	Schema definition statement	03	CREATE VIEW	YES	
 F311	Schema definition statement	04	CREATE VIEW: WITH CHECK OPTION	YES	
 F311	Schema definition statement	05	GRANT statement	YES	
-F312	MERGE statement			NO	
+F312	MERGE statement			NO	Consider INSERT ... ON CONFLICT DO UPDATE
 F313	Enhanced MERGE statement			NO	
 F314	MERGE statement with DELETE branch			NO	
 F321	User authorization			YES	
@@ -467,9 +467,9 @@ T331	Basic roles			YES
 T332	Extended roles			NO	mostly supported
 T341	Overloading of SQL-invoked functions and procedures			YES	
 T351	Bracketed SQL comments (/*...*/ comments)			YES	
-T431	Extended grouping capabilities			NO	
-T432	Nested and concatenated GROUPING SETS			NO	
-T433	Multiargument GROUPING function			NO	
+T431	Extended grouping capabilities			YES	
+T432	Nested and concatenated GROUPING SETS			YES	
+T433	Multiargument GROUPING function			YES	
 T434	GROUP BY DISTINCT			NO	
 T441	ABS and MOD functions			YES	
 T461	Symmetric BETWEEN predicate			YES	
@@ -492,7 +492,7 @@ T591	UNIQUE constraints of possibly null columns			YES
 T601	Local cursor references			NO	
 T611	Elementary OLAP operations			NO	most forms supported
 T612	Advanced OLAP operations			NO	some forms supported
-T613	Sampling			NO	
+T613	Sampling			YES	
 T614	NTILE function			YES	
 T615	LEAD and LAG functions			YES	
 T616	Null treatment option for LEAD and LAG functions			NO	
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index 0943a74f55..d260370694 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -129,7 +129,7 @@ RelationCreateStorage(RelFileNode rnode, char relpersistence)
 }
 
 /*
- * Perform XLogInsert of a XLOG_SMGR_CREATE record to WAL.
+ * Perform XLogInsert of an XLOG_SMGR_CREATE record to WAL.
  */
 void
 log_smgrcreate(RelFileNode *rnode, ForkNumber forkNum)
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index a4fd88fa98..e82a53aee9 100644
--- a/src/backend/catalog/system_views.sql
+++ b/src/backend/catalog/system_views.sql
@@ -411,6 +411,12 @@ CREATE RULE pg_settings_n AS
 
 GRANT SELECT, UPDATE ON pg_settings TO PUBLIC;
 
+CREATE VIEW pg_file_settings AS
+   SELECT * FROM pg_show_all_file_settings() AS A;
+
+REVOKE ALL on pg_file_settings FROM PUBLIC;
+REVOKE EXECUTE ON FUNCTION pg_show_all_file_settings() FROM PUBLIC;
+
 CREATE VIEW pg_timezone_abbrevs AS
     SELECT * FROM pg_timezone_abbrevs();
 
@@ -665,6 +671,7 @@ CREATE VIEW pg_replication_slots AS
             L.datoid,
             D.datname AS database,
             L.active,
+            L.active_pid,
             L.xmin,
             L.catalog_xmin,
             L.restart_lsn
@@ -777,6 +784,13 @@ CREATE VIEW pg_user_mappings AS
 
 REVOKE ALL on pg_user_mapping FROM public;
 
+
+CREATE VIEW pg_replication_origin_status AS
+    SELECT *
+    FROM pg_show_replication_origin_status();
+
+REVOKE ALL ON pg_replication_origin_status FROM public;
+
 --
 -- We have a few function definitions in here, too.
 -- At some point there might be enough to justify breaking them out into
@@ -908,3 +922,11 @@ RETURNS interval
 LANGUAGE INTERNAL
 STRICT IMMUTABLE
 AS 'make_interval';
+
+CREATE OR REPLACE FUNCTION
+  jsonb_set(jsonb_in jsonb, path text[] , replacement jsonb,
+            create_if_missing boolean DEFAULT true)
+RETURNS jsonb
+LANGUAGE INTERNAL
+STRICT IMMUTABLE
+AS 'jsonb_set';
diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index c99d3534ce..3652d7bf51 100644
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -175,9 +175,9 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 		/*
 		 * Check to see whether the table needs a TOAST table.
 		 *
-		 * If an update-in-place TOAST relfilenode is specified, force TOAST file
-		 * creation even if it seems not to need one.  This handles the case
-		 * where the old cluster needed a TOAST table but the new cluster
+		 * If an update-in-place TOAST relfilenode is specified, force TOAST
+		 * file creation even if it seems not to need one.  This handles the
+		 * case where the old cluster needed a TOAST table but the new cluster
 		 * would not normally create one.
 		 */
 
@@ -260,9 +260,9 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 		namespaceid = PG_TOAST_NAMESPACE;
 
 	/*
-	 * Use binary-upgrade override for pg_type.oid, if supplied.  We might
-	 * be in the post-schema-restore phase where we are doing ALTER TABLE
-	 * to create TOAST tables that didn't exist in the old cluster.
+	 * Use binary-upgrade override for pg_type.oid, if supplied.  We might be
+	 * in the post-schema-restore phase where we are doing ALTER TABLE to
+	 * create TOAST tables that didn't exist in the old cluster.
 	 */
 	if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_toast_pg_type_oid))
 	{
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index afc6c69156..3503b7df18 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -55,6 +55,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/pg_rusage.h"
+#include "utils/sampling.h"
 #include "utils/sortsupport.h"
 #include "utils/syscache.h"
 #include "utils/timestamp.h"
@@ -69,17 +70,6 @@
 #include "utils/snapmgr.h"
 #endif
 
-/* Data structure for Algorithm S from Knuth 3.4.2 */
-typedef struct
-{
-	BlockNumber N;				/* number of blocks, known in advance */
-	int			n;				/* desired sample size */
-	BlockNumber t;				/* current block number */
-	int			m;				/* blocks selected so far */
-} BlockSamplerData;
-
-typedef BlockSamplerData *BlockSampler;
-
 /* Per-index data for ANALYZE */
 typedef struct AnlIndexData
 {
@@ -102,10 +92,6 @@ static void do_analyze_rel(Relation onerel, int options,
 			   VacuumParams *params, List *va_cols,
 			   AcquireSampleRowsFunc acquirefunc, BlockNumber relpages,
 			   bool inh, bool in_outer_xact, int elevel);
-static void BlockSampler_Init(BlockSampler bs, BlockNumber nblocks,
-				  int samplesize);
-static bool BlockSampler_HasMore(BlockSampler bs);
-static BlockNumber BlockSampler_Next(BlockSampler bs);
 static void compute_index_stats(Relation onerel, double totalrows,
 					AnlIndexData *indexdata, int nindexes,
 					HeapTuple *rows, int numrows,
@@ -993,94 +979,6 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr)
 }
 
 /*
- * BlockSampler_Init -- prepare for random sampling of blocknumbers
- *
- * BlockSampler is used for stage one of our new two-stage tuple
- * sampling mechanism as discussed on pgsql-hackers 2004-04-02 (subject
- * "Large DB").  It selects a random sample of samplesize blocks out of
- * the nblocks blocks in the table.  If the table has less than
- * samplesize blocks, all blocks are selected.
- *
- * Since we know the total number of blocks in advance, we can use the
- * straightforward Algorithm S from Knuth 3.4.2, rather than Vitter's
- * algorithm.
- */
-static void
-BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize)
-{
-	bs->N = nblocks;			/* measured table size */
-
-	/*
-	 * If we decide to reduce samplesize for tables that have less or not much
-	 * more than samplesize blocks, here is the place to do it.
-	 */
-	bs->n = samplesize;
-	bs->t = 0;					/* blocks scanned so far */
-	bs->m = 0;					/* blocks selected so far */
-}
-
-static bool
-BlockSampler_HasMore(BlockSampler bs)
-{
-	return (bs->t < bs->N) && (bs->m < bs->n);
-}
-
-static BlockNumber
-BlockSampler_Next(BlockSampler bs)
-{
-	BlockNumber K = bs->N - bs->t;		/* remaining blocks */
-	int			k = bs->n - bs->m;		/* blocks still to sample */
-	double		p;				/* probability to skip block */
-	double		V;				/* random */
-
-	Assert(BlockSampler_HasMore(bs));	/* hence K > 0 and k > 0 */
-
-	if ((BlockNumber) k >= K)
-	{
-		/* need all the rest */
-		bs->m++;
-		return bs->t++;
-	}
-
-	/*----------
-	 * It is not obvious that this code matches Knuth's Algorithm S.
-	 * Knuth says to skip the current block with probability 1 - k/K.
-	 * If we are to skip, we should advance t (hence decrease K), and
-	 * repeat the same probabilistic test for the next block.  The naive
-	 * implementation thus requires an anl_random_fract() call for each block
-	 * number.  But we can reduce this to one anl_random_fract() call per
-	 * selected block, by noting that each time the while-test succeeds,
-	 * we can reinterpret V as a uniform random number in the range 0 to p.
-	 * Therefore, instead of choosing a new V, we just adjust p to be
-	 * the appropriate fraction of its former value, and our next loop
-	 * makes the appropriate probabilistic test.
-	 *
-	 * We have initially K > k > 0.  If the loop reduces K to equal k,
-	 * the next while-test must fail since p will become exactly zero
-	 * (we assume there will not be roundoff error in the division).
-	 * (Note: Knuth suggests a "<=" loop condition, but we use "<" just
-	 * to be doubly sure about roundoff error.)  Therefore K cannot become
-	 * less than k, which means that we cannot fail to select enough blocks.
-	 *----------
-	 */
-	V = anl_random_fract();
-	p = 1.0 - (double) k / (double) K;
-	while (V < p)
-	{
-		/* skip */
-		bs->t++;
-		K--;					/* keep K == N - t */
-
-		/* adjust p to be new cutoff point in reduced range */
-		p *= 1.0 - (double) k / (double) K;
-	}
-
-	/* select */
-	bs->m++;
-	return bs->t++;
-}
-
-/*
  * acquire_sample_rows -- acquire a random sample of rows from the table
  *
  * Selected rows are returned in the caller-allocated array rows[], which
@@ -1126,7 +1024,7 @@ acquire_sample_rows(Relation onerel, int elevel,
 	BlockNumber totalblocks;
 	TransactionId OldestXmin;
 	BlockSamplerData bs;
-	double		rstate;
+	ReservoirStateData rstate;
 
 	Assert(targrows > 0);
 
@@ -1136,9 +1034,9 @@ acquire_sample_rows(Relation onerel, int elevel,
 	OldestXmin = GetOldestXmin(onerel, true);
 
 	/* Prepare for sampling block numbers */
-	BlockSampler_Init(&bs, totalblocks, targrows);
+	BlockSampler_Init(&bs, totalblocks, targrows, random());
 	/* Prepare for sampling rows */
-	rstate = anl_init_selection_state(targrows);
+	reservoir_init_selection_state(&rstate, targrows);
 
 	/* Outer loop over blocks to sample */
 	while (BlockSampler_HasMore(&bs))
@@ -1286,8 +1184,7 @@ acquire_sample_rows(Relation onerel, int elevel,
 					 * t.
 					 */
 					if (rowstoskip < 0)
-						rowstoskip = anl_get_next_S(samplerows, targrows,
-													&rstate);
+						rowstoskip = reservoir_get_next_S(&rstate, samplerows, targrows);
 
 					if (rowstoskip <= 0)
 					{
@@ -1295,7 +1192,7 @@ acquire_sample_rows(Relation onerel, int elevel,
 						 * Found a suitable tuple, so save it, replacing one
 						 * old tuple at random
 						 */
-						int			k = (int) (targrows * anl_random_fract());
+						int			k = (int) (targrows * sampler_random_fract(rstate.randstate));
 
 						Assert(k >= 0 && k < targrows);
 						heap_freetuple(rows[k]);
@@ -1354,116 +1251,6 @@ acquire_sample_rows(Relation onerel, int elevel,
 	return numrows;
 }
 
-/* Select a random value R uniformly distributed in (0 - 1) */
-double
-anl_random_fract(void)
-{
-	return ((double) random() + 1) / ((double) MAX_RANDOM_VALUE + 2);
-}
-
-/*
- * These two routines embody Algorithm Z from "Random sampling with a
- * reservoir" by Jeffrey S. Vitter, in ACM Trans. Math. Softw. 11, 1
- * (Mar. 1985), Pages 37-57.  Vitter describes his algorithm in terms
- * of the count S of records to skip before processing another record.
- * It is computed primarily based on t, the number of records already read.
- * The only extra state needed between calls is W, a random state variable.
- *
- * anl_init_selection_state computes the initial W value.
- *
- * Given that we've already read t records (t >= n), anl_get_next_S
- * determines the number of records to skip before the next record is
- * processed.
- */
-double
-anl_init_selection_state(int n)
-{
-	/* Initial value of W (for use when Algorithm Z is first applied) */
-	return exp(-log(anl_random_fract()) / n);
-}
-
-double
-anl_get_next_S(double t, int n, double *stateptr)
-{
-	double		S;
-
-	/* The magic constant here is T from Vitter's paper */
-	if (t <= (22.0 * n))
-	{
-		/* Process records using Algorithm X until t is large enough */
-		double		V,
-					quot;
-
-		V = anl_random_fract(); /* Generate V */
-		S = 0;
-		t += 1;
-		/* Note: "num" in Vitter's code is always equal to t - n */
-		quot = (t - (double) n) / t;
-		/* Find min S satisfying (4.1) */
-		while (quot > V)
-		{
-			S += 1;
-			t += 1;
-			quot *= (t - (double) n) / t;
-		}
-	}
-	else
-	{
-		/* Now apply Algorithm Z */
-		double		W = *stateptr;
-		double		term = t - (double) n + 1;
-
-		for (;;)
-		{
-			double		numer,
-						numer_lim,
-						denom;
-			double		U,
-						X,
-						lhs,
-						rhs,
-						y,
-						tmp;
-
-			/* Generate U and X */
-			U = anl_random_fract();
-			X = t * (W - 1.0);
-			S = floor(X);		/* S is tentatively set to floor(X) */
-			/* Test if U <= h(S)/cg(X) in the manner of (6.3) */
-			tmp = (t + 1) / term;
-			lhs = exp(log(((U * tmp * tmp) * (term + S)) / (t + X)) / n);
-			rhs = (((t + X) / (term + S)) * term) / t;
-			if (lhs <= rhs)
-			{
-				W = rhs / lhs;
-				break;
-			}
-			/* Test if U <= f(S)/cg(X) */
-			y = (((U * (t + 1)) / term) * (t + S + 1)) / (t + X);
-			if ((double) n < S)
-			{
-				denom = t;
-				numer_lim = term + S;
-			}
-			else
-			{
-				denom = t - (double) n + S;
-				numer_lim = t + 1;
-			}
-			for (numer = t + S; numer >= numer_lim; numer -= 1)
-			{
-				y *= numer / denom;
-				denom -= 1;
-			}
-			W = exp(-log(anl_random_fract()) / n);		/* Generate W in advance */
-			if (exp(log(y) / n) <= (t + X) / t)
-				break;
-		}
-		*stateptr = W;
-	}
-	return S;
-}
-
 /*
  * qsort comparator for sorting rows[] array
  */
@@ -2405,6 +2192,7 @@ compute_scalar_stats(VacAttrStatsP stats,
 	/* We always use the default collation for statistics */
 	ssup.ssup_collation = DEFAULT_COLLATION_OID;
 	ssup.ssup_nulls_first = false;
+
 	/*
 	 * For now, don't perform abbreviated key conversion, because full values
 	 * are required for MCV slot generation.  Supporting that optimization
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 3febdd5cf4..7ab4874c4b 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -1532,7 +1532,7 @@ finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
 	else if (newrelpersistence == RELPERSISTENCE_PERMANENT)
 		reindex_flags |= REINDEX_REL_FORCE_INDEXES_PERMANENT;
 
-	reindex_relation(OIDOldHeap, reindex_flags);
+	reindex_relation(OIDOldHeap, reindex_flags, 0);
 
 	/*
 	 * If the relation being rebuild is pg_class, swap_relation_files()
diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c
index 561d8fae57..28fccaf381 100644
--- a/src/backend/commands/constraint.c
+++ b/src/backend/commands/constraint.c
@@ -89,9 +89,10 @@ unique_key_recheck(PG_FUNCTION_ARGS)
 	 * because this trigger gets queued only in response to index insertions;
 	 * which means it does not get queued for HOT updates.  The row we are
 	 * called for might now be dead, but have a live HOT child, in which case
-	 * we still need to make the check.  Therefore we have to use
-	 * heap_hot_search, not just HeapTupleSatisfiesVisibility as is done in
-	 * the comparable test in RI_FKey_check.
+	 * we still need to make the check --- effectively, we're applying the
+	 * check against the live child row, although we can use the values from
+	 * this row since by definition all columns of interest to us are the
+	 * same.
 	 *
 	 * This might look like just an optimization, because the index AM will
 	 * make this identical test before throwing an error.  But it's actually
@@ -159,7 +160,9 @@ unique_key_recheck(PG_FUNCTION_ARGS)
 	{
 		/*
 		 * Note: this is not a real insert; it is a check that the index entry
-		 * that has already been inserted is unique.
+		 * that has already been inserted is unique.  Passing t_self is
+		 * correct even if t_self is now dead, because that is the TID the
+		 * index will know about.
 		 */
 		index_insert(indexRel, values, isnull, &(new_row->t_self),
 					 trigdata->tg_relation, UNIQUE_CHECK_EXISTING);
@@ -168,11 +171,13 @@ unique_key_recheck(PG_FUNCTION_ARGS)
 	{
 		/*
 		 * For exclusion constraints we just do the normal check, but now it's
-		 * okay to throw error.
+		 * okay to throw error.  In the HOT-update case, we must use the live
+		 * HOT child's TID here, else check_exclusion_constraint will think
+		 * the child is a conflict.
 		 */
 		check_exclusion_constraint(trigdata->tg_relation, indexRel, indexInfo,
-								   &(new_row->t_self), values, isnull,
-								   estate, false, false);
+								   &tmptid, values, isnull,
+								   estate, false);
 	}
 
 	/*
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 5c063c486d..c76814c17f 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -909,7 +909,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 			FirstLowInvalidHeapAttributeNumber;
 
 			if (is_from)
-				rte->modifiedCols = bms_add_member(rte->modifiedCols, attno);
+				rte->insertedCols = bms_add_member(rte->insertedCols, attno);
 			else
 				rte->selectedCols = bms_add_member(rte->selectedCols, attno);
 		}
@@ -923,8 +923,8 @@ DoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 		 * RLS (returns RLS_ENABLED) or not for this COPY statement.
 		 *
 		 * If the relation has a row security policy and we are to apply it
-		 * then perform a "query" copy and allow the normal query processing to
-		 * handle the policies.
+		 * then perform a "query" copy and allow the normal query processing
+		 * to handle the policies.
 		 *
 		 * If RLS is not enabled for this, then just fall through to the
 		 * normal non-filtering relation handling.
@@ -939,7 +939,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 			if (is_from)
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("COPY FROM not supported with row level security."),
+				  errmsg("COPY FROM not supported with row level security."),
 						 errhint("Use direct INSERT statements instead.")));
 
 			/* Build target list */
@@ -966,7 +966,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 			select->targetList = list_make1(target);
 			select->fromClause = list_make1(from);
 
-			query = (Node*) select;
+			query = (Node *) select;
 
 			/* Close the handle to the relation as it is no longer needed. */
 			heap_close(rel, (is_from ? RowExclusiveLock : AccessShareLock));
@@ -1006,9 +1006,10 @@ DoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 	{
 		Assert(rel);
 
-		/* check read-only transaction */
+		/* check read-only transaction and parallel mode */
 		if (XactReadOnly && !rel->rd_islocaltemp)
 			PreventCommandIfReadOnly("COPY FROM");
+		PreventCommandIfParallelMode("COPY FROM");
 
 		cstate = BeginCopyFrom(rel, stmt->filename, stmt->is_program,
 							   stmt->attlist, stmt->options);
@@ -1538,26 +1539,27 @@ BeginCopy(bool is_from,
 
 		/*
 		 * If we were passed in a relid, make sure we got the same one back
-		 * after planning out the query.  It's possible that it changed between
-		 * when we checked the policies on the table and decided to use a query
-		 * and now.
+		 * after planning out the query.  It's possible that it changed
+		 * between when we checked the policies on the table and decided to
+		 * use a query and now.
 		 */
 		if (queryRelId != InvalidOid)
 		{
-			Oid relid = linitial_oid(plan->relationOids);
+			Oid			relid = linitial_oid(plan->relationOids);
 
 			/*
-			 * There should only be one relationOid in this case, since we will
-			 * only get here when we have changed the command for the user from
-			 * a "COPY relation TO" to "COPY (SELECT * FROM relation) TO", to
-			 * allow row level security policies to be applied.
+			 * There should only be one relationOid in this case, since we
+			 * will only get here when we have changed the command for the
+			 * user from a "COPY relation TO" to "COPY (SELECT * FROM
+			 * relation) TO", to allow row level security policies to be
+			 * applied.
 			 */
 			Assert(list_length(plan->relationOids) == 1);
 
 			if (relid != queryRelId)
 				ereport(ERROR,
 						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-						 errmsg("relation referenced by COPY statement has changed")));
+				errmsg("relation referenced by COPY statement has changed")));
 		}
 
 		/*
@@ -2505,7 +2507,7 @@ CopyFrom(CopyState cstate)
 					  1,		/* dummy rangetable index */
 					  0);
 
-	ExecOpenIndices(resultRelInfo);
+	ExecOpenIndices(resultRelInfo, false);
 
 	estate->es_result_relations = resultRelInfo;
 	estate->es_num_result_relations = 1;
@@ -2725,7 +2727,8 @@ CopyFrom(CopyState cstate)
 
 				if (resultRelInfo->ri_NumIndices > 0)
 					recheckIndexes = ExecInsertIndexTuples(slot, &(tuple->t_self),
-														   estate);
+														 estate, false, NULL,
+														   NIL);
 
 				/* AFTER ROW INSERT Triggers */
 				ExecARInsertTriggers(estate, resultRelInfo, tuple,
@@ -2861,7 +2864,7 @@ CopyFromInsertBatch(CopyState cstate, EState *estate, CommandId mycid,
 			ExecStoreTuple(bufferedTuples[i], myslot, InvalidBuffer, false);
 			recheckIndexes =
 				ExecInsertIndexTuples(myslot, &(bufferedTuples[i]->t_self),
-									  estate);
+									  estate, false, NULL, NIL);
 			ExecARInsertTriggers(estate, resultRelInfo,
 								 bufferedTuples[i],
 								 recheckIndexes);
@@ -3878,7 +3881,7 @@ CopyReadLineText(CopyState cstate)
 			 * just use the char as a toggle. If they are different, we need
 			 * to ensure that we only take account of an escape inside a
 			 * quoted field and immediately preceding a quote char, and not
-			 * the second in a escape-escape sequence.
+			 * the second in an escape-escape sequence.
 			 */
 			if (in_quote && c == escapec)
 				last_was_esc = !last_was_esc;
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index 54b2f382ea..41183f6ff5 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -89,7 +89,7 @@ ExecCreateTableAs(CreateTableAsStmt *stmt, const char *queryString,
 
 	if (stmt->if_not_exists)
 	{
-		Oid	nspid;
+		Oid			nspid;
 
 		nspid = RangeVarGetCreationNamespace(stmt->into->rel);
 
@@ -433,7 +433,7 @@ intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
 	rte->requiredPerms = ACL_INSERT;
 
 	for (attnum = 1; attnum <= intoRelationDesc->rd_att->natts; attnum++)
-		rte->modifiedCols = bms_add_member(rte->modifiedCols,
+		rte->insertedCols = bms_add_member(rte->insertedCols,
 								attnum - FirstLowInvalidHeapAttributeNumber);
 
 	ExecCheckRTPerms(list_make1(rte), true);
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 28a97dbc7e..c11c0bf388 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -566,8 +566,8 @@ createdb(const CreatedbStmt *stmt)
 	 * Force a checkpoint before starting the copy. This will force all dirty
 	 * buffers, including those of unlogged tables, out to disk, to ensure
 	 * source database is up-to-date on disk for the copy.
-	 * FlushDatabaseBuffers() would suffice for that, but we also want
-	 * to process any pending unlink requests. Otherwise, if a checkpoint
+	 * FlushDatabaseBuffers() would suffice for that, but we also want to
+	 * process any pending unlink requests. Otherwise, if a checkpoint
 	 * happened while we're copying files, a file might be deleted just when
 	 * we're about to copy it, causing the lstat() call in copydir() to fail
 	 * with ENOENT.
@@ -881,8 +881,8 @@ dropdb(const char *dbname, bool missing_ok)
 	if (ReplicationSlotsCountDBSlots(db_id, &nslots, &nslots_active))
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_IN_USE),
-				 errmsg("database \"%s\" is used by a logical replication slot",
-						dbname),
+			  errmsg("database \"%s\" is used by a logical replication slot",
+					 dbname),
 				 errdetail_plural("There is %d slot, %d of them active.",
 								  "There are %d slots, %d of them active.",
 								  nslots,
diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c
index a1b0d4d2fa..f04f4f5f31 100644
--- a/src/backend/commands/dropcmds.c
+++ b/src/backend/commands/dropcmds.c
@@ -366,6 +366,14 @@ does_not_exist_skipping(ObjectType objtype, List *objname, List *objargs)
 				}
 			}
 			break;
+		case OBJECT_TRANSFORM:
+			if (!type_in_list_does_not_exist_skipping(objname, &msg, &name))
+			{
+				msg = gettext_noop("transform for type %s language \"%s\" does not exist, skipping");
+				name = TypeNameToString((TypeName *) linitial(objname));
+				args = strVal(linitial(objargs));
+			}
+			break;
 		case OBJECT_TRIGGER:
 			if (!owningrel_does_not_exist_skipping(objname, &msg, &name))
 			{
@@ -407,7 +415,7 @@ does_not_exist_skipping(ObjectType objtype, List *objname, List *objargs)
 			break;
 		case OBJECT_OPCLASS:
 			{
-				List *opcname = list_copy_tail(objname, 1);
+				List	   *opcname = list_copy_tail(objname, 1);
 
 				if (!schema_does_not_exist_skipping(opcname, &msg, &name))
 				{
@@ -419,7 +427,7 @@ does_not_exist_skipping(ObjectType objtype, List *objname, List *objargs)
 			break;
 		case OBJECT_OPFAMILY:
 			{
-				List *opfname = list_copy_tail(objname, 1);
+				List	   *opfname = list_copy_tail(objname, 1);
 
 				if (!schema_does_not_exist_skipping(opfname, &msg, &name))
 				{
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 2275bf590d..11866a2aa8 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -20,17 +20,22 @@
 #include "catalog/objectaccess.h"
 #include "catalog/pg_event_trigger.h"
 #include "catalog/pg_namespace.h"
+#include "catalog/pg_opclass.h"
+#include "catalog/pg_opfamily.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_trigger.h"
+#include "catalog/pg_ts_config.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "commands/event_trigger.h"
+#include "commands/extension.h"
 #include "commands/trigger.h"
 #include "funcapi.h"
 #include "parser/parse_func.h"
 #include "pgstat.h"
 #include "lib/ilist.h"
 #include "miscadmin.h"
+#include "tcop/deparse_utility.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/evtcache.h"
@@ -44,15 +49,23 @@
 
 typedef struct EventTriggerQueryState
 {
+	/* memory context for this state's objects */
+	MemoryContext cxt;
+
 	/* sql_drop */
 	slist_head	SQLDropList;
 	bool		in_sql_drop;
 
 	/* table_rewrite */
-	Oid			table_rewrite_oid;	/* InvalidOid, or set for table_rewrite event */
+	Oid			table_rewrite_oid;		/* InvalidOid, or set for
+										 * table_rewrite event */
 	int			table_rewrite_reason;	/* AT_REWRITE reason */
 
-	MemoryContext cxt;
+	/* Support for command collection */
+	bool		commandCollectionInhibited;
+	CollectedCommand *currentCommand;
+	List	   *commandList;	/* list of CollectedCommand; see
+								 * deparse_utility.h */
 	struct EventTriggerQueryState *previous;
 } EventTriggerQueryState;
 
@@ -71,6 +84,7 @@ typedef enum
 	EVENT_TRIGGER_COMMAND_TAG_NOT_RECOGNIZED
 } event_trigger_command_tag_check_result;
 
+/* XXX merge this with ObjectTypeMap? */
 static event_trigger_support_data event_trigger_support[] = {
 	{"AGGREGATE", true},
 	{"CAST", true},
@@ -98,6 +112,7 @@ static event_trigger_support_data event_trigger_support[] = {
 	{"SERVER", true},
 	{"TABLE", true},
 	{"TABLESPACE", false},
+	{"TRANSFORM", true},
 	{"TRIGGER", true},
 	{"TEXT SEARCH CONFIGURATION", true},
 	{"TEXT SEARCH DICTIONARY", true},
@@ -130,7 +145,7 @@ static void AlterEventTriggerOwner_internal(Relation rel,
 								Oid newOwnerId);
 static event_trigger_command_tag_check_result check_ddl_tag(const char *tag);
 static event_trigger_command_tag_check_result check_table_rewrite_ddl_tag(
-	const char *tag);
+							const char *tag);
 static void error_duplicate_filter_variable(const char *defname);
 static Datum filter_list_to_array(List *filterlist);
 static Oid insert_event_trigger_tuple(char *trigname, char *eventname,
@@ -138,6 +153,8 @@ static Oid insert_event_trigger_tuple(char *trigname, char *eventname,
 static void validate_ddl_tags(const char *filtervar, List *taglist);
 static void validate_table_rewrite_tags(const char *filtervar, List *taglist);
 static void EventTriggerInvoke(List *fn_oid_list, EventTriggerData *trigdata);
+static const char *stringify_grantobjtype(GrantObjectType objtype);
+static const char *stringify_adefprivs_objtype(GrantObjectType objtype);
 
 /*
  * Create an event trigger.
@@ -699,7 +716,7 @@ EventTriggerCommonSetup(Node *parsetree,
 
 		dbgtag = CreateCommandTag(parsetree);
 		if (event == EVT_DDLCommandStart ||
-			event == EVT_DDLCommandEnd   ||
+			event == EVT_DDLCommandEnd ||
 			event == EVT_SQLDrop)
 		{
 			if (check_ddl_tag(dbgtag) != EVENT_TRIGGER_COMMAND_TAG_OK)
@@ -868,7 +885,7 @@ EventTriggerSQLDrop(Node *parsetree)
 	/*
 	 * Nothing to do if run list is empty.  Note this shouldn't happen,
 	 * because if there are no sql_drop events, then objects-to-drop wouldn't
-	 * have been collected in the first place and we would have quitted above.
+	 * have been collected in the first place and we would have quit above.
 	 */
 	if (runlist == NIL)
 		return;
@@ -1090,6 +1107,7 @@ EventTriggerSupportsObjectType(ObjectType obtype)
 		case OBJECT_SEQUENCE:
 		case OBJECT_TABCONSTRAINT:
 		case OBJECT_TABLE:
+		case OBJECT_TRANSFORM:
 		case OBJECT_TRIGGER:
 		case OBJECT_TSCONFIGURATION:
 		case OBJECT_TSDICTIONARY:
@@ -1137,6 +1155,7 @@ EventTriggerSupportsObjectClass(ObjectClass objclass)
 		case OCLASS_REWRITE:
 		case OCLASS_TRIGGER:
 		case OCLASS_SCHEMA:
+		case OCLASS_TRANSFORM:
 		case OCLASS_TSPARSER:
 		case OCLASS_TSDICT:
 		case OCLASS_TSTEMPLATE:
@@ -1208,9 +1227,9 @@ EventTriggerBeginCompleteQuery(void)
 	MemoryContext cxt;
 
 	/*
-	 * Currently, sql_drop and table_rewrite events are the only reason to
-	 * have event trigger state at all; so if there are none, don't install
-	 * one.
+	 * Currently, sql_drop, table_rewrite, ddl_command_end events are the only
+	 * reason to have event trigger state at all; so if there are none, don't
+	 * install one.
 	 */
 	if (!trackDroppedObjectsNeeded())
 		return false;
@@ -1226,6 +1245,10 @@ EventTriggerBeginCompleteQuery(void)
 	state->in_sql_drop = false;
 	state->table_rewrite_oid = InvalidOid;
 
+	state->commandCollectionInhibited = currentEventTriggerState ?
+		currentEventTriggerState->commandCollectionInhibited : false;
+	state->currentCommand = NULL;
+	state->commandList = NIL;
 	state->previous = currentEventTriggerState;
 	currentEventTriggerState = state;
 
@@ -1264,9 +1287,13 @@ EventTriggerEndCompleteQuery(void)
 bool
 trackDroppedObjectsNeeded(void)
 {
-	/* true if any sql_drop or table_rewrite event trigger exists */
+	/*
+	 * true if any sql_drop, table_rewrite, ddl_command_end event trigger
+	 * exists
+	 */
 	return list_length(EventCacheLookup(EVT_SQLDrop)) > 0 ||
-		list_length(EventCacheLookup(EVT_TableRewrite)) > 0;
+		list_length(EventCacheLookup(EVT_TableRewrite)) > 0 ||
+		list_length(EventCacheLookup(EVT_DDLCommandEnd)) > 0;
 }
 
 /*
@@ -1542,8 +1569,8 @@ pg_event_trigger_table_rewrite_oid(PG_FUNCTION_ARGS)
 		currentEventTriggerState->table_rewrite_oid == InvalidOid)
 		ereport(ERROR,
 				(errcode(ERRCODE_E_R_I_E_EVENT_TRIGGER_PROTOCOL_VIOLATED),
-		 errmsg("%s can only be called in a table_rewrite event trigger function",
-				"pg_event_trigger_table_rewrite_oid()")));
+				 errmsg("%s can only be called in a table_rewrite event trigger function",
+						"pg_event_trigger_table_rewrite_oid()")));
 
 	PG_RETURN_OID(currentEventTriggerState->table_rewrite_oid);
 }
@@ -1563,8 +1590,680 @@ pg_event_trigger_table_rewrite_reason(PG_FUNCTION_ARGS)
 		currentEventTriggerState->table_rewrite_reason == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_E_R_I_E_EVENT_TRIGGER_PROTOCOL_VIOLATED),
-		 errmsg("%s can only be called in a table_rewrite event trigger function",
-				"pg_event_trigger_table_rewrite_reason()")));
+				 errmsg("%s can only be called in a table_rewrite event trigger function",
+						"pg_event_trigger_table_rewrite_reason()")));
 
 	PG_RETURN_INT32(currentEventTriggerState->table_rewrite_reason);
 }
+
+/*-------------------------------------------------------------------------
+ * Support for DDL command deparsing
+ *
+ * The routines below enable an event trigger function to obtain a list of
+ * DDL commands as they are executed.  There are three main pieces to this
+ * feature:
+ *
+ * 1) Within ProcessUtilitySlow, or some sub-routine thereof, each DDL command
+ * adds a struct CollectedCommand representation of itself to the command list,
+ * using the routines below.
+ *
+ * 2) Some time after that, ddl_command_end fires and the command list is made
+ * available to the event trigger function via pg_event_trigger_ddl_commands();
+ * the complete command details are exposed as a column of type pg_ddl_command.
+ *
+ * 3) An extension can install a function capable of taking a value of type
+ * pg_ddl_command and transform it into some external, user-visible and/or
+ * -modifiable representation.
+ *-------------------------------------------------------------------------
+ */
+
+/*
+ * Inhibit DDL command collection.
+ */
+void
+EventTriggerInhibitCommandCollection(void)
+{
+	if (!currentEventTriggerState)
+		return;
+
+	currentEventTriggerState->commandCollectionInhibited = true;
+}
+
+/*
+ * Re-establish DDL command collection.
+ */
+void
+EventTriggerUndoInhibitCommandCollection(void)
+{
+	if (!currentEventTriggerState)
+		return;
+
+	currentEventTriggerState->commandCollectionInhibited = false;
+}
+
+/*
+ * EventTriggerCollectSimpleCommand
+ *		Save data about a simple DDL command that was just executed
+ *
+ * address identifies the object being operated on.  secondaryObject is an
+ * object address that was related in some way to the executed command; its
+ * meaning is command-specific.
+ *
+ * For instance, for an ALTER obj SET SCHEMA command, objtype is the type of
+ * object being moved, objectId is its OID, and secondaryOid is the OID of the
+ * old schema.  (The destination schema OID can be obtained by catalog lookup
+ * of the object.)
+ */
+void
+EventTriggerCollectSimpleCommand(ObjectAddress address,
+								 ObjectAddress secondaryObject,
+								 Node *parsetree)
+{
+	MemoryContext oldcxt;
+	CollectedCommand *command;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	command = palloc(sizeof(CollectedCommand));
+
+	command->type = SCT_Simple;
+	command->in_extension = creating_extension;
+
+	command->d.simple.address = address;
+	command->d.simple.secondaryObject = secondaryObject;
+	command->parsetree = copyObject(parsetree);
+
+	currentEventTriggerState->commandList = lappend(currentEventTriggerState->commandList,
+													command);
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * EventTriggerAlterTableStart
+ *		Prepare to receive data on an ALTER TABLE command about to be executed
+ *
+ * Note we don't collect the command immediately; instead we keep it in
+ * currentCommand, and only when we're done processing the subcommands we will
+ * add it to the command list.
+ *
+ * XXX -- this API isn't considering the possibility of an ALTER TABLE command
+ * being called reentrantly by an event trigger function.  Do we need stackable
+ * commands at this level?	Perhaps at least we should detect the condition and
+ * raise an error.
+ */
+void
+EventTriggerAlterTableStart(Node *parsetree)
+{
+	MemoryContext oldcxt;
+	CollectedCommand *command;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	command = palloc(sizeof(CollectedCommand));
+
+	command->type = SCT_AlterTable;
+	command->in_extension = creating_extension;
+
+	command->d.alterTable.classId = RelationRelationId;
+	command->d.alterTable.objectId = InvalidOid;
+	command->d.alterTable.subcmds = NIL;
+	command->parsetree = copyObject(parsetree);
+
+	currentEventTriggerState->currentCommand = command;
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * Remember the OID of the object being affected by an ALTER TABLE.
+ *
+ * This is needed because in some cases we don't know the OID until later.
+ */
+void
+EventTriggerAlterTableRelid(Oid objectId)
+{
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	currentEventTriggerState->currentCommand->d.alterTable.objectId = objectId;
+}
+
+/*
+ * EventTriggerCollectAlterTableSubcmd
+ *		Save data about a single part of an ALTER TABLE.
+ *
+ * Several different commands go through this path, but apart from ALTER TABLE
+ * itself, they are all concerned with AlterTableCmd nodes that are generated
+ * internally, so that's all that this code needs to handle at the moment.
+ */
+void
+EventTriggerCollectAlterTableSubcmd(Node *subcmd, ObjectAddress address)
+{
+	MemoryContext oldcxt;
+	CollectedATSubcmd *newsub;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	Assert(IsA(subcmd, AlterTableCmd));
+	Assert(OidIsValid(currentEventTriggerState->currentCommand->d.alterTable.objectId));
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	newsub = palloc(sizeof(CollectedATSubcmd));
+	newsub->address = address;
+	newsub->parsetree = copyObject(subcmd);
+
+	currentEventTriggerState->currentCommand->d.alterTable.subcmds =
+		lappend(currentEventTriggerState->currentCommand->d.alterTable.subcmds, newsub);
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * EventTriggerAlterTableEnd
+ *		Finish up saving an ALTER TABLE command, and add it to command list.
+ *
+ * FIXME this API isn't considering the possibility that an xact/subxact is
+ * aborted partway through.  Probably it's best to add an
+ * AtEOSubXact_EventTriggers() to fix this.
+ */
+void
+EventTriggerAlterTableEnd(void)
+{
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	/* If no subcommands, don't collect */
+	if (list_length(currentEventTriggerState->currentCommand->d.alterTable.subcmds) != 0)
+	{
+		currentEventTriggerState->commandList =
+			lappend(currentEventTriggerState->commandList,
+					currentEventTriggerState->currentCommand);
+	}
+	else
+		pfree(currentEventTriggerState->currentCommand);
+
+	currentEventTriggerState->currentCommand = NULL;
+}
+
+/*
+ * EventTriggerCollectGrant
+ *		Save data about a GRANT/REVOKE command being executed
+ *
+ * This function creates a copy of the InternalGrant, as the original might
+ * not have the right lifetime.
+ */
+void
+EventTriggerCollectGrant(InternalGrant *istmt)
+{
+	MemoryContext oldcxt;
+	CollectedCommand *command;
+	InternalGrant *icopy;
+	ListCell   *cell;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	/*
+	 * This is tedious, but necessary.
+	 */
+	icopy = palloc(sizeof(InternalGrant));
+	memcpy(icopy, istmt, sizeof(InternalGrant));
+	icopy->objects = list_copy(istmt->objects);
+	icopy->grantees = list_copy(istmt->grantees);
+	icopy->col_privs = NIL;
+	foreach(cell, istmt->col_privs)
+		icopy->col_privs = lappend(icopy->col_privs, copyObject(lfirst(cell)));
+
+	/* Now collect it, using the copied InternalGrant */
+	command = palloc(sizeof(CollectedCommand));
+	command->type = SCT_Grant;
+	command->in_extension = creating_extension;
+	command->d.grant.istmt = icopy;
+	command->parsetree = NULL;
+
+	currentEventTriggerState->commandList =
+		lappend(currentEventTriggerState->commandList, command);
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * EventTriggerCollectAlterOpFam
+ *		Save data about an ALTER OPERATOR FAMILY ADD/DROP command being
+ *		executed
+ */
+void
+EventTriggerCollectAlterOpFam(AlterOpFamilyStmt *stmt, Oid opfamoid,
+							  List *operators, List *procedures)
+{
+	MemoryContext oldcxt;
+	CollectedCommand *command;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	command = palloc(sizeof(CollectedCommand));
+	command->type = SCT_AlterOpFamily;
+	command->in_extension = creating_extension;
+	ObjectAddressSet(command->d.opfam.address,
+					 OperatorFamilyRelationId, opfamoid);
+	command->d.opfam.operators = operators;
+	command->d.opfam.procedures = procedures;
+	command->parsetree = copyObject(stmt);
+
+	currentEventTriggerState->commandList =
+		lappend(currentEventTriggerState->commandList, command);
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * EventTriggerCollectCreateOpClass
+ *		Save data about a CREATE OPERATOR CLASS command being executed
+ */
+void
+EventTriggerCollectCreateOpClass(CreateOpClassStmt *stmt, Oid opcoid,
+								 List *operators, List *procedures)
+{
+	MemoryContext oldcxt;
+	CollectedCommand *command;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	command = palloc0(sizeof(CollectedCommand));
+	command->type = SCT_CreateOpClass;
+	command->in_extension = creating_extension;
+	ObjectAddressSet(command->d.createopc.address,
+					 OperatorClassRelationId, opcoid);
+	command->d.createopc.operators = operators;
+	command->d.createopc.procedures = procedures;
+	command->parsetree = copyObject(stmt);
+
+	currentEventTriggerState->commandList =
+		lappend(currentEventTriggerState->commandList, command);
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * EventTriggerCollectAlterTSConfig
+ *		Save data about an ALTER TEXT SEARCH CONFIGURATION command being
+ *		executed
+ */
+void
+EventTriggerCollectAlterTSConfig(AlterTSConfigurationStmt *stmt, Oid cfgId,
+								 Oid *dictIds, int ndicts)
+{
+	MemoryContext oldcxt;
+	CollectedCommand *command;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	command = palloc0(sizeof(CollectedCommand));
+	command->type = SCT_AlterTSConfig;
+	command->in_extension = creating_extension;
+	ObjectAddressSet(command->d.atscfg.address,
+					 TSConfigRelationId, cfgId);
+	command->d.atscfg.dictIds = palloc(sizeof(Oid) * ndicts);
+	memcpy(command->d.atscfg.dictIds, dictIds, sizeof(Oid) * ndicts);
+	command->d.atscfg.ndicts = ndicts;
+	command->parsetree = copyObject(stmt);
+
+	currentEventTriggerState->commandList =
+		lappend(currentEventTriggerState->commandList, command);
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * EventTriggerCollectAlterDefPrivs
+ *		Save data about an ALTER DEFAULT PRIVILEGES command being
+ *		executed
+ */
+void
+EventTriggerCollectAlterDefPrivs(AlterDefaultPrivilegesStmt *stmt)
+{
+	MemoryContext oldcxt;
+	CollectedCommand *command;
+
+	/* ignore if event trigger context not set, or collection disabled */
+	if (!currentEventTriggerState ||
+		currentEventTriggerState->commandCollectionInhibited)
+		return;
+
+	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
+
+	command = palloc0(sizeof(CollectedCommand));
+	command->type = SCT_AlterDefaultPrivileges;
+	command->d.defprivs.objtype = stmt->action->objtype;
+	command->in_extension = creating_extension;
+	command->parsetree = copyObject(stmt);
+
+	currentEventTriggerState->commandList =
+		lappend(currentEventTriggerState->commandList, command);
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * In a ddl_command_end event trigger, this function reports the DDL commands
+ * being run.
+ */
+Datum
+pg_event_trigger_ddl_commands(PG_FUNCTION_ARGS)
+{
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+	TupleDesc	tupdesc;
+	Tuplestorestate *tupstore;
+	MemoryContext per_query_ctx;
+	MemoryContext oldcontext;
+	ListCell   *lc;
+
+	/*
+	 * Protect this function from being called out of context
+	 */
+	if (!currentEventTriggerState)
+		ereport(ERROR,
+				(errcode(ERRCODE_E_R_I_E_EVENT_TRIGGER_PROTOCOL_VIOLATED),
+				 errmsg("%s can only be called in an event trigger function",
+						"pg_event_trigger_ddl_commands()")));
+
+	/* check to see if caller supports us returning a tuplestore */
+	if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("set-valued function called in context that cannot accept a set")));
+	if (!(rsinfo->allowedModes & SFRM_Materialize))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("materialize mode required, but it is not allowed in this context")));
+
+	/* Build a tuple descriptor for our result type */
+	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
+	/* Build tuplestore to hold the result rows */
+	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+
+	tupstore = tuplestore_begin_heap(true, false, work_mem);
+	rsinfo->returnMode = SFRM_Materialize;
+	rsinfo->setResult = tupstore;
+	rsinfo->setDesc = tupdesc;
+
+	MemoryContextSwitchTo(oldcontext);
+
+	foreach(lc, currentEventTriggerState->commandList)
+	{
+		CollectedCommand *cmd = lfirst(lc);
+		Datum		values[9];
+		bool		nulls[9];
+		ObjectAddress addr;
+		int			i = 0;
+
+		/*
+		 * For IF NOT EXISTS commands that attempt to create an existing
+		 * object, the returned OID is Invalid.  Don't return anything.
+		 *
+		 * One might think that a viable alternative would be to look up the
+		 * Oid of the existing object and run the deparse with that.  But
+		 * since the parse tree might be different from the one that created
+		 * the object in the first place, we might not end up in a consistent
+		 * state anyway.
+		 */
+		if (cmd->type == SCT_Simple &&
+			!OidIsValid(cmd->d.simple.address.objectId))
+			continue;
+
+		MemSet(nulls, 0, sizeof(nulls));
+
+		switch (cmd->type)
+		{
+			case SCT_Simple:
+			case SCT_AlterTable:
+			case SCT_AlterOpFamily:
+			case SCT_CreateOpClass:
+			case SCT_AlterTSConfig:
+				{
+					char	   *identity;
+					char	   *type;
+					char	   *schema = NULL;
+
+					if (cmd->type == SCT_Simple)
+						addr = cmd->d.simple.address;
+					else if (cmd->type == SCT_AlterTable)
+						ObjectAddressSet(addr,
+										 cmd->d.alterTable.classId,
+										 cmd->d.alterTable.objectId);
+					else if (cmd->type == SCT_AlterOpFamily)
+						addr = cmd->d.opfam.address;
+					else if (cmd->type == SCT_CreateOpClass)
+						addr = cmd->d.createopc.address;
+					else if (cmd->type == SCT_AlterTSConfig)
+						addr = cmd->d.atscfg.address;
+
+					type = getObjectTypeDescription(&addr);
+					identity = getObjectIdentity(&addr);
+
+					/*
+					 * Obtain schema name, if any ("pg_temp" if a temp
+					 * object). If the object class is not in the supported
+					 * list here, we assume it's a schema-less object type,
+					 * and thus "schema" remains set to NULL.
+					 */
+					if (is_objectclass_supported(addr.classId))
+					{
+						AttrNumber	nspAttnum;
+
+						nspAttnum = get_object_attnum_namespace(addr.classId);
+						if (nspAttnum != InvalidAttrNumber)
+						{
+							Relation	catalog;
+							HeapTuple	objtup;
+							Oid			schema_oid;
+							bool		isnull;
+
+							catalog = heap_open(addr.classId, AccessShareLock);
+							objtup = get_catalog_object_by_oid(catalog,
+															   addr.objectId);
+							if (!HeapTupleIsValid(objtup))
+								elog(ERROR, "cache lookup failed for object %u/%u",
+									 addr.classId, addr.objectId);
+							schema_oid =
+								heap_getattr(objtup, nspAttnum,
+										 RelationGetDescr(catalog), &isnull);
+							if (isnull)
+								elog(ERROR,
+								 "invalid null namespace in object %u/%u/%d",
+									 addr.classId, addr.objectId, addr.objectSubId);
+							/* XXX not quite get_namespace_name_or_temp */
+							if (isAnyTempNamespace(schema_oid))
+								schema = pstrdup("pg_temp");
+							else
+								schema = get_namespace_name(schema_oid);
+
+							heap_close(catalog, AccessShareLock);
+						}
+					}
+
+					/* classid */
+					values[i++] = ObjectIdGetDatum(addr.classId);
+					/* objid */
+					values[i++] = ObjectIdGetDatum(addr.objectId);
+					/* objsubid */
+					values[i++] = Int32GetDatum(addr.objectSubId);
+					/* command tag */
+					values[i++] = CStringGetTextDatum(CreateCommandTag(cmd->parsetree));
+					/* object_type */
+					values[i++] = CStringGetTextDatum(type);
+					/* schema */
+					if (schema == NULL)
+						nulls[i++] = true;
+					else
+						values[i++] = CStringGetTextDatum(schema);
+					/* identity */
+					values[i++] = CStringGetTextDatum(identity);
+					/* in_extension */
+					values[i++] = BoolGetDatum(cmd->in_extension);
+					/* command */
+					values[i++] = PointerGetDatum(cmd);
+				}
+				break;
+
+			case SCT_AlterDefaultPrivileges:
+				/* classid */
+				nulls[i++] = true;
+				/* objid */
+				nulls[i++] = true;
+				/* objsubid */
+				nulls[i++] = true;
+				/* command tag */
+				values[i++] = CStringGetTextDatum(CreateCommandTag(cmd->parsetree));
+				/* object_type */
+				values[i++] = CStringGetTextDatum(stringify_adefprivs_objtype(
+												   cmd->d.defprivs.objtype));
+				/* schema */
+				nulls[i++] = true;
+				/* identity */
+				nulls[i++] = true;
+				/* in_extension */
+				values[i++] = BoolGetDatum(cmd->in_extension);
+				/* command */
+				values[i++] = PointerGetDatum(cmd);
+				break;
+
+			case SCT_Grant:
+				/* classid */
+				nulls[i++] = true;
+				/* objid */
+				nulls[i++] = true;
+				/* objsubid */
+				nulls[i++] = true;
+				/* command tag */
+				values[i++] = CStringGetTextDatum(cmd->d.grant.istmt->is_grant ?
+												  "GRANT" : "REVOKE");
+				/* object_type */
+				values[i++] = CStringGetTextDatum(stringify_grantobjtype(
+											   cmd->d.grant.istmt->objtype));
+				/* schema */
+				nulls[i++] = true;
+				/* identity */
+				nulls[i++] = true;
+				/* in_extension */
+				values[i++] = BoolGetDatum(cmd->in_extension);
+				/* command */
+				values[i++] = PointerGetDatum(cmd);
+				break;
+		}
+
+		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+	}
+
+	/* clean up and return the tuplestore */
+	tuplestore_donestoring(tupstore);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Return the GrantObjectType as a string, as it would appear in GRANT and
+ * REVOKE commands.
+ */
+static const char *
+stringify_grantobjtype(GrantObjectType objtype)
+{
+	switch (objtype)
+	{
+		case ACL_OBJECT_COLUMN:
+			return "COLUMN";
+		case ACL_OBJECT_RELATION:
+			return "TABLE";
+		case ACL_OBJECT_SEQUENCE:
+			return "SEQUENCE";
+		case ACL_OBJECT_DATABASE:
+			return "DATABASE";
+		case ACL_OBJECT_DOMAIN:
+			return "DOMAIN";
+		case ACL_OBJECT_FDW:
+			return "FOREIGN DATA WRAPPER";
+		case ACL_OBJECT_FOREIGN_SERVER:
+			return "FOREIGN SERVER";
+		case ACL_OBJECT_FUNCTION:
+			return "FUNCTION";
+		case ACL_OBJECT_LANGUAGE:
+			return "LANGUAGE";
+		case ACL_OBJECT_LARGEOBJECT:
+			return "LARGE OBJECT";
+		case ACL_OBJECT_NAMESPACE:
+			return "SCHEMA";
+		case ACL_OBJECT_TABLESPACE:
+			return "TABLESPACE";
+		case ACL_OBJECT_TYPE:
+			return "TYPE";
+		default:
+			elog(ERROR, "unrecognized type %d", objtype);
+			return "???";		/* keep compiler quiet */
+	}
+}
+
+/*
+ * Return the GrantObjectType as a string; as above, but use the spelling
+ * in ALTER DEFAULT PRIVILEGES commands instead.
+ */
+static const char *
+stringify_adefprivs_objtype(GrantObjectType objtype)
+{
+	switch (objtype)
+	{
+		case ACL_OBJECT_RELATION:
+			return "TABLES";
+			break;
+		case ACL_OBJECT_FUNCTION:
+			return "FUNCTIONS";
+			break;
+		case ACL_OBJECT_SEQUENCE:
+			return "SEQUENCES";
+			break;
+		case ACL_OBJECT_TYPE:
+			return "TYPES";
+			break;
+		default:
+			elog(ERROR, "unrecognized type %d", objtype);
+			return "???";		/* keep compiler quiet */
+	}
+}
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 073e83e6ce..d2707be224 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -42,6 +42,8 @@
 #include "utils/xml.h"
 #ifdef PGXC
 #include "catalog/pgxc_node.h"
+#include "pgxc/pgxcnode.h"
+#include "pgxc/planner.h"
 #endif
 
 /* Hook for plugins to get control in ExplainOneQuery() */
@@ -89,6 +91,12 @@ static void show_merge_append_keys(MergeAppendState *mstate, List *ancestors,
 					   ExplainState *es);
 static void show_agg_keys(AggState *astate, List *ancestors,
 			  ExplainState *es);
+static void show_grouping_sets(PlanState *planstate, Agg *agg,
+				   List *ancestors, ExplainState *es);
+static void show_grouping_set_keys(PlanState *planstate,
+					   Agg *aggnode, Sort *sortnode,
+					   List *context, bool useprefix,
+					   List *ancestors, ExplainState *es);
 static void show_group_keys(GroupState *gstate, List *ancestors,
 				ExplainState *es);
 static void show_sort_group_keys(PlanState *planstate, const char *qlabel,
@@ -110,7 +118,8 @@ static void ExplainIndexScanDetails(Oid indexid, ScanDirection indexorderdir,
 static void ExplainScanTarget(Scan *plan, ExplainState *es);
 static void ExplainModifyTarget(ModifyTable *plan, ExplainState *es);
 static void ExplainTargetRel(Plan *plan, Index rti, ExplainState *es);
-static void show_modifytable_info(ModifyTableState *mtstate, ExplainState *es);
+static void show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
+					  ExplainState *es);
 static void ExplainMemberNodes(List *plans, PlanState **planstates,
 				   List *ancestors, ExplainState *es);
 static void ExplainSubPlans(List *plans, List *ancestors,
@@ -751,14 +760,24 @@ ExplainPreScanNode(PlanState *planstate, Bitmapset **rels_used)
 		case T_ValuesScan:
 		case T_CteScan:
 		case T_WorkTableScan:
-		case T_ForeignScan:
-		case T_CustomScan:
+		case T_SampleScan:
 			*rels_used = bms_add_member(*rels_used,
 										((Scan *) plan)->scanrelid);
 			break;
+		case T_ForeignScan:
+			*rels_used = bms_add_members(*rels_used,
+										 ((ForeignScan *) plan)->fs_relids);
+			break;
+		case T_CustomScan:
+			*rels_used = bms_add_members(*rels_used,
+									   ((CustomScan *) plan)->custom_relids);
+			break;
 		case T_ModifyTable:
 			*rels_used = bms_add_member(*rels_used,
 									((ModifyTable *) plan)->nominalRelation);
+			if (((ModifyTable *) plan)->exclRelRTI)
+				*rels_used = bms_add_member(*rels_used,
+										 ((ModifyTable *) plan)->exclRelRTI);
 			break;
 		default:
 			break;
@@ -988,6 +1007,23 @@ ExplainNode(PlanState *planstate, List *ancestors,
 			else
 				pname = sname;
 			break;
+		case T_SampleScan:
+			{
+				/*
+				 * Fetch the tablesample method name from RTE.
+				 *
+				 * It would be nice to also show parameters, but since we
+				 * support arbitrary expressions as parameter it might get
+				 * quite messy.
+				 */
+				RangeTblEntry *rte;
+
+				rte = rt_fetch(((SampleScan *) plan)->scanrelid, es->rtable);
+				custom_name = get_tablesample_method_name(rte->tablesample->tsmid);
+				pname = psprintf("Sample Scan (%s)", custom_name);
+				sname = "Sample Scan";
+			}
+			break;
 		case T_Material:
 			pname = sname = "Materialize";
 			break;
@@ -1118,8 +1154,14 @@ ExplainNode(PlanState *planstate, List *ancestors,
 		case T_ValuesScan:
 		case T_CteScan:
 		case T_WorkTableScan:
+			ExplainScanTarget((Scan *) plan, es);
+			break;
 		case T_ForeignScan:
 		case T_CustomScan:
+			if (((Scan *) plan)->scanrelid > 0)
+				ExplainScanTarget((Scan *) plan, es);
+			break;
+		case T_SampleScan:
 			ExplainScanTarget((Scan *) plan, es);
 			break;
 #ifdef PGXC
@@ -1492,6 +1534,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
 		case T_CteScan:
 		case T_WorkTableScan:
 		case T_SubqueryScan:
+		case T_SampleScan:
 			show_scan_qual(plan->qual, "Filter", planstate, ancestors, es);
 			if (plan->qual)
 				show_instrumentation_count("Rows Removed by Filter", 1,
@@ -1623,7 +1666,8 @@ ExplainNode(PlanState *planstate, List *ancestors,
 										   planstate, es);
 			break;
 		case T_ModifyTable:
-			show_modifytable_info((ModifyTableState *) planstate, es);
+			show_modifytable_info((ModifyTableState *) planstate, ancestors,
+								  es);
 			break;
 		case T_Hash:
 			show_hash_info((HashState *) planstate, es);
@@ -1982,18 +2026,116 @@ show_agg_keys(AggState *astate, List *ancestors,
 {
 	Agg		   *plan = (Agg *) astate->ss.ps.plan;
 
-	if (plan->numCols > 0)
+	if (plan->numCols > 0 || plan->groupingSets)
 	{
 		/* The key columns refer to the tlist of the child plan */
 		ancestors = lcons(astate, ancestors);
-		show_sort_group_keys(outerPlanState(astate), "Group Key",
-							 plan->numCols, plan->grpColIdx,
-							 NULL, NULL, NULL,
-							 ancestors, es);
+
+		if (plan->groupingSets)
+			show_grouping_sets(outerPlanState(astate), plan, ancestors, es);
+		else
+			show_sort_group_keys(outerPlanState(astate), "Group Key",
+								 plan->numCols, plan->grpColIdx,
+								 NULL, NULL, NULL,
+								 ancestors, es);
+
 		ancestors = list_delete_first(ancestors);
 	}
 }
 
+static void
+show_grouping_sets(PlanState *planstate, Agg *agg,
+				   List *ancestors, ExplainState *es)
+{
+	List	   *context;
+	bool		useprefix;
+	ListCell   *lc;
+
+	/* Set up deparsing context */
+	context = set_deparse_context_planstate(es->deparse_cxt,
+											(Node *) planstate,
+											ancestors);
+	useprefix = (list_length(es->rtable) > 1 || es->verbose);
+
+	ExplainOpenGroup("Grouping Sets", "Grouping Sets", false, es);
+
+	show_grouping_set_keys(planstate, agg, NULL,
+						   context, useprefix, ancestors, es);
+
+	foreach(lc, agg->chain)
+	{
+		Agg		   *aggnode = lfirst(lc);
+		Sort	   *sortnode = (Sort *) aggnode->plan.lefttree;
+
+		show_grouping_set_keys(planstate, aggnode, sortnode,
+							   context, useprefix, ancestors, es);
+	}
+
+	ExplainCloseGroup("Grouping Sets", "Grouping Sets", false, es);
+}
+
+static void
+show_grouping_set_keys(PlanState *planstate,
+					   Agg *aggnode, Sort *sortnode,
+					   List *context, bool useprefix,
+					   List *ancestors, ExplainState *es)
+{
+	Plan	   *plan = planstate->plan;
+	char	   *exprstr;
+	ListCell   *lc;
+	List	   *gsets = aggnode->groupingSets;
+	AttrNumber *keycols = aggnode->grpColIdx;
+
+	ExplainOpenGroup("Grouping Set", NULL, true, es);
+
+	if (sortnode)
+	{
+		show_sort_group_keys(planstate, "Sort Key",
+							 sortnode->numCols, sortnode->sortColIdx,
+							 sortnode->sortOperators, sortnode->collations,
+							 sortnode->nullsFirst,
+							 ancestors, es);
+		if (es->format == EXPLAIN_FORMAT_TEXT)
+			es->indent++;
+	}
+
+	ExplainOpenGroup("Group Keys", "Group Keys", false, es);
+
+	foreach(lc, gsets)
+	{
+		List	   *result = NIL;
+		ListCell   *lc2;
+
+		foreach(lc2, (List *) lfirst(lc))
+		{
+			Index		i = lfirst_int(lc2);
+			AttrNumber	keyresno = keycols[i];
+			TargetEntry *target = get_tle_by_resno(plan->targetlist,
+												   keyresno);
+
+			if (!target)
+				elog(ERROR, "no tlist entry for key %d", keyresno);
+			/* Deparse the expression, showing any top-level cast */
+			exprstr = deparse_expression((Node *) target->expr, context,
+										 useprefix, true);
+
+			result = lappend(result, exprstr);
+		}
+
+		if (!result && es->format == EXPLAIN_FORMAT_TEXT)
+			ExplainPropertyText("Group Key", "()", es);
+		else
+			ExplainPropertyListNested("Group Key", result, es);
+	}
+
+	ExplainCloseGroup("Group Keys", "Group Keys", false, es);
+
+	if (sortnode && es->format == EXPLAIN_FORMAT_TEXT)
+		es->indent--;
+
+	ExplainCloseGroup("Grouping Set", NULL, true, es);
+}
+
 /*
  * Show the grouping keys for a Group node.
  */
@@ -2390,6 +2532,7 @@ ExplainTargetRel(Plan *plan, Index rti, ExplainState *es)
 		case T_TidScan:
 		case T_ForeignScan:
 		case T_CustomScan:
+		case T_SampleScan:
 		case T_ModifyTable:
 			/* Assert it's on a real relation */
 			Assert(rte->rtekind == RTE_RELATION);
@@ -2480,18 +2623,22 @@ ExplainTargetRel(Plan *plan, Index rti, ExplainState *es)
 /*
  * Show extra information for a ModifyTable node
  *
- * We have two objectives here.  First, if there's more than one target table
- * or it's different from the nominal target, identify the actual target(s).
- * Second, give FDWs a chance to display extra info about foreign targets.
+ * We have three objectives here.  First, if there's more than one target
+ * table or it's different from the nominal target, identify the actual
+ * target(s).  Second, give FDWs a chance to display extra info about foreign
+ * targets.  Third, show information about ON CONFLICT.
  */
 static void
-show_modifytable_info(ModifyTableState *mtstate, ExplainState *es)
+show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
+					  ExplainState *es)
 {
 	ModifyTable *node = (ModifyTable *) mtstate->ps.plan;
 	const char *operation;
 	const char *foperation;
 	bool		labeltargets;
 	int			j;
+	List	   *idxNames = NIL;
+	ListCell   *lst;
 
 	switch (node->operation)
 	{
@@ -2577,6 +2724,55 @@ show_modifytable_info(ModifyTableState *mtstate, ExplainState *es)
 		}
 	}
 
+	/* Gather names of ON CONFLICT arbiter indexes */
+	foreach(lst, node->arbiterIndexes)
+	{
+		char	   *indexname = get_rel_name(lfirst_oid(lst));
+
+		idxNames = lappend(idxNames, indexname);
+	}
+
+	if (node->onConflictAction != ONCONFLICT_NONE)
+	{
+		ExplainProperty("Conflict Resolution",
+						node->onConflictAction == ONCONFLICT_NOTHING ?
+						"NOTHING" : "UPDATE",
+						false, es);
+
+		/*
+		 * Don't display arbiter indexes at all when DO NOTHING variant
+		 * implicitly ignores all conflicts
+		 */
+		if (idxNames)
+			ExplainPropertyList("Conflict Arbiter Indexes", idxNames, es);
+
+		/* ON CONFLICT DO UPDATE WHERE qual is specially displayed */
+		if (node->onConflictWhere)
+		{
+			show_upper_qual((List *) node->onConflictWhere, "Conflict Filter",
+							&mtstate->ps, ancestors, es);
+			show_instrumentation_count("Rows Removed by Conflict Filter", 1, &mtstate->ps, es);
+		}
+
+		/* EXPLAIN ANALYZE display of actual outcome for each tuple proposed */
+		if (es->analyze && mtstate->ps.instrument)
+		{
+			double		total;
+			double		insert_path;
+			double		other_path;
+
+			InstrEndLoop(mtstate->mt_plans[0]->instrument);
+
+			/* count the number of source rows */
+			total = mtstate->mt_plans[0]->instrument->ntuples;
+			other_path = mtstate->ps.instrument->nfiltered2;
+			insert_path = total - other_path;
+
+			ExplainPropertyFloat("Tuples Inserted", insert_path, 0, es);
+			ExplainPropertyFloat("Conflicting Tuples", other_path, 0, es);
+		}
+	}
+
 	if (labeltargets)
 		ExplainCloseGroup("Target Tables", "Target Tables", false, es);
 }
@@ -2696,6 +2892,52 @@ ExplainPropertyList(const char *qlabel, List *data, ExplainState *es)
 }
 
 /*
+ * Explain a property that takes the form of a list of unlabeled items within
+ * another list.  "data" is a list of C strings.
+ */
+void
+ExplainPropertyListNested(const char *qlabel, List *data, ExplainState *es)
+{
+	ListCell   *lc;
+	bool		first = true;
+
+	switch (es->format)
+	{
+		case EXPLAIN_FORMAT_TEXT:
+		case EXPLAIN_FORMAT_XML:
+			ExplainPropertyList(qlabel, data, es);
+			return;
+
+		case EXPLAIN_FORMAT_JSON:
+			ExplainJSONLineEnding(es);
+			appendStringInfoSpaces(es->str, es->indent * 2);
+			appendStringInfoChar(es->str, '[');
+			foreach(lc, data)
+			{
+				if (!first)
+					appendStringInfoString(es->str, ", ");
+				escape_json(es->str, (const char *) lfirst(lc));
+				first = false;
+			}
+			appendStringInfoChar(es->str, ']');
+			break;
+
+		case EXPLAIN_FORMAT_YAML:
+			ExplainYAMLLineStarting(es);
+			appendStringInfoString(es->str, "- [");
+			foreach(lc, data)
+			{
+				if (!first)
+					appendStringInfoString(es->str, ", ");
+				escape_yaml(es->str, (const char *) lfirst(lc));
+				first = false;
+			}
+			appendStringInfoChar(es->str, ']');
+			break;
+	}
+}
+
+/*
  * Explain a simple property.
  *
  * If "numeric" is true, the value is a number (or other value that
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index f4725056da..4accf767bb 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -45,6 +45,7 @@
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_proc_fn.h"
+#include "catalog/pg_transform.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_type_fn.h"
 #include "commands/alter.h"
@@ -583,6 +584,7 @@ static void
 compute_attributes_sql_style(List *options,
 							 List **as,
 							 char **language,
+							 Node **transform,
 							 bool *windowfunc_p,
 							 char *volatility_p,
 							 bool *strict_p,
@@ -595,6 +597,7 @@ compute_attributes_sql_style(List *options,
 	ListCell   *option;
 	DefElem    *as_item = NULL;
 	DefElem    *language_item = NULL;
+	DefElem    *transform_item = NULL;
 	DefElem    *windowfunc_item = NULL;
 	DefElem    *volatility_item = NULL;
 	DefElem    *strict_item = NULL;
@@ -624,6 +627,14 @@ compute_attributes_sql_style(List *options,
 						 errmsg("conflicting or redundant options")));
 			language_item = defel;
 		}
+		else if (strcmp(defel->defname, "transform") == 0)
+		{
+			if (transform_item)
+				ereport(ERROR,
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("conflicting or redundant options")));
+			transform_item = defel;
+		}
 		else if (strcmp(defel->defname, "window") == 0)
 		{
 			if (windowfunc_item)
@@ -671,6 +682,8 @@ compute_attributes_sql_style(List *options,
 	}
 
 	/* process optional items */
+	if (transform_item)
+		*transform = transform_item->arg;
 	if (windowfunc_item)
 		*windowfunc_p = intVal(windowfunc_item->arg);
 	if (volatility_item)
@@ -807,7 +820,6 @@ interpret_AS_clause(Oid languageOid, const char *languageName,
 }
 
 
-
 /*
  * CreateFunction
  *	 Execute a CREATE FUNCTION utility statement.
@@ -822,6 +834,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 	char	   *language;
 	Oid			languageOid;
 	Oid			languageValidator;
+	Node	   *transformDefElem = NULL;
 	char	   *funcname;
 	Oid			namespaceId;
 	AclResult	aclresult;
@@ -831,6 +844,8 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 	ArrayType  *parameterNames;
 	List	   *parameterDefaults;
 	Oid			variadicArgType;
+	List	   *trftypes_list = NIL;
+	ArrayType  *trftypes;
 	Oid			requiredResultType;
 	bool		isWindowFunc,
 				isStrict,
@@ -866,7 +881,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 
 	/* override attributes from explicit list */
 	compute_attributes_sql_style(stmt->options,
-								 &as_clause, &language,
+								 &as_clause, &language, &transformDefElem,
 								 &isWindowFunc, &volatility,
 								 &isStrict, &security, &isLeakProof,
 								 &proconfig, &procost, &prorows);
@@ -906,15 +921,33 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 	ReleaseSysCache(languageTuple);
 
 	/*
-	 * Only superuser is allowed to create leakproof functions because leakproof
-	 * functions can see tuples which have not yet been filtered out by security
-	 * barrier views or row level security policies.
+	 * Only superuser is allowed to create leakproof functions because
+	 * leakproof functions can see tuples which have not yet been filtered out
+	 * by security barrier views or row level security policies.
 	 */
 	if (isLeakProof && !superuser())
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("only superuser can define a leakproof function")));
 
+	if (transformDefElem)
+	{
+		ListCell   *lc;
+
+		Assert(IsA(transformDefElem, List));
+
+		foreach(lc, (List *) transformDefElem)
+		{
+			Oid			typeid = typenameTypeId(NULL, lfirst(lc));
+			Oid			elt = get_base_element_type(typeid);
+
+			typeid = elt ? elt : typeid;
+
+			get_transform_oid(typeid, languageOid, false);
+			trftypes_list = lappend_oid(trftypes_list, typeid);
+		}
+	}
+
 	/*
 	 * Convert remaining parameters of CREATE to form wanted by
 	 * ProcedureCreate.
@@ -958,6 +991,25 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 		returnsSet = false;
 	}
 
+	if (list_length(trftypes_list) > 0)
+	{
+		ListCell   *lc;
+		Datum	   *arr;
+		int			i;
+
+		arr = palloc(list_length(trftypes_list) * sizeof(Datum));
+		i = 0;
+		foreach(lc, trftypes_list)
+			arr[i++] = ObjectIdGetDatum(lfirst_oid(lc));
+		trftypes = construct_array(arr, list_length(trftypes_list),
+								   OIDOID, sizeof(Oid), true, 'i');
+	}
+	else
+	{
+		/* store SQL NULL instead of emtpy array */
+		trftypes = NULL;
+	}
+
 	compute_attributes_with_style(stmt->withClause, &isStrict, &volatility);
 
 	interpret_AS_clause(languageOid, language, funcname, as_clause,
@@ -1014,6 +1066,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 						   PointerGetDatum(parameterModes),
 						   PointerGetDatum(parameterNames),
 						   parameterDefaults,
+						   PointerGetDatum(trftypes),
 						   PointerGetDatum(proconfig),
 						   procost,
 						   prorows);
@@ -1137,11 +1190,11 @@ AlterFunction(AlterFunctionStmt *stmt)
 		procForm->prosecdef = intVal(security_def_item->arg);
 	if (leakproof_item)
 	{
-		if (intVal(leakproof_item->arg) && !superuser())
+		procForm->proleakproof = intVal(leakproof_item->arg);
+		if (procForm->proleakproof && !superuser())
 			ereport(ERROR,
 					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				  errmsg("only superuser can define a leakproof function")));
-		procForm->proleakproof = intVal(leakproof_item->arg);
 	}
 	if (cost_item)
 	{
@@ -1653,6 +1706,293 @@ DropCastById(Oid castOid)
 	heap_close(relation, RowExclusiveLock);
 }
 
+
+static void
+check_transform_function(Form_pg_proc procstruct)
+{
+	if (procstruct->provolatile == PROVOLATILE_VOLATILE)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("transform function must not be volatile")));
+	if (procstruct->proisagg)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+			errmsg("transform function must not be an aggregate function")));
+	if (procstruct->proiswindow)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("transform function must not be a window function")));
+	if (procstruct->proretset)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("transform function must not return a set")));
+	if (procstruct->pronargs != 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("transform function must take one argument")));
+	if (procstruct->proargtypes.values[0] != INTERNALOID)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("first argument of transform function must be type \"internal\"")));
+}
+
+
+/*
+ * CREATE TRANSFORM
+ */
+Oid
+CreateTransform(CreateTransformStmt *stmt)
+{
+	Oid			typeid;
+	char		typtype;
+	Oid			langid;
+	Oid			fromsqlfuncid;
+	Oid			tosqlfuncid;
+	AclResult	aclresult;
+	Form_pg_proc procstruct;
+	Datum		values[Natts_pg_transform];
+	bool		nulls[Natts_pg_transform];
+	bool		replaces[Natts_pg_transform];
+	Oid			transformid;
+	HeapTuple	tuple;
+	HeapTuple	newtuple;
+	Relation	relation;
+	ObjectAddress myself,
+				referenced;
+	bool		is_replace;
+
+	/*
+	 * Get the type
+	 */
+	typeid = typenameTypeId(NULL, stmt->type_name);
+	typtype = get_typtype(typeid);
+
+	if (typtype == TYPTYPE_PSEUDO)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("data type %s is a pseudo-type",
+						TypeNameToString(stmt->type_name))));
+
+	if (typtype == TYPTYPE_DOMAIN)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("data type %s is a domain",
+						TypeNameToString(stmt->type_name))));
+
+	if (!pg_type_ownercheck(typeid, GetUserId()))
+		aclcheck_error_type(ACLCHECK_NOT_OWNER, typeid);
+
+	aclresult = pg_type_aclcheck(typeid, GetUserId(), ACL_USAGE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error_type(aclresult, typeid);
+
+	/*
+	 * Get the language
+	 */
+	langid = get_language_oid(stmt->lang, false);
+
+	aclresult = pg_language_aclcheck(langid, GetUserId(), ACL_USAGE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_LANGUAGE, stmt->lang);
+
+	/*
+	 * Get the functions
+	 */
+	if (stmt->fromsql)
+	{
+		fromsqlfuncid = LookupFuncNameTypeNames(stmt->fromsql->funcname, stmt->fromsql->funcargs, false);
+
+		if (!pg_proc_ownercheck(fromsqlfuncid, GetUserId()))
+			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC, NameListToString(stmt->fromsql->funcname));
+
+		aclresult = pg_proc_aclcheck(fromsqlfuncid, GetUserId(), ACL_EXECUTE);
+		if (aclresult != ACLCHECK_OK)
+			aclcheck_error(aclresult, ACL_KIND_PROC, NameListToString(stmt->fromsql->funcname));
+
+		tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(fromsqlfuncid));
+		if (!HeapTupleIsValid(tuple))
+			elog(ERROR, "cache lookup failed for function %u", fromsqlfuncid);
+		procstruct = (Form_pg_proc) GETSTRUCT(tuple);
+		if (procstruct->prorettype != INTERNALOID)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("return data type of FROM SQL function must be \"internal\"")));
+		check_transform_function(procstruct);
+		ReleaseSysCache(tuple);
+	}
+	else
+		fromsqlfuncid = InvalidOid;
+
+	if (stmt->tosql)
+	{
+		tosqlfuncid = LookupFuncNameTypeNames(stmt->tosql->funcname, stmt->tosql->funcargs, false);
+
+		if (!pg_proc_ownercheck(tosqlfuncid, GetUserId()))
+			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC, NameListToString(stmt->tosql->funcname));
+
+		aclresult = pg_proc_aclcheck(tosqlfuncid, GetUserId(), ACL_EXECUTE);
+		if (aclresult != ACLCHECK_OK)
+			aclcheck_error(aclresult, ACL_KIND_PROC, NameListToString(stmt->tosql->funcname));
+
+		tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(tosqlfuncid));
+		if (!HeapTupleIsValid(tuple))
+			elog(ERROR, "cache lookup failed for function %u", tosqlfuncid);
+		procstruct = (Form_pg_proc) GETSTRUCT(tuple);
+		if (procstruct->prorettype != typeid)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("return data type of TO SQL function must be the transform data type")));
+		check_transform_function(procstruct);
+		ReleaseSysCache(tuple);
+	}
+	else
+		tosqlfuncid = InvalidOid;
+
+	/*
+	 * Ready to go
+	 */
+	values[Anum_pg_transform_trftype - 1] = ObjectIdGetDatum(typeid);
+	values[Anum_pg_transform_trflang - 1] = ObjectIdGetDatum(langid);
+	values[Anum_pg_transform_trffromsql - 1] = ObjectIdGetDatum(fromsqlfuncid);
+	values[Anum_pg_transform_trftosql - 1] = ObjectIdGetDatum(tosqlfuncid);
+
+	MemSet(nulls, false, sizeof(nulls));
+
+	relation = heap_open(TransformRelationId, RowExclusiveLock);
+
+	tuple = SearchSysCache2(TRFTYPELANG,
+							ObjectIdGetDatum(typeid),
+							ObjectIdGetDatum(langid));
+	if (HeapTupleIsValid(tuple))
+	{
+		if (!stmt->replace)
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_OBJECT),
+			   errmsg("transform for type %s language \"%s\" already exists",
+					  format_type_be(typeid),
+					  stmt->lang)));
+
+		MemSet(replaces, false, sizeof(replaces));
+		replaces[Anum_pg_transform_trffromsql - 1] = true;
+		replaces[Anum_pg_transform_trftosql - 1] = true;
+
+		newtuple = heap_modify_tuple(tuple, RelationGetDescr(relation), values, nulls, replaces);
+		simple_heap_update(relation, &newtuple->t_self, newtuple);
+
+		transformid = HeapTupleGetOid(tuple);
+		ReleaseSysCache(tuple);
+		is_replace = true;
+	}
+	else
+	{
+		newtuple = heap_form_tuple(RelationGetDescr(relation), values, nulls);
+		transformid = simple_heap_insert(relation, newtuple);
+		is_replace = false;
+	}
+
+	CatalogUpdateIndexes(relation, newtuple);
+
+	if (is_replace)
+		deleteDependencyRecordsFor(TransformRelationId, transformid, true);
+
+	/* make dependency entries */
+	myself.classId = TransformRelationId;
+	myself.objectId = transformid;
+	myself.objectSubId = 0;
+
+	/* dependency on language */
+	referenced.classId = LanguageRelationId;
+	referenced.objectId = langid;
+	referenced.objectSubId = 0;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	/* dependency on type */
+	referenced.classId = TypeRelationId;
+	referenced.objectId = typeid;
+	referenced.objectSubId = 0;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	/* dependencies on functions */
+	if (OidIsValid(fromsqlfuncid))
+	{
+		referenced.classId = ProcedureRelationId;
+		referenced.objectId = fromsqlfuncid;
+		referenced.objectSubId = 0;
+		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+	}
+	if (OidIsValid(tosqlfuncid))
+	{
+		referenced.classId = ProcedureRelationId;
+		referenced.objectId = tosqlfuncid;
+		referenced.objectSubId = 0;
+		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+	}
+
+	/* dependency on extension */
+	recordDependencyOnCurrentExtension(&myself, is_replace);
+
+	/* Post creation hook for new transform */
+	InvokeObjectPostCreateHook(TransformRelationId, transformid, 0);
+
+	heap_freetuple(newtuple);
+
+	heap_close(relation, RowExclusiveLock);
+
+	return transformid;
+}
+
+
+/*
+ * get_transform_oid - given type OID and language OID, look up a transform OID
+ *
+ * If missing_ok is false, throw an error if the transform is not found.  If
+ * true, just return InvalidOid.
+ */
+Oid
+get_transform_oid(Oid type_id, Oid lang_id, bool missing_ok)
+{
+	Oid			oid;
+
+	oid = GetSysCacheOid2(TRFTYPELANG,
+						  ObjectIdGetDatum(type_id),
+						  ObjectIdGetDatum(lang_id));
+	if (!OidIsValid(oid) && !missing_ok)
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+			   errmsg("transform for type %s language \"%s\" does not exist",
+					  format_type_be(type_id),
+					  get_language_name(lang_id, false))));
+	return oid;
+}
+
+
+void
+DropTransformById(Oid transformOid)
+{
+	Relation	relation;
+	ScanKeyData scankey;
+	SysScanDesc scan;
+	HeapTuple	tuple;
+
+	relation = heap_open(TransformRelationId, RowExclusiveLock);
+
+	ScanKeyInit(&scankey,
+				ObjectIdAttributeNumber,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(transformOid));
+	scan = systable_beginscan(relation, TransformOidIndexId, true,
+							  NULL, 1, &scankey);
+
+	tuple = systable_getnext(scan);
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "could not find tuple for transform %u", transformOid);
+	simple_heap_delete(relation, &tuple->t_self);
+
+	systable_endscan(scan);
+	heap_close(relation, RowExclusiveLock);
+}
+
+
 /*
  * Subroutine for ALTER FUNCTION/AGGREGATE SET SCHEMA/RENAME
  *
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 663a2c7e7d..471dbd0f7a 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -1111,7 +1111,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
 				 */
 
 				/*
-				 * A expression using mutable functions is probably wrong,
+				 * An expression using mutable functions is probably wrong,
 				 * since if you aren't going to get the same result for the
 				 * same data every time, it's not clear what the index entries
 				 * mean at all.
@@ -1741,7 +1741,7 @@ ChooseIndexColumnNames(List *indexElems)
  *		Recreate a specific index.
  */
 Oid
-ReindexIndex(RangeVar *indexRelation)
+ReindexIndex(RangeVar *indexRelation, int options)
 {
 	Oid			indOid;
 	Oid			heapOid = InvalidOid;
@@ -1766,7 +1766,7 @@ ReindexIndex(RangeVar *indexRelation)
 	persistence = irel->rd_rel->relpersistence;
 	index_close(irel, NoLock);
 
-	reindex_index(indOid, false, persistence);
+	reindex_index(indOid, false, persistence, options);
 
 	return indOid;
 }
@@ -1835,7 +1835,7 @@ RangeVarCallbackForReindexIndex(const RangeVar *relation,
  *		Recreate all indexes of a table (and of its toast table, if any)
  */
 Oid
-ReindexTable(RangeVar *relation)
+ReindexTable(RangeVar *relation, int options)
 {
 	Oid			heapOid;
 
@@ -1845,7 +1845,8 @@ ReindexTable(RangeVar *relation)
 
 	if (!reindex_relation(heapOid,
 						  REINDEX_REL_PROCESS_TOAST |
-						  REINDEX_REL_CHECK_CONSTRAINTS))
+						  REINDEX_REL_CHECK_CONSTRAINTS,
+						  options))
 		ereport(NOTICE,
 				(errmsg("table \"%s\" has no indexes",
 						relation->relname)));
@@ -1862,7 +1863,8 @@ ReindexTable(RangeVar *relation)
  * That means this must not be called within a user transaction block!
  */
 void
-ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind)
+ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
+					  int options)
 {
 	Oid			objectOid;
 	Relation	relationRelation;
@@ -1998,11 +2000,14 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind)
 		PushActiveSnapshot(GetTransactionSnapshot());
 		if (reindex_relation(relid,
 							 REINDEX_REL_PROCESS_TOAST |
-							 REINDEX_REL_CHECK_CONSTRAINTS))
-			ereport(DEBUG1,
-					(errmsg("table \"%s.%s\" was reindexed",
-							get_namespace_name(get_rel_namespace(relid)),
-							get_rel_name(relid))));
+							 REINDEX_REL_CHECK_CONSTRAINTS,
+							 options))
+
+			if (options & REINDEXOPT_VERBOSE)
+				ereport(INFO,
+						(errmsg("table \"%s.%s\" was reindexed",
+								get_namespace_name(get_rel_namespace(relid)),
+								get_rel_name(relid))));
 		PopActiveSnapshot();
 		CommitTransactionCommand();
 	}
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bdec2ff545..a1670821aa 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -169,13 +169,17 @@ static AclResult
 LockTableAclCheck(Oid reloid, LOCKMODE lockmode)
 {
 	AclResult	aclresult;
+	AclMode		aclmask;
 
 	/* Verify adequate privilege */
 	if (lockmode == AccessShareLock)
-		aclresult = pg_class_aclcheck(reloid, GetUserId(),
-									  ACL_SELECT);
+		aclmask = ACL_SELECT;
+	else if (lockmode == RowExclusiveLock)
+		aclmask = ACL_INSERT | ACL_UPDATE | ACL_DELETE | ACL_TRUNCATE;
 	else
-		aclresult = pg_class_aclcheck(reloid, GetUserId(),
-									  ACL_UPDATE | ACL_DELETE | ACL_TRUNCATE);
+		aclmask = ACL_UPDATE | ACL_DELETE | ACL_TRUNCATE;
+
+	aclresult = pg_class_aclcheck(reloid, GetUserId(), aclmask);
+
 	return aclresult;
 }
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 9e38c1aa4a..f3b780322a 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -72,7 +72,7 @@ static char *make_temptable_name_n(char *tempname, int n);
 static void mv_GenerateOper(StringInfo buf, Oid opoid);
 
 static void refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
-						 int save_sec_context);
+					   int save_sec_context);
 static void refresh_by_heap_swap(Oid matviewOid, Oid OIDNewHeap, char relpersistence);
 
 static void OpenMatViewIncrementalMaintenance(void);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index c327cc0473..3375f10861 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -25,6 +25,7 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
+#include "catalog/opfam_internal.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_namespace.h"
@@ -35,6 +36,7 @@
 #include "catalog/pg_type.h"
 #include "commands/alter.h"
 #include "commands/defrem.h"
+#include "commands/event_trigger.h"
 #include "miscadmin.h"
 #include "parser/parse_func.h"
 #include "parser/parse_oper.h"
@@ -47,24 +49,12 @@
 #include "utils/tqual.h"
 
 
-/*
- * We use lists of this struct type to keep track of both operators and
- * procedures while building or adding to an opfamily.
- */
-typedef struct
-{
-	Oid			object;			/* operator or support proc's OID */
-	int			number;			/* strategy or support proc number */
-	Oid			lefttype;		/* lefttype */
-	Oid			righttype;		/* righttype */
-	Oid			sortfamily;		/* ordering operator's sort opfamily, or 0 */
-} OpFamilyMember;
-
-
-static void AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid,
+static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt,
+				 Oid amoid, Oid opfamilyoid,
 				 int maxOpNumber, int maxProcNumber,
 				 List *items);
-static void AlterOpFamilyDrop(List *opfamilyname, Oid amoid, Oid opfamilyoid,
+static void AlterOpFamilyDrop(AlterOpFamilyStmt *stmt,
+				  Oid amoid, Oid opfamilyoid,
 				  int maxOpNumber, int maxProcNumber,
 				  List *items);
 static void processTypesSpec(List *args, Oid *lefttype, Oid *righttype);
@@ -675,6 +665,9 @@ DefineOpClass(CreateOpClassStmt *stmt)
 	storeProcedures(stmt->opfamilyname, amoid, opfamilyoid,
 					opclassoid, procedures, false);
 
+	/* let event triggers know what happened */
+	EventTriggerCollectCreateOpClass(stmt, opclassoid, operators, procedures);
+
 	/*
 	 * Create dependencies for the opclass proper.  Note: we do not create a
 	 * dependency link to the AM, because we don't currently support DROP
@@ -822,13 +815,11 @@ AlterOpFamily(AlterOpFamilyStmt *stmt)
 	 * ADD and DROP cases need separate code from here on down.
 	 */
 	if (stmt->isDrop)
-		AlterOpFamilyDrop(stmt->opfamilyname, amoid, opfamilyoid,
-						  maxOpNumber, maxProcNumber,
-						  stmt->items);
+		AlterOpFamilyDrop(stmt, amoid, opfamilyoid,
+						  maxOpNumber, maxProcNumber, stmt->items);
 	else
-		AlterOpFamilyAdd(stmt->opfamilyname, amoid, opfamilyoid,
-						 maxOpNumber, maxProcNumber,
-						 stmt->items);
+		AlterOpFamilyAdd(stmt, amoid, opfamilyoid,
+						 maxOpNumber, maxProcNumber, stmt->items);
 
 	return opfamilyoid;
 }
@@ -837,9 +828,8 @@ AlterOpFamily(AlterOpFamilyStmt *stmt)
  * ADD part of ALTER OP FAMILY
  */
 static void
-AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid,
-				 int maxOpNumber, int maxProcNumber,
-				 List *items)
+AlterOpFamilyAdd(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid,
+				 int maxOpNumber, int maxProcNumber, List *items)
 {
 	List	   *operators;		/* OpFamilyMember list for operators */
 	List	   *procedures;		/* OpFamilyMember list for support procs */
@@ -958,19 +948,22 @@ AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid,
 	 * Add tuples to pg_amop and pg_amproc tying in the operators and
 	 * functions.  Dependencies on them are inserted, too.
 	 */
-	storeOperators(opfamilyname, amoid, opfamilyoid,
+	storeOperators(stmt->opfamilyname, amoid, opfamilyoid,
 				   InvalidOid, operators, true);
-	storeProcedures(opfamilyname, amoid, opfamilyoid,
+	storeProcedures(stmt->opfamilyname, amoid, opfamilyoid,
 					InvalidOid, procedures, true);
+
+	/* make information available to event triggers */
+	EventTriggerCollectAlterOpFam(stmt, opfamilyoid,
+								  operators, procedures);
 }
 
 /*
  * DROP part of ALTER OP FAMILY
  */
 static void
-AlterOpFamilyDrop(List *opfamilyname, Oid amoid, Oid opfamilyoid,
-				  int maxOpNumber, int maxProcNumber,
-				  List *items)
+AlterOpFamilyDrop(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid,
+				  int maxOpNumber, int maxProcNumber, List *items)
 {
 	List	   *operators;		/* OpFamilyMember list for operators */
 	List	   *procedures;		/* OpFamilyMember list for support procs */
@@ -1033,8 +1026,12 @@ AlterOpFamilyDrop(List *opfamilyname, Oid amoid, Oid opfamilyoid,
 	/*
 	 * Remove tuples from pg_amop and pg_amproc.
 	 */
-	dropOperators(opfamilyname, amoid, opfamilyoid, operators);
-	dropProcedures(opfamilyname, amoid, opfamilyoid, procedures);
+	dropOperators(stmt->opfamilyname, amoid, opfamilyoid, operators);
+	dropProcedures(stmt->opfamilyname, amoid, opfamilyoid, procedures);
+
+	/* make information available to event triggers */
+	EventTriggerCollectAlterOpFam(stmt, opfamilyoid,
+								  operators, procedures);
 }
 
 
@@ -1673,7 +1670,7 @@ RemoveAmProcEntryById(Oid entryOid)
 	heap_close(rel, RowExclusiveLock);
 }
 
-static char *
+char *
 get_am_name(Oid amOid)
 {
 	HeapTuple	tup;
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index a3d840da5c..6e95ba28b9 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -45,27 +45,27 @@
 #include "utils/syscache.h"
 
 static void RangeVarCallbackForPolicy(const RangeVar *rv,
-				Oid relid, Oid oldrelid, void *arg);
+						  Oid relid, Oid oldrelid, void *arg);
 static char parse_policy_command(const char *cmd_name);
-static ArrayType* policy_role_list_to_array(List *roles);
+static ArrayType *policy_role_list_to_array(List *roles);
 
 /*
  * Callback to RangeVarGetRelidExtended().
  *
  * Checks the following:
- *  - the relation specified is a table.
- *  - current user owns the table.
- *  - the table is not a system table.
+ *	- the relation specified is a table.
+ *	- current user owns the table.
+ *	- the table is not a system table.
  *
  * If any of these checks fails then an error is raised.
  */
 static void
 RangeVarCallbackForPolicy(const RangeVar *rv, Oid relid, Oid oldrelid,
-								void *arg)
+						  void *arg)
 {
-	HeapTuple		tuple;
-	Form_pg_class	classform;
-	char			relkind;
+	HeapTuple	tuple;
+	Form_pg_class classform;
+	char		relkind;
 
 	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
 	if (!HeapTupleIsValid(tuple))
@@ -96,8 +96,8 @@ RangeVarCallbackForPolicy(const RangeVar *rv, Oid relid, Oid oldrelid,
 
 /*
  * parse_policy_command -
- *   helper function to convert full command strings to their char
- *   representation.
+ *	 helper function to convert full command strings to their char
+ *	 representation.
  *
  * cmd_name - full string command name. Valid values are 'all', 'select',
  *			  'insert', 'update' and 'delete'.
@@ -106,7 +106,7 @@ RangeVarCallbackForPolicy(const RangeVar *rv, Oid relid, Oid oldrelid,
 static char
 parse_policy_command(const char *cmd_name)
 {
-	char cmd;
+	char		cmd;
 
 	if (!cmd_name)
 		elog(ERROR, "unrecognized policy command");
@@ -129,7 +129,7 @@ parse_policy_command(const char *cmd_name)
 
 /*
  * policy_role_list_to_array
- *   helper function to convert a list of RoleSpecs to an array of role ids.
+ *	 helper function to convert a list of RoleSpecs to an array of role ids.
  */
 static ArrayType *
 policy_role_list_to_array(List *roles)
@@ -156,7 +156,7 @@ policy_role_list_to_array(List *roles)
 
 	foreach(cell, roles)
 	{
-		RoleSpec *spec = lfirst(cell);
+		RoleSpec   *spec = lfirst(cell);
 
 		/*
 		 * PUBLIC covers all roles, so it only makes sense alone.
@@ -167,7 +167,7 @@ policy_role_list_to_array(List *roles)
 				ereport(WARNING,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("ignoring roles specified other than public"),
-						 errhint("All roles are members of the public role.")));
+					  errhint("All roles are members of the public role.")));
 			temp_array[0] = ObjectIdGetDatum(ACL_ID_PUBLIC);
 			num_roles = 1;
 			break;
@@ -193,14 +193,14 @@ policy_role_list_to_array(List *roles)
 void
 RelationBuildRowSecurity(Relation relation)
 {
-	MemoryContext		rscxt;
-	MemoryContext		oldcxt = CurrentMemoryContext;
-	RowSecurityDesc	   * volatile rsdesc = NULL;
+	MemoryContext rscxt;
+	MemoryContext oldcxt = CurrentMemoryContext;
+	RowSecurityDesc *volatile rsdesc = NULL;
 
 	/*
 	 * Create a memory context to hold everything associated with this
-	 * relation's row security policy.  This makes it easy to clean up
-	 * during a relcache flush.
+	 * relation's row security policy.  This makes it easy to clean up during
+	 * a relcache flush.
 	 */
 	rscxt = AllocSetContextCreate(CacheMemoryContext,
 								  "row security descriptor",
@@ -209,15 +209,15 @@ RelationBuildRowSecurity(Relation relation)
 								  ALLOCSET_SMALL_MAXSIZE);
 
 	/*
-	 * Since rscxt lives under CacheMemoryContext, it is long-lived.  Use
-	 * a PG_TRY block to ensure it'll get freed if we fail partway through.
+	 * Since rscxt lives under CacheMemoryContext, it is long-lived.  Use a
+	 * PG_TRY block to ensure it'll get freed if we fail partway through.
 	 */
 	PG_TRY();
 	{
-		Relation			catalog;
-		ScanKeyData			skey;
-		SysScanDesc			sscan;
-		HeapTuple			tuple;
+		Relation	catalog;
+		ScanKeyData skey;
+		SysScanDesc sscan;
+		HeapTuple	tuple;
 
 		rsdesc = MemoryContextAllocZero(rscxt, sizeof(RowSecurityDesc));
 		rsdesc->rscxt = rscxt;
@@ -238,17 +238,17 @@ RelationBuildRowSecurity(Relation relation)
 		 */
 		while (HeapTupleIsValid(tuple = systable_getnext(sscan)))
 		{
-			Datum				value_datum;
-			char				cmd_value;
-			Datum				roles_datum;
-			char			   *qual_value;
-			Expr			   *qual_expr;
-			char			   *with_check_value;
-			Expr			   *with_check_qual;
-			char			   *policy_name_value;
-			Oid					policy_id;
-			bool				isnull;
-			RowSecurityPolicy  *policy;
+			Datum		value_datum;
+			char		cmd_value;
+			Datum		roles_datum;
+			char	   *qual_value;
+			Expr	   *qual_expr;
+			char	   *with_check_value;
+			Expr	   *with_check_qual;
+			char	   *policy_name_value;
+			Oid			policy_id;
+			bool		isnull;
+			RowSecurityPolicy *policy;
 
 			/*
 			 * Note: all the pass-by-reference data we collect here is either
@@ -259,26 +259,26 @@ RelationBuildRowSecurity(Relation relation)
 
 			/* Get policy command */
 			value_datum = heap_getattr(tuple, Anum_pg_policy_polcmd,
-								 RelationGetDescr(catalog), &isnull);
+									   RelationGetDescr(catalog), &isnull);
 			Assert(!isnull);
 			cmd_value = DatumGetChar(value_datum);
 
 			/* Get policy name */
 			value_datum = heap_getattr(tuple, Anum_pg_policy_polname,
-										RelationGetDescr(catalog), &isnull);
+									   RelationGetDescr(catalog), &isnull);
 			Assert(!isnull);
 			policy_name_value = NameStr(*(DatumGetName(value_datum)));
 
 			/* Get policy roles */
 			roles_datum = heap_getattr(tuple, Anum_pg_policy_polroles,
-										RelationGetDescr(catalog), &isnull);
+									   RelationGetDescr(catalog), &isnull);
 			/* shouldn't be null, but initdb doesn't mark it so, so check */
 			if (isnull)
 				elog(ERROR, "unexpected null value in pg_policy.polroles");
 
 			/* Get policy qual */
 			value_datum = heap_getattr(tuple, Anum_pg_policy_polqual,
-								 RelationGetDescr(catalog), &isnull);
+									   RelationGetDescr(catalog), &isnull);
 			if (!isnull)
 			{
 				qual_value = TextDatumGetCString(value_datum);
@@ -289,7 +289,7 @@ RelationBuildRowSecurity(Relation relation)
 
 			/* Get WITH CHECK qual */
 			value_datum = heap_getattr(tuple, Anum_pg_policy_polwithcheck,
-										RelationGetDescr(catalog), &isnull);
+									   RelationGetDescr(catalog), &isnull);
 			if (!isnull)
 			{
 				with_check_value = TextDatumGetCString(value_datum);
@@ -311,7 +311,7 @@ RelationBuildRowSecurity(Relation relation)
 			policy->qual = copyObject(qual_expr);
 			policy->with_check_qual = copyObject(with_check_qual);
 			policy->hassublinks = checkExprHasSubLink((Node *) qual_expr) ||
-								  checkExprHasSubLink((Node *) with_check_qual);
+				checkExprHasSubLink((Node *) with_check_qual);
 
 			rsdesc->policies = lcons(policy, rsdesc->policies);
 
@@ -330,15 +330,15 @@ RelationBuildRowSecurity(Relation relation)
 		/*
 		 * Check if no policies were added
 		 *
-		 * If no policies exist in pg_policy for this relation, then we
-		 * need to create a single default-deny policy.  We use InvalidOid for
-		 * the Oid to indicate that this is the default-deny policy (we may
-		 * decide to ignore the default policy if an extension adds policies).
+		 * If no policies exist in pg_policy for this relation, then we need
+		 * to create a single default-deny policy.  We use InvalidOid for the
+		 * Oid to indicate that this is the default-deny policy (we may decide
+		 * to ignore the default policy if an extension adds policies).
 		 */
 		if (rsdesc->policies == NIL)
 		{
-			RowSecurityPolicy  *policy;
-			Datum				role;
+			RowSecurityPolicy *policy;
+			Datum		role;
 
 			MemoryContextSwitchTo(rscxt);
 
@@ -351,7 +351,7 @@ RelationBuildRowSecurity(Relation relation)
 			policy->roles = construct_array(&role, 1, OIDOID, sizeof(Oid), true,
 											'i');
 			policy->qual = (Expr *) makeConst(BOOLOID, -1, InvalidOid,
-											  sizeof(bool), BoolGetDatum(false),
+										   sizeof(bool), BoolGetDatum(false),
 											  false, true);
 			policy->with_check_qual = copyObject(policy->qual);
 			policy->hassublinks = false;
@@ -376,15 +376,15 @@ RelationBuildRowSecurity(Relation relation)
 
 /*
  * RemovePolicyById -
- *   remove a policy by its OID.  If a policy does not exist with the provided
- *   oid, then an error is raised.
+ *	 remove a policy by its OID.  If a policy does not exist with the provided
+ *	 oid, then an error is raised.
  *
  * policy_id - the oid of the policy.
  */
 void
 RemovePolicyById(Oid policy_id)
 {
-	Relation 	pg_policy_rel;
+	Relation	pg_policy_rel;
 	SysScanDesc sscan;
 	ScanKeyData skey[1];
 	HeapTuple	tuple;
@@ -435,8 +435,8 @@ RemovePolicyById(Oid policy_id)
 
 	/*
 	 * Note that, unlike some of the other flags in pg_class, relrowsecurity
-	 * is not just an indication of if policies exist.  When relrowsecurity
-	 * is set by a user, then all access to the relation must be through a
+	 * is not just an indication of if policies exist.  When relrowsecurity is
+	 * set by a user, then all access to the relation must be through a
 	 * policy.  If no policy is defined for the relation then a default-deny
 	 * policy is created and all records are filtered (except for queries from
 	 * the owner).
@@ -450,31 +450,31 @@ RemovePolicyById(Oid policy_id)
 
 /*
  * CreatePolicy -
- *   handles the execution of the CREATE POLICY command.
+ *	 handles the execution of the CREATE POLICY command.
  *
  * stmt - the CreatePolicyStmt that describes the policy to create.
  */
 ObjectAddress
 CreatePolicy(CreatePolicyStmt *stmt)
 {
-	Relation		pg_policy_rel;
-	Oid				policy_id;
-	Relation		target_table;
-	Oid				table_id;
-	char			polcmd;
-	ArrayType	   *role_ids;
-	ParseState	   *qual_pstate;
-	ParseState	   *with_check_pstate;
-	RangeTblEntry  *rte;
-	Node		   *qual;
-	Node		   *with_check_qual;
-	ScanKeyData		skey[2];
-	SysScanDesc		sscan;
-	HeapTuple		policy_tuple;
-	Datum			values[Natts_pg_policy];
-	bool			isnull[Natts_pg_policy];
-	ObjectAddress	target;
-	ObjectAddress	myself;
+	Relation	pg_policy_rel;
+	Oid			policy_id;
+	Relation	target_table;
+	Oid			table_id;
+	char		polcmd;
+	ArrayType  *role_ids;
+	ParseState *qual_pstate;
+	ParseState *with_check_pstate;
+	RangeTblEntry *rte;
+	Node	   *qual;
+	Node	   *with_check_qual;
+	ScanKeyData skey[2];
+	SysScanDesc sscan;
+	HeapTuple	policy_tuple;
+	Datum		values[Natts_pg_policy];
+	bool		isnull[Natts_pg_policy];
+	ObjectAddress target;
+	ObjectAddress myself;
 
 	/* Parse command */
 	polcmd = parse_policy_command(stmt->cmd);
@@ -506,8 +506,8 @@ CreatePolicy(CreatePolicyStmt *stmt)
 	with_check_pstate = make_parsestate(NULL);
 
 	/* zero-clear */
-	memset(values,   0, sizeof(values));
-	memset(isnull,   0, sizeof(isnull));
+	memset(values, 0, sizeof(values));
+	memset(isnull, 0, sizeof(isnull));
 
 	/* Get id of table.  Also handles permissions checks. */
 	table_id = RangeVarGetRelidExtended(stmt->table, AccessExclusiveLock,
@@ -515,7 +515,7 @@ CreatePolicy(CreatePolicyStmt *stmt)
 										RangeVarCallbackForPolicy,
 										(void *) stmt);
 
-	/* Open target_table to build quals. No lock is necessary.*/
+	/* Open target_table to build quals. No lock is necessary. */
 	target_table = relation_open(table_id, NoLock);
 
 	/* Add for the regular security quals */
@@ -534,9 +534,9 @@ CreatePolicy(CreatePolicyStmt *stmt)
 								"POLICY");
 
 	with_check_qual = transformWhereClause(with_check_pstate,
-								copyObject(stmt->with_check),
-								EXPR_KIND_WHERE,
-								"POLICY");
+										   copyObject(stmt->with_check),
+										   EXPR_KIND_WHERE,
+										   "POLICY");
 
 	/* Open pg_policy catalog */
 	pg_policy_rel = heap_open(PolicyRelationId, RowExclusiveLock);
@@ -568,7 +568,7 @@ CreatePolicy(CreatePolicyStmt *stmt)
 
 	values[Anum_pg_policy_polrelid - 1] = ObjectIdGetDatum(table_id);
 	values[Anum_pg_policy_polname - 1] = DirectFunctionCall1(namein,
-															 CStringGetDatum(stmt->policy_name));
+										 CStringGetDatum(stmt->policy_name));
 	values[Anum_pg_policy_polcmd - 1] = CharGetDatum(polcmd);
 	values[Anum_pg_policy_polroles - 1] = PointerGetDatum(role_ids);
 
@@ -625,34 +625,34 @@ CreatePolicy(CreatePolicyStmt *stmt)
 
 /*
  * AlterPolicy -
- *   handles the execution of the ALTER POLICY command.
+ *	 handles the execution of the ALTER POLICY command.
  *
  * stmt - the AlterPolicyStmt that describes the policy and how to alter it.
  */
 ObjectAddress
 AlterPolicy(AlterPolicyStmt *stmt)
 {
-	Relation		pg_policy_rel;
-	Oid				policy_id;
-	Relation		target_table;
-	Oid				table_id;
-	ArrayType	   *role_ids = NULL;
-	List		   *qual_parse_rtable = NIL;
-	List		   *with_check_parse_rtable = NIL;
-	Node		   *qual = NULL;
-	Node		   *with_check_qual = NULL;
-	ScanKeyData		skey[2];
-	SysScanDesc		sscan;
-	HeapTuple		policy_tuple;
-	HeapTuple		new_tuple;
-	Datum			values[Natts_pg_policy];
-	bool			isnull[Natts_pg_policy];
-	bool			replaces[Natts_pg_policy];
-	ObjectAddress	target;
-	ObjectAddress	myself;
-	Datum			cmd_datum;
-	char			polcmd;
-	bool			polcmd_isnull;
+	Relation	pg_policy_rel;
+	Oid			policy_id;
+	Relation	target_table;
+	Oid			table_id;
+	ArrayType  *role_ids = NULL;
+	List	   *qual_parse_rtable = NIL;
+	List	   *with_check_parse_rtable = NIL;
+	Node	   *qual = NULL;
+	Node	   *with_check_qual = NULL;
+	ScanKeyData skey[2];
+	SysScanDesc sscan;
+	HeapTuple	policy_tuple;
+	HeapTuple	new_tuple;
+	Datum		values[Natts_pg_policy];
+	bool		isnull[Natts_pg_policy];
+	bool		replaces[Natts_pg_policy];
+	ObjectAddress target;
+	ObjectAddress myself;
+	Datum		cmd_datum;
+	char		polcmd;
+	bool		polcmd_isnull;
 
 	/* Parse role_ids */
 	if (stmt->roles != NULL)
@@ -669,8 +669,8 @@ AlterPolicy(AlterPolicyStmt *stmt)
 	/* Parse the using policy clause */
 	if (stmt->qual)
 	{
-		RangeTblEntry  *rte;
-		ParseState	   *qual_pstate = make_parsestate(NULL);
+		RangeTblEntry *rte;
+		ParseState *qual_pstate = make_parsestate(NULL);
 
 		rte = addRangeTableEntryForRelation(qual_pstate, target_table,
 											NULL, false, false);
@@ -688,8 +688,8 @@ AlterPolicy(AlterPolicyStmt *stmt)
 	/* Parse the with-check policy clause */
 	if (stmt->with_check)
 	{
-		RangeTblEntry  *rte;
-		ParseState	   *with_check_pstate = make_parsestate(NULL);
+		RangeTblEntry *rte;
+		ParseState *with_check_pstate = make_parsestate(NULL);
 
 		rte = addRangeTableEntryForRelation(with_check_pstate, target_table,
 											NULL, false, false);
@@ -706,9 +706,9 @@ AlterPolicy(AlterPolicyStmt *stmt)
 	}
 
 	/* zero-clear */
-	memset(values,   0, sizeof(values));
+	memset(values, 0, sizeof(values));
 	memset(replaces, 0, sizeof(replaces));
-	memset(isnull,   0, sizeof(isnull));
+	memset(isnull, 0, sizeof(isnull));
 
 	/* Find policy to update. */
 	pg_policy_rel = heap_open(PolicyRelationId, RowExclusiveLock);
@@ -756,8 +756,8 @@ AlterPolicy(AlterPolicyStmt *stmt)
 				 errmsg("only USING expression allowed for SELECT, DELETE")));
 
 	/*
-	 * If the command is INSERT then WITH CHECK should be the only
-	 * expression provided.
+	 * If the command is INSERT then WITH CHECK should be the only expression
+	 * provided.
 	 */
 	if ((polcmd == ACL_INSERT_CHR)
 		&& stmt->qual != NULL)
@@ -829,19 +829,19 @@ AlterPolicy(AlterPolicyStmt *stmt)
 
 /*
  * rename_policy -
- *   change the name of a policy on a relation
+ *	 change the name of a policy on a relation
  */
 ObjectAddress
 rename_policy(RenameStmt *stmt)
 {
-	Relation		pg_policy_rel;
-	Relation		target_table;
-	Oid				table_id;
-	Oid				opoloid;
-	ScanKeyData		skey[2];
-	SysScanDesc		sscan;
-	HeapTuple		policy_tuple;
-	ObjectAddress	address;
+	Relation	pg_policy_rel;
+	Relation	target_table;
+	Oid			table_id;
+	Oid			opoloid;
+	ScanKeyData skey[2];
+	SysScanDesc sscan;
+	HeapTuple	policy_tuple;
+	ObjectAddress address;
 
 	/* Get id of table.  Also handles permissions checks. */
 	table_id = RangeVarGetRelidExtended(stmt->relation, AccessExclusiveLock,
@@ -875,7 +875,7 @@ rename_policy(RenameStmt *stmt)
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
 				 errmsg("policy \"%s\" for table \"%s\" already exists",
-						stmt->newname, RelationGetRelationName(target_table))));
+					 stmt->newname, RelationGetRelationName(target_table))));
 
 	systable_endscan(sscan);
 
@@ -903,7 +903,7 @@ rename_policy(RenameStmt *stmt)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("policy \"%s\" for table \"%s\" does not exist",
-						stmt->subname, RelationGetRelationName(target_table))));
+					 stmt->subname, RelationGetRelationName(target_table))));
 
 	opoloid = HeapTupleGetOid(policy_tuple);
 
@@ -923,9 +923,9 @@ rename_policy(RenameStmt *stmt)
 	ObjectAddressSet(address, PolicyRelationId, opoloid);
 
 	/*
-	 * Invalidate relation's relcache entry so that other backends (and
-	 * this one too!) are sent SI message to make them rebuild relcache
-	 * entries.  (Ideally this should happen automatically...)
+	 * Invalidate relation's relcache entry so that other backends (and this
+	 * one too!) are sent SI message to make them rebuild relcache entries.
+	 * (Ideally this should happen automatically...)
 	 */
 	CacheInvalidateRelcache(target_table);
 
@@ -946,11 +946,11 @@ rename_policy(RenameStmt *stmt)
 Oid
 get_relation_policy_oid(Oid relid, const char *policy_name, bool missing_ok)
 {
-	Relation		pg_policy_rel;
-	ScanKeyData		skey[2];
-	SysScanDesc		sscan;
-	HeapTuple		policy_tuple;
-	Oid				policy_oid;
+	Relation	pg_policy_rel;
+	ScanKeyData skey[2];
+	SysScanDesc sscan;
+	HeapTuple	policy_tuple;
+	Oid			policy_oid;
 
 	pg_policy_rel = heap_open(PolicyRelationId, AccessShareLock);
 
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 11e6213e80..3995a575e4 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -141,6 +141,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 									  PointerGetDatum(NULL),
 									  NIL,
 									  PointerGetDatum(NULL),
+									  PointerGetDatum(NULL),
 									  1,
 									  0);
 			handlerOid = tmpAddr.objectId;
@@ -179,6 +180,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 										  PointerGetDatum(NULL),
 										  NIL,
 										  PointerGetDatum(NULL),
+										  PointerGetDatum(NULL),
 										  1,
 										  0);
 				inlineOid = tmpAddr.objectId;
@@ -220,6 +222,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 										  PointerGetDatum(NULL),
 										  NIL,
 										  PointerGetDatum(NULL),
+										  PointerGetDatum(NULL),
 										  1,
 										  0);
 				valOid = tmpAddr.objectId;
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 4f87284b33..948eab4803 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -30,6 +30,7 @@
 #include "catalog/objectaccess.h"
 #include "catalog/pg_namespace.h"
 #include "commands/dbcommands.h"
+#include "commands/event_trigger.h"
 #include "commands/schemacmds.h"
 #include "miscadmin.h"
 #include "parser/parse_utilcmd.h"
@@ -56,7 +57,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString, bool sentTo
 CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 #endif
 {
-	const char	*schemaName = stmt->schemaname;
+	const char *schemaName = stmt->schemaname;
 	Oid			namespaceId;
 	OverrideSearchPath *overridePath;
 	List	   *parsetree_list;
@@ -65,6 +66,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 	Oid			saved_uid;
 	int			save_sec_context;
 	AclResult	aclresult;
+	ObjectAddress address;
 
 	GetUserIdAndSecContext(&saved_uid, &save_sec_context);
 
@@ -79,7 +81,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 	/* fill schema name with the user name if not specified */
 	if (!schemaName)
 	{
-		HeapTuple tuple;
+		HeapTuple	tuple;
 
 		tuple = SearchSysCache1(AUTHOID, ObjectIdGetDatum(owner_uid));
 		if (!HeapTupleIsValid(tuple))
@@ -156,6 +158,16 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 	PushOverrideSearchPath(overridePath);
 
 	/*
+	 * Report the new schema to possibly interested event triggers.  Note we
+	 * must do this here and not in ProcessUtilitySlow because otherwise the
+	 * objects created below are reported before the schema, which would be
+	 * wrong.
+	 */
+	ObjectAddressSet(address, NamespaceRelationId, namespaceId);
+	EventTriggerCollectSimpleCommand(address, InvalidObjectAddress,
+									 (Node *) stmt);
+
+	/*
 	 * Examine the list of commands embedded in the CREATE SCHEMA command, and
 	 * reorganize them into a sequentially executable order with no forward
 	 * references.  Note that the result is still a list of raw parsetrees ---
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 732d15214a..c43f2d9a4f 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -725,6 +725,12 @@ nextval_internal(Oid relid)
 #ifdef PGXC
 	is_temp = seqrel->rd_backend == MyBackendId;
 #endif
+	/*
+	 * Forbid this during parallel operation because, to make it work, the
+	 * cooperating backends would need to share the backend-local cached
+	 * sequence information.  Currently, we don't support that.
+	 */
+	PreventCommandIfParallelMode("nextval()");
 
 	if (elm->last != elm->cached)		/* some numbers were cached */
 	{
@@ -986,10 +992,10 @@ nextval_internal(Oid relid)
 
 	/*
 	 * If something needs to be WAL logged, acquire an xid, so this
-	 * transaction's commit will trigger a WAL flush and wait for
-	 * syncrep. It's sufficient to ensure the toplevel transaction has a xid,
-	 * no need to assign xids subxacts, that'll already trigger a appropriate
-	 * wait.  (Have to do that here, so we're outside the critical section)
+	 * transaction's commit will trigger a WAL flush and wait for syncrep.
+	 * It's sufficient to ensure the toplevel transaction has an xid, no need
+	 * to assign xids subxacts, that'll already trigger an appropriate wait.
+	 * (Have to do that here, so we're outside the critical section)
 	 */
 	if (logit && RelationNeedsWAL(seqrel))
 		GetTopTransactionId();
@@ -1199,6 +1205,12 @@ do_setval(Oid relid, int64 next, bool iscalled)
 #ifdef PGXC
 	is_temp = seqrel->rd_backend == MyBackendId;
 #endif
+	/*
+	 * Forbid this during parallel operation because, to make it work, the
+	 * cooperating backends would need to share the backend-local cached
+	 * sequence information.  Currently, we don't support that.
+	 */
+	PreventCommandIfParallelMode("setval()");
 
 	/* lock page' buffer and read tuple */
 	seq = read_seq_tuple(elm, seqrel, &buf, &seqtuple);
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 16cc56385d..bdf360e568 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -326,14 +326,14 @@ static void createForeignKeyTriggers(Relation rel, Oid refRelOid,
 						 Constraint *fkconstraint,
 						 Oid constraintOid, Oid indexOid);
 static void ATController(AlterTableStmt *parsetree,
-						 Relation rel, List *cmds, bool recurse, LOCKMODE lockmode);
+			 Relation rel, List *cmds, bool recurse, LOCKMODE lockmode);
 static void ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 		  bool recurse, bool recursing, LOCKMODE lockmode);
 static void ATRewriteCatalogs(List **wqueue, LOCKMODE lockmode);
 static void ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 		  AlterTableCmd *cmd, LOCKMODE lockmode);
 static void ATRewriteTables(AlterTableStmt *parsetree,
-							List **wqueue, LOCKMODE lockmode);
+				List **wqueue, LOCKMODE lockmode);
 static void ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode);
 static AlteredTableInfo *ATGetQueueEntry(List **wqueue, Relation rel);
 static void ATSimplePermissions(Relation rel, int allowed_targets);
@@ -609,6 +609,14 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 	 */
 	descriptor = BuildDescForRelation(schema);
 
+	/*
+	 * Notice that we allow OIDs here only for plain tables, even though some
+	 * other relkinds can support them.  This is necessary because the
+	 * default_with_oids GUC must apply only to plain tables and not any other
+	 * relkind; doing otherwise would break existing pg_dump files.  We could
+	 * allow explicit "WITH OIDS" while not allowing default_with_oids to
+	 * affect other relkinds, but it would complicate interpretOidsOption().
+	 */
 	localHasOids = interpretOidsOption(stmt->options,
 									   (relkind == RELKIND_RELATION));
 	descriptor->tdhasoid = (localHasOids || parentOidCount > 0);
@@ -653,7 +661,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 
 			cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
 			cooked->contype = CONSTR_DEFAULT;
-			cooked->conoid = InvalidOid;	/* until created */
+			cooked->conoid = InvalidOid;		/* until created */
 			cooked->name = NULL;
 			cooked->attnum = attnum;
 			cooked->expr = colDef->cooked_default;
@@ -1295,7 +1303,7 @@ ExecuteTruncate(TruncateStmt *stmt)
 			/*
 			 * Reconstruct the indexes to match, and we're done.
 			 */
-			reindex_relation(heap_relid, REINDEX_REL_PROCESS_TOAST);
+			reindex_relation(heap_relid, REINDEX_REL_PROCESS_TOAST, 0);
 		}
 
 		pgstat_count_truncate(rel);
@@ -1812,7 +1820,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
 
 					cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
 					cooked->contype = CONSTR_CHECK;
-					cooked->conoid = InvalidOid;	/* until created */
+					cooked->conoid = InvalidOid;		/* until created */
 					cooked->name = pstrdup(name);
 					cooked->attnum = 0; /* not used for constraints */
 					cooked->expr = expr;
@@ -1842,7 +1850,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
 	 */
 	if (inhSchema != NIL)
 	{
-		int		schema_attno = 0;
+		int			schema_attno = 0;
 
 		foreach(entry, schema)
 		{
@@ -1870,14 +1878,14 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
 				 * Yes, try to merge the two column definitions. They must
 				 * have the same type, typmod, and collation.
 				 */
-				 if (exist_attno == schema_attno)
+				if (exist_attno == schema_attno)
 					ereport(NOTICE,
-					   (errmsg("merging column \"%s\" with inherited definition",
-							   attributeName)));
+					(errmsg("merging column \"%s\" with inherited definition",
+							attributeName)));
 				else
 					ereport(NOTICE,
-					   (errmsg("moving and merging column \"%s\" with inherited definition", attributeName),
-						errdetail("User-specified column moved to the position of the inherited column.")));
+							(errmsg("moving and merging column \"%s\" with inherited definition", attributeName),
+							 errdetail("User-specified column moved to the position of the inherited column.")));
 				def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
 				typenameTypeIdAndMod(NULL, def->typeName, &defTypeId, &deftypmod);
 				typenameTypeIdAndMod(NULL, newdef->typeName, &newTypeId, &newtypmod);
@@ -2403,7 +2411,7 @@ RangeVarCallbackForRenameAttribute(const RangeVar *rv, Oid relid, Oid oldrelid,
 }
 
 /*
- *		renameatt		- changes the name of a attribute in a relation
+ *		renameatt		- changes the name of an attribute in a relation
  *
  * The returned ObjectAddress is that of the renamed column.
  */
@@ -2884,6 +2892,8 @@ AlterTableInternal(Oid relid, List *cmds, bool recurse)
 
 	rel = relation_open(relid, lockmode);
 
+	EventTriggerAlterTableRelid(relid);
+
 	ATController(NULL, rel, cmds, recurse, lockmode);
 }
 
@@ -3686,7 +3696,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 			break;
 		case AT_ReAddIndex:		/* ADD INDEX */
 			address = ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, true,
-									lockmode);
+									 lockmode);
 			break;
 		case AT_AddConstraint:	/* ADD CONSTRAINT */
 			address =
@@ -3878,8 +3888,10 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 			break;
 	}
 
-	/* supress compiler warning until we have some use for the address */
-	(void) address;
+	/*
+	 * Report the subcommand to interested event triggers.
+	 */
+	EventTriggerCollectAlterTableSubcmd((Node *) cmd, address);
 
 	/*
 	 * Bump the command counter to ensure the next subcommand in the sequence
@@ -4015,7 +4027,7 @@ ATRewriteTables(AlterTableStmt *parsetree, List **wqueue, LOCKMODE lockmode)
 			 * And fire it only once.
 			 */
 			if (parsetree)
-				EventTriggerTableRewrite((Node *)parsetree,
+				EventTriggerTableRewrite((Node *) parsetree,
 										 tab->relid,
 										 tab->rewrite);
 
@@ -4597,10 +4609,12 @@ ATSimpleRecursion(List **wqueue, Relation rel,
 				  AlterTableCmd *cmd, bool recurse, LOCKMODE lockmode)
 {
 	/*
-	 * Propagate to children if desired.  Non-table relations never have
-	 * children, so no need to search in that case.
+	 * Propagate to children if desired.  Only plain tables and foreign tables
+	 * have children, so no need to search for other relkinds.
 	 */
-	if (recurse && rel->rd_rel->relkind == RELKIND_RELATION)
+	if (recurse &&
+		(rel->rd_rel->relkind == RELKIND_RELATION ||
+		 rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE))
 	{
 		Oid			relid = RelationGetRelid(rel);
 		ListCell   *child;
@@ -6184,7 +6198,7 @@ ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel,
 									  true,		/* update pg_index */
 									  true,		/* remove old dependencies */
 									  allowSystemTableMods,
-									  false);		/* is_internal */
+									  false);	/* is_internal */
 
 	index_close(indexRel, NoLock);
 
@@ -6831,12 +6845,12 @@ static ObjectAddress
 ATExecAlterConstraint(Relation rel, AlterTableCmd *cmd,
 					  bool recurse, bool recursing, LOCKMODE lockmode)
 {
+	Constraint *cmdcon;
 	Relation	conrel;
 	SysScanDesc scan;
 	ScanKeyData key;
 	HeapTuple	contuple;
 	Form_pg_constraint currcon = NULL;
-	Constraint *cmdcon = NULL;
 	bool		found = false;
 	ObjectAddress address;
 
@@ -6892,10 +6906,11 @@ ATExecAlterConstraint(Relation rel, AlterTableCmd *cmd,
 		HeapTuple	copyTuple;
 		HeapTuple	tgtuple;
 		Form_pg_constraint copy_con;
-		Form_pg_trigger copy_tg;
+		List	   *otherrelids = NIL;
 		ScanKeyData tgkey;
 		SysScanDesc tgscan;
 		Relation	tgrel;
+		ListCell   *lc;
 
 		/*
 		 * Now update the catalog, while we have the door open.
@@ -6928,8 +6943,16 @@ ATExecAlterConstraint(Relation rel, AlterTableCmd *cmd,
 
 		while (HeapTupleIsValid(tgtuple = systable_getnext(tgscan)))
 		{
+			Form_pg_trigger copy_tg;
+
 			copyTuple = heap_copytuple(tgtuple);
 			copy_tg = (Form_pg_trigger) GETSTRUCT(copyTuple);
+
+			/* Remember OIDs of other relation(s) involved in FK constraint */
+			if (copy_tg->tgrelid != RelationGetRelid(rel))
+				otherrelids = list_append_unique_oid(otherrelids,
+													 copy_tg->tgrelid);
+
 			copy_tg->tgdeferrable = cmdcon->deferrable;
 			copy_tg->tginitdeferred = cmdcon->initdeferred;
 			simple_heap_update(tgrel, &copyTuple->t_self, copyTuple);
@@ -6946,9 +6969,16 @@ ATExecAlterConstraint(Relation rel, AlterTableCmd *cmd,
 		heap_close(tgrel, RowExclusiveLock);
 
 		/*
-		 * Invalidate relcache so that others see the new attributes.
+		 * Invalidate relcache so that others see the new attributes.  We must
+		 * inval both the named rel and any others having relevant triggers.
+		 * (At present there should always be exactly one other rel, but
+		 * there's no need to hard-wire such an assumption here.)
 		 */
 		CacheInvalidateRelcache(rel);
+		foreach(lc, otherrelids)
+		{
+			CacheInvalidateRelcacheByRelid(lfirst_oid(lc));
+		}
 
 		ObjectAddressSet(address, ConstraintRelationId,
 						 HeapTupleGetOid(contuple));
@@ -7123,7 +7153,7 @@ ATExecValidateConstraint(Relation rel, char *constrName, bool recurse,
 						 HeapTupleGetOid(tuple));
 	}
 	else
-		address = InvalidObjectAddress;		/* already validated */
+		address = InvalidObjectAddress; /* already validated */
 
 	systable_endscan(scan);
 
@@ -8093,11 +8123,12 @@ ATPrepAlterColumnType(List **wqueue,
 	{
 		/*
 		 * Set up an expression to transform the old data value to the new
-		 * type. If a USING option was given, use the expression as transformed
-		 * by transformAlterTableStmt, else just take the old value and try to
-		 * coerce it.  We do this first so that type incompatibility can be
-		 * detected before we waste effort, and because we need the expression
-		 * to be parsed against the original table row type.
+		 * type. If a USING option was given, use the expression as
+		 * transformed by transformAlterTableStmt, else just take the old
+		 * value and try to coerce it.  We do this first so that type
+		 * incompatibility can be detected before we waste effort, and because
+		 * we need the expression to be parsed against the original table row
+		 * type.
 		 */
 		if (!transform)
 		{
@@ -8448,8 +8479,8 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
 				 * specified in the policy's USING or WITH CHECK qual
 				 * expressions.  It might be possible to rewrite and recheck
 				 * the policy expression, but punt for now.  It's certainly
-				 * easy enough to remove and recreate the policy; still,
-				 * FIXME someday.
+				 * easy enough to remove and recreate the policy; still, FIXME
+				 * someday.
 				 */
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -9928,9 +9959,9 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
 			!ConditionalLockRelationOid(relOid, AccessExclusiveLock))
 			ereport(ERROR,
 					(errcode(ERRCODE_OBJECT_IN_USE),
-			   errmsg("aborting because lock on relation \"%s\".\"%s\" is not available",
-					  get_namespace_name(relForm->relnamespace),
-					  NameStr(relForm->relname))));
+					 errmsg("aborting because lock on relation \"%s\".\"%s\" is not available",
+							get_namespace_name(relForm->relnamespace),
+							NameStr(relForm->relname))));
 		else
 			LockRelationOid(relOid, AccessExclusiveLock);
 
@@ -9959,7 +9990,10 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
 
 		cmds = lappend(cmds, cmd);
 
+		EventTriggerAlterTableStart((Node *) stmt);
+		/* OID is set by AlterTableInternal */
 		AlterTableInternal(lfirst_oid(l), cmds, false);
+		EventTriggerAlterTableEnd();
 	}
 
 	return new_tablespaceoid;
@@ -11147,9 +11181,9 @@ ATExecReplicaIdentity(Relation rel, ReplicaIdentityStmt *stmt, LOCKMODE lockmode
 static void
 ATExecEnableRowSecurity(Relation rel)
 {
-	Relation		pg_class;
-	Oid				relid;
-	HeapTuple		tuple;
+	Relation	pg_class;
+	Oid			relid;
+	HeapTuple	tuple;
 
 	relid = RelationGetRelid(rel);
 
@@ -11173,9 +11207,9 @@ ATExecEnableRowSecurity(Relation rel)
 static void
 ATExecDisableRowSecurity(Relation rel)
 {
-	Relation		pg_class;
-	Oid				relid;
-	HeapTuple		tuple;
+	Relation	pg_class;
+	Oid			relid;
+	HeapTuple	tuple;
 
 	relid = RelationGetRelid(rel);
 
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index f06e40f8de..8cb6fb01cb 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -302,6 +302,12 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
 				 errmsg("tablespace location \"%s\" is too long",
 						location)));
 
+	/* Warn if the tablespace is in the data directory. */
+	if (path_is_prefix_of_path(DataDir, location))
+		ereport(WARNING,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("tablespace location should not be inside the data directory")));
+
 	/*
 	 * Disallow creation of tablespaces named "pg_xxx"; we reserve this
 	 * namespace for system purposes.
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index a35586c6a9..14214de160 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -74,13 +74,13 @@ int			SessionReplicationRole = SESSION_REPLICATION_ROLE_ORIGIN;
 static int	MyTriggerDepth = 0;
 
 /*
- * Note that this macro also exists in executor/execMain.c.  There does not
- * appear to be any good header to put it into, given the structures that
- * it uses, so we let them be duplicated.  Be sure to update both if one needs
+ * Note that similar macros also exist in executor/execMain.c.  There does not
+ * appear to be any good header to put them into, given the structures that
+ * they use, so we let them be duplicated.  Be sure to update all if one needs
  * to be changed, however.
  */
-#define GetModifiedColumns(relinfo, estate) \
-	(rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->modifiedCols)
+#define GetUpdatedColumns(relinfo, estate) \
+	(rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->updatedCols)
 
 /* Local function prototypes */
 static void ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid);
@@ -2359,7 +2359,7 @@ ExecBSUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
 	TriggerDesc *trigdesc;
 	int			i;
 	TriggerData LocTriggerData;
-	Bitmapset  *modifiedCols;
+	Bitmapset  *updatedCols;
 
 	trigdesc = relinfo->ri_TrigDesc;
 
@@ -2368,7 +2368,7 @@ ExecBSUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
 	if (!trigdesc->trig_update_before_statement)
 		return;
 
-	modifiedCols = GetModifiedColumns(relinfo, estate);
+	updatedCols = GetUpdatedColumns(relinfo, estate);
 
 	LocTriggerData.type = T_TriggerData;
 	LocTriggerData.tg_event = TRIGGER_EVENT_UPDATE |
@@ -2389,7 +2389,7 @@ ExecBSUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
 								  TRIGGER_TYPE_UPDATE))
 			continue;
 		if (!TriggerEnabled(estate, relinfo, trigger, LocTriggerData.tg_event,
-							modifiedCols, NULL, NULL))
+							updatedCols, NULL, NULL))
 			continue;
 
 		LocTriggerData.tg_trigger = trigger;
@@ -2414,7 +2414,7 @@ ExecASUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
 	if (trigdesc && trigdesc->trig_update_after_statement)
 		AfterTriggerSaveEvent(estate, relinfo, TRIGGER_EVENT_UPDATE,
 							  false, NULL, NULL, NIL,
-							  GetModifiedColumns(relinfo, estate));
+							  GetUpdatedColumns(relinfo, estate));
 }
 
 TupleTableSlot *
@@ -2432,22 +2432,11 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate,
 	HeapTuple	oldtuple;
 	TupleTableSlot *newSlot;
 	int			i;
-	Bitmapset  *modifiedCols;
-	Bitmapset  *keyCols;
+	Bitmapset  *updatedCols;
 	LockTupleMode lockmode;
 
-	/*
-	 * Compute lock mode to use.  If columns that are part of the key have not
-	 * been modified, then we can use a weaker lock, allowing for better
-	 * concurrency.
-	 */
-	modifiedCols = GetModifiedColumns(relinfo, estate);
-	keyCols = RelationGetIndexAttrBitmap(relinfo->ri_RelationDesc,
-										 INDEX_ATTR_BITMAP_KEY);
-	if (bms_overlap(keyCols, modifiedCols))
-		lockmode = LockTupleExclusive;
-	else
-		lockmode = LockTupleNoKeyExclusive;
+	/* Determine lock mode to use */
+	lockmode = ExecUpdateLockMode(estate, relinfo);
 
 	Assert(HeapTupleIsValid(fdw_trigtuple) ^ ItemPointerIsValid(tupleid));
 	if (fdw_trigtuple == NULL)
@@ -2488,6 +2477,7 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate,
 		TRIGGER_EVENT_ROW |
 		TRIGGER_EVENT_BEFORE;
 	LocTriggerData.tg_relation = relinfo->ri_RelationDesc;
+	updatedCols = GetUpdatedColumns(relinfo, estate);
 	for (i = 0; i < trigdesc->numtriggers; i++)
 	{
 		Trigger    *trigger = &trigdesc->triggers[i];
@@ -2498,7 +2488,7 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate,
 								  TRIGGER_TYPE_UPDATE))
 			continue;
 		if (!TriggerEnabled(estate, relinfo, trigger, LocTriggerData.tg_event,
-							modifiedCols, trigtuple, newtuple))
+							updatedCols, trigtuple, newtuple))
 			continue;
 
 		LocTriggerData.tg_trigtuple = trigtuple;
@@ -2568,7 +2558,7 @@ ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 
 		AfterTriggerSaveEvent(estate, relinfo, TRIGGER_EVENT_UPDATE,
 							  true, trigtuple, newtuple, recheckIndexes,
-							  GetModifiedColumns(relinfo, estate));
+							  GetUpdatedColumns(relinfo, estate));
 		if (trigtuple != fdw_trigtuple)
 			heap_freetuple(trigtuple);
 	}
@@ -2795,6 +2785,9 @@ ltrmark:;
 				 */
 				return NULL;
 
+			case HeapTupleInvisible:
+				elog(ERROR, "attempted to lock invisible tuple");
+
 			default:
 				ReleaseBuffer(buffer);
 				elog(ERROR, "unrecognized heap_lock_tuple status: %u", test);
@@ -4375,7 +4368,7 @@ AfterTriggerEndSubXact(bool isCommit)
 static void
 AfterTriggerEnlargeQueryState(void)
 {
-	int		init_depth = afterTriggers.maxquerydepth;
+	int			init_depth = afterTriggers.maxquerydepth;
 
 	Assert(afterTriggers.query_depth >= afterTriggers.maxquerydepth);
 
@@ -4442,7 +4435,7 @@ SetConstraintStateCreate(int numalloc)
 	state = (SetConstraintState)
 		MemoryContextAllocZero(TopTransactionContext,
 							   offsetof(SetConstraintStateData, trigstates) +
-						   numalloc * sizeof(SetConstraintTriggerData));
+							   numalloc * sizeof(SetConstraintTriggerData));
 
 	state->numalloc = numalloc;
 
diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
index 4c404e73d0..ff90040193 100644
--- a/src/backend/commands/tsearchcmds.c
+++ b/src/backend/commands/tsearchcmds.c
@@ -34,6 +34,7 @@
 #include "catalog/pg_type.h"
 #include "commands/alter.h"
 #include "commands/defrem.h"
+#include "commands/event_trigger.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "parser/parse_func.h"
@@ -1442,6 +1443,8 @@ MakeConfigurationMapping(AlterTSConfigurationStmt *stmt,
 			}
 		}
 	}
+
+	EventTriggerCollectAlterTSConfig(stmt, cfgId, dictIds, ndict);
 }
 
 /*
@@ -1509,6 +1512,8 @@ DropConfigurationMapping(AlterTSConfigurationStmt *stmt,
 
 		i++;
 	}
+
+	EventTriggerCollectAlterTSConfig(stmt, cfgId, NULL, 0);
 }
 
 
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 907ba1100a..de91353891 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -215,6 +215,7 @@ DefineType(List *names, List *parameters)
 	if (!OidIsValid(typoid))
 	{
 		address = TypeShellMake(typeName, typeNamespace, GetUserId());
+		typoid = address.objectId;
 		/* Make new shell type visible for modification below */
 		CommandCounterIncrement();
 
@@ -574,13 +575,13 @@ DefineType(List *names, List *parameters)
 	if (typmodinOid && func_volatile(typmodinOid) == PROVOLATILE_VOLATILE)
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-				 errmsg("type modifier input function %s should not be volatile",
-						NameListToString(typmodinName))));
+			 errmsg("type modifier input function %s should not be volatile",
+					NameListToString(typmodinName))));
 	if (typmodoutOid && func_volatile(typmodoutOid) == PROVOLATILE_VOLATILE)
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-				 errmsg("type modifier output function %s should not be volatile",
-						NameListToString(typmodoutName))));
+			errmsg("type modifier output function %s should not be volatile",
+				   NameListToString(typmodoutName))));
 
 	/*
 	 * OK, we're done checking, time to make the type.  We must assign the
@@ -628,6 +629,7 @@ DefineType(List *names, List *parameters)
 				   0,			/* Array Dimensions of typbasetype */
 				   false,		/* Type NOT NULL */
 				   collation);	/* type's collation */
+	Assert(typoid == address.objectId);
 
 	/*
 	 * Create the array type that goes with it.
@@ -641,32 +643,32 @@ DefineType(List *names, List *parameters)
 			   array_type,		/* type name */
 			   typeNamespace,	/* namespace */
 			   InvalidOid,		/* relation oid (n/a here) */
-			   0,		/* relation kind (ditto) */
-			   GetUserId(),	/* owner's ID */
-			   -1,		/* internal size (always varlena) */
+			   0,				/* relation kind (ditto) */
+			   GetUserId(),		/* owner's ID */
+			   -1,				/* internal size (always varlena) */
 			   TYPTYPE_BASE,	/* type-type (base type) */
 			   TYPCATEGORY_ARRAY,		/* type-category (array) */
-			   false,	/* array types are never preferred */
+			   false,			/* array types are never preferred */
 			   delimiter,		/* array element delimiter */
 			   F_ARRAY_IN,		/* input procedure */
-			   F_ARRAY_OUT,	/* output procedure */
+			   F_ARRAY_OUT,		/* output procedure */
 			   F_ARRAY_RECV,	/* receive procedure */
 			   F_ARRAY_SEND,	/* send procedure */
-			   typmodinOid,	/* typmodin procedure */
+			   typmodinOid,		/* typmodin procedure */
 			   typmodoutOid,	/* typmodout procedure */
 			   F_ARRAY_TYPANALYZE,		/* analyze procedure */
-			   typoid, /* element type ID */
-			   true,	/* yes this is an array type */
+			   typoid,			/* element type ID */
+			   true,			/* yes this is an array type */
 			   InvalidOid,		/* no further array type */
 			   InvalidOid,		/* base type ID */
-			   NULL,	/* never a default type value */
-			   NULL,	/* binary default isn't sent either */
-			   false,	/* never passed by value */
+			   NULL,			/* never a default type value */
+			   NULL,			/* binary default isn't sent either */
+			   false,			/* never passed by value */
 			   alignment,		/* see above */
-			   'x',	/* ARRAY is always toastable */
-			   -1,		/* typMod (Domains only) */
-			   0,		/* Array dimensions of typbasetype */
-			   false,	/* Type NOT NULL */
+			   'x',				/* ARRAY is always toastable */
+			   -1,				/* typMod (Domains only) */
+			   0,				/* Array dimensions of typbasetype */
+			   false,			/* Type NOT NULL */
 			   collation);		/* type's collation */
 
 	pfree(array_type);
@@ -1505,7 +1507,7 @@ DefineRange(CreateRangeStmt *stmt)
 				   0,			/* Array dimensions of typbasetype */
 				   false,		/* Type NOT NULL */
 				   InvalidOid); /* type's collation (ranges never have one) */
-	typoid = address.objectId;
+	Assert(typoid == address.objectId);
 
 	/* Create the entry in pg_range */
 	RangeCreate(typoid, rangeSubtype, rangeCollation, rangeSubOpclass,
@@ -1614,6 +1616,7 @@ makeRangeConstructors(const char *name, Oid namespace,
 								 PointerGetDatum(NULL), /* parameterModes */
 								 PointerGetDatum(NULL), /* parameterNames */
 								 NIL,	/* parameterDefaults */
+								 PointerGetDatum(NULL), /* trftypes */
 								 PointerGetDatum(NULL), /* proconfig */
 								 1.0,	/* procost */
 								 0.0);	/* prorows */
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 456c27ebe0..3b381c5835 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -87,7 +87,8 @@ CreateRole(CreateRoleStmt *stmt)
 	bool		createdb = false;		/* Can the user create databases? */
 	bool		canlogin = false;		/* Can this user login? */
 	bool		isreplication = false;	/* Is this a replication role? */
-	bool		bypassrls = false;		/* Is this a row security enabled role? */
+	bool		bypassrls = false;		/* Is this a row security enabled
+										 * role? */
 	int			connlimit = -1; /* maximum connections allowed */
 	List	   *addroleto = NIL;	/* roles to make this a member of */
 	List	   *rolemembers = NIL;		/* roles to be members of this role */
@@ -300,7 +301,7 @@ CreateRole(CreateRoleStmt *stmt)
 		if (!superuser())
 			ereport(ERROR,
 					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg("must be superuser to change bypassrls attribute.")));
+				errmsg("must be superuser to change bypassrls attribute.")));
 	}
 	else
 	{
@@ -681,7 +682,7 @@ AlterRole(AlterRoleStmt *stmt)
 		if (!superuser())
 			ereport(ERROR,
 					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg("must be superuser to change bypassrls attribute")));
+				 errmsg("must be superuser to change bypassrls attribute")));
 	}
 	else if (!have_createrole_privilege())
 	{
@@ -721,11 +722,11 @@ AlterRole(AlterRoleStmt *stmt)
 	 * Call the password checking hook if there is one defined
 	 */
 	if (check_password_hook && password)
-		(*check_password_hook)(rolename ,
-							   password,
-			 isMD5(password) ? PASSWORD_TYPE_MD5 : PASSWORD_TYPE_PLAINTEXT,
-							   validUntil_datum,
-							   validUntil_null);
+		(*check_password_hook) (rolename,
+								password,
+			   isMD5(password) ? PASSWORD_TYPE_MD5 : PASSWORD_TYPE_PLAINTEXT,
+								validUntil_datum,
+								validUntil_null);
 
 	/*
 	 * Build an updated tuple, perusing the information just obtained
@@ -1358,8 +1359,8 @@ roleSpecsToIds(List *memberNames)
 
 	foreach(l, memberNames)
 	{
-		Node   *rolespec = (Node *) lfirst(l);
-		Oid		roleid;
+		Node	   *rolespec = (Node *) lfirst(l);
+		Oid			roleid;
 
 		roleid = get_rolespec_oid(rolespec, false);
 		result = lappend_oid(result, roleid);
@@ -1455,7 +1456,7 @@ AddRoleMems(const char *rolename, Oid roleid,
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_GRANT_OPERATION),
 					 (errmsg("role \"%s\" is a member of role \"%s\"",
-							 rolename, get_rolespec_name((Node *) memberRole)))));
+						rolename, get_rolespec_name((Node *) memberRole)))));
 
 		/*
 		 * Check if entry for this role/member already exists; if so, give
@@ -1470,7 +1471,7 @@ AddRoleMems(const char *rolename, Oid roleid,
 		{
 			ereport(NOTICE,
 					(errmsg("role \"%s\" is already a member of role \"%s\"",
-							get_rolespec_name((Node *) memberRole), rolename)));
+						 get_rolespec_name((Node *) memberRole), rolename)));
 			ReleaseSysCache(authmem_tuple);
 			continue;
 		}
@@ -1581,7 +1582,7 @@ DelRoleMems(const char *rolename, Oid roleid,
 		{
 			ereport(WARNING,
 					(errmsg("role \"%s\" is not a member of role \"%s\"",
-							get_rolespec_name((Node *) memberRole), rolename)));
+						 get_rolespec_name((Node *) memberRole), rolename)));
 			continue;
 		}
 
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 28a1e676be..f75ca31abc 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -100,7 +100,7 @@ static bool vacuum_rel(Oid relid, RangeVar *relation, int options,
 void
 ExecVacuum(VacuumStmt *vacstmt, bool isTopLevel)
 {
-	VacuumParams	params;
+	VacuumParams params;
 
 	/* sanity checks on options */
 	Assert(vacstmt->options & (VACOPT_VACUUM | VACOPT_ANALYZE));
@@ -488,6 +488,7 @@ vacuum_set_xid_limits(Relation rel,
 {
 	int			freezemin;
 	int			mxid_freezemin;
+	int			effective_multixact_freeze_max_age;
 	TransactionId limit;
 	TransactionId safeLimit;
 	MultiXactId mxactLimit;
@@ -545,16 +546,23 @@ vacuum_set_xid_limits(Relation rel,
 	*freezeLimit = limit;
 
 	/*
+	 * Compute the multixact age for which freezing is urgent.  This is
+	 * normally autovacuum_multixact_freeze_max_age, but may be less if we are
+	 * short of multixact member space.
+	 */
+	effective_multixact_freeze_max_age = MultiXactMemberFreezeThreshold();
+
+	/*
 	 * Determine the minimum multixact freeze age to use: as specified by
 	 * caller, or vacuum_multixact_freeze_min_age, but in any case not more
-	 * than half autovacuum_multixact_freeze_max_age, so that autovacuums to
+	 * than half effective_multixact_freeze_max_age, so that autovacuums to
 	 * prevent MultiXact wraparound won't occur too frequently.
 	 */
 	mxid_freezemin = multixact_freeze_min_age;
 	if (mxid_freezemin < 0)
 		mxid_freezemin = vacuum_multixact_freeze_min_age;
 	mxid_freezemin = Min(mxid_freezemin,
-						 autovacuum_multixact_freeze_max_age / 2);
+						 effective_multixact_freeze_max_age / 2);
 	Assert(mxid_freezemin >= 0);
 
 	/* compute the cutoff multi, being careful to generate a valid value */
@@ -563,7 +571,7 @@ vacuum_set_xid_limits(Relation rel,
 		mxactLimit = FirstMultiXactId;
 
 	safeMxactLimit =
-		ReadNextMultiXactId() - autovacuum_multixact_freeze_max_age;
+		ReadNextMultiXactId() - effective_multixact_freeze_max_age;
 	if (safeMxactLimit < FirstMultiXactId)
 		safeMxactLimit = FirstMultiXactId;
 
@@ -618,7 +626,7 @@ vacuum_set_xid_limits(Relation rel,
 		if (freezetable < 0)
 			freezetable = vacuum_multixact_freeze_table_age;
 		freezetable = Min(freezetable,
-						  autovacuum_multixact_freeze_max_age * 0.95);
+						  effective_multixact_freeze_max_age * 0.95);
 		Assert(freezetable >= 0);
 
 		/*
@@ -1152,9 +1160,8 @@ vac_truncate_clog(TransactionId frozenXID,
 		return;
 
 	/*
-	 * Truncate CLOG and CommitTs to the oldest computed value.
-	 * Note we don't truncate multixacts; that will be done by the next
-	 * checkpoint.
+	 * Truncate CLOG and CommitTs to the oldest computed value. Note we don't
+	 * truncate multixacts; that will be done by the next checkpoint.
 	 */
 	TruncateCLOG(frozenXID);
 	TruncateCommitTs(frozenXID, true);
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index c3d6e59890..a01cfb4c04 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -105,7 +105,7 @@ typedef struct LVRelStats
 	BlockNumber old_rel_pages;	/* previous value of pg_class.relpages */
 	BlockNumber rel_pages;		/* total number of pages */
 	BlockNumber scanned_pages;	/* number of pages we examined */
-	BlockNumber	pinskipped_pages; /* # of pages we skipped due to a pin */
+	BlockNumber pinskipped_pages;		/* # of pages we skipped due to a pin */
 	double		scanned_tuples; /* counts only tuples on scanned pages */
 	double		old_rel_tuples; /* previous value of pg_class.reltuples */
 	double		new_rel_tuples; /* new estimated total # of tuples */
@@ -336,7 +336,8 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
 			TimestampDifferenceExceeds(starttime, endtime,
 									   params->log_min_duration))
 		{
-			StringInfoData	buf;
+			StringInfoData buf;
+
 			TimestampDifference(starttime, endtime, &secs, &usecs);
 
 			read_rate = 0;
@@ -369,7 +370,7 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
 							 vacrelstats->new_rel_tuples,
 							 vacrelstats->new_dead_tuples);
 			appendStringInfo(&buf,
-							 _("buffer usage: %d hits, %d misses, %d dirtied\n"),
+						 _("buffer usage: %d hits, %d misses, %d dirtied\n"),
 							 VacuumPageHit,
 							 VacuumPageMiss,
 							 VacuumPageDirty);
@@ -454,7 +455,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 	BlockNumber next_not_all_visible_block;
 	bool		skipping_all_visible_blocks;
 	xl_heap_freeze_tuple *frozen;
-	StringInfoData	buf;
+	StringInfoData buf;
 
 	pg_rusage_init(&ru0);
 
@@ -952,7 +953,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 				heap_execute_freeze_tuple(htup, &frozen[i]);
 			}
 
-			/* Now WAL-log freezing if neccessary */
+			/* Now WAL-log freezing if necessary */
 			if (RelationNeedsWAL(onerel))
 			{
 				XLogRecPtr	recptr;
@@ -1784,7 +1785,7 @@ static bool
 heap_page_is_all_visible(Relation rel, Buffer buf, TransactionId *visibility_cutoff_xid)
 {
 	Page		page = BufferGetPage(buf);
-	BlockNumber	blockno = BufferGetBlockNumber(buf);
+	BlockNumber blockno = BufferGetBlockNumber(buf);
 	OffsetNumber offnum,
 				maxoff;
 	bool		all_visible = true;
diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile
index 8312804d19..1154371b9f 100644
--- a/src/backend/executor/Makefile
+++ b/src/backend/executor/Makefile
@@ -12,8 +12,8 @@ subdir = src/backend/executor
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = execAmi.o execCurrent.o execGrouping.o execJunk.o execMain.o \
-       execProcnode.o execQual.o execScan.o execTuples.o \
+OBJS = execAmi.o execCurrent.o execGrouping.o execIndexing.o execJunk.o \
+       execMain.o execProcnode.o execQual.o execScan.o execTuples.o \
        execUtils.o functions.o instrument.o nodeAppend.o nodeAgg.o \
        nodeBitmapAnd.o nodeBitmapOr.o \
        nodeBitmapHeapscan.o nodeBitmapIndexscan.o nodeCustom.o nodeHash.o \
@@ -21,7 +21,7 @@ OBJS = execAmi.o execCurrent.o execGrouping.o execJunk.o execMain.o \
        nodeLimit.o nodeLockRows.o \
        nodeMaterial.o nodeMergeAppend.o nodeMergejoin.o nodeModifyTable.o \
        nodeNestloop.o nodeFunctionscan.o nodeRecursiveunion.o nodeResult.o \
-       nodeSeqscan.o nodeSetOp.o nodeSort.o nodeUnique.o \
+       nodeSamplescan.o nodeSeqscan.o nodeSetOp.o nodeSort.o nodeUnique.o \
        nodeValuesscan.o nodeCtescan.o nodeWorktablescan.o \
        nodeGroup.o nodeSubplan.o nodeSubqueryscan.o nodeTidscan.o \
        nodeForeignscan.o nodeWindowAgg.o producerReceiver.o tstoreReceiver.o spi.o
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 4a15821581..d66546b6da 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -44,6 +44,7 @@
 #include "executor/nodeNestloop.h"
 #include "executor/nodeRecursiveunion.h"
 #include "executor/nodeResult.h"
+#include "executor/nodeSamplescan.h"
 #include "executor/nodeSeqscan.h"
 #include "executor/nodeSetOp.h"
 #include "executor/nodeSort.h"
@@ -163,6 +164,10 @@ ExecReScan(PlanState *node)
 			ExecReScanSeqScan((SeqScanState *) node);
 			break;
 
+		case T_SampleScanState:
+			ExecReScanSampleScan((SampleScanState *) node);
+			break;
+
 		case T_IndexScanState:
 			ExecReScanIndexScan((IndexScanState *) node);
 			break;
@@ -419,10 +424,10 @@ ExecSupportsMarkRestore(Path *pathnode)
 			 * that does, we presently come here only for ResultPath nodes,
 			 * which represent Result plans without a child plan.  So there is
 			 * nothing to recurse to and we can just say "false".  (This means
-			 * that Result's support for mark/restore is in fact dead code.
-			 * We keep it since it's not much code, and someday the planner
-			 * might be smart enough to use it.  That would require making
-			 * this function smarter too, of course.)
+			 * that Result's support for mark/restore is in fact dead code. We
+			 * keep it since it's not much code, and someday the planner might
+			 * be smart enough to use it.  That would require making this
+			 * function smarter too, of course.)
 			 */
 			Assert(IsA(pathnode, ResultPath));
 			return false;
@@ -499,6 +504,9 @@ ExecSupportsBackwardScan(Plan *node)
 			}
 			return false;
 
+		case T_SampleScan:
+			return false;
+
 		case T_Material:
 		case T_Sort:
 			/* these don't evaluate tlist */
diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c
index e34725fc90..dcb778ad07 100644
--- a/src/backend/executor/execCurrent.c
+++ b/src/backend/executor/execCurrent.c
@@ -286,6 +286,7 @@ search_plan_tree(PlanState *node, Oid table_oid)
 			 * Relation scan nodes can all be treated alike
 			 */
 		case T_SeqScanState:
+		case T_SampleScanState:
 		case T_IndexScanState:
 		case T_IndexOnlyScanState:
 		case T_BitmapHeapScanState:
diff --git a/src/backend/executor/execIndexing.c b/src/backend/executor/execIndexing.c
new file mode 100644
index 0000000000..bf385086c6
--- /dev/null
+++ b/src/backend/executor/execIndexing.c
@@ -0,0 +1,897 @@
+/*-------------------------------------------------------------------------
+ *
+ * execIndexing.c
+ *	  routines for inserting index tuples and enforcing unique and
+ *	  exclusive constraints.
+ *
+ * ExecInsertIndexTuples() is the main entry point.  It's called after
+ * inserting a tuple to the heap, and it inserts corresponding index tuples
+ * into all indexes.  At the same time, it enforces any unique and
+ * exclusion constraints:
+ *
+ * Unique Indexes
+ * --------------
+ *
+ * Enforcing a unique constraint is straightforward.  When the index AM
+ * inserts the tuple to the index, it also checks that there are no
+ * conflicting tuples in the index already.  It does so atomically, so that
+ * even if two backends try to insert the same key concurrently, only one
+ * of them will succeed.  All the logic to ensure atomicity, and to wait
+ * for in-progress transactions to finish, is handled by the index AM.
+ *
+ * If a unique constraint is deferred, we request the index AM to not
+ * throw an error if a conflict is found.  Instead, we make note that there
+ * was a conflict and return the list of indexes with conflicts to the
+ * caller.  The caller must re-check them later, by calling index_insert()
+ * with the UNIQUE_CHECK_EXISTING option.
+ *
+ * Exclusion Constraints
+ * ---------------------
+ *
+ * Exclusion constraints are different from unique indexes in that when the
+ * tuple is inserted to the index, the index AM does not check for
+ * duplicate keys at the same time.  After the insertion, we perform a
+ * separate scan on the index to check for conflicting tuples, and if one
+ * is found, we throw an error and the transaction is aborted.  If the
+ * conflicting tuple's inserter or deleter is in-progress, we wait for it
+ * to finish first.
+ *
+ * There is a chance of deadlock, if two backends insert a tuple at the
+ * same time, and then perform the scan to check for conflicts.  They will
+ * find each other's tuple, and both try to wait for each other.  The
+ * deadlock detector will detect that, and abort one of the transactions.
+ * That's fairly harmless, as one of them was bound to abort with a
+ * "duplicate key error" anyway, although you get a different error
+ * message.
+ *
+ * If an exclusion constraint is deferred, we still perform the conflict
+ * checking scan immediately after inserting the index tuple.  But instead
+ * of throwing an error if a conflict is found, we return that information
+ * to the caller.  The caller must re-check them later by calling
+ * check_exclusion_constraint().
+ *
+ * Speculative insertion
+ * ---------------------
+ *
+ * Speculative insertion is a two-phase mechanism used to implement
+ * INSERT ... ON CONFLICT DO UPDATE/NOTHING.  The tuple is first inserted
+ * to the heap and update the indexes as usual, but if a constraint is
+ * violated, we can still back out the insertion without aborting the whole
+ * transaction.  In an INSERT ... ON CONFLICT statement, if a conflict is
+ * detected, the inserted tuple is backed out and the ON CONFLICT action is
+ * executed instead.
+ *
+ * Insertion to a unique index works as usual: the index AM checks for
+ * duplicate keys atomically with the insertion.  But instead of throwing
+ * an error on a conflict, the speculatively inserted heap tuple is backed
+ * out.
+ *
+ * Exclusion constraints are slightly more complicated.  As mentioned
+ * earlier, there is a risk of deadlock when two backends insert the same
+ * key concurrently.  That was not a problem for regular insertions, when
+ * one of the transactions has to be aborted anyway, but with a speculative
+ * insertion we cannot let a deadlock happen, because we only want to back
+ * out the speculatively inserted tuple on conflict, not abort the whole
+ * transaction.
+ *
+ * When a backend detects that the speculative insertion conflicts with
+ * another in-progress tuple, it has two options:
+ *
+ * 1. back out the speculatively inserted tuple, then wait for the other
+ *	  transaction, and retry. Or,
+ * 2. wait for the other transaction, with the speculatively inserted tuple
+ *	  still in place.
+ *
+ * If two backends insert at the same time, and both try to wait for each
+ * other, they will deadlock.  So option 2 is not acceptable.  Option 1
+ * avoids the deadlock, but it is prone to a livelock instead.  Both
+ * transactions will wake up immediately as the other transaction backs
+ * out.  Then they both retry, and conflict with each other again, lather,
+ * rinse, repeat.
+ *
+ * To avoid the livelock, one of the backends must back out first, and then
+ * wait, while the other one waits without backing out.  It doesn't matter
+ * which one backs out, so we employ an arbitrary rule that the transaction
+ * with the higher XID backs out.
+ *
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/executor/execIndexing.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/relscan.h"
+#include "access/xact.h"
+#include "catalog/index.h"
+#include "executor/executor.h"
+#include "nodes/nodeFuncs.h"
+#include "storage/lmgr.h"
+#include "utils/tqual.h"
+
+/* waitMode argument to check_exclusion_or_unique_constraint() */
+typedef enum
+{
+	CEOUC_WAIT,
+	CEOUC_NOWAIT,
+	CEOUC_LIVELOCK_PREVENTING_WAIT,
+} CEOUC_WAIT_MODE;
+
+static bool check_exclusion_or_unique_constraint(Relation heap, Relation index,
+									 IndexInfo *indexInfo,
+									 ItemPointer tupleid,
+									 Datum *values, bool *isnull,
+									 EState *estate, bool newIndex,
+									 CEOUC_WAIT_MODE waitMode,
+									 bool errorOK,
+									 ItemPointer conflictTid);
+
+static bool index_recheck_constraint(Relation index, Oid *constr_procs,
+						 Datum *existing_values, bool *existing_isnull,
+						 Datum *new_values);
+
+/* ----------------------------------------------------------------
+ *		ExecOpenIndices
+ *
+ *		Find the indices associated with a result relation, open them,
+ *		and save information about them in the result ResultRelInfo.
+ *
+ *		At entry, caller has already opened and locked
+ *		resultRelInfo->ri_RelationDesc.
+ * ----------------------------------------------------------------
+ */
+void
+ExecOpenIndices(ResultRelInfo *resultRelInfo, bool speculative)
+{
+	Relation	resultRelation = resultRelInfo->ri_RelationDesc;
+	List	   *indexoidlist;
+	ListCell   *l;
+	int			len,
+				i;
+	RelationPtr relationDescs;
+	IndexInfo **indexInfoArray;
+
+	resultRelInfo->ri_NumIndices = 0;
+
+	/* fast path if no indexes */
+	if (!RelationGetForm(resultRelation)->relhasindex)
+		return;
+
+	/*
+	 * Get cached list of index OIDs
+	 */
+	indexoidlist = RelationGetIndexList(resultRelation);
+	len = list_length(indexoidlist);
+	if (len == 0)
+		return;
+
+	/*
+	 * allocate space for result arrays
+	 */
+	relationDescs = (RelationPtr) palloc(len * sizeof(Relation));
+	indexInfoArray = (IndexInfo **) palloc(len * sizeof(IndexInfo *));
+
+	resultRelInfo->ri_NumIndices = len;
+	resultRelInfo->ri_IndexRelationDescs = relationDescs;
+	resultRelInfo->ri_IndexRelationInfo = indexInfoArray;
+
+	/*
+	 * For each index, open the index relation and save pg_index info. We
+	 * acquire RowExclusiveLock, signifying we will update the index.
+	 *
+	 * Note: we do this even if the index is not IndexIsReady; it's not worth
+	 * the trouble to optimize for the case where it isn't.
+	 */
+	i = 0;
+	foreach(l, indexoidlist)
+	{
+		Oid			indexOid = lfirst_oid(l);
+		Relation	indexDesc;
+		IndexInfo  *ii;
+
+		indexDesc = index_open(indexOid, RowExclusiveLock);
+
+		/* extract index key information from the index's pg_index info */
+		ii = BuildIndexInfo(indexDesc);
+
+		/*
+		 * If the indexes are to be used for speculative insertion, add extra
+		 * information required by unique index entries.
+		 */
+		if (speculative && ii->ii_Unique)
+			BuildSpeculativeIndexInfo(indexDesc, ii);
+
+		relationDescs[i] = indexDesc;
+		indexInfoArray[i] = ii;
+		i++;
+	}
+
+	list_free(indexoidlist);
+}
+
+/* ----------------------------------------------------------------
+ *		ExecCloseIndices
+ *
+ *		Close the index relations stored in resultRelInfo
+ * ----------------------------------------------------------------
+ */
+void
+ExecCloseIndices(ResultRelInfo *resultRelInfo)
+{
+	int			i;
+	int			numIndices;
+	RelationPtr indexDescs;
+
+	numIndices = resultRelInfo->ri_NumIndices;
+	indexDescs = resultRelInfo->ri_IndexRelationDescs;
+
+	for (i = 0; i < numIndices; i++)
+	{
+		if (indexDescs[i] == NULL)
+			continue;			/* shouldn't happen? */
+
+		/* Drop lock acquired by ExecOpenIndices */
+		index_close(indexDescs[i], RowExclusiveLock);
+	}
+
+	/*
+	 * XXX should free indexInfo array here too?  Currently we assume that
+	 * such stuff will be cleaned up automatically in FreeExecutorState.
+	 */
+}
+
+/* ----------------------------------------------------------------
+ *		ExecInsertIndexTuples
+ *
+ *		This routine takes care of inserting index tuples
+ *		into all the relations indexing the result relation
+ *		when a heap tuple is inserted into the result relation.
+ *
+ *		Unique and exclusion constraints are enforced at the same
+ *		time.  This returns a list of index OIDs for any unique or
+ *		exclusion constraints that are deferred and that had
+ *		potential (unconfirmed) conflicts.  (if noDupErr == true,
+ *		the same is done for non-deferred constraints, but report
+ *		if conflict was speculative or deferred conflict to caller)
+ *
+ *		CAUTION: this must not be called for a HOT update.
+ *		We can't defend against that here for lack of info.
+ *		Should we change the API to make it safer?
+ * ----------------------------------------------------------------
+ */
+List *
+ExecInsertIndexTuples(TupleTableSlot *slot,
+					  ItemPointer tupleid,
+					  EState *estate,
+					  bool noDupErr,
+					  bool *specConflict,
+					  List *arbiterIndexes)
+{
+	List	   *result = NIL;
+	ResultRelInfo *resultRelInfo;
+	int			i;
+	int			numIndices;
+	RelationPtr relationDescs;
+	Relation	heapRelation;
+	IndexInfo **indexInfoArray;
+	ExprContext *econtext;
+	Datum		values[INDEX_MAX_KEYS];
+	bool		isnull[INDEX_MAX_KEYS];
+
+	/*
+	 * Get information from the result relation info structure.
+	 */
+	resultRelInfo = estate->es_result_relation_info;
+	numIndices = resultRelInfo->ri_NumIndices;
+	relationDescs = resultRelInfo->ri_IndexRelationDescs;
+	indexInfoArray = resultRelInfo->ri_IndexRelationInfo;
+	heapRelation = resultRelInfo->ri_RelationDesc;
+
+	/*
+	 * We will use the EState's per-tuple context for evaluating predicates
+	 * and index expressions (creating it if it's not already there).
+	 */
+	econtext = GetPerTupleExprContext(estate);
+
+	/* Arrange for econtext's scan tuple to be the tuple under test */
+	econtext->ecxt_scantuple = slot;
+
+	/*
+	 * for each index, form and insert the index tuple
+	 */
+	for (i = 0; i < numIndices; i++)
+	{
+		Relation	indexRelation = relationDescs[i];
+		IndexInfo  *indexInfo;
+		IndexUniqueCheck checkUnique;
+		bool		satisfiesConstraint;
+		bool		arbiter;
+
+		if (indexRelation == NULL)
+			continue;
+
+		indexInfo = indexInfoArray[i];
+
+		/* Record if speculative insertion arbiter */
+		arbiter = list_member_oid(arbiterIndexes,
+								  indexRelation->rd_index->indexrelid);
+
+		/* If the index is marked as read-only, ignore it */
+		if (!indexInfo->ii_ReadyForInserts)
+			continue;
+
+		/* Check for partial index */
+		if (indexInfo->ii_Predicate != NIL)
+		{
+			List	   *predicate;
+
+			/*
+			 * If predicate state not set up yet, create it (in the estate's
+			 * per-query context)
+			 */
+			predicate = indexInfo->ii_PredicateState;
+			if (predicate == NIL)
+			{
+				predicate = (List *)
+					ExecPrepareExpr((Expr *) indexInfo->ii_Predicate,
+									estate);
+				indexInfo->ii_PredicateState = predicate;
+			}
+
+			/* Skip this index-update if the predicate isn't satisfied */
+			if (!ExecQual(predicate, econtext, false))
+				continue;
+		}
+
+		/*
+		 * FormIndexDatum fills in its values and isnull parameters with the
+		 * appropriate values for the column(s) of the index.
+		 */
+		FormIndexDatum(indexInfo,
+					   slot,
+					   estate,
+					   values,
+					   isnull);
+
+		/*
+		 * The index AM does the actual insertion, plus uniqueness checking.
+		 *
+		 * For an immediate-mode unique index, we just tell the index AM to
+		 * throw error if not unique.
+		 *
+		 * For a deferrable unique index, we tell the index AM to just detect
+		 * possible non-uniqueness, and we add the index OID to the result
+		 * list if further checking is needed.
+		 *
+		 * For a speculative insertion (used by INSERT ... ON CONFLICT), do
+		 * the same as for a deferrable unique index.
+		 */
+		if (!indexRelation->rd_index->indisunique)
+			checkUnique = UNIQUE_CHECK_NO;
+		else if (noDupErr && (arbiterIndexes == NIL || arbiter))
+			checkUnique = UNIQUE_CHECK_PARTIAL;
+		else if (indexRelation->rd_index->indimmediate)
+			checkUnique = UNIQUE_CHECK_YES;
+		else
+			checkUnique = UNIQUE_CHECK_PARTIAL;
+
+		satisfiesConstraint =
+			index_insert(indexRelation, /* index relation */
+						 values,	/* array of index Datums */
+						 isnull,	/* null flags */
+						 tupleid,		/* tid of heap tuple */
+						 heapRelation,	/* heap relation */
+						 checkUnique);	/* type of uniqueness check to do */
+
+		/*
+		 * If the index has an associated exclusion constraint, check that.
+		 * This is simpler than the process for uniqueness checks since we
+		 * always insert first and then check.  If the constraint is deferred,
+		 * we check now anyway, but don't throw error on violation or wait for
+		 * a conclusive outcome from a concurrent insertion; instead we'll
+		 * queue a recheck event.  Similarly, noDupErr callers (speculative
+		 * inserters) will recheck later, and wait for a conclusive outcome
+		 * then.
+		 *
+		 * An index for an exclusion constraint can't also be UNIQUE (not an
+		 * essential property, we just don't allow it in the grammar), so no
+		 * need to preserve the prior state of satisfiesConstraint.
+		 */
+		if (indexInfo->ii_ExclusionOps != NULL)
+		{
+			bool		violationOK;
+			bool		waitMode;
+
+			if (noDupErr)
+			{
+				violationOK = true;
+				waitMode = CEOUC_LIVELOCK_PREVENTING_WAIT;
+			}
+			else if (!indexRelation->rd_index->indimmediate)
+			{
+				violationOK = true;
+				waitMode = CEOUC_NOWAIT;
+			}
+			else
+			{
+				violationOK = false;
+				waitMode = CEOUC_WAIT;
+			}
+
+			satisfiesConstraint =
+				check_exclusion_or_unique_constraint(heapRelation,
+													 indexRelation, indexInfo,
+													 tupleid, values, isnull,
+													 estate, false,
+												waitMode, violationOK, NULL);
+		}
+
+		if ((checkUnique == UNIQUE_CHECK_PARTIAL ||
+			 indexInfo->ii_ExclusionOps != NULL) &&
+			!satisfiesConstraint)
+		{
+			/*
+			 * The tuple potentially violates the uniqueness or exclusion
+			 * constraint, so make a note of the index so that we can re-check
+			 * it later.  Speculative inserters are told if there was a
+			 * speculative conflict, since that always requires a restart.
+			 */
+			result = lappend_oid(result, RelationGetRelid(indexRelation));
+			if (indexRelation->rd_index->indimmediate && specConflict)
+				*specConflict = true;
+		}
+	}
+
+	return result;
+}
+
+/* ----------------------------------------------------------------
+ *		ExecCheckIndexConstraints
+ *
+ *		This routine checks if a tuple violates any unique or
+ *		exclusion constraints.  Returns true if there is no no conflict.
+ *		Otherwise returns false, and the TID of the conflicting
+ *		tuple is returned in *conflictTid.
+ *
+ *		If 'arbiterIndexes' is given, only those indexes are checked.
+ *		NIL means all indexes.
+ *
+ *		Note that this doesn't lock the values in any way, so it's
+ *		possible that a conflicting tuple is inserted immediately
+ *		after this returns.  But this can be used for a pre-check
+ *		before insertion.
+ * ----------------------------------------------------------------
+ */
+bool
+ExecCheckIndexConstraints(TupleTableSlot *slot,
+						  EState *estate, ItemPointer conflictTid,
+						  List *arbiterIndexes)
+{
+	ResultRelInfo *resultRelInfo;
+	int			i;
+	int			numIndices;
+	RelationPtr relationDescs;
+	Relation	heapRelation;
+	IndexInfo **indexInfoArray;
+	ExprContext *econtext;
+	Datum		values[INDEX_MAX_KEYS];
+	bool		isnull[INDEX_MAX_KEYS];
+	ItemPointerData invalidItemPtr;
+	bool		checkedIndex = false;
+
+	ItemPointerSetInvalid(conflictTid);
+	ItemPointerSetInvalid(&invalidItemPtr);
+
+	/*
+	 * Get information from the result relation info structure.
+	 */
+	resultRelInfo = estate->es_result_relation_info;
+	numIndices = resultRelInfo->ri_NumIndices;
+	relationDescs = resultRelInfo->ri_IndexRelationDescs;
+	indexInfoArray = resultRelInfo->ri_IndexRelationInfo;
+	heapRelation = resultRelInfo->ri_RelationDesc;
+
+	/*
+	 * We will use the EState's per-tuple context for evaluating predicates
+	 * and index expressions (creating it if it's not already there).
+	 */
+	econtext = GetPerTupleExprContext(estate);
+
+	/* Arrange for econtext's scan tuple to be the tuple under test */
+	econtext->ecxt_scantuple = slot;
+
+	/*
+	 * For each index, form index tuple and check if it satisfies the
+	 * constraint.
+	 */
+	for (i = 0; i < numIndices; i++)
+	{
+		Relation	indexRelation = relationDescs[i];
+		IndexInfo  *indexInfo;
+		bool		satisfiesConstraint;
+
+		if (indexRelation == NULL)
+			continue;
+
+		indexInfo = indexInfoArray[i];
+
+		if (!indexInfo->ii_Unique && !indexInfo->ii_ExclusionOps)
+			continue;
+
+		/* If the index is marked as read-only, ignore it */
+		if (!indexInfo->ii_ReadyForInserts)
+			continue;
+
+		/* When specific arbiter indexes requested, only examine them */
+		if (arbiterIndexes != NIL &&
+			!list_member_oid(arbiterIndexes,
+							 indexRelation->rd_index->indexrelid))
+			continue;
+
+		if (!indexRelation->rd_index->indimmediate)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("ON CONFLICT does not support deferred unique constraints/exclusion constraints as arbiters"),
+					 errtableconstraint(heapRelation,
+								   RelationGetRelationName(indexRelation))));
+
+		checkedIndex = true;
+
+		/* Check for partial index */
+		if (indexInfo->ii_Predicate != NIL)
+		{
+			List	   *predicate;
+
+			/*
+			 * If predicate state not set up yet, create it (in the estate's
+			 * per-query context)
+			 */
+			predicate = indexInfo->ii_PredicateState;
+			if (predicate == NIL)
+			{
+				predicate = (List *)
+					ExecPrepareExpr((Expr *) indexInfo->ii_Predicate,
+									estate);
+				indexInfo->ii_PredicateState = predicate;
+			}
+
+			/* Skip this index-update if the predicate isn't satisfied */
+			if (!ExecQual(predicate, econtext, false))
+				continue;
+		}
+
+		/*
+		 * FormIndexDatum fills in its values and isnull parameters with the
+		 * appropriate values for the column(s) of the index.
+		 */
+		FormIndexDatum(indexInfo,
+					   slot,
+					   estate,
+					   values,
+					   isnull);
+
+		satisfiesConstraint =
+			check_exclusion_or_unique_constraint(heapRelation, indexRelation,
+												 indexInfo, &invalidItemPtr,
+											   values, isnull, estate, false,
+												 CEOUC_WAIT, true,
+												 conflictTid);
+		if (!satisfiesConstraint)
+			return false;
+	}
+
+	if (arbiterIndexes != NIL && !checkedIndex)
+		elog(ERROR, "unexpected failure to find arbiter index");
+
+	return true;
+}
+
+/*
+ * Check for violation of an exclusion or unique constraint
+ *
+ * heap: the table containing the new tuple
+ * index: the index supporting the constraint
+ * indexInfo: info about the index, including the exclusion properties
+ * tupleid: heap TID of the new tuple we have just inserted (invalid if we
+ *		haven't inserted a new tuple yet)
+ * values, isnull: the *index* column values computed for the new tuple
+ * estate: an EState we can do evaluation in
+ * newIndex: if true, we are trying to build a new index (this affects
+ *		only the wording of error messages)
+ * waitMode: whether to wait for concurrent inserters/deleters
+ * violationOK: if true, don't throw error for violation
+ * conflictTid: if not-NULL, the TID of the conflicting tuple is returned here
+ *
+ * Returns true if OK, false if actual or potential violation
+ *
+ * 'waitMode' determines what happens if a conflict is detected with a tuple
+ * that was inserted or deleted by a transaction that's still running.
+ * CEOUC_WAIT means that we wait for the transaction to commit, before
+ * throwing an error or returning.  CEOUC_NOWAIT means that we report the
+ * violation immediately; so the violation is only potential, and the caller
+ * must recheck sometime later.  This behavior is convenient for deferred
+ * exclusion checks; we need not bother queuing a deferred event if there is
+ * definitely no conflict at insertion time.
+ *
+ * CEOUC_LIVELOCK_PREVENTING_WAIT is like CEOUC_NOWAIT, but we will sometimes
+ * wait anyway, to prevent livelocking if two transactions try inserting at
+ * the same time.  This is used with speculative insertions, for INSERT ON
+ * CONFLICT statements. (See notes in file header)
+ *
+ * If violationOK is true, we just report the potential or actual violation to
+ * the caller by returning 'false'.  Otherwise we throw a descriptive error
+ * message here.  When violationOK is false, a false result is impossible.
+ *
+ * Note: The indexam is normally responsible for checking unique constraints,
+ * so this normally only needs to be used for exclusion constraints.  But this
+ * function is also called when doing a "pre-check" for conflicts on a unique
+ * constraint, when doing speculative insertion.  Caller may use the returned
+ * conflict TID to take further steps.
+ */
+static bool
+check_exclusion_or_unique_constraint(Relation heap, Relation index,
+									 IndexInfo *indexInfo,
+									 ItemPointer tupleid,
+									 Datum *values, bool *isnull,
+									 EState *estate, bool newIndex,
+									 CEOUC_WAIT_MODE waitMode,
+									 bool violationOK,
+									 ItemPointer conflictTid)
+{
+	Oid		   *constr_procs;
+	uint16	   *constr_strats;
+	Oid		   *index_collations = index->rd_indcollation;
+	int			index_natts = index->rd_index->indnatts;
+	IndexScanDesc index_scan;
+	HeapTuple	tup;
+	ScanKeyData scankeys[INDEX_MAX_KEYS];
+	SnapshotData DirtySnapshot;
+	int			i;
+	bool		conflict;
+	bool		found_self;
+	ExprContext *econtext;
+	TupleTableSlot *existing_slot;
+	TupleTableSlot *save_scantuple;
+
+	if (indexInfo->ii_ExclusionOps)
+	{
+		constr_procs = indexInfo->ii_ExclusionProcs;
+		constr_strats = indexInfo->ii_ExclusionStrats;
+	}
+	else
+	{
+		constr_procs = indexInfo->ii_UniqueProcs;
+		constr_strats = indexInfo->ii_UniqueStrats;
+	}
+
+	/*
+	 * If any of the input values are NULL, the constraint check is assumed to
+	 * pass (i.e., we assume the operators are strict).
+	 */
+	for (i = 0; i < index_natts; i++)
+	{
+		if (isnull[i])
+			return true;
+	}
+
+	/*
+	 * Search the tuples that are in the index for any violations, including
+	 * tuples that aren't visible yet.
+	 */
+	InitDirtySnapshot(DirtySnapshot);
+
+	for (i = 0; i < index_natts; i++)
+	{
+		ScanKeyEntryInitialize(&scankeys[i],
+							   0,
+							   i + 1,
+							   constr_strats[i],
+							   InvalidOid,
+							   index_collations[i],
+							   constr_procs[i],
+							   values[i]);
+	}
+
+	/*
+	 * Need a TupleTableSlot to put existing tuples in.
+	 *
+	 * To use FormIndexDatum, we have to make the econtext's scantuple point
+	 * to this slot.  Be sure to save and restore caller's value for
+	 * scantuple.
+	 */
+	existing_slot = MakeSingleTupleTableSlot(RelationGetDescr(heap));
+
+	econtext = GetPerTupleExprContext(estate);
+	save_scantuple = econtext->ecxt_scantuple;
+	econtext->ecxt_scantuple = existing_slot;
+
+	/*
+	 * May have to restart scan from this point if a potential conflict is
+	 * found.
+	 */
+retry:
+	conflict = false;
+	found_self = false;
+	index_scan = index_beginscan(heap, index, &DirtySnapshot, index_natts, 0);
+	index_rescan(index_scan, scankeys, index_natts, NULL, 0);
+
+	while ((tup = index_getnext(index_scan,
+								ForwardScanDirection)) != NULL)
+	{
+		TransactionId xwait;
+		ItemPointerData ctid_wait;
+		Datum		existing_values[INDEX_MAX_KEYS];
+		bool		existing_isnull[INDEX_MAX_KEYS];
+		char	   *error_new;
+		char	   *error_existing;
+
+		/*
+		 * Ignore the entry for the tuple we're trying to check.
+		 */
+		if (ItemPointerIsValid(tupleid) &&
+			ItemPointerEquals(tupleid, &tup->t_self))
+		{
+			if (found_self)		/* should not happen */
+				elog(ERROR, "found self tuple multiple times in index \"%s\"",
+					 RelationGetRelationName(index));
+			found_self = true;
+			continue;
+		}
+
+		/*
+		 * Extract the index column values and isnull flags from the existing
+		 * tuple.
+		 */
+		ExecStoreTuple(tup, existing_slot, InvalidBuffer, false);
+		FormIndexDatum(indexInfo, existing_slot, estate,
+					   existing_values, existing_isnull);
+
+		/* If lossy indexscan, must recheck the condition */
+		if (index_scan->xs_recheck)
+		{
+			if (!index_recheck_constraint(index,
+										  constr_procs,
+										  existing_values,
+										  existing_isnull,
+										  values))
+				continue;		/* tuple doesn't actually match, so no
+								 * conflict */
+		}
+
+		/*
+		 * At this point we have either a conflict or a potential conflict.
+		 *
+		 * If an in-progress transaction is affecting the visibility of this
+		 * tuple, we need to wait for it to complete and then recheck (unless
+		 * the caller requested not to).  For simplicity we do rechecking by
+		 * just restarting the whole scan --- this case probably doesn't
+		 * happen often enough to be worth trying harder, and anyway we don't
+		 * want to hold any index internal locks while waiting.
+		 */
+		xwait = TransactionIdIsValid(DirtySnapshot.xmin) ?
+			DirtySnapshot.xmin : DirtySnapshot.xmax;
+
+		if (TransactionIdIsValid(xwait) &&
+			(waitMode == CEOUC_WAIT ||
+			 (waitMode == CEOUC_LIVELOCK_PREVENTING_WAIT &&
+			  DirtySnapshot.speculativeToken &&
+			  TransactionIdPrecedes(GetCurrentTransactionId(), xwait))))
+		{
+			ctid_wait = tup->t_data->t_ctid;
+			index_endscan(index_scan);
+			if (DirtySnapshot.speculativeToken)
+				SpeculativeInsertionWait(DirtySnapshot.xmin,
+										 DirtySnapshot.speculativeToken);
+			else
+				XactLockTableWait(xwait, heap, &ctid_wait,
+								  XLTW_RecheckExclusionConstr);
+			goto retry;
+		}
+
+		/*
+		 * We have a definite conflict (or a potential one, but the caller
+		 * didn't want to wait).  Return it to caller, or report it.
+		 */
+		if (violationOK)
+		{
+			conflict = true;
+			if (conflictTid)
+				*conflictTid = tup->t_self;
+			break;
+		}
+
+		error_new = BuildIndexValueDescription(index, values, isnull);
+		error_existing = BuildIndexValueDescription(index, existing_values,
+													existing_isnull);
+		if (newIndex)
+			ereport(ERROR,
+					(errcode(ERRCODE_EXCLUSION_VIOLATION),
+					 errmsg("could not create exclusion constraint \"%s\"",
+							RelationGetRelationName(index)),
+					 error_new && error_existing ?
+					 errdetail("Key %s conflicts with key %s.",
+							   error_new, error_existing) :
+					 errdetail("Key conflicts exist."),
+					 errtableconstraint(heap,
+										RelationGetRelationName(index))));
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_EXCLUSION_VIOLATION),
+					 errmsg("conflicting key value violates exclusion constraint \"%s\"",
+							RelationGetRelationName(index)),
+					 error_new && error_existing ?
+					 errdetail("Key %s conflicts with existing key %s.",
+							   error_new, error_existing) :
+					 errdetail("Key conflicts with existing key."),
+					 errtableconstraint(heap,
+										RelationGetRelationName(index))));
+	}
+
+	index_endscan(index_scan);
+
+	/*
+	 * Ordinarily, at this point the search should have found the originally
+	 * inserted tuple (if any), unless we exited the loop early because of
+	 * conflict.  However, it is possible to define exclusion constraints for
+	 * which that wouldn't be true --- for instance, if the operator is <>. So
+	 * we no longer complain if found_self is still false.
+	 */
+
+	econtext->ecxt_scantuple = save_scantuple;
+
+	ExecDropSingleTupleTableSlot(existing_slot);
+
+	return !conflict;
+}
+
+/*
+ * Check for violation of an exclusion constraint
+ *
+ * This is a dumbed down version of check_exclusion_or_unique_constraint
+ * for external callers. They don't need all the special modes.
+ */
+void
+check_exclusion_constraint(Relation heap, Relation index,
+						   IndexInfo *indexInfo,
+						   ItemPointer tupleid,
+						   Datum *values, bool *isnull,
+						   EState *estate, bool newIndex)
+{
+	(void) check_exclusion_or_unique_constraint(heap, index, indexInfo, tupleid,
+												values, isnull,
+												estate, newIndex,
+												CEOUC_WAIT, false, NULL);
+}
+
+/*
+ * Check existing tuple's index values to see if it really matches the
+ * exclusion condition against the new_values.  Returns true if conflict.
+ */
+static bool
+index_recheck_constraint(Relation index, Oid *constr_procs,
+						 Datum *existing_values, bool *existing_isnull,
+						 Datum *new_values)
+{
+	int			index_natts = index->rd_index->indnatts;
+	int			i;
+
+	for (i = 0; i < index_natts; i++)
+	{
+		/* Assume the exclusion operators are strict */
+		if (existing_isnull[i])
+			return false;
+
+		if (!DatumGetBool(OidFunctionCall2Coll(constr_procs[i],
+											   index->rd_indcollation[i],
+											   existing_values[i],
+											   new_values[i])))
+			return false;
+	}
+
+	return true;
+}
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 6c891e2b4d..bae0792b4a 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -95,6 +95,9 @@ static void ExecutePlan(EState *estate, PlanState *planstate,
 			ScanDirection direction,
 			DestReceiver *dest);
 static bool ExecCheckRTEPerms(RangeTblEntry *rte);
+static bool ExecCheckRTEPermsModified(Oid relOid, Oid userid,
+						  Bitmapset *modifiedCols,
+						  AclMode requiredPerms);
 static void ExecCheckXactReadOnly(PlannedStmt *plannedstmt);
 static char *ExecBuildSlotValueDescription(Oid reloid,
 							  TupleTableSlot *slot,
@@ -105,13 +108,15 @@ static void EvalPlanQualStart(EPQState *epqstate, EState *parentestate,
 				  Plan *planTree);
 
 /*
- * Note that this macro also exists in commands/trigger.c.  There does not
- * appear to be any good header to put it into, given the structures that
+ * Note that GetUpdatedColumns() also exists in commands/trigger.c.  There does
+ * not appear to be any good header to put it into, given the structures that
  * it uses, so we let them be duplicated.  Be sure to update both if one needs
  * to be changed, however.
  */
-#define GetModifiedColumns(relinfo, estate) \
-	(rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->modifiedCols)
+#define GetInsertedColumns(relinfo, estate) \
+	(rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->insertedCols)
+#define GetUpdatedColumns(relinfo, estate) \
+	(rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->updatedCols)
 
 /* end of local decls */
 
@@ -160,8 +165,20 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	/*
 	 * If the transaction is read-only, we need to check if any writes are
 	 * planned to non-temporary tables.  EXPLAIN is considered read-only.
+	 *
+	 * Don't allow writes in parallel mode.  Supporting UPDATE and DELETE
+	 * would require (a) storing the combocid hash in shared memory, rather
+	 * than synchronizing it just once at the start of parallelism, and (b) an
+	 * alternative to heap_update()'s reliance on xmax for mutual exclusion.
+	 * INSERT may have no such troubles, but we forbid it to simplify the
+	 * checks.
+	 *
+	 * We have lower-level defenses in CommandCounterIncrement and elsewhere
+	 * against performing unsafe operations in parallel mode, but this gives a
+	 * more user-friendly error message.
 	 */
-	if (XactReadOnly && !(eflags & EXEC_FLAG_EXPLAIN_ONLY))
+	if ((XactReadOnly || IsInParallelMode()) &&
+		!(eflags & EXEC_FLAG_EXPLAIN_ONLY))
 		ExecCheckXactReadOnly(queryDesc->plannedstmt);
 
 	/*
@@ -603,7 +620,6 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 	AclMode		remainingPerms;
 	Oid			relOid;
 	Oid			userid;
-	int			col;
 
 	/*
 	 * Only plain-relation RTEs need to be checked here.  Function RTEs are
@@ -641,6 +657,8 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 	remainingPerms = requiredPerms & ~relPerms;
 	if (remainingPerms != 0)
 	{
+		int			col = -1;
+
 		/*
 		 * If we lack any permissions that exist only as relation permissions,
 		 * we can fail straight away.
@@ -669,7 +687,6 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 					return false;
 			}
 
-			col = -1;
 			while ((col = bms_next_member(rte->selectedCols, col)) >= 0)
 			{
 				/* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
@@ -692,61 +709,85 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 		}
 
 		/*
-		 * Basically the same for the mod columns, with either INSERT or
-		 * UPDATE privilege as specified by remainingPerms.
+		 * Basically the same for the mod columns, for both INSERT and UPDATE
+		 * privilege as specified by remainingPerms.
 		 */
-		remainingPerms &= ~ACL_SELECT;
-		if (remainingPerms != 0)
-		{
-			/*
-			 * When the query doesn't explicitly change any columns, allow the
-			 * query if we have permission on any column of the rel.  This is
-			 * to handle SELECT FOR UPDATE as well as possible corner cases in
-			 * INSERT and UPDATE.
-			 */
-			if (bms_is_empty(rte->modifiedCols))
-			{
-				if (pg_attribute_aclcheck_all(relOid, userid, remainingPerms,
-											  ACLMASK_ANY) != ACLCHECK_OK)
-					return false;
-			}
+		if (remainingPerms & ACL_INSERT && !ExecCheckRTEPermsModified(relOid,
+																	  userid,
+														   rte->insertedCols,
+																 ACL_INSERT))
+			return false;
 
-			col = -1;
-			while ((col = bms_next_member(rte->modifiedCols, col)) >= 0)
-			{
-				/* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
-				AttrNumber	attno = col + FirstLowInvalidHeapAttributeNumber;
+		if (remainingPerms & ACL_UPDATE && !ExecCheckRTEPermsModified(relOid,
+																	  userid,
+															rte->updatedCols,
+																 ACL_UPDATE))
+			return false;
+	}
+	return true;
+}
 
-				if (attno == InvalidAttrNumber)
-				{
-					/* whole-row reference can't happen here */
-					elog(ERROR, "whole-row update is not implemented");
-				}
-				else
-				{
-					if (pg_attribute_aclcheck(relOid, attno, userid,
-											  remainingPerms) != ACLCHECK_OK)
-						return false;
-				}
-			}
+/*
+ * ExecCheckRTEPermsModified
+ *		Check INSERT or UPDATE access permissions for a single RTE (these
+ *		are processed uniformly).
+ */
+static bool
+ExecCheckRTEPermsModified(Oid relOid, Oid userid, Bitmapset *modifiedCols,
+						  AclMode requiredPerms)
+{
+	int			col = -1;
+
+	/*
+	 * When the query doesn't explicitly update any columns, allow the query
+	 * if we have permission on any column of the rel.  This is to handle
+	 * SELECT FOR UPDATE as well as possible corner cases in UPDATE.
+	 */
+	if (bms_is_empty(modifiedCols))
+	{
+		if (pg_attribute_aclcheck_all(relOid, userid, requiredPerms,
+									  ACLMASK_ANY) != ACLCHECK_OK)
+			return false;
+	}
+
+	while ((col = bms_next_member(modifiedCols, col)) >= 0)
+	{
+		/* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
+		AttrNumber	attno = col + FirstLowInvalidHeapAttributeNumber;
+
+		if (attno == InvalidAttrNumber)
+		{
+			/* whole-row reference can't happen here */
+			elog(ERROR, "whole-row update is not implemented");
+		}
+		else
+		{
+			if (pg_attribute_aclcheck(relOid, attno, userid,
+									  requiredPerms) != ACLCHECK_OK)
+				return false;
 		}
 	}
 	return true;
 }
 
 /*
- * Check that the query does not imply any writes to non-temp tables.
+ * Check that the query does not imply any writes to non-temp tables;
+ * unless we're in parallel mode, in which case don't even allow writes
+ * to temp tables.
  *
  * Note: in a Hot Standby slave this would need to reject writes to temp
- * tables as well; but an HS slave can't have created any temp tables
- * in the first place, so no need to check that.
+ * tables just as we do in parallel mode; but an HS slave can't have created
+ * any temp tables in the first place, so no need to check that.
  */
 static void
 ExecCheckXactReadOnly(PlannedStmt *plannedstmt)
 {
 	ListCell   *l;
 
-	/* Fail if write permissions are requested on any non-temp table */
+	/*
+	 * Fail if write permissions are requested in parallel mode for table
+	 * (temp or non-temp), otherwise fail for any non-temp table.
+	 */
 	foreach(l, plannedstmt->rtable)
 	{
 		RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
@@ -762,6 +803,9 @@ ExecCheckXactReadOnly(PlannedStmt *plannedstmt)
 
 		PreventCommandIfReadOnly(CreateCommandTag((Node *) plannedstmt));
 	}
+
+	if (plannedstmt->commandType != CMD_SELECT || plannedstmt->hasModifyingCTE)
+		PreventCommandIfParallelMode(CreateCommandTag((Node *) plannedstmt));
 }
 
 
@@ -907,8 +951,11 @@ estate->es_result_remoterel = NULL;
 		erm->prti = rc->prti;
 		erm->rowmarkId = rc->rowmarkId;
 		erm->markType = rc->markType;
+		erm->strength = rc->strength;
 		erm->waitPolicy = rc->waitPolicy;
+		erm->ermActive = false;
 		ItemPointerSetInvalid(&(erm->curCtid));
+		erm->ermExtra = NULL;
 		estate->es_rowMarks = lappend(estate->es_rowMarks, erm);
 	}
 
@@ -1170,6 +1217,8 @@ CheckValidResultRel(Relation resultRel, CmdType operation)
 static void
 CheckValidRowMarkRel(Relation rel, RowMarkType markType)
 {
+	FdwRoutine *fdwroutine;
+
 	switch (rel->rd_rel->relkind)
 	{
 		case RELKIND_RELATION:
@@ -1205,11 +1254,13 @@ CheckValidRowMarkRel(Relation rel, RowMarkType markType)
 							  RelationGetRelationName(rel))));
 			break;
 		case RELKIND_FOREIGN_TABLE:
-			/* Should not get here; planner should have used ROW_MARK_COPY */
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("cannot lock rows in foreign table \"%s\"",
-							RelationGetRelationName(rel))));
+			/* Okay only if the FDW supports it */
+			fdwroutine = GetFdwRoutineForRelation(rel, false);
+			if (fdwroutine->RefetchForeignRow == NULL)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("cannot lock rows in foreign table \"%s\"",
+								RelationGetRelationName(rel))));
 			break;
 		default:
 			ereport(ERROR,
@@ -1685,6 +1736,9 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 	Relation	rel = resultRelInfo->ri_RelationDesc;
 	TupleDesc	tupdesc = RelationGetDescr(rel);
 	TupleConstr *constr = tupdesc->constr;
+	Bitmapset  *modifiedCols;
+	Bitmapset  *insertedCols;
+	Bitmapset  *updatedCols;
 
 	Assert(constr);
 
@@ -1699,9 +1753,10 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 				slot_attisnull(slot, attrChk))
 			{
 				char	   *val_desc;
-				Bitmapset  *modifiedCols;
 
-				modifiedCols = GetModifiedColumns(resultRelInfo, estate);
+				insertedCols = GetInsertedColumns(resultRelInfo, estate);
+				updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+				modifiedCols = bms_union(insertedCols, updatedCols);
 				val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
 														 slot,
 														 tupdesc,
@@ -1725,9 +1780,10 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 		if ((failed = ExecRelCheck(resultRelInfo, slot, estate)) != NULL)
 		{
 			char	   *val_desc;
-			Bitmapset  *modifiedCols;
 
-			modifiedCols = GetModifiedColumns(resultRelInfo, estate);
+			insertedCols = GetInsertedColumns(resultRelInfo, estate);
+			updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+			modifiedCols = bms_union(insertedCols, updatedCols);
 			val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
 													 slot,
 													 tupdesc,
@@ -1737,7 +1793,7 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 					(errcode(ERRCODE_CHECK_VIOLATION),
 					 errmsg("new row for relation \"%s\" violates check constraint \"%s\"",
 							RelationGetRelationName(rel), failed),
-					 val_desc ? errdetail("Failing row contains %s.", val_desc) : 0,
+			  val_desc ? errdetail("Failing row contains %s.", val_desc) : 0,
 					 errtableconstraint(rel, failed)));
 		}
 	}
@@ -1745,9 +1801,15 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 
 /*
  * ExecWithCheckOptions -- check that tuple satisfies any WITH CHECK OPTIONs
+ * of the specified kind.
+ *
+ * Note that this needs to be called multiple times to ensure that all kinds of
+ * WITH CHECK OPTIONs are handled (both those from views which have the WITH
+ * CHECK OPTION set and from row level security policies).  See ExecInsert()
+ * and ExecUpdate().
  */
 void
-ExecWithCheckOptions(ResultRelInfo *resultRelInfo,
+ExecWithCheckOptions(WCOKind kind, ResultRelInfo *resultRelInfo,
 					 TupleTableSlot *slot, EState *estate)
 {
 	Relation	rel = resultRelInfo->ri_RelationDesc;
@@ -1773,32 +1835,73 @@ ExecWithCheckOptions(ResultRelInfo *resultRelInfo,
 		ExprState  *wcoExpr = (ExprState *) lfirst(l2);
 
 		/*
+		 * Skip any WCOs which are not the kind we are looking for at this
+		 * time.
+		 */
+		if (wco->kind != kind)
+			continue;
+
+		/*
 		 * WITH CHECK OPTION checks are intended to ensure that the new tuple
 		 * is visible (in the case of a view) or that it passes the
-		 * 'with-check' policy (in the case of row security).
-		 * If the qual evaluates to NULL or FALSE, then the new tuple won't be
-		 * included in the view or doesn't pass the 'with-check' policy for the
-		 * table.  We need ExecQual to return FALSE for NULL to handle the view
-		 * case (the opposite of what we do above for CHECK constraints).
+		 * 'with-check' policy (in the case of row security). If the qual
+		 * evaluates to NULL or FALSE, then the new tuple won't be included in
+		 * the view or doesn't pass the 'with-check' policy for the table.  We
+		 * need ExecQual to return FALSE for NULL to handle the view case (the
+		 * opposite of what we do above for CHECK constraints).
 		 */
 		if (!ExecQual((List *) wcoExpr, econtext, false))
 		{
 			char	   *val_desc;
 			Bitmapset  *modifiedCols;
+			Bitmapset  *insertedCols;
+			Bitmapset  *updatedCols;
 
-			modifiedCols = GetModifiedColumns(resultRelInfo, estate);
-			val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
-													 slot,
-													 tupdesc,
-													 modifiedCols,
-													 64);
-
-			ereport(ERROR,
-					(errcode(ERRCODE_WITH_CHECK_OPTION_VIOLATION),
-				 errmsg("new row violates WITH CHECK OPTION for \"%s\"",
-						wco->viewname),
-					val_desc ? errdetail("Failing row contains %s.", val_desc) :
-							   0));
+			switch (wco->kind)
+			{
+					/*
+					 * For WITH CHECK OPTIONs coming from views, we might be
+					 * able to provide the details on the row, depending on
+					 * the permissions on the relation (that is, if the user
+					 * could view it directly anyway).  For RLS violations, we
+					 * don't include the data since we don't know if the user
+					 * should be able to view the tuple as as that depends on
+					 * the USING policy.
+					 */
+				case WCO_VIEW_CHECK:
+					insertedCols = GetInsertedColumns(resultRelInfo, estate);
+					updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+					modifiedCols = bms_union(insertedCols, updatedCols);
+					val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
+															 slot,
+															 tupdesc,
+															 modifiedCols,
+															 64);
+
+					ereport(ERROR,
+							(errcode(ERRCODE_WITH_CHECK_OPTION_VIOLATION),
+					  errmsg("new row violates WITH CHECK OPTION for \"%s\"",
+							 wco->relname),
+							 val_desc ? errdetail("Failing row contains %s.",
+												  val_desc) : 0));
+					break;
+				case WCO_RLS_INSERT_CHECK:
+				case WCO_RLS_UPDATE_CHECK:
+					ereport(ERROR,
+							(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+							 errmsg("new row violates row level security policy for \"%s\"",
+									wco->relname)));
+					break;
+				case WCO_RLS_CONFLICT_CHECK:
+					ereport(ERROR,
+							(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+							 errmsg("new row violates row level security policy (USING expression) for \"%s\"",
+									wco->relname)));
+					break;
+				default:
+					elog(ERROR, "unrecognized WCO kind: %u", wco->kind);
+					break;
+			}
 		}
 	}
 }
@@ -1884,8 +1987,8 @@ ExecBuildSlotValueDescription(Oid reloid,
 		{
 			/*
 			 * No table-level SELECT, so need to make sure they either have
-			 * SELECT rights on the column or that they have provided the
-			 * data for the column.  If not, omit this column from the error
+			 * SELECT rights on the column or that they have provided the data
+			 * for the column.  If not, omit this column from the error
 			 * message.
 			 */
 			aclresult = pg_attribute_aclcheck(reloid, tupdesc->attrs[i]->attnum,
@@ -1955,10 +2058,37 @@ ExecBuildSlotValueDescription(Oid reloid,
 
 
 /*
+ * ExecUpdateLockMode -- find the appropriate UPDATE tuple lock mode for a
+ * given ResultRelInfo
+ */
+LockTupleMode
+ExecUpdateLockMode(EState *estate, ResultRelInfo *relinfo)
+{
+	Bitmapset  *keyCols;
+	Bitmapset  *updatedCols;
+
+	/*
+	 * Compute lock mode to use.  If columns that are part of the key have not
+	 * been modified, then we can use a weaker lock, allowing for better
+	 * concurrency.
+	 */
+	updatedCols = GetUpdatedColumns(relinfo, estate);
+	keyCols = RelationGetIndexAttrBitmap(relinfo->ri_RelationDesc,
+										 INDEX_ATTR_BITMAP_KEY);
+
+	if (bms_overlap(keyCols, updatedCols))
+		return LockTupleExclusive;
+
+	return LockTupleNoKeyExclusive;
+}
+
+/*
  * ExecFindRowMark -- find the ExecRowMark struct for given rangetable index
+ *
+ * If no such struct, either return NULL or throw error depending on missing_ok
  */
 ExecRowMark *
-ExecFindRowMark(EState *estate, Index rti)
+ExecFindRowMark(EState *estate, Index rti, bool missing_ok)
 {
 	ListCell   *lc;
 
@@ -1969,8 +2099,9 @@ ExecFindRowMark(EState *estate, Index rti)
 		if (erm->rti == rti)
 			return erm;
 	}
-	elog(ERROR, "failed to find ExecRowMark for rangetable index %u", rti);
-	return NULL;				/* keep compiler quiet */
+	if (!missing_ok)
+		elog(ERROR, "failed to find ExecRowMark for rangetable index %u", rti);
+	return NULL;
 }
 
 /*
@@ -2168,8 +2299,9 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
 			 * recycled and reused for an unrelated tuple.  This implies that
 			 * the latest version of the row was deleted, so we need do
 			 * nothing.  (Should be safe to examine xmin without getting
-			 * buffer's content lock, since xmin never changes in an existing
-			 * tuple.)
+			 * buffer's content lock.  We assume reading a TransactionId to be
+			 * atomic, and Xmin never changes in an existing tuple, except to
+			 * invalid or frozen, and neither of those can match priorXmax.)
 			 */
 			if (!TransactionIdEquals(HeapTupleHeaderGetXmin(tuple.t_data),
 									 priorXmax))
@@ -2198,14 +2330,14 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
 						break;
 					case LockWaitSkip:
 						if (!ConditionalXactLockTableWait(SnapshotDirty.xmax))
-							return NULL; /* skip instead of waiting */
+							return NULL;		/* skip instead of waiting */
 						break;
 					case LockWaitError:
 						if (!ConditionalXactLockTableWait(SnapshotDirty.xmax))
 							ereport(ERROR,
 									(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
 									 errmsg("could not obtain lock on row in relation \"%s\"",
-											RelationGetRelationName(relation))));
+										RelationGetRelationName(relation))));
 						break;
 				}
 				continue;		/* loop back to repeat heap_fetch */
@@ -2250,11 +2382,12 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
 					 * case, so as to avoid the "Halloween problem" of
 					 * repeated update attempts.  In the latter case it might
 					 * be sensible to fetch the updated tuple instead, but
-					 * doing so would require changing heap_lock_tuple as well
-					 * as heap_update and heap_delete to not complain about
-					 * updating "invisible" tuples, which seems pretty scary.
-					 * So for now, treat the tuple as deleted and do not
-					 * process.
+					 * doing so would require changing heap_update and
+					 * heap_delete to not complain about updating "invisible"
+					 * tuples, which seems pretty scary (heap_lock_tuple will
+					 * not complain, but few callers expect
+					 * HeapTupleInvisible, and we're not one of them).  So for
+					 * now, treat the tuple as deleted and do not process.
 					 */
 					ReleaseBuffer(buffer);
 					return NULL;
@@ -2269,6 +2402,9 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
 						ereport(ERROR,
 								(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 								 errmsg("could not serialize access due to concurrent update")));
+
+					/* Should not encounter speculative tuple on recheck */
+					Assert(!HeapTupleHeaderIsSpeculative(tuple.t_data));
 					if (!ItemPointerEquals(&hufd.ctid, &tuple.t_self))
 					{
 						/* it was updated, so look at the updated version */
@@ -2284,6 +2420,9 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
 					ReleaseBuffer(buffer);
 					return NULL;
 
+				case HeapTupleInvisible:
+					elog(ERROR, "attempted to lock invisible tuple");
+
 				default:
 					ReleaseBuffer(buffer);
 					elog(ERROR, "unrecognized heap_lock_tuple status: %u",
@@ -2473,7 +2612,7 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
 
 		if (erm->markType == ROW_MARK_REFERENCE)
 		{
-			Buffer		buffer;
+			HeapTuple	copyTuple;
 
 			Assert(erm->relation != NULL);
 
@@ -2484,17 +2623,50 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
 			/* non-locked rels could be on the inside of outer joins */
 			if (isNull)
 				continue;
-			tuple.t_self = *((ItemPointer) DatumGetPointer(datum));
 
-			/* okay, fetch the tuple */
-			if (!heap_fetch(erm->relation, SnapshotAny, &tuple, &buffer,
-							false, NULL))
-				elog(ERROR, "failed to fetch tuple for EvalPlanQual recheck");
+			/* fetch requests on foreign tables must be passed to their FDW */
+			if (erm->relation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+			{
+				FdwRoutine *fdwroutine;
+				bool		updated = false;
+
+				fdwroutine = GetFdwRoutineForRelation(erm->relation, false);
+				/* this should have been checked already, but let's be safe */
+				if (fdwroutine->RefetchForeignRow == NULL)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						   errmsg("cannot lock rows in foreign table \"%s\"",
+								  RelationGetRelationName(erm->relation))));
+				copyTuple = fdwroutine->RefetchForeignRow(epqstate->estate,
+														  erm,
+														  datum,
+														  &updated);
+				if (copyTuple == NULL)
+					elog(ERROR, "failed to fetch tuple for EvalPlanQual recheck");
+
+				/*
+				 * Ideally we'd insist on updated == false here, but that
+				 * assumes that FDWs can track that exactly, which they might
+				 * not be able to.  So just ignore the flag.
+				 */
+			}
+			else
+			{
+				/* ordinary table, fetch the tuple */
+				Buffer		buffer;
 
-			/* successful, copy and store tuple */
-			EvalPlanQualSetTuple(epqstate, erm->rti,
-								 heap_copytuple(&tuple));
-			ReleaseBuffer(buffer);
+				tuple.t_self = *((ItemPointer) DatumGetPointer(datum));
+				if (!heap_fetch(erm->relation, SnapshotAny, &tuple, &buffer,
+								false, NULL))
+					elog(ERROR, "failed to fetch tuple for EvalPlanQual recheck");
+
+				/* successful, copy tuple */
+				copyTuple = heap_copytuple(&tuple);
+				ReleaseBuffer(buffer);
+			}
+
+			/* store tuple */
+			EvalPlanQualSetTuple(epqstate, erm->rti, copyTuple);
 		}
 		else
 		{
@@ -2513,13 +2685,14 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
 
 			/* build a temporary HeapTuple control structure */
 			tuple.t_len = HeapTupleHeaderGetDatumLength(td);
-			ItemPointerSetInvalid(&(tuple.t_self));
+			tuple.t_data = td;
 			/* relation might be a foreign table, if so provide tableoid */
 			tuple.t_tableOid = erm->relid;
 #ifdef PGXC
 			tuple.t_xc_node_id = 0;
 #endif
-			tuple.t_data = td;
+			/* also copy t_ctid in case there's valid data there */
+			tuple.t_self = td->t_ctid;
 
 			/* copy and store tuple */
 			EvalPlanQualSetTuple(epqstate, erm->rti,
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 26cfa6b0b7..41457e2b8e 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -107,6 +107,7 @@
 #include "executor/nodeNestloop.h"
 #include "executor/nodeRecursiveunion.h"
 #include "executor/nodeResult.h"
+#include "executor/nodeSamplescan.h"
 #include "executor/nodeSeqscan.h"
 #include "executor/nodeSetOp.h"
 #include "executor/nodeSort.h"
@@ -197,6 +198,11 @@ ExecInitNode(Plan *node, EState *estate, int eflags)
 												   estate, eflags);
 			break;
 
+		case T_SampleScan:
+			result = (PlanState *) ExecInitSampleScan((SampleScan *) node,
+													  estate, eflags);
+			break;
+
 		case T_IndexScan:
 			result = (PlanState *) ExecInitIndexScan((IndexScan *) node,
 													 estate, eflags);
@@ -510,6 +516,10 @@ ExecProcNode(PlanState *node)
 			result = ExecSeqScan((SeqScanState *) node);
 			break;
 
+		case T_SampleScanState:
+			result = ExecSampleScan((SampleScanState *) node);
+			break;
+
 		case T_IndexScanState:
 			result = ExecIndexScan((IndexScanState *) node);
 			break;
@@ -759,6 +769,10 @@ ExecEndNode(PlanState *node)
 			ExecEndSeqScan((SeqScanState *) node);
 			break;
 
+		case T_SampleScanState:
+			ExecEndSampleScan((SampleScanState *) node);
+			break;
+
 		case T_IndexScanState:
 			ExecEndIndexScan((IndexScanState *) node);
 			break;
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 9f3f651bda..ad54a8fec9 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -181,6 +181,9 @@ static Datum ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate,
 						bool *isNull, ExprDoneCond *isDone);
 static Datum ExecEvalCurrentOfExpr(ExprState *exprstate, ExprContext *econtext,
 					  bool *isNull, ExprDoneCond *isDone);
+static Datum ExecEvalGroupingFuncExpr(GroupingFuncExprState *gstate,
+						 ExprContext *econtext,
+						 bool *isNull, ExprDoneCond *isDone);
 
 
 /* ----------------------------------------------------------------
@@ -3022,6 +3025,44 @@ ExecEvalCaseTestExpr(ExprState *exprstate,
 	return econtext->caseValue_datum;
 }
 
+/*
+ * ExecEvalGroupingFuncExpr
+ *
+ * Return a bitmask with a bit for each (unevaluated) argument expression
+ * (rightmost arg is least significant bit).
+ *
+ * A bit is set if the corresponding expression is NOT part of the set of
+ * grouping expressions in the current grouping set.
+ */
+static Datum
+ExecEvalGroupingFuncExpr(GroupingFuncExprState *gstate,
+						 ExprContext *econtext,
+						 bool *isNull,
+						 ExprDoneCond *isDone)
+{
+	int			result = 0;
+	int			attnum = 0;
+	Bitmapset  *grouped_cols = gstate->aggstate->grouped_cols;
+	ListCell   *lc;
+
+	if (isDone)
+		*isDone = ExprSingleResult;
+
+	*isNull = false;
+
+	foreach(lc, (gstate->clauses))
+	{
+		attnum = lfirst_int(lc);
+
+		result = result << 1;
+
+		if (!bms_is_member(attnum, grouped_cols))
+			result = result | 1;
+	}
+
+	return (Datum) result;
+}
+
 /* ----------------------------------------------------------------
  *		ExecEvalArray - ARRAY[] expressions
  * ----------------------------------------------------------------
@@ -4257,7 +4298,6 @@ ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate,
 {
 	ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) astate->xprstate.expr;
 	Datum		result;
-	ArrayType  *array;
 	FunctionCallInfoData locfcinfo;
 
 	result = ExecEvalExpr(astate->arg, econtext, isNull, isDone);
@@ -4274,14 +4314,12 @@ ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate,
 	if (!OidIsValid(acoerce->elemfuncid))
 	{
 		/* Detoast input array if necessary, and copy in any case */
-		array = DatumGetArrayTypePCopy(result);
+		ArrayType  *array = DatumGetArrayTypePCopy(result);
+
 		ARR_ELEMTYPE(array) = astate->resultelemtype;
 		PG_RETURN_ARRAYTYPE_P(array);
 	}
 
-	/* Detoast input array if necessary, but don't make a useless copy */
-	array = DatumGetArrayTypeP(result);
-
 	/* Initialize function cache if first time through */
 	if (astate->elemfunc.fn_oid == InvalidOid)
 	{
@@ -4311,15 +4349,14 @@ ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate,
 	 */
 	InitFunctionCallInfoData(locfcinfo, &(astate->elemfunc), 3,
 							 InvalidOid, NULL, NULL);
-	locfcinfo.arg[0] = PointerGetDatum(array);
+	locfcinfo.arg[0] = result;
 	locfcinfo.arg[1] = Int32GetDatum(acoerce->resulttypmod);
 	locfcinfo.arg[2] = BoolGetDatum(acoerce->isExplicit);
 	locfcinfo.argnull[0] = false;
 	locfcinfo.argnull[1] = false;
 	locfcinfo.argnull[2] = false;
 
-	return array_map(&locfcinfo, ARR_ELEMTYPE(array), astate->resultelemtype,
-					 astate->amstate);
+	return array_map(&locfcinfo, astate->resultelemtype, astate->amstate);
 }
 
 /* ----------------------------------------------------------------
@@ -4495,6 +4532,28 @@ ExecInitExpr(Expr *node, PlanState *parent)
 				state = (ExprState *) astate;
 			}
 			break;
+		case T_GroupingFunc:
+			{
+				GroupingFunc *grp_node = (GroupingFunc *) node;
+				GroupingFuncExprState *grp_state = makeNode(GroupingFuncExprState);
+				Agg		   *agg = NULL;
+
+				if (!parent || !IsA(parent, AggState) ||!IsA(parent->plan, Agg))
+					elog(ERROR, "parent of GROUPING is not Agg node");
+
+				grp_state->aggstate = (AggState *) parent;
+
+				agg = (Agg *) (parent->plan);
+
+				if (agg->groupingSets)
+					grp_state->clauses = grp_node->cols;
+				else
+					grp_state->clauses = NIL;
+
+				state = (ExprState *) grp_state;
+				state->evalfunc = (ExprStateEvalFunc) ExecEvalGroupingFuncExpr;
+			}
+			break;
 		case T_WindowFunc:
 			{
 				WindowFunc *wfunc = (WindowFunc *) node;
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index 3f0d809387..a96e826ba4 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -246,13 +246,18 @@ void
 ExecAssignScanProjectionInfo(ScanState *node)
 {
 	Scan	   *scan = (Scan *) node->ps.plan;
-	Index		varno;
 
-	/* Vars in an index-only scan's tlist should be INDEX_VAR */
-	if (IsA(scan, IndexOnlyScan))
-		varno = INDEX_VAR;
-	else
-		varno = scan->scanrelid;
+	ExecAssignScanProjectionInfoWithVarno(node, scan->scanrelid);
+}
+
+/*
+ * ExecAssignScanProjectionInfoWithVarno
+ *		As above, but caller can specify varno expected in Vars in the tlist.
+ */
+void
+ExecAssignScanProjectionInfoWithVarno(ScanState *node, Index varno)
+{
+	Scan	   *scan = (Scan *) node->ps.plan;
 
 	if (tlist_matches_tupdesc(&node->ps,
 							  scan->plan.targetlist,
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 168a369716..517ddce462 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -93,6 +93,7 @@
 #include "nodes/nodeFuncs.h"
 #include "storage/bufmgr.h"
 #include "utils/builtins.h"
+#include "utils/expandeddatum.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
 #ifdef XCP
@@ -1116,6 +1117,52 @@ ExecCopySlot(TupleTableSlot *dstslot, TupleTableSlot *srcslot)
 	return ExecStoreTuple(newTuple, dstslot, InvalidBuffer, true);
 }
 
+/* --------------------------------
+ *		ExecMakeSlotContentsReadOnly
+ *			Mark any R/W expanded datums in the slot as read-only.
+ *
+ * This is needed when a slot that might contain R/W datum references is to be
+ * used as input for general expression evaluation.  Since the expression(s)
+ * might contain more than one Var referencing the same R/W datum, we could
+ * get wrong answers if functions acting on those Vars thought they could
+ * modify the expanded value in-place.
+ *
+ * For notational reasons, we return the same slot passed in.
+ * --------------------------------
+ */
+TupleTableSlot *
+ExecMakeSlotContentsReadOnly(TupleTableSlot *slot)
+{
+	/*
+	 * sanity checks
+	 */
+	Assert(slot != NULL);
+	Assert(slot->tts_tupleDescriptor != NULL);
+	Assert(!slot->tts_isempty);
+
+	/*
+	 * If the slot contains a physical tuple, it can't contain any expanded
+	 * datums, because we flatten those when making a physical tuple.  This
+	 * might change later; but for now, we need do nothing unless the slot is
+	 * virtual.
+	 */
+	if (slot->tts_tuple == NULL)
+	{
+		Form_pg_attribute *att = slot->tts_tupleDescriptor->attrs;
+		int			attnum;
+
+		for (attnum = 0; attnum < slot->tts_nvalid; attnum++)
+		{
+			slot->tts_values[attnum] =
+				MakeExpandedObjectReadOnly(slot->tts_values[attnum],
+										   slot->tts_isnull[attnum],
+										   att[attnum]->attlen);
+		}
+	}
+
+	return slot;
+}
+
 
 /* ----------------------------------------------------------------
  *				convenience initialization routines
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index f75ad31182..5138640e24 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -33,10 +33,6 @@
  *		ExecOpenScanRelation	Common code for scan node init routines.
  *		ExecCloseScanRelation
  *
- *		ExecOpenIndices			\
- *		ExecCloseIndices		 | referenced by InitPlan, EndPlan,
- *		ExecInsertIndexTuples	/  ExecInsert, ExecUpdate
- *
  *		RegisterExprContextCallback    Register function shutdown callback
  *		UnregisterExprContextCallback  Deregister function shutdown callback
  *
@@ -49,19 +45,14 @@
 
 #include "access/relscan.h"
 #include "access/transam.h"
-#include "catalog/index.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "nodes/nodeFuncs.h"
 #include "parser/parsetree.h"
-#include "storage/lmgr.h"
 #include "utils/memutils.h"
-#include "utils/tqual.h"
+#include "utils/rel.h"
 
 
 static bool get_last_attnums(Node *node, ProjectionInfo *projInfo);
-static bool index_recheck_constraint(Relation index, Oid *constr_procs,
-						 Datum *existing_values, bool *existing_isnull,
-						 Datum *new_values);
 static void ShutdownExprContext(ExprContext *econtext, bool isCommit);
 
 
@@ -661,12 +652,15 @@ get_last_attnums(Node *node, ProjectionInfo *projInfo)
 	/*
 	 * Don't examine the arguments or filters of Aggrefs or WindowFuncs,
 	 * because those do not represent expressions to be evaluated within the
-	 * overall targetlist's econtext.
+	 * overall targetlist's econtext.  GroupingFunc arguments are never
+	 * evaluated at all.
 	 */
 	if (IsA(node, Aggref))
 		return false;
 	if (IsA(node, WindowFunc))
 		return false;
+	if (IsA(node, GroupingFunc))
+		return false;
 	return expression_tree_walker(node, get_last_attnums,
 								  (void *) projInfo);
 }
@@ -824,20 +818,11 @@ ExecOpenScanRelation(EState *estate, Index scanrelid, int eflags)
 		lockmode = NoLock;
 	else
 	{
-		ListCell   *l;
-
-		foreach(l, estate->es_rowMarks)
-		{
-			ExecRowMark *erm = lfirst(l);
+		/* Keep this check in sync with InitPlan! */
+		ExecRowMark *erm = ExecFindRowMark(estate, scanrelid, true);
 
-			/* Keep this check in sync with InitPlan! */
-			if (erm->rti == scanrelid &&
-				erm->relation != NULL)
-			{
-				lockmode = NoLock;
-				break;
-			}
-		}
+		if (erm != NULL && erm->relation != NULL)
+			lockmode = NoLock;
 	}
 
 	/* Open the relation and acquire lock as needed */
@@ -880,527 +865,6 @@ ExecCloseScanRelation(Relation scanrel)
 	heap_close(scanrel, NoLock);
 }
 
-
-/* ----------------------------------------------------------------
- *				  ExecInsertIndexTuples support
- * ----------------------------------------------------------------
- */
-
-/* ----------------------------------------------------------------
- *		ExecOpenIndices
- *
- *		Find the indices associated with a result relation, open them,
- *		and save information about them in the result ResultRelInfo.
- *
- *		At entry, caller has already opened and locked
- *		resultRelInfo->ri_RelationDesc.
- * ----------------------------------------------------------------
- */
-void
-ExecOpenIndices(ResultRelInfo *resultRelInfo)
-{
-	Relation	resultRelation = resultRelInfo->ri_RelationDesc;
-	List	   *indexoidlist;
-	ListCell   *l;
-	int			len,
-				i;
-	RelationPtr relationDescs;
-	IndexInfo **indexInfoArray;
-
-	resultRelInfo->ri_NumIndices = 0;
-
-	/* fast path if no indexes */
-	if (!RelationGetForm(resultRelation)->relhasindex)
-		return;
-
-	/*
-	 * Get cached list of index OIDs
-	 */
-	indexoidlist = RelationGetIndexList(resultRelation);
-	len = list_length(indexoidlist);
-	if (len == 0)
-		return;
-
-	/*
-	 * allocate space for result arrays
-	 */
-	relationDescs = (RelationPtr) palloc(len * sizeof(Relation));
-	indexInfoArray = (IndexInfo **) palloc(len * sizeof(IndexInfo *));
-
-	resultRelInfo->ri_NumIndices = len;
-	resultRelInfo->ri_IndexRelationDescs = relationDescs;
-	resultRelInfo->ri_IndexRelationInfo = indexInfoArray;
-
-	/*
-	 * For each index, open the index relation and save pg_index info. We
-	 * acquire RowExclusiveLock, signifying we will update the index.
-	 *
-	 * Note: we do this even if the index is not IndexIsReady; it's not worth
-	 * the trouble to optimize for the case where it isn't.
-	 */
-	i = 0;
-	foreach(l, indexoidlist)
-	{
-		Oid			indexOid = lfirst_oid(l);
-		Relation	indexDesc;
-		IndexInfo  *ii;
-
-		indexDesc = index_open(indexOid, RowExclusiveLock);
-
-		/* extract index key information from the index's pg_index info */
-		ii = BuildIndexInfo(indexDesc);
-
-		relationDescs[i] = indexDesc;
-		indexInfoArray[i] = ii;
-		i++;
-	}
-
-	list_free(indexoidlist);
-}
-
-/* ----------------------------------------------------------------
- *		ExecCloseIndices
- *
- *		Close the index relations stored in resultRelInfo
- * ----------------------------------------------------------------
- */
-void
-ExecCloseIndices(ResultRelInfo *resultRelInfo)
-{
-	int			i;
-	int			numIndices;
-	RelationPtr indexDescs;
-
-	numIndices = resultRelInfo->ri_NumIndices;
-	indexDescs = resultRelInfo->ri_IndexRelationDescs;
-
-	for (i = 0; i < numIndices; i++)
-	{
-		if (indexDescs[i] == NULL)
-			continue;			/* shouldn't happen? */
-
-		/* Drop lock acquired by ExecOpenIndices */
-		index_close(indexDescs[i], RowExclusiveLock);
-	}
-
-	/*
-	 * XXX should free indexInfo array here too?  Currently we assume that
-	 * such stuff will be cleaned up automatically in FreeExecutorState.
-	 */
-}
-
-/* ----------------------------------------------------------------
- *		ExecInsertIndexTuples
- *
- *		This routine takes care of inserting index tuples
- *		into all the relations indexing the result relation
- *		when a heap tuple is inserted into the result relation.
- *		Much of this code should be moved into the genam
- *		stuff as it only exists here because the genam stuff
- *		doesn't provide the functionality needed by the
- *		executor.. -cim 9/27/89
- *
- *		This returns a list of index OIDs for any unique or exclusion
- *		constraints that are deferred and that had
- *		potential (unconfirmed) conflicts.
- *
- *		CAUTION: this must not be called for a HOT update.
- *		We can't defend against that here for lack of info.
- *		Should we change the API to make it safer?
- * ----------------------------------------------------------------
- */
-List *
-ExecInsertIndexTuples(TupleTableSlot *slot,
-					  ItemPointer tupleid,
-					  EState *estate)
-{
-	List	   *result = NIL;
-	ResultRelInfo *resultRelInfo;
-	int			i;
-	int			numIndices;
-	RelationPtr relationDescs;
-	Relation	heapRelation;
-	IndexInfo **indexInfoArray;
-	ExprContext *econtext;
-	Datum		values[INDEX_MAX_KEYS];
-	bool		isnull[INDEX_MAX_KEYS];
-
-	/*
-	 * Get information from the result relation info structure.
-	 */
-	resultRelInfo = estate->es_result_relation_info;
-	numIndices = resultRelInfo->ri_NumIndices;
-	relationDescs = resultRelInfo->ri_IndexRelationDescs;
-	indexInfoArray = resultRelInfo->ri_IndexRelationInfo;
-	heapRelation = resultRelInfo->ri_RelationDesc;
-
-	/*
-	 * We will use the EState's per-tuple context for evaluating predicates
-	 * and index expressions (creating it if it's not already there).
-	 */
-	econtext = GetPerTupleExprContext(estate);
-
-	/* Arrange for econtext's scan tuple to be the tuple under test */
-	econtext->ecxt_scantuple = slot;
-
-	/*
-	 * for each index, form and insert the index tuple
-	 */
-	for (i = 0; i < numIndices; i++)
-	{
-		Relation	indexRelation = relationDescs[i];
-		IndexInfo  *indexInfo;
-		IndexUniqueCheck checkUnique;
-		bool		satisfiesConstraint;
-
-		if (indexRelation == NULL)
-			continue;
-
-		indexInfo = indexInfoArray[i];
-
-		/* If the index is marked as read-only, ignore it */
-		if (!indexInfo->ii_ReadyForInserts)
-			continue;
-
-		/* Check for partial index */
-		if (indexInfo->ii_Predicate != NIL)
-		{
-			List	   *predicate;
-
-			/*
-			 * If predicate state not set up yet, create it (in the estate's
-			 * per-query context)
-			 */
-			predicate = indexInfo->ii_PredicateState;
-			if (predicate == NIL)
-			{
-				predicate = (List *)
-					ExecPrepareExpr((Expr *) indexInfo->ii_Predicate,
-									estate);
-				indexInfo->ii_PredicateState = predicate;
-			}
-
-			/* Skip this index-update if the predicate isn't satisfied */
-			if (!ExecQual(predicate, econtext, false))
-				continue;
-		}
-
-		/*
-		 * FormIndexDatum fills in its values and isnull parameters with the
-		 * appropriate values for the column(s) of the index.
-		 */
-		FormIndexDatum(indexInfo,
-					   slot,
-					   estate,
-					   values,
-					   isnull);
-
-		/*
-		 * The index AM does the actual insertion, plus uniqueness checking.
-		 *
-		 * For an immediate-mode unique index, we just tell the index AM to
-		 * throw error if not unique.
-		 *
-		 * For a deferrable unique index, we tell the index AM to just detect
-		 * possible non-uniqueness, and we add the index OID to the result
-		 * list if further checking is needed.
-		 */
-		if (!indexRelation->rd_index->indisunique)
-			checkUnique = UNIQUE_CHECK_NO;
-		else if (indexRelation->rd_index->indimmediate)
-			checkUnique = UNIQUE_CHECK_YES;
-		else
-			checkUnique = UNIQUE_CHECK_PARTIAL;
-
-		satisfiesConstraint =
-			index_insert(indexRelation, /* index relation */
-						 values,	/* array of index Datums */
-						 isnull,	/* null flags */
-						 tupleid,		/* tid of heap tuple */
-						 heapRelation,	/* heap relation */
-						 checkUnique);	/* type of uniqueness check to do */
-
-		/*
-		 * If the index has an associated exclusion constraint, check that.
-		 * This is simpler than the process for uniqueness checks since we
-		 * always insert first and then check.  If the constraint is deferred,
-		 * we check now anyway, but don't throw error on violation; instead
-		 * we'll queue a recheck event.
-		 *
-		 * An index for an exclusion constraint can't also be UNIQUE (not an
-		 * essential property, we just don't allow it in the grammar), so no
-		 * need to preserve the prior state of satisfiesConstraint.
-		 */
-		if (indexInfo->ii_ExclusionOps != NULL)
-		{
-			bool		errorOK = !indexRelation->rd_index->indimmediate;
-
-			satisfiesConstraint =
-				check_exclusion_constraint(heapRelation,
-										   indexRelation, indexInfo,
-										   tupleid, values, isnull,
-										   estate, false, errorOK);
-		}
-
-		if ((checkUnique == UNIQUE_CHECK_PARTIAL ||
-			 indexInfo->ii_ExclusionOps != NULL) &&
-			!satisfiesConstraint)
-		{
-			/*
-			 * The tuple potentially violates the uniqueness or exclusion
-			 * constraint, so make a note of the index so that we can re-check
-			 * it later.
-			 */
-			result = lappend_oid(result, RelationGetRelid(indexRelation));
-		}
-	}
-
-	return result;
-}
-
-/*
- * Check for violation of an exclusion constraint
- *
- * heap: the table containing the new tuple
- * index: the index supporting the exclusion constraint
- * indexInfo: info about the index, including the exclusion properties
- * tupleid: heap TID of the new tuple we have just inserted
- * values, isnull: the *index* column values computed for the new tuple
- * estate: an EState we can do evaluation in
- * newIndex: if true, we are trying to build a new index (this affects
- *		only the wording of error messages)
- * errorOK: if true, don't throw error for violation
- *
- * Returns true if OK, false if actual or potential violation
- *
- * When errorOK is true, we report violation without waiting to see if any
- * concurrent transaction has committed or not; so the violation is only
- * potential, and the caller must recheck sometime later.  This behavior
- * is convenient for deferred exclusion checks; we need not bother queuing
- * a deferred event if there is definitely no conflict at insertion time.
- *
- * When errorOK is false, we'll throw error on violation, so a false result
- * is impossible.
- */
-bool
-check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo,
-						   ItemPointer tupleid, Datum *values, bool *isnull,
-						   EState *estate, bool newIndex, bool errorOK)
-{
-	Oid		   *constr_procs = indexInfo->ii_ExclusionProcs;
-	uint16	   *constr_strats = indexInfo->ii_ExclusionStrats;
-	Oid		   *index_collations = index->rd_indcollation;
-	int			index_natts = index->rd_index->indnatts;
-	IndexScanDesc index_scan;
-	HeapTuple	tup;
-	ScanKeyData scankeys[INDEX_MAX_KEYS];
-	SnapshotData DirtySnapshot;
-	int			i;
-	bool		conflict;
-	bool		found_self;
-	ExprContext *econtext;
-	TupleTableSlot *existing_slot;
-	TupleTableSlot *save_scantuple;
-
-	/*
-	 * If any of the input values are NULL, the constraint check is assumed to
-	 * pass (i.e., we assume the operators are strict).
-	 */
-	for (i = 0; i < index_natts; i++)
-	{
-		if (isnull[i])
-			return true;
-	}
-
-	/*
-	 * Search the tuples that are in the index for any violations, including
-	 * tuples that aren't visible yet.
-	 */
-	InitDirtySnapshot(DirtySnapshot);
-
-	for (i = 0; i < index_natts; i++)
-	{
-		ScanKeyEntryInitialize(&scankeys[i],
-							   0,
-							   i + 1,
-							   constr_strats[i],
-							   InvalidOid,
-							   index_collations[i],
-							   constr_procs[i],
-							   values[i]);
-	}
-
-	/*
-	 * Need a TupleTableSlot to put existing tuples in.
-	 *
-	 * To use FormIndexDatum, we have to make the econtext's scantuple point
-	 * to this slot.  Be sure to save and restore caller's value for
-	 * scantuple.
-	 */
-	existing_slot = MakeSingleTupleTableSlot(RelationGetDescr(heap));
-
-	econtext = GetPerTupleExprContext(estate);
-	save_scantuple = econtext->ecxt_scantuple;
-	econtext->ecxt_scantuple = existing_slot;
-
-	/*
-	 * May have to restart scan from this point if a potential conflict is
-	 * found.
-	 */
-retry:
-	conflict = false;
-	found_self = false;
-	index_scan = index_beginscan(heap, index, &DirtySnapshot, index_natts, 0);
-	index_rescan(index_scan, scankeys, index_natts, NULL, 0);
-
-	while ((tup = index_getnext(index_scan,
-								ForwardScanDirection)) != NULL)
-	{
-		TransactionId xwait;
-		ItemPointerData ctid_wait;
-		Datum		existing_values[INDEX_MAX_KEYS];
-		bool		existing_isnull[INDEX_MAX_KEYS];
-		char	   *error_new;
-		char	   *error_existing;
-
-		/*
-		 * Ignore the entry for the tuple we're trying to check.
-		 */
-		if (ItemPointerEquals(tupleid, &tup->t_self))
-		{
-			if (found_self)		/* should not happen */
-				elog(ERROR, "found self tuple multiple times in index \"%s\"",
-					 RelationGetRelationName(index));
-			found_self = true;
-			continue;
-		}
-
-		/*
-		 * Extract the index column values and isnull flags from the existing
-		 * tuple.
-		 */
-		ExecStoreTuple(tup, existing_slot, InvalidBuffer, false);
-		FormIndexDatum(indexInfo, existing_slot, estate,
-					   existing_values, existing_isnull);
-
-		/* If lossy indexscan, must recheck the condition */
-		if (index_scan->xs_recheck)
-		{
-			if (!index_recheck_constraint(index,
-										  constr_procs,
-										  existing_values,
-										  existing_isnull,
-										  values))
-				continue;		/* tuple doesn't actually match, so no
-								 * conflict */
-		}
-
-		/*
-		 * At this point we have either a conflict or a potential conflict. If
-		 * we're not supposed to raise error, just return the fact of the
-		 * potential conflict without waiting to see if it's real.
-		 */
-		if (errorOK)
-		{
-			conflict = true;
-			break;
-		}
-
-		/*
-		 * If an in-progress transaction is affecting the visibility of this
-		 * tuple, we need to wait for it to complete and then recheck.  For
-		 * simplicity we do rechecking by just restarting the whole scan ---
-		 * this case probably doesn't happen often enough to be worth trying
-		 * harder, and anyway we don't want to hold any index internal locks
-		 * while waiting.
-		 */
-		xwait = TransactionIdIsValid(DirtySnapshot.xmin) ?
-			DirtySnapshot.xmin : DirtySnapshot.xmax;
-
-		if (TransactionIdIsValid(xwait))
-		{
-			ctid_wait = tup->t_data->t_ctid;
-			index_endscan(index_scan);
-			XactLockTableWait(xwait, heap, &ctid_wait,
-							  XLTW_RecheckExclusionConstr);
-			goto retry;
-		}
-
-		/*
-		 * We have a definite conflict.  Report it.
-		 */
-		error_new = BuildIndexValueDescription(index, values, isnull);
-		error_existing = BuildIndexValueDescription(index, existing_values,
-													existing_isnull);
-		if (newIndex)
-			ereport(ERROR,
-					(errcode(ERRCODE_EXCLUSION_VIOLATION),
-					 errmsg("could not create exclusion constraint \"%s\"",
-							RelationGetRelationName(index)),
-					 error_new && error_existing ?
-						errdetail("Key %s conflicts with key %s.",
-								  error_new, error_existing) :
-						errdetail("Key conflicts exist."),
-					 errtableconstraint(heap,
-										RelationGetRelationName(index))));
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_EXCLUSION_VIOLATION),
-					 errmsg("conflicting key value violates exclusion constraint \"%s\"",
-							RelationGetRelationName(index)),
-					 error_new && error_existing ?
-						errdetail("Key %s conflicts with existing key %s.",
-								  error_new, error_existing) :
-						errdetail("Key conflicts with existing key."),
-					 errtableconstraint(heap,
-										RelationGetRelationName(index))));
-	}
-
-	index_endscan(index_scan);
-
-	/*
-	 * Ordinarily, at this point the search should have found the originally
-	 * inserted tuple, unless we exited the loop early because of conflict.
-	 * However, it is possible to define exclusion constraints for which that
-	 * wouldn't be true --- for instance, if the operator is <>. So we no
-	 * longer complain if found_self is still false.
-	 */
-
-	econtext->ecxt_scantuple = save_scantuple;
-
-	ExecDropSingleTupleTableSlot(existing_slot);
-
-	return !conflict;
-}
-
-/*
- * Check existing tuple's index values to see if it really matches the
- * exclusion condition against the new_values.  Returns true if conflict.
- */
-static bool
-index_recheck_constraint(Relation index, Oid *constr_procs,
-						 Datum *existing_values, bool *existing_isnull,
-						 Datum *new_values)
-{
-	int			index_natts = index->rd_index->indnatts;
-	int			i;
-
-	for (i = 0; i < index_natts; i++)
-	{
-		/* Assume the exclusion operators are strict */
-		if (existing_isnull[i])
-			return false;
-
-		if (!DatumGetBool(OidFunctionCall2Coll(constr_procs[i],
-											   index->rd_indcollation[i],
-											   existing_values[i],
-											   new_values[i])))
-			return false;
-	}
-
-	return true;
-}
-
 /*
  * UpdateChangedParamSet
  *		Add changed parameters to a plan node's chgParam set
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index b7c7222e5d..34e6c4557f 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -535,6 +535,9 @@ init_execution_state(List *queryTree_list,
 			}
 #endif /* PGXC */
 
+			if (IsInParallelMode() && !CommandIsReadOnly(stmt))
+				PreventCommandIfParallelMode(CreateCommandTag(stmt));
+
 			/* OK, build the execution_state for this query */
 			newes = (execution_state *) palloc(sizeof(execution_state));
 			if (preves)
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 308bc679e1..1e2d9c54d8 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -45,15 +45,19 @@
  *	  needed to allow resolution of a polymorphic aggregate's result type.
  *
  *	  We compute aggregate input expressions and run the transition functions
- *	  in a temporary econtext (aggstate->tmpcontext).  This is reset at
- *	  least once per input tuple, so when the transvalue datatype is
+ *	  in a temporary econtext (aggstate->tmpcontext).  This is reset at least
+ *	  once per input tuple, so when the transvalue datatype is
  *	  pass-by-reference, we have to be careful to copy it into a longer-lived
- *	  memory context, and free the prior value to avoid memory leakage.
- *	  We store transvalues in the memory context aggstate->aggcontext,
- *	  which is also used for the hashtable structures in AGG_HASHED mode.
- *	  The node's regular econtext (aggstate->ss.ps.ps_ExprContext)
- *	  is used to run finalize functions and compute the output tuple;
- *	  this context can be reset once per output tuple.
+ *	  memory context, and free the prior value to avoid memory leakage.  We
+ *	  store transvalues in another set of econtexts, aggstate->aggcontexts
+ *	  (one per grouping set, see below), which are also used for the hashtable
+ *	  structures in AGG_HASHED mode.  These econtexts are rescanned, not just
+ *	  reset, at group boundaries so that aggregate transition functions can
+ *	  register shutdown callbacks via AggRegisterCallback.
+ *
+ *	  The node's regular econtext (aggstate->ss.ps.ps_ExprContext) is used to
+ *	  run finalize functions and compute the output tuple; this context can be
+ *	  reset once per output tuple.
  *
  *	  The executor's AggState node is passed as the fmgr "context" value in
  *	  all transfunc and finalfunc calls.  It is not recommended that the
@@ -88,6 +92,37 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
+ *	  Grouping sets:
+ *
+ *	  A list of grouping sets which is structurally equivalent to a ROLLUP
+ *	  clause (e.g. (a,b,c), (a,b), (a)) can be processed in a single pass over
+ *	  ordered data.  We do this by keeping a separate set of transition values
+ *	  for each grouping set being concurrently processed; for each input tuple
+ *	  we update them all, and on group boundaries we reset those states
+ *	  (starting at the front of the list) whose grouping values have changed
+ *	  (the list of grouping sets is ordered from most specific to least
+ *	  specific).
+ *
+ *	  Where more complex grouping sets are used, we break them down into
+ *	  "phases", where each phase has a different sort order.  During each
+ *	  phase but the last, the input tuples are additionally stored in a
+ *	  tuplesort which is keyed to the next phase's sort order; during each
+ *	  phase but the first, the input tuples are drawn from the previously
+ *	  sorted data.  (The sorting of the data for the first phase is handled by
+ *	  the planner, as it might be satisfied by underlying nodes.)
+ *
+ *	  From the perspective of aggregate transition and final functions, the
+ *	  only issue regarding grouping sets is this: a single call site (flinfo)
+ *	  of an aggregate function may be used for updating several different
+ *	  transition values in turn. So the function must not cache in the flinfo
+ *	  anything which logically belongs as part of the transition value (most
+ *	  importantly, the memory context in which the transition value exists).
+ *	  The support API functions (AggCheckCallContext, AggRegisterCallback) are
+ *	  sensitive to the grouping set for which the aggregate function is
+ *	  currently being called.
+ *
+ *	  TODO: AGG_HASHED doesn't support multiple grouping sets yet.
+ *
  * Portions Copyright (c) 2012-2014, TransLattice, Inc.
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -262,9 +297,11 @@ typedef struct AggStatePerAggData
 	 * then at completion of the input tuple group, we scan the sorted values,
 	 * eliminate duplicates if needed, and run the transition function on the
 	 * rest.
+	 *
+	 * We need a separate tuplesort for each grouping set.
 	 */
 
-	Tuplesortstate *sortstate;	/* sort object, if DISTINCT or ORDER BY */
+	Tuplesortstate **sortstates;	/* sort objects, if DISTINCT or ORDER BY */
 
 	/*
 	 * This field is a pre-initialized FunctionCallInfo struct used for
@@ -319,6 +356,27 @@ typedef struct AggStatePerGroupData
 } AggStatePerGroupData;
 
 /*
+ * AggStatePerPhaseData - per-grouping-set-phase state
+ *
+ * Grouping sets are divided into "phases", where a single phase can be
+ * processed in one pass over the input. If there is more than one phase, then
+ * at the end of input from the current phase, state is reset and another pass
+ * taken over the data which has been re-sorted in the mean time.
+ *
+ * Accordingly, each phase specifies a list of grouping sets and group clause
+ * information, plus each phase after the first also has a sort order.
+ */
+typedef struct AggStatePerPhaseData
+{
+	int			numsets;		/* number of grouping sets (or 0) */
+	int		   *gset_lengths;	/* lengths of grouping sets */
+	Bitmapset **grouped_cols;	/* column groupings for rollup */
+	FmgrInfo   *eqfunctions;	/* per-grouping-field equality fns */
+	Agg		   *aggnode;		/* Agg node for phase data */
+	Sort	   *sortnode;		/* Sort node for input ordering for phase */
+}	AggStatePerPhaseData;
+
+/*
  * To implement hashed aggregation, we need a hashtable that stores a
  * representative tuple and an array of AggStatePerGroup structs for each
  * distinct set of GROUP BY column values.  We compute the hash key from
@@ -334,9 +392,12 @@ typedef struct AggHashEntryData
 }	AggHashEntryData;
 
 
+static void initialize_phase(AggState *aggstate, int newphase);
+static TupleTableSlot *fetch_input_tuple(AggState *aggstate);
 static void initialize_aggregates(AggState *aggstate,
 					  AggStatePerAgg peragg,
-					  AggStatePerGroup pergroup);
+					  AggStatePerGroup pergroup,
+					  int numReset);
 static void advance_transition_function(AggState *aggstate,
 							AggStatePerAgg peraggstate,
 							AggStatePerGroup pergroupstate);
@@ -351,6 +412,14 @@ static void finalize_aggregate(AggState *aggstate,
 				   AggStatePerAgg peraggstate,
 				   AggStatePerGroup pergroupstate,
 				   Datum *resultVal, bool *resultIsNull);
+static void prepare_projection_slot(AggState *aggstate,
+						TupleTableSlot *slot,
+						int currentSet);
+static void finalize_aggregates(AggState *aggstate,
+					AggStatePerAgg peragg,
+					AggStatePerGroup pergroup,
+					int currentSet);
+static TupleTableSlot *project_aggregates(AggState *aggstate);
 static Bitmapset *find_unaggregated_cols(AggState *aggstate);
 static bool find_unaggregated_cols_walker(Node *node, Bitmapset **colnos);
 static void build_hash_table(AggState *aggstate);
@@ -363,50 +432,135 @@ static Datum GetAggInitVal(Datum textInitVal, Oid transtype);
 
 
 /*
- * Initialize all aggregates for a new group of input values.
- *
- * When called, CurrentMemoryContext should be the per-query context.
+ * Switch to phase "newphase", which must either be 0 (to reset) or
+ * current_phase + 1. Juggle the tuplesorts accordingly.
  */
 static void
-initialize_aggregates(AggState *aggstate,
-					  AggStatePerAgg peragg,
-					  AggStatePerGroup pergroup)
+initialize_phase(AggState *aggstate, int newphase)
 {
-	int			aggno;
+	Assert(newphase == 0 || newphase == aggstate->current_phase + 1);
 
-	for (aggno = 0; aggno < aggstate->numaggs; aggno++)
+	/*
+	 * Whatever the previous state, we're now done with whatever input
+	 * tuplesort was in use.
+	 */
+	if (aggstate->sort_in)
 	{
-		AggStatePerAgg peraggstate = &peragg[aggno];
-		AggStatePerGroup pergroupstate = &pergroup[aggno];
+		tuplesort_end(aggstate->sort_in);
+		aggstate->sort_in = NULL;
+	}
 
+	if (newphase == 0)
+	{
 		/*
-		 * Start a fresh sort operation for each DISTINCT/ORDER BY aggregate.
+		 * Discard any existing output tuplesort.
 		 */
-		if (peraggstate->numSortCols > 0)
+		if (aggstate->sort_out)
 		{
-			/*
-			 * In case of rescan, maybe there could be an uncompleted sort
-			 * operation?  Clean it up if so.
-			 */
-			if (peraggstate->sortstate)
-				tuplesort_end(peraggstate->sortstate);
+			tuplesort_end(aggstate->sort_out);
+			aggstate->sort_out = NULL;
+		}
+	}
+	else
+	{
+		/*
+		 * The old output tuplesort becomes the new input one, and this is the
+		 * right time to actually sort it.
+		 */
+		aggstate->sort_in = aggstate->sort_out;
+		aggstate->sort_out = NULL;
+		Assert(aggstate->sort_in);
+		tuplesort_performsort(aggstate->sort_in);
+	}
 
-			/*
-			 * We use a plain Datum sorter when there's a single input column;
-			 * otherwise sort the full tuple.  (See comments for
-			 * process_ordered_aggregate_single.)
-			 *
-			 * In the future, we should consider forcing the
-			 * tuplesort_begin_heap() case when the abbreviated key
-			 * optimization can thereby be used, even when numInputs is 1.
-			 */
-			peraggstate->sortstate =
-				(peraggstate->numInputs == 1) ?
+	/*
+	 * If this isn't the last phase, we need to sort appropriately for the
+	 * next phase in sequence.
+	 */
+	if (newphase < aggstate->numphases - 1)
+	{
+		Sort	   *sortnode = aggstate->phases[newphase + 1].sortnode;
+		PlanState  *outerNode = outerPlanState(aggstate);
+		TupleDesc	tupDesc = ExecGetResultType(outerNode);
+
+		aggstate->sort_out = tuplesort_begin_heap(tupDesc,
+												  sortnode->numCols,
+												  sortnode->sortColIdx,
+												  sortnode->sortOperators,
+												  sortnode->collations,
+												  sortnode->nullsFirst,
+												  work_mem,
+												  false);
+	}
+
+	aggstate->current_phase = newphase;
+	aggstate->phase = &aggstate->phases[newphase];
+}
+
+/*
+ * Fetch a tuple from either the outer plan (for phase 0) or from the sorter
+ * populated by the previous phase.  Copy it to the sorter for the next phase
+ * if any.
+ */
+static TupleTableSlot *
+fetch_input_tuple(AggState *aggstate)
+{
+	TupleTableSlot *slot;
+
+	if (aggstate->sort_in)
+	{
+		if (!tuplesort_gettupleslot(aggstate->sort_in, true, aggstate->sort_slot))
+			return NULL;
+		slot = aggstate->sort_slot;
+	}
+	else
+		slot = ExecProcNode(outerPlanState(aggstate));
+
+	if (!TupIsNull(slot) && aggstate->sort_out)
+		tuplesort_puttupleslot(aggstate->sort_out, slot);
+
+	return slot;
+}
+
+/*
+ * (Re)Initialize an individual aggregate.
+ *
+ * This function handles only one grouping set (already set in
+ * aggstate->current_set).
+ *
+ * When called, CurrentMemoryContext should be the per-query context.
+ */
+static void
+initialize_aggregate(AggState *aggstate, AggStatePerAgg peraggstate,
+					 AggStatePerGroup pergroupstate)
+{
+	/*
+	 * Start a fresh sort operation for each DISTINCT/ORDER BY aggregate.
+	 */
+	if (peraggstate->numSortCols > 0)
+	{
+		/*
+		 * In case of rescan, maybe there could be an uncompleted sort
+		 * operation?  Clean it up if so.
+		 */
+		if (peraggstate->sortstates[aggstate->current_set])
+			tuplesort_end(peraggstate->sortstates[aggstate->current_set]);
+
+
+		/*
+		 * We use a plain Datum sorter when there's a single input column;
+		 * otherwise sort the full tuple.  (See comments for
+		 * process_ordered_aggregate_single.)
+		 */
+		if (peraggstate->numInputs == 1)
+			peraggstate->sortstates[aggstate->current_set] =
 				tuplesort_begin_datum(peraggstate->evaldesc->attrs[0]->atttypid,
 									  peraggstate->sortOperators[0],
 									  peraggstate->sortCollations[0],
 									  peraggstate->sortNullsFirst[0],
-									  work_mem, false) :
+									  work_mem, false);
+		else
+			peraggstate->sortstates[aggstate->current_set] =
 				tuplesort_begin_heap(peraggstate->evaldesc,
 									 peraggstate->numSortCols,
 									 peraggstate->sortColIdx,
@@ -414,73 +568,115 @@ initialize_aggregates(AggState *aggstate,
 									 peraggstate->sortCollations,
 									 peraggstate->sortNullsFirst,
 									 work_mem, false);
-		}
+	}
 
-		/*
-		 * (Re)set transValue to the initial value.
-		 *
-		 * Note that when the initial value is pass-by-ref, we must copy it
-		 * (into the aggcontext) since we will pfree the transValue later.
-		 */
-		if (peraggstate->initValueIsNull)
-			pergroupstate->transValue = peraggstate->initValue;
-		else
-		{
-			MemoryContext oldContext;
+	/*
+	 * (Re)set transValue to the initial value.
+	 *
+	 * Note that when the initial value is pass-by-ref, we must copy it (into
+	 * the aggcontext) since we will pfree the transValue later.
+	 */
+	if (peraggstate->initValueIsNull)
+		pergroupstate->transValue = peraggstate->initValue;
+	else
+	{
+		MemoryContext oldContext;
 
-			oldContext = MemoryContextSwitchTo(aggstate->aggcontext);
-			pergroupstate->transValue = datumCopy(peraggstate->initValue,
-												  peraggstate->transtypeByVal,
-												  peraggstate->transtypeLen);
-			MemoryContextSwitchTo(oldContext);
-		}
-		pergroupstate->transValueIsNull = peraggstate->initValueIsNull;
+		oldContext = MemoryContextSwitchTo(
+		aggstate->aggcontexts[aggstate->current_set]->ecxt_per_tuple_memory);
+		pergroupstate->transValue = datumCopy(peraggstate->initValue,
+											  peraggstate->transtypeByVal,
+											  peraggstate->transtypeLen);
+		MemoryContextSwitchTo(oldContext);
+	}
+	pergroupstate->transValueIsNull = peraggstate->initValueIsNull;
 
-		/*
-		 * If the initial value for the transition state doesn't exist in the
-		 * pg_aggregate table then we will let the first non-NULL value
-		 * returned from the outer procNode become the initial value. (This is
-		 * useful for aggregates like max() and min().) The noTransValue flag
-		 * signals that we still need to do this.
-		 */
-		pergroupstate->noTransValue = peraggstate->initValueIsNull;
+	/*
+	 * If the initial value for the transition state doesn't exist in the
+	 * pg_aggregate table then we will let the first non-NULL value returned
+	 * from the outer procNode become the initial value. (This is useful for
+	 * aggregates like max() and min().) The noTransValue flag signals that we
+	 * still need to do this.
+	 */
+	pergroupstate->noTransValue = peraggstate->initValueIsNull;
 
 #ifdef PGXC
-		/*
-		 * (Re)set collectValue to the initial value.
-		 *
-		 * Note that when the initial value is pass-by-ref, we must copy it
-		 * (into the aggcontext) since we will pfree the collectValue later.
-		 * collection type is same as transition type.
-		 */
-		if (peraggstate->initCollectValueIsNull)
-			pergroupstate->collectValue = peraggstate->initCollectValue;
-		else
-		{
-			MemoryContext oldContext;
+	/*
+	 * (Re)set collectValue to the initial value.
+	 *
+	 * Note that when the initial value is pass-by-ref, we must copy it
+	 * (into the aggcontext) since we will pfree the collectValue later.
+	 * collection type is same as transition type.
+	 */
+	if (peraggstate->initCollectValueIsNull)
+		pergroupstate->collectValue = peraggstate->initCollectValue;
+	else
+	{
+		MemoryContext oldContext;
 
-			oldContext = MemoryContextSwitchTo(aggstate->aggcontext);
-			pergroupstate->collectValue = datumCopy(peraggstate->initCollectValue,
-												  peraggstate->transtypeByVal,
-												  peraggstate->transtypeLen);
-			MemoryContextSwitchTo(oldContext);
-		}
-		pergroupstate->collectValueIsNull = peraggstate->initCollectValueIsNull;
+		oldContext = MemoryContextSwitchTo(
+		aggstate->aggcontexts[aggstate->current_set]->ecxt_per_tuple_memory);
+		pergroupstate->collectValue = datumCopy(peraggstate->initCollectValue,
+				peraggstate->transtypeByVal,
+				peraggstate->transtypeLen);
+		MemoryContextSwitchTo(oldContext);
+	}
+	pergroupstate->collectValueIsNull = peraggstate->initCollectValueIsNull;
 
-		/*
-		 * If the initial value for the transition state doesn't exist in the
-		 * pg_aggregate table then we will let the first non-NULL value
-		 * returned from the outer procNode become the initial value. (This is
-		 * useful for aggregates like max() and min().) The noTransValue flag
-		 * signals that we still need to do this.
-		 */
-		pergroupstate->noCollectValue = peraggstate->initCollectValueIsNull;
+	/*
+	 * If the initial value for the transition state doesn't exist in the
+	 * pg_aggregate table then we will let the first non-NULL value
+	 * returned from the outer procNode become the initial value. (This is
+	 * useful for aggregates like max() and min().) The noTransValue flag
+	 * signals that we still need to do this.
+	 */
+	pergroupstate->noCollectValue = peraggstate->initCollectValueIsNull;
 #endif /* PGXC */
+}
+
+/*
+ * Initialize all aggregates for a new group of input values.
+ *
+ * If there are multiple grouping sets, we initialize only the first numReset
+ * of them (the grouping sets are ordered so that the most specific one, which
+ * is reset most often, is first). As a convenience, if numReset is < 1, we
+ * reinitialize all sets.
+ *
+ * When called, CurrentMemoryContext should be the per-query context.
+ */
+static void
+initialize_aggregates(AggState *aggstate,
+					  AggStatePerAgg peragg,
+					  AggStatePerGroup pergroup,
+					  int numReset)
+{
+	int			aggno;
+	int			numGroupingSets = Max(aggstate->phase->numsets, 1);
+	int			setno = 0;
+
+	if (numReset < 1)
+		numReset = numGroupingSets;
+
+	for (aggno = 0; aggno < aggstate->numaggs; aggno++)
+	{
+		AggStatePerAgg peraggstate = &peragg[aggno];
+
+		for (setno = 0; setno < numReset; setno++)
+		{
+			AggStatePerGroup pergroupstate;
+
+			pergroupstate = &pergroup[aggno + (setno * (aggstate->numaggs))];
+
+			aggstate->current_set = setno;
+
+			initialize_aggregate(aggstate, peraggstate, pergroupstate);
+		}
 	}
 }
 
 /*
- * Given new input value(s), advance the transition function of an aggregate.
+ * Given new input value(s), advance the transition function of one aggregate
+ * within one grouping set only (already set in aggstate->current_set)
  *
  * The new values (and null flags) have been preloaded into argument positions
  * 1 and up in peraggstate->transfn_fcinfo, so that we needn't copy them again
@@ -523,7 +719,8 @@ advance_transition_function(AggState *aggstate,
 			 * We must copy the datum into aggcontext if it is pass-by-ref. We
 			 * do not need to pfree the old transValue, since it's NULL.
 			 */
-			oldContext = MemoryContextSwitchTo(aggstate->aggcontext);
+			oldContext = MemoryContextSwitchTo(
+											   aggstate->aggcontexts[aggstate->current_set]->ecxt_per_tuple_memory);
 			pergroupstate->transValue = datumCopy(fcinfo->arg[1],
 												  peraggstate->transtypeByVal,
 												  peraggstate->transtypeLen);
@@ -571,7 +768,7 @@ advance_transition_function(AggState *aggstate,
 	{
 		if (!fcinfo->isnull)
 		{
-			MemoryContextSwitchTo(aggstate->aggcontext);
+			MemoryContextSwitchTo(aggstate->aggcontexts[aggstate->current_set]->ecxt_per_tuple_memory);
 			newVal = datumCopy(newVal,
 							   peraggstate->transtypeByVal,
 							   peraggstate->transtypeLen);
@@ -707,11 +904,13 @@ static void
 advance_aggregates(AggState *aggstate, AggStatePerGroup pergroup)
 {
 	int			aggno;
+	int			setno = 0;
+	int			numGroupingSets = Max(aggstate->phase->numsets, 1);
+	int			numAggs = aggstate->numaggs;
 
-	for (aggno = 0; aggno < aggstate->numaggs; aggno++)
+	for (aggno = 0; aggno < numAggs; aggno++)
 	{
 		AggStatePerAgg peraggstate = &aggstate->peragg[aggno];
-		AggStatePerGroup pergroupstate = &pergroup[aggno];
 		ExprState  *filter = peraggstate->aggrefstate->aggfilter;
 		int			numTransInputs = peraggstate->numTransInputs;
 		int			i;
@@ -755,13 +954,16 @@ advance_aggregates(AggState *aggstate, AggStatePerGroup pergroup)
 					continue;
 			}
 
-			/* OK, put the tuple into the tuplesort object */
-			if (peraggstate->numInputs == 1)
-				tuplesort_putdatum(peraggstate->sortstate,
-								   slot->tts_values[0],
-								   slot->tts_isnull[0]);
-			else
-				tuplesort_puttupleslot(peraggstate->sortstate, slot);
+			for (setno = 0; setno < numGroupingSets; setno++)
+			{
+				/* OK, put the tuple into the tuplesort object */
+				if (peraggstate->numInputs == 1)
+					tuplesort_putdatum(peraggstate->sortstates[setno],
+									   slot->tts_values[0],
+									   slot->tts_isnull[0]);
+				else
+					tuplesort_puttupleslot(peraggstate->sortstates[setno], slot);
+			}
 		}
 		else
 		{
@@ -777,21 +979,14 @@ advance_aggregates(AggState *aggstate, AggStatePerGroup pergroup)
 				fcinfo->argnull[i + 1] = slot->tts_isnull[i];
 			}
 
-#ifdef PGXC
-#ifndef XCP
-			if (aggstate->skip_trans)
+			for (setno = 0; setno < numGroupingSets; setno++)
 			{
-				Assert(IS_PGXC_COORDINATOR);
-				/*
-				 * we are collecting results sent by the Datanodes, so advance
-				 * collections instead of transitions
-				 */
+				AggStatePerGroup pergroupstate = &pergroup[aggno + (setno * numAggs)];
+
+				aggstate->current_set = setno;
+
 				advance_transition_function(aggstate, peraggstate, pergroupstate);
 			}
-			else
-#endif /* XCP */
-#endif /* PGXC */
-			advance_transition_function(aggstate, peraggstate, pergroupstate);
 		}
 	}
 }
@@ -814,6 +1009,9 @@ advance_aggregates(AggState *aggstate, AggStatePerGroup pergroup)
  * is around 300% faster.  (The speedup for by-reference types is less
  * but still noticeable.)
  *
+ * This function handles only one grouping set (already set in
+ * aggstate->current_set).
+ *
  * When called, CurrentMemoryContext should be the per-query context.
  */
 static void
@@ -833,7 +1031,7 @@ process_ordered_aggregate_single(AggState *aggstate,
 
 	Assert(peraggstate->numDistinctCols < 2);
 
-	tuplesort_performsort(peraggstate->sortstate);
+	tuplesort_performsort(peraggstate->sortstates[aggstate->current_set]);
 
 	/* Load the column into argument 1 (arg 0 will be transition value) */
 	newVal = fcinfo->arg + 1;
@@ -845,8 +1043,8 @@ process_ordered_aggregate_single(AggState *aggstate,
 	 * pfree them when they are no longer needed.
 	 */
 
-	while (tuplesort_getdatum(peraggstate->sortstate, true,
-							  newVal, isNull))
+	while (tuplesort_getdatum(peraggstate->sortstates[aggstate->current_set],
+							  true, newVal, isNull))
 	{
 		/*
 		 * Clear and select the working context for evaluation of the equality
@@ -889,8 +1087,8 @@ process_ordered_aggregate_single(AggState *aggstate,
 	if (!oldIsNull && !peraggstate->inputtypeByVal)
 		pfree(DatumGetPointer(oldVal));
 
-	tuplesort_end(peraggstate->sortstate);
-	peraggstate->sortstate = NULL;
+	tuplesort_end(peraggstate->sortstates[aggstate->current_set]);
+	peraggstate->sortstates[aggstate->current_set] = NULL;
 }
 
 /*
@@ -900,6 +1098,9 @@ process_ordered_aggregate_single(AggState *aggstate,
  * sort, read out the values in sorted order, and run the transition
  * function on each value (applying DISTINCT if appropriate).
  *
+ * This function handles only one grouping set (already set in
+ * aggstate->current_set).
+ *
  * When called, CurrentMemoryContext should be the per-query context.
  */
 static void
@@ -916,13 +1117,14 @@ process_ordered_aggregate_multi(AggState *aggstate,
 	bool		haveOldValue = false;
 	int			i;
 
-	tuplesort_performsort(peraggstate->sortstate);
+	tuplesort_performsort(peraggstate->sortstates[aggstate->current_set]);
 
 	ExecClearTuple(slot1);
 	if (slot2)
 		ExecClearTuple(slot2);
 
-	while (tuplesort_gettupleslot(peraggstate->sortstate, true, slot1))
+	while (tuplesort_gettupleslot(peraggstate->sortstates[aggstate->current_set],
+								  true, slot1))
 	{
 		/*
 		 * Extract the first numTransInputs columns as datums to pass to the
@@ -970,13 +1172,16 @@ process_ordered_aggregate_multi(AggState *aggstate,
 	if (slot2)
 		ExecClearTuple(slot2);
 
-	tuplesort_end(peraggstate->sortstate);
-	peraggstate->sortstate = NULL;
+	tuplesort_end(peraggstate->sortstates[aggstate->current_set]);
+	peraggstate->sortstates[aggstate->current_set] = NULL;
 }
 
 /*
  * Compute the final value of one aggregate.
  *
+ * This function handles only one grouping set (already set in
+ * aggstate->current_set).
+ *
  * The finalfunction will be run, and the result delivered, in the
  * output-tuple context; caller's CurrentMemoryContext does not matter.
  */
@@ -1079,7 +1284,7 @@ finalize_aggregate(AggState *aggstate,
 		/* set up aggstate->curperagg for AggGetAggref() */
 		aggstate->curperagg = peraggstate;
 
-		InitFunctionCallInfoData(fcinfo, &(peraggstate->finalfn),
+		InitFunctionCallInfoData(fcinfo, &peraggstate->finalfn,
 								 numFinalArgs,
 								 peraggstate->aggCollation,
 								 (void *) aggstate, NULL);
@@ -1138,6 +1343,153 @@ finalize_aggregate(AggState *aggstate,
 	MemoryContextSwitchTo(oldContext);
 }
 
+
+/*
+ * Prepare to finalize and project based on the specified representative tuple
+ * slot and grouping set.
+ *
+ * In the specified tuple slot, force to null all attributes that should be
+ * read as null in the context of the current grouping set.  Also stash the
+ * current group bitmap where GroupingExpr can get at it.
+ *
+ * This relies on three conditions:
+ *
+ * 1) Nothing is ever going to try and extract the whole tuple from this slot,
+ * only reference it in evaluations, which will only access individual
+ * attributes.
+ *
+ * 2) No system columns are going to need to be nulled. (If a system column is
+ * referenced in a group clause, it is actually projected in the outer plan
+ * tlist.)
+ *
+ * 3) Within a given phase, we never need to recover the value of an attribute
+ * once it has been set to null.
+ *
+ * Poking into the slot this way is a bit ugly, but the consensus is that the
+ * alternative was worse.
+ */
+static void
+prepare_projection_slot(AggState *aggstate, TupleTableSlot *slot, int currentSet)
+{
+	if (aggstate->phase->grouped_cols)
+	{
+		Bitmapset  *grouped_cols = aggstate->phase->grouped_cols[currentSet];
+
+		aggstate->grouped_cols = grouped_cols;
+
+		if (slot->tts_isempty)
+		{
+			/*
+			 * Force all values to be NULL if working on an empty input tuple
+			 * (i.e. an empty grouping set for which no input rows were
+			 * supplied).
+			 */
+			ExecStoreAllNullTuple(slot);
+		}
+		else if (aggstate->all_grouped_cols)
+		{
+			ListCell   *lc;
+
+			/* all_grouped_cols is arranged in desc order */
+			slot_getsomeattrs(slot, linitial_int(aggstate->all_grouped_cols));
+
+			foreach(lc, aggstate->all_grouped_cols)
+			{
+				int			attnum = lfirst_int(lc);
+
+				if (!bms_is_member(attnum, grouped_cols))
+					slot->tts_isnull[attnum - 1] = true;
+			}
+		}
+	}
+}
+
+/*
+ * Compute the final value of all aggregates for one group.
+ *
+ * This function handles only one grouping set at a time.
+ *
+ * Results are stored in the output econtext aggvalues/aggnulls.
+ */
+static void
+finalize_aggregates(AggState *aggstate,
+					AggStatePerAgg peragg,
+					AggStatePerGroup pergroup,
+					int currentSet)
+{
+	ExprContext *econtext = aggstate->ss.ps.ps_ExprContext;
+	Datum	   *aggvalues = econtext->ecxt_aggvalues;
+	bool	   *aggnulls = econtext->ecxt_aggnulls;
+	int			aggno;
+
+	Assert(currentSet == 0 ||
+		   ((Agg *) aggstate->ss.ps.plan)->aggstrategy != AGG_HASHED);
+
+	aggstate->current_set = currentSet;
+
+	for (aggno = 0; aggno < aggstate->numaggs; aggno++)
+	{
+		AggStatePerAgg peraggstate = &peragg[aggno];
+		AggStatePerGroup pergroupstate;
+
+		pergroupstate = &pergroup[aggno + (currentSet * (aggstate->numaggs))];
+
+		if (peraggstate->numSortCols > 0)
+		{
+			Assert(((Agg *) aggstate->ss.ps.plan)->aggstrategy != AGG_HASHED);
+
+			if (peraggstate->numInputs == 1)
+				process_ordered_aggregate_single(aggstate,
+												 peraggstate,
+												 pergroupstate);
+			else
+				process_ordered_aggregate_multi(aggstate,
+												peraggstate,
+												pergroupstate);
+		}
+
+		finalize_aggregate(aggstate, peraggstate, pergroupstate,
+						   &aggvalues[aggno], &aggnulls[aggno]);
+	}
+}
+
+/*
+ * Project the result of a group (whose aggs have already been calculated by
+ * finalize_aggregates). Returns the result slot, or NULL if no row is
+ * projected (suppressed by qual or by an empty SRF).
+ */
+static TupleTableSlot *
+project_aggregates(AggState *aggstate)
+{
+	ExprContext *econtext = aggstate->ss.ps.ps_ExprContext;
+
+	/*
+	 * Check the qual (HAVING clause); if the group does not match, ignore it.
+	 */
+	if (ExecQual(aggstate->ss.ps.qual, econtext, false))
+	{
+		/*
+		 * Form and return or store a projection tuple using the aggregate
+		 * results and the representative input tuple.
+		 */
+		ExprDoneCond isDone;
+		TupleTableSlot *result;
+
+		result = ExecProject(aggstate->ss.ps.ps_ProjInfo, &isDone);
+
+		if (isDone != ExprEndResult)
+		{
+			aggstate->ss.ps.ps_TupFromTlist =
+				(isDone == ExprMultipleResult);
+			return result;
+		}
+	}
+	else
+		InstrCountFiltered1(aggstate, 1);
+
+	return NULL;
+}
+
 /*
  * find_unaggregated_cols
  *	  Construct a bitmapset of the column numbers of un-aggregated Vars
@@ -1172,8 +1524,11 @@ find_unaggregated_cols_walker(Node *node, Bitmapset **colnos)
 		*colnos = bms_add_member(*colnos, var->varattno);
 		return false;
 	}
-	if (IsA(node, Aggref))		/* do not descend into aggregate exprs */
+	if (IsA(node, Aggref) ||IsA(node, GroupingFunc))
+	{
+		/* do not descend into aggregate exprs */
 		return false;
+	}
 	return expression_tree_walker(node, find_unaggregated_cols_walker,
 								  (void *) colnos);
 }
@@ -1198,11 +1553,11 @@ build_hash_table(AggState *aggstate)
 
 	aggstate->hashtable = BuildTupleHashTable(node->numCols,
 											  node->grpColIdx,
-											  aggstate->eqfunctions,
+											  aggstate->phase->eqfunctions,
 											  aggstate->hashfunctions,
 											  node->numGroups,
 											  entrysize,
-											  aggstate->aggcontext,
+							 aggstate->aggcontexts[0]->ecxt_per_tuple_memory,
 											  tmpmem);
 }
 
@@ -1313,7 +1668,7 @@ lookup_hash_entry(AggState *aggstate, TupleTableSlot *inputslot)
 	if (isnew)
 	{
 		/* initialize aggregates for new tuple group */
-		initialize_aggregates(aggstate, aggstate->peragg, entry->pergroup);
+		initialize_aggregates(aggstate, aggstate->peragg, entry->pergroup, 0);
 	}
 
 	return entry;
@@ -1335,6 +1690,8 @@ lookup_hash_entry(AggState *aggstate, TupleTableSlot *inputslot)
 TupleTableSlot *
 ExecAgg(AggState *node)
 {
+	TupleTableSlot *result;
+
 	/*
 	 * Check to see if we're still projecting out tuples from a previous agg
 	 * tuple (because there is a function-returning-set in the projection
@@ -1342,7 +1699,6 @@ ExecAgg(AggState *node)
 	 */
 	if (node->ss.ps.ps_TupFromTlist)
 	{
-		TupleTableSlot *result;
 		ExprDoneCond isDone;
 
 		result = ExecProject(node->ss.ps.ps_ProjInfo, &isDone);
@@ -1353,22 +1709,30 @@ ExecAgg(AggState *node)
 	}
 
 	/*
-	 * Exit if nothing left to do.  (We must do the ps_TupFromTlist check
-	 * first, because in some cases agg_done gets set before we emit the final
-	 * aggregate tuple, and we have to finish running SRFs for it.)
+	 * (We must do the ps_TupFromTlist check first, because in some cases
+	 * agg_done gets set before we emit the final aggregate tuple, and we have
+	 * to finish running SRFs for it.)
 	 */
-	if (node->agg_done)
-		return NULL;
-
-	/* Dispatch based on strategy */
-	if (((Agg *) node->ss.ps.plan)->aggstrategy == AGG_HASHED)
+	if (!node->agg_done)
 	{
-		if (!node->table_filled)
-			agg_fill_hash_table(node);
-		return agg_retrieve_hash_table(node);
+		/* Dispatch based on strategy */
+		switch (node->phase->aggnode->aggstrategy)
+		{
+			case AGG_HASHED:
+				if (!node->table_filled)
+					agg_fill_hash_table(node);
+				result = agg_retrieve_hash_table(node);
+				break;
+			default:
+				result = agg_retrieve_direct(node);
+				break;
+		}
+
+		if (!TupIsNull(result))
+			return result;
 	}
-	else
-		return agg_retrieve_direct(node);
+
+	return NULL;
 }
 
 /*
@@ -1377,28 +1741,31 @@ ExecAgg(AggState *node)
 static TupleTableSlot *
 agg_retrieve_direct(AggState *aggstate)
 {
-	Agg		   *node = (Agg *) aggstate->ss.ps.plan;
-	PlanState  *outerPlan;
+	Agg		   *node = aggstate->phase->aggnode;
 	ExprContext *econtext;
 	ExprContext *tmpcontext;
-	Datum	   *aggvalues;
-	bool	   *aggnulls;
 	AggStatePerAgg peragg;
 	AggStatePerGroup pergroup;
 	TupleTableSlot *outerslot;
 	TupleTableSlot *firstSlot;
-	int			aggno;
+	TupleTableSlot *result;
+	bool		hasGroupingSets = aggstate->phase->numsets > 0;
+	int			numGroupingSets = Max(aggstate->phase->numsets, 1);
+	int			currentSet;
+	int			nextSetSize;
+	int			numReset;
+	int			i;
 
 	/*
 	 * get state info from node
+	 *
+	 * econtext is the per-output-tuple expression context
+	 *
+	 * tmpcontext is the per-input-tuple expression context
 	 */
-	outerPlan = outerPlanState(aggstate);
-	/* econtext is the per-output-tuple expression context */
 	econtext = aggstate->ss.ps.ps_ExprContext;
-	aggvalues = econtext->ecxt_aggvalues;
-	aggnulls = econtext->ecxt_aggnulls;
-	/* tmpcontext is the per-input-tuple expression context */
 	tmpcontext = aggstate->tmpcontext;
+
 	peragg = aggstate->peragg;
 	pergroup = aggstate->pergroup;
 	firstSlot = aggstate->ss.ss_ScanTupleSlot;
@@ -1406,172 +1773,283 @@ agg_retrieve_direct(AggState *aggstate)
 	/*
 	 * We loop retrieving groups until we find one matching
 	 * aggstate->ss.ps.qual
+	 *
+	 * For grouping sets, we have the invariant that aggstate->projected_set
+	 * is either -1 (initial call) or the index (starting from 0) in
+	 * gset_lengths for the group we just completed (either by projecting a
+	 * row or by discarding it in the qual).
 	 */
 	while (!aggstate->agg_done)
 	{
 		/*
-		 * If we don't already have the first tuple of the new group, fetch it
-		 * from the outer plan.
+		 * Clear the per-output-tuple context for each group, as well as
+		 * aggcontext (which contains any pass-by-ref transvalues of the old
+		 * group).  Some aggregate functions store working state in child
+		 * contexts; those now get reset automatically without us needing to
+		 * do anything special.
+		 *
+		 * We use ReScanExprContext not just ResetExprContext because we want
+		 * any registered shutdown callbacks to be called.  That allows
+		 * aggregate functions to ensure they've cleaned up any non-memory
+		 * resources.
 		 */
-		if (aggstate->grp_firstTuple == NULL)
+		ReScanExprContext(econtext);
+
+		/*
+		 * Determine how many grouping sets need to be reset at this boundary.
+		 */
+		if (aggstate->projected_set >= 0 &&
+			aggstate->projected_set < numGroupingSets)
+			numReset = aggstate->projected_set + 1;
+		else
+			numReset = numGroupingSets;
+
+		/*
+		 * numReset can change on a phase boundary, but that's OK; we want to
+		 * reset the contexts used in _this_ phase, and later, after possibly
+		 * changing phase, initialize the right number of aggregates for the
+		 * _new_ phase.
+		 */
+
+		for (i = 0; i < numReset; i++)
+		{
+			ReScanExprContext(aggstate->aggcontexts[i]);
+		}
+
+		/*
+		 * Check if input is complete and there are no more groups to project
+		 * in this phase; move to next phase or mark as done.
+		 */
+		if (aggstate->input_done == true &&
+			aggstate->projected_set >= (numGroupingSets - 1))
 		{
-			outerslot = ExecProcNode(outerPlan);
-			if (!TupIsNull(outerslot))
+			if (aggstate->current_phase < aggstate->numphases - 1)
 			{
-				/*
-				 * Make a copy of the first input tuple; we will use this for
-				 * comparisons (in group mode) and for projection.
-				 */
-				aggstate->grp_firstTuple = ExecCopySlotTuple(outerslot);
+				initialize_phase(aggstate, aggstate->current_phase + 1);
+				aggstate->input_done = false;
+				aggstate->projected_set = -1;
+				numGroupingSets = Max(aggstate->phase->numsets, 1);
+				node = aggstate->phase->aggnode;
+				numReset = numGroupingSets;
 			}
 			else
 			{
-				/* outer plan produced no tuples at all */
 				aggstate->agg_done = true;
-				/* If we are grouping, we should produce no tuples too */
-				if (node->aggstrategy != AGG_PLAIN)
-					return NULL;
+				break;
 			}
 		}
 
 		/*
-		 * Clear the per-output-tuple context for each group, as well as
-		 * aggcontext (which contains any pass-by-ref transvalues of the old
-		 * group).  We also clear any child contexts of the aggcontext; some
-		 * aggregate functions store working state in such contexts.
-		 *
-		 * We use ReScanExprContext not just ResetExprContext because we want
-		 * any registered shutdown callbacks to be called.  That allows
-		 * aggregate functions to ensure they've cleaned up any non-memory
-		 * resources.
+		 * Get the number of columns in the next grouping set after the last
+		 * projected one (if any). This is the number of columns to compare to
+		 * see if we reached the boundary of that set too.
 		 */
-		ReScanExprContext(econtext);
-
-		MemoryContextResetAndDeleteChildren(aggstate->aggcontext);
+		if (aggstate->projected_set >= 0 &&
+			aggstate->projected_set < (numGroupingSets - 1))
+			nextSetSize = aggstate->phase->gset_lengths[aggstate->projected_set + 1];
+		else
+			nextSetSize = 0;
 
-		/*
-		 * Initialize working state for a new input tuple group
+		/*----------
+		 * If a subgroup for the current grouping set is present, project it.
+		 *
+		 * We have a new group if:
+		 *	- we're out of input but haven't projected all grouping sets
+		 *	  (checked above)
+		 * OR
+		 *	  - we already projected a row that wasn't from the last grouping
+		 *		set
+		 *	  AND
+		 *	  - the next grouping set has at least one grouping column (since
+		 *		empty grouping sets project only once input is exhausted)
+		 *	  AND
+		 *	  - the previous and pending rows differ on the grouping columns
+		 *		of the next grouping set
+		 *----------
 		 */
-		initialize_aggregates(aggstate, peragg, pergroup);
+		if (aggstate->input_done ||
+			(node->aggstrategy == AGG_SORTED &&
+			 aggstate->projected_set != -1 &&
+			 aggstate->projected_set < (numGroupingSets - 1) &&
+			 nextSetSize > 0 &&
+			 !execTuplesMatch(econtext->ecxt_outertuple,
+							  tmpcontext->ecxt_outertuple,
+							  nextSetSize,
+							  node->grpColIdx,
+							  aggstate->phase->eqfunctions,
+							  tmpcontext->ecxt_per_tuple_memory)))
+		{
+			aggstate->projected_set += 1;
 
-		if (aggstate->grp_firstTuple != NULL)
+			Assert(aggstate->projected_set < numGroupingSets);
+			Assert(nextSetSize > 0 || aggstate->input_done);
+		}
+		else
 		{
 			/*
-			 * Store the copied first input tuple in the tuple table slot
-			 * reserved for it.  The tuple will be deleted when it is cleared
-			 * from the slot.
+			 * We no longer care what group we just projected, the next
+			 * projection will always be the first (or only) grouping set
+			 * (unless the input proves to be empty).
 			 */
-			ExecStoreTuple(aggstate->grp_firstTuple,
-						   firstSlot,
-						   InvalidBuffer,
-						   true);
-			aggstate->grp_firstTuple = NULL;	/* don't keep two pointers */
-
-			/* set up for first advance_aggregates call */
-			tmpcontext->ecxt_outertuple = firstSlot;
+			aggstate->projected_set = 0;
 
 			/*
-			 * Process each outer-plan tuple, and then fetch the next one,
-			 * until we exhaust the outer plan or cross a group boundary.
+			 * If we don't already have the first tuple of the new group,
+			 * fetch it from the outer plan.
 			 */
-			for (;;)
+			if (aggstate->grp_firstTuple == NULL)
 			{
-				advance_aggregates(aggstate, pergroup);
-
-				/* Reset per-input-tuple context after each tuple */
-				ResetExprContext(tmpcontext);
-
-				outerslot = ExecProcNode(outerPlan);
-				if (TupIsNull(outerslot))
+				outerslot = fetch_input_tuple(aggstate);
+				if (!TupIsNull(outerslot))
 				{
-					/* no more outer-plan tuples available */
-					aggstate->agg_done = true;
-					break;
+					/*
+					 * Make a copy of the first input tuple; we will use this
+					 * for comparisons (in group mode) and for projection.
+					 */
+					aggstate->grp_firstTuple = ExecCopySlotTuple(outerslot);
 				}
-				/* set up for next advance_aggregates call */
-				tmpcontext->ecxt_outertuple = outerslot;
-
-				/*
-				 * If we are grouping, check whether we've crossed a group
-				 * boundary.
-				 */
-				if (node->aggstrategy == AGG_SORTED)
+				else
 				{
-					if (!execTuplesMatch(firstSlot,
-										 outerslot,
-										 node->numCols, node->grpColIdx,
-										 aggstate->eqfunctions,
-										 tmpcontext->ecxt_per_tuple_memory))
+					/* outer plan produced no tuples at all */
+					if (hasGroupingSets)
 					{
 						/*
-						 * Save the first input tuple of the next group.
+						 * If there was no input at all, we need to project
+						 * rows only if there are grouping sets of size 0.
+						 * Note that this implies that there can't be any
+						 * references to ungrouped Vars, which would otherwise
+						 * cause issues with the empty output slot.
+						 *
+						 * XXX: This is no longer true, we currently deal with
+						 * this in finalize_aggregates().
 						 */
-						aggstate->grp_firstTuple = ExecCopySlotTuple(outerslot);
-						break;
+						aggstate->input_done = true;
+
+						while (aggstate->phase->gset_lengths[aggstate->projected_set] > 0)
+						{
+							aggstate->projected_set += 1;
+							if (aggstate->projected_set >= numGroupingSets)
+							{
+								/*
+								 * We can't set agg_done here because we might
+								 * have more phases to do, even though the
+								 * input is empty. So we need to restart the
+								 * whole outer loop.
+								 */
+								break;
+							}
+						}
+
+						if (aggstate->projected_set >= numGroupingSets)
+							continue;
+					}
+					else
+					{
+						aggstate->agg_done = true;
+						/* If we are grouping, we should produce no tuples too */
+						if (node->aggstrategy != AGG_PLAIN)
+							return NULL;
 					}
 				}
 			}
-		}
 
-		/*
-		 * Use the representative input tuple for any references to
-		 * non-aggregated input columns in aggregate direct args, the node
-		 * qual, and the tlist.  (If we are not grouping, and there are no
-		 * input rows at all, we will come here with an empty firstSlot ...
-		 * but if not grouping, there can't be any references to
-		 * non-aggregated input columns, so no problem.)
-		 */
-		econtext->ecxt_outertuple = firstSlot;
-
-		/*
-		 * Done scanning input tuple group. Finalize each aggregate
-		 * calculation, and stash results in the per-output-tuple context.
-		 */
-		for (aggno = 0; aggno < aggstate->numaggs; aggno++)
-		{
-			AggStatePerAgg peraggstate = &peragg[aggno];
-			AggStatePerGroup pergroupstate = &pergroup[aggno];
+			/*
+			 * Initialize working state for a new input tuple group.
+			 */
+			initialize_aggregates(aggstate, peragg, pergroup, numReset);
 
-			if (peraggstate->numSortCols > 0)
+			if (aggstate->grp_firstTuple != NULL)
 			{
-				if (peraggstate->numInputs == 1)
-					process_ordered_aggregate_single(aggstate,
-													 peraggstate,
-													 pergroupstate);
-				else
-					process_ordered_aggregate_multi(aggstate,
-													peraggstate,
-													pergroupstate);
-			}
+				/*
+				 * Store the copied first input tuple in the tuple table slot
+				 * reserved for it.  The tuple will be deleted when it is
+				 * cleared from the slot.
+				 */
+				ExecStoreTuple(aggstate->grp_firstTuple,
+							   firstSlot,
+							   InvalidBuffer,
+							   true);
+				aggstate->grp_firstTuple = NULL;		/* don't keep two
+														 * pointers */
 
-			finalize_aggregate(aggstate, peraggstate, pergroupstate,
-							   &aggvalues[aggno], &aggnulls[aggno]);
-		}
+				/* set up for first advance_aggregates call */
+				tmpcontext->ecxt_outertuple = firstSlot;
 
-		/*
-		 * Check the qual (HAVING clause); if the group does not match, ignore
-		 * it and loop back to try to process another group.
-		 */
-		if (ExecQual(aggstate->ss.ps.qual, econtext, false))
-		{
-			/*
-			 * Form and return a projection tuple using the aggregate results
-			 * and the representative input tuple.
-			 */
-			TupleTableSlot *result;
-			ExprDoneCond isDone;
+				/*
+				 * Process each outer-plan tuple, and then fetch the next one,
+				 * until we exhaust the outer plan or cross a group boundary.
+				 */
+				for (;;)
+				{
+					advance_aggregates(aggstate, pergroup);
 
-			result = ExecProject(aggstate->ss.ps.ps_ProjInfo, &isDone);
+					/* Reset per-input-tuple context after each tuple */
+					ResetExprContext(tmpcontext);
 
-			if (isDone != ExprEndResult)
-			{
-				aggstate->ss.ps.ps_TupFromTlist =
-					(isDone == ExprMultipleResult);
-				return result;
+					outerslot = fetch_input_tuple(aggstate);
+					if (TupIsNull(outerslot))
+					{
+						/* no more outer-plan tuples available */
+						if (hasGroupingSets)
+						{
+							aggstate->input_done = true;
+							break;
+						}
+						else
+						{
+							aggstate->agg_done = true;
+							break;
+						}
+					}
+					/* set up for next advance_aggregates call */
+					tmpcontext->ecxt_outertuple = outerslot;
+
+					/*
+					 * If we are grouping, check whether we've crossed a group
+					 * boundary.
+					 */
+					if (node->aggstrategy == AGG_SORTED)
+					{
+						if (!execTuplesMatch(firstSlot,
+											 outerslot,
+											 node->numCols,
+											 node->grpColIdx,
+											 aggstate->phase->eqfunctions,
+										  tmpcontext->ecxt_per_tuple_memory))
+						{
+							aggstate->grp_firstTuple = ExecCopySlotTuple(outerslot);
+							break;
+						}
+					}
+				}
 			}
+
+			/*
+			 * Use the representative input tuple for any references to
+			 * non-aggregated input columns in aggregate direct args, the node
+			 * qual, and the tlist.  (If we are not grouping, and there are no
+			 * input rows at all, we will come here with an empty firstSlot
+			 * ... but if not grouping, there can't be any references to
+			 * non-aggregated input columns, so no problem.)
+			 */
+			econtext->ecxt_outertuple = firstSlot;
 		}
-		else
-			InstrCountFiltered1(aggstate, 1);
+
+		Assert(aggstate->projected_set >= 0);
+
+		currentSet = aggstate->projected_set;
+
+		prepare_projection_slot(aggstate, econtext->ecxt_outertuple, currentSet);
+
+		finalize_aggregates(aggstate, peragg, pergroup, currentSet);
+
+		/*
+		 * If there's no row to project right now, we must continue rather
+		 * than returning a null since there might be more groups.
+		 */
+		result = project_aggregates(aggstate);
+		if (result)
+			return result;
 	}
 
 	/* No more groups */
@@ -1584,16 +2062,15 @@ agg_retrieve_direct(AggState *aggstate)
 static void
 agg_fill_hash_table(AggState *aggstate)
 {
-	PlanState  *outerPlan;
 	ExprContext *tmpcontext;
 	AggHashEntry entry;
 	TupleTableSlot *outerslot;
 
 	/*
 	 * get state info from node
+	 *
+	 * tmpcontext is the per-input-tuple expression context
 	 */
-	outerPlan = outerPlanState(aggstate);
-	/* tmpcontext is the per-input-tuple expression context */
 	tmpcontext = aggstate->tmpcontext;
 
 	/*
@@ -1602,7 +2079,7 @@ agg_fill_hash_table(AggState *aggstate)
 	 */
 	for (;;)
 	{
-		outerslot = ExecProcNode(outerPlan);
+		outerslot = fetch_input_tuple(aggstate);
 		if (TupIsNull(outerslot))
 			break;
 		/* set up for advance_aggregates call */
@@ -1630,21 +2107,17 @@ static TupleTableSlot *
 agg_retrieve_hash_table(AggState *aggstate)
 {
 	ExprContext *econtext;
-	Datum	   *aggvalues;
-	bool	   *aggnulls;
 	AggStatePerAgg peragg;
 	AggStatePerGroup pergroup;
 	AggHashEntry entry;
 	TupleTableSlot *firstSlot;
-	int			aggno;
+	TupleTableSlot *result;
 
 	/*
 	 * get state info from node
 	 */
 	/* econtext is the per-output-tuple expression context */
 	econtext = aggstate->ss.ps.ps_ExprContext;
-	aggvalues = econtext->ecxt_aggvalues;
-	aggnulls = econtext->ecxt_aggnulls;
 	peragg = aggstate->peragg;
 	firstSlot = aggstate->ss.ss_ScanTupleSlot;
 
@@ -1684,19 +2157,7 @@ agg_retrieve_hash_table(AggState *aggstate)
 
 		pergroup = entry->pergroup;
 
-		/*
-		 * Finalize each aggregate calculation, and stash results in the
-		 * per-output-tuple context.
-		 */
-		for (aggno = 0; aggno < aggstate->numaggs; aggno++)
-		{
-			AggStatePerAgg peraggstate = &peragg[aggno];
-			AggStatePerGroup pergroupstate = &pergroup[aggno];
-
-			Assert(peraggstate->numSortCols == 0);
-			finalize_aggregate(aggstate, peraggstate, pergroupstate,
-							   &aggvalues[aggno], &aggnulls[aggno]);
-		}
+		finalize_aggregates(aggstate, peragg, pergroup, 0);
 
 		/*
 		 * Use the representative input tuple for any references to
@@ -1704,30 +2165,9 @@ agg_retrieve_hash_table(AggState *aggstate)
 		 */
 		econtext->ecxt_outertuple = firstSlot;
 
-		/*
-		 * Check the qual (HAVING clause); if the group does not match, ignore
-		 * it and loop back to try to process another group.
-		 */
-		if (ExecQual(aggstate->ss.ps.qual, econtext, false))
-		{
-			/*
-			 * Form and return a projection tuple using the aggregate results
-			 * and the representative input tuple.
-			 */
-			TupleTableSlot *result;
-			ExprDoneCond isDone;
-
-			result = ExecProject(aggstate->ss.ps.ps_ProjInfo, &isDone);
-
-			if (isDone != ExprEndResult)
-			{
-				aggstate->ss.ps.ps_TupFromTlist =
-					(isDone == ExprMultipleResult);
-				return result;
-			}
-		}
-		else
-			InstrCountFiltered1(aggstate, 1);
+		result = project_aggregates(aggstate);
+		if (result)
+			return result;
 	}
 
 	/* No more groups */
@@ -1751,7 +2191,14 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	ExprContext *econtext;
 	int			numaggs,
 				aggno;
+	int			phase;
 	ListCell   *l;
+	Bitmapset  *all_grouped_cols = NULL;
+	int			numGroupingSets = 1;
+	int			numPhases;
+	int			currentsortno = 0;
+	int			i = 0;
+	int			j = 0;
 
 	/* check for unsupported flags */
 	Assert(!(eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK)));
@@ -1765,41 +2212,71 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 
 	aggstate->aggs = NIL;
 	aggstate->numaggs = 0;
-	aggstate->eqfunctions = NULL;
+	aggstate->maxsets = 0;
 	aggstate->hashfunctions = NULL;
+	aggstate->projected_set = -1;
+	aggstate->current_set = 0;
 	aggstate->peragg = NULL;
 	aggstate->curperagg = NULL;
 	aggstate->agg_done = false;
+	aggstate->input_done = false;
 	aggstate->pergroup = NULL;
 	aggstate->grp_firstTuple = NULL;
 	aggstate->hashtable = NULL;
 #ifndef XCP
 	aggstate->skip_trans = node->skip_trans;
 #endif
+	aggstate->sort_in = NULL;
+	aggstate->sort_out = NULL;
 
 	/*
-	 * Create expression contexts.  We need two, one for per-input-tuple
-	 * processing and one for per-output-tuple processing.  We cheat a little
-	 * by using ExecAssignExprContext() to build both.
+	 * Calculate the maximum number of grouping sets in any phase; this
+	 * determines the size of some allocations.
 	 */
-	ExecAssignExprContext(estate, &aggstate->ss.ps);
-	aggstate->tmpcontext = aggstate->ss.ps.ps_ExprContext;
-	ExecAssignExprContext(estate, &aggstate->ss.ps);
+	if (node->groupingSets)
+	{
+		Assert(node->aggstrategy != AGG_HASHED);
+
+		numGroupingSets = list_length(node->groupingSets);
+
+		foreach(l, node->chain)
+		{
+			Agg		   *agg = lfirst(l);
+
+			numGroupingSets = Max(numGroupingSets,
+								  list_length(agg->groupingSets));
+		}
+	}
+
+	aggstate->maxsets = numGroupingSets;
+	aggstate->numphases = numPhases = 1 + list_length(node->chain);
+
+	aggstate->aggcontexts = (ExprContext **)
+		palloc0(sizeof(ExprContext *) * numGroupingSets);
 
 	/*
-	 * We also need a long-lived memory context for holding hashtable data
-	 * structures and transition values.  NOTE: the details of what is stored
-	 * in aggcontext and what is stored in the regular per-query memory
-	 * context are driven by a simple decision: we want to reset the
-	 * aggcontext at group boundaries (if not hashing) and in ExecReScanAgg to
-	 * recover no-longer-wanted space.
+	 * Create expression contexts.  We need three or more, one for
+	 * per-input-tuple processing, one for per-output-tuple processing, and
+	 * one for each grouping set.  The per-tuple memory context of the
+	 * per-grouping-set ExprContexts (aggcontexts) replaces the standalone
+	 * memory context formerly used to hold transition values.  We cheat a
+	 * little by using ExecAssignExprContext() to build all of them.
+	 *
+	 * NOTE: the details of what is stored in aggcontexts and what is stored
+	 * in the regular per-query memory context are driven by a simple
+	 * decision: we want to reset the aggcontext at group boundaries (if not
+	 * hashing) and in ExecReScanAgg to recover no-longer-wanted space.
 	 */
-	aggstate->aggcontext =
-		AllocSetContextCreate(CurrentMemoryContext,
-							  "AggContext",
-							  ALLOCSET_DEFAULT_MINSIZE,
-							  ALLOCSET_DEFAULT_INITSIZE,
-							  ALLOCSET_DEFAULT_MAXSIZE);
+	ExecAssignExprContext(estate, &aggstate->ss.ps);
+	aggstate->tmpcontext = aggstate->ss.ps.ps_ExprContext;
+
+	for (i = 0; i < numGroupingSets; ++i)
+	{
+		ExecAssignExprContext(estate, &aggstate->ss.ps);
+		aggstate->aggcontexts[i] = aggstate->ss.ps.ps_ExprContext;
+	}
+
+	ExecAssignExprContext(estate, &aggstate->ss.ps);
 
 	/*
 	 * tuple table initialization
@@ -1807,6 +2284,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	ExecInitScanTupleSlot(estate, &aggstate->ss);
 	ExecInitResultTupleSlot(estate, &aggstate->ss.ps);
 	aggstate->hashslot = ExecInitExtraTupleSlot(estate);
+	aggstate->sort_slot = ExecInitExtraTupleSlot(estate);
 
 	/*
 	 * initialize child expressions
@@ -1825,7 +2303,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 					 (PlanState *) aggstate);
 
 	/*
-	 * initialize child nodes
+	 * Initialize child nodes.
 	 *
 	 * If we are doing a hashed aggregation then the child plan does not need
 	 * to handle REWIND efficiently; see ExecReScanAgg.
@@ -1839,6 +2317,9 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	 * initialize source tuple type.
 	 */
 	ExecAssignScanTypeFromOuterPlan(&aggstate->ss);
+	if (node->chain)
+		ExecSetSlotDescriptor(aggstate->sort_slot,
+						 aggstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor);
 
 	/*
 	 * Initialize result tuple type and projection info.
@@ -1866,24 +2347,105 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	}
 
 	/*
-	 * If we are grouping, precompute fmgr lookup data for inner loop. We need
-	 * both equality and hashing functions to do it by hashing, but only
-	 * equality if not hashing.
+	 * For each phase, prepare grouping set data and fmgr lookup data for
+	 * compare functions.  Accumulate all_grouped_cols in passing.
 	 */
-	if (node->numCols > 0)
+
+	aggstate->phases = palloc0(numPhases * sizeof(AggStatePerPhaseData));
+
+	for (phase = 0; phase < numPhases; ++phase)
 	{
-		if (node->aggstrategy == AGG_HASHED)
-			execTuplesHashPrepare(node->numCols,
-								  node->grpOperators,
-								  &aggstate->eqfunctions,
-								  &aggstate->hashfunctions);
+		AggStatePerPhase phasedata = &aggstate->phases[phase];
+		Agg		   *aggnode;
+		Sort	   *sortnode;
+		int			num_sets;
+
+		if (phase > 0)
+		{
+			aggnode = list_nth(node->chain, phase - 1);
+			sortnode = (Sort *) aggnode->plan.lefttree;
+			Assert(IsA(sortnode, Sort));
+		}
 		else
-			aggstate->eqfunctions =
-				execTuplesMatchPrepare(node->numCols,
-									   node->grpOperators);
+		{
+			aggnode = node;
+			sortnode = NULL;
+		}
+
+		phasedata->numsets = num_sets = list_length(aggnode->groupingSets);
+
+		if (num_sets)
+		{
+			phasedata->gset_lengths = palloc(num_sets * sizeof(int));
+			phasedata->grouped_cols = palloc(num_sets * sizeof(Bitmapset *));
+
+			i = 0;
+			foreach(l, aggnode->groupingSets)
+			{
+				int			current_length = list_length(lfirst(l));
+				Bitmapset  *cols = NULL;
+
+				/* planner forces this to be correct */
+				for (j = 0; j < current_length; ++j)
+					cols = bms_add_member(cols, aggnode->grpColIdx[j]);
+
+				phasedata->grouped_cols[i] = cols;
+				phasedata->gset_lengths[i] = current_length;
+				++i;
+			}
+
+			all_grouped_cols = bms_add_members(all_grouped_cols,
+											   phasedata->grouped_cols[0]);
+		}
+		else
+		{
+			Assert(phase == 0);
+
+			phasedata->gset_lengths = NULL;
+			phasedata->grouped_cols = NULL;
+		}
+
+		/*
+		 * If we are grouping, precompute fmgr lookup data for inner loop.
+		 */
+		if (aggnode->aggstrategy == AGG_SORTED)
+		{
+			Assert(aggnode->numCols > 0);
+
+			phasedata->eqfunctions =
+				execTuplesMatchPrepare(aggnode->numCols,
+									   aggnode->grpOperators);
+		}
+
+		phasedata->aggnode = aggnode;
+		phasedata->sortnode = sortnode;
 	}
 
 	/*
+	 * Convert all_grouped_cols to a descending-order list.
+	 */
+	i = -1;
+	while ((i = bms_next_member(all_grouped_cols, i)) >= 0)
+		aggstate->all_grouped_cols = lcons_int(i, aggstate->all_grouped_cols);
+
+	/*
+	 * Hashing can only appear in the initial phase.
+	 */
+
+	if (node->aggstrategy == AGG_HASHED)
+		execTuplesHashPrepare(node->numCols,
+							  node->grpOperators,
+							  &aggstate->phases[0].eqfunctions,
+							  &aggstate->hashfunctions);
+
+	/*
+	 * Initialize current phase-dependent values to initial phase
+	 */
+
+	aggstate->current_phase = 0;
+	initialize_phase(aggstate, 0);
+
+	/*
 	 * Set up aggregate-result storage in the output expr context, and also
 	 * allocate my private per-agg working storage
 	 */
@@ -1905,7 +2467,10 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	{
 		AggStatePerGroup pergroup;
 
-		pergroup = (AggStatePerGroup) palloc0(sizeof(AggStatePerGroupData) * numaggs);
+		pergroup = (AggStatePerGroup) palloc0(sizeof(AggStatePerGroupData)
+											  * numaggs
+											  * numGroupingSets);
+
 		aggstate->pergroup = pergroup;
 	}
 
@@ -1975,7 +2540,11 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		/* Begin filling in the peraggstate data */
 		peraggstate->aggrefstate = aggrefstate;
 		peraggstate->aggref = aggref;
-		peraggstate->sortstate = NULL;
+		peraggstate->sortstates = (Tuplesortstate **)
+			palloc0(sizeof(Tuplesortstate *) * numGroupingSets);
+
+		for (currentsortno = 0; currentsortno < numGroupingSets; currentsortno++)
+			peraggstate->sortstates[currentsortno] = NULL;
 
 		/* Fetch the pg_aggregate row */
 		aggTuple = SearchSysCache1(AGGFNOID,
@@ -2455,31 +3024,41 @@ ExecEndAgg(AggState *node)
 {
 	PlanState  *outerPlan;
 	int			aggno;
+	int			numGroupingSets = Max(node->maxsets, 1);
+	int			setno;
 
 	/* Make sure we have closed any open tuplesorts */
+
+	if (node->sort_in)
+		tuplesort_end(node->sort_in);
+	if (node->sort_out)
+		tuplesort_end(node->sort_out);
+
 	for (aggno = 0; aggno < node->numaggs; aggno++)
 	{
 		AggStatePerAgg peraggstate = &node->peragg[aggno];
 
-		if (peraggstate->sortstate)
-			tuplesort_end(peraggstate->sortstate);
+		for (setno = 0; setno < numGroupingSets; setno++)
+		{
+			if (peraggstate->sortstates[setno])
+				tuplesort_end(peraggstate->sortstates[setno]);
+		}
 	}
 
 	/* And ensure any agg shutdown callbacks have been called */
-	ReScanExprContext(node->ss.ps.ps_ExprContext);
+	for (setno = 0; setno < numGroupingSets; setno++)
+		ReScanExprContext(node->aggcontexts[setno]);
 
 	/*
-	 * Free both the expr contexts.
+	 * We don't actually free any ExprContexts here (see comment in
+	 * ExecFreeExprContext), just unlinking the output one from the plan node
+	 * suffices.
 	 */
 	ExecFreeExprContext(&node->ss.ps);
-	node->ss.ps.ps_ExprContext = node->tmpcontext;
-	ExecFreeExprContext(&node->ss.ps);
 
 	/* clean up tuple table */
 	ExecClearTuple(node->ss.ss_ScanTupleSlot);
 
-	MemoryContextDelete(node->aggcontext);
-
 	outerPlan = outerPlanState(node);
 	ExecEndNode(outerPlan);
 }
@@ -2488,13 +3067,17 @@ void
 ExecReScanAgg(AggState *node)
 {
 	ExprContext *econtext = node->ss.ps.ps_ExprContext;
+	PlanState  *outerPlan = outerPlanState(node);
+	Agg		   *aggnode = (Agg *) node->ss.ps.plan;
 	int			aggno;
+	int			numGroupingSets = Max(node->maxsets, 1);
+	int			setno;
 
 	node->agg_done = false;
 
 	node->ss.ps.ps_TupFromTlist = false;
 
-	if (((Agg *) node->ss.ps.plan)->aggstrategy == AGG_HASHED)
+	if (aggnode->aggstrategy == AGG_HASHED)
 	{
 		/*
 		 * In the hashed case, if we haven't yet built the hash table then we
@@ -2510,7 +3093,7 @@ ExecReScanAgg(AggState *node)
 		 * parameter changes, then we can just rescan the existing hash table;
 		 * no need to build it again.
 		 */
-		if (node->ss.ps.lefttree->chgParam == NULL)
+		if (outerPlan->chgParam == NULL)
 		{
 			ResetTupleHashIterator(node->hashtable, &node->hashiter);
 			return;
@@ -2520,14 +3103,34 @@ ExecReScanAgg(AggState *node)
 	/* Make sure we have closed any open tuplesorts */
 	for (aggno = 0; aggno < node->numaggs; aggno++)
 	{
-		AggStatePerAgg peraggstate = &node->peragg[aggno];
+		for (setno = 0; setno < numGroupingSets; setno++)
+		{
+			AggStatePerAgg peraggstate = &node->peragg[aggno];
 
-		if (peraggstate->sortstate)
-			tuplesort_end(peraggstate->sortstate);
-		peraggstate->sortstate = NULL;
+			if (peraggstate->sortstates[setno])
+			{
+				tuplesort_end(peraggstate->sortstates[setno]);
+				peraggstate->sortstates[setno] = NULL;
+			}
+		}
 	}
 
-	/* We don't need to ReScanExprContext here; ExecReScan already did it */
+	/*
+	 * We don't need to ReScanExprContext the output tuple context here;
+	 * ExecReScan already did it. But we do need to reset our per-grouping-set
+	 * contexts, which may have transvalues stored in them. (We use rescan
+	 * rather than just reset because transfns may have registered callbacks
+	 * that need to be run now.)
+	 *
+	 * Note that with AGG_HASHED, the hash table is allocated in a sub-context
+	 * of the aggcontext. This used to be an issue, but now, resetting a
+	 * context automatically deletes sub-contexts too.
+	 */
+
+	for (setno = 0; setno < numGroupingSets; setno++)
+	{
+		ReScanExprContext(node->aggcontexts[setno]);
+	}
 
 	/* Release first tuple of group, if we have made a copy */
 	if (node->grp_firstTuple != NULL)
@@ -2535,21 +3138,13 @@ ExecReScanAgg(AggState *node)
 		heap_freetuple(node->grp_firstTuple);
 		node->grp_firstTuple = NULL;
 	}
+	ExecClearTuple(node->ss.ss_ScanTupleSlot);
 
 	/* Forget current agg values */
 	MemSet(econtext->ecxt_aggvalues, 0, sizeof(Datum) * node->numaggs);
 	MemSet(econtext->ecxt_aggnulls, 0, sizeof(bool) * node->numaggs);
 
-	/*
-	 * Release all temp storage. Note that with AGG_HASHED, the hash table is
-	 * allocated in a sub-context of the aggcontext. We're going to rebuild
-	 * the hash table from scratch, so we need to use
-	 * MemoryContextResetAndDeleteChildren() to avoid leaking the old hash
-	 * table's memory context header.
-	 */
-	MemoryContextResetAndDeleteChildren(node->aggcontext);
-
-	if (((Agg *) node->ss.ps.plan)->aggstrategy == AGG_HASHED)
+	if (aggnode->aggstrategy == AGG_HASHED)
 	{
 		/* Rebuild an empty hash table */
 		build_hash_table(node);
@@ -2561,15 +3156,17 @@ ExecReScanAgg(AggState *node)
 		 * Reset the per-group state (in particular, mark transvalues null)
 		 */
 		MemSet(node->pergroup, 0,
-			   sizeof(AggStatePerGroupData) * node->numaggs);
+			 sizeof(AggStatePerGroupData) * node->numaggs * numGroupingSets);
+
+		/* reset to phase 0 */
+		initialize_phase(node, 0);
+
+		node->input_done = false;
+		node->projected_set = -1;
 	}
 
-	/*
-	 * if chgParam of subnode is not null then plan will be re-scanned by
-	 * first ExecProcNode.
-	 */
-	if (node->ss.ps.lefttree->chgParam == NULL)
-		ExecReScan(node->ss.ps.lefttree);
+	if (outerPlan->chgParam == NULL)
+		ExecReScan(outerPlan);
 }
 
 
@@ -2589,8 +3186,11 @@ ExecReScanAgg(AggState *node)
  * values could conceivably appear in future.)
  *
  * If aggcontext isn't NULL, the function also stores at *aggcontext the
- * identity of the memory context that aggregate transition values are
- * being stored in.
+ * identity of the memory context that aggregate transition values are being
+ * stored in.  Note that the same aggregate call site (flinfo) may be called
+ * interleaved on different transition values in different contexts, so it's
+ * not kosher to cache aggcontext under fn_extra.  It is, however, kosher to
+ * cache it in the transvalue itself (for internal-type transvalues).
  */
 int
 AggCheckCallContext(FunctionCallInfo fcinfo, MemoryContext *aggcontext)
@@ -2598,7 +3198,12 @@ AggCheckCallContext(FunctionCallInfo fcinfo, MemoryContext *aggcontext)
 	if (fcinfo->context && IsA(fcinfo->context, AggState))
 	{
 		if (aggcontext)
-			*aggcontext = ((AggState *) fcinfo->context)->aggcontext;
+		{
+			AggState   *aggstate = ((AggState *) fcinfo->context);
+			ExprContext *cxt = aggstate->aggcontexts[aggstate->current_set];
+
+			*aggcontext = cxt->ecxt_per_tuple_memory;
+		}
 		return AGG_CONTEXT_AGGREGATE;
 	}
 	if (fcinfo->context && IsA(fcinfo->context, WindowAggState))
@@ -2682,8 +3287,9 @@ AggRegisterCallback(FunctionCallInfo fcinfo,
 	if (fcinfo->context && IsA(fcinfo->context, AggState))
 	{
 		AggState   *aggstate = (AggState *) fcinfo->context;
+		ExprContext *cxt = aggstate->aggcontexts[aggstate->current_set];
 
-		RegisterExprContextCallback(aggstate->ss.ps.ps_ExprContext, func, arg);
+		RegisterExprContextCallback(cxt, func, arg);
 
 		return;
 	}
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index 8ea8b9f16b..4597437178 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -449,6 +449,8 @@ ExecBitmapHeapScan(BitmapHeapScanState *node)
 void
 ExecReScanBitmapHeapScan(BitmapHeapScanState *node)
 {
+	PlanState  *outerPlan = outerPlanState(node);
+
 	/* rescan to release any page pin */
 	heap_rescan(node->ss.ss_currentScanDesc, NULL);
 
@@ -469,8 +471,8 @@ ExecReScanBitmapHeapScan(BitmapHeapScanState *node)
 	 * if chgParam of subnode is not null then plan will be re-scanned by
 	 * first ExecProcNode.
 	 */
-	if (node->ss.ps.lefttree->chgParam == NULL)
-		ExecReScan(node->ss.ps.lefttree);
+	if (outerPlan->chgParam == NULL)
+		ExecReScan(outerPlan);
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index b07932b32e..0a022dff94 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -22,13 +22,24 @@
 CustomScanState *
 ExecInitCustomScan(CustomScan *cscan, EState *estate, int eflags)
 {
-	CustomScanState    *css;
-	Relation			scan_rel;
+	CustomScanState *css;
+	Relation	scan_rel = NULL;
+	Index		scanrelid = cscan->scan.scanrelid;
+	Index		tlistvarno;
 
-	/* populate a CustomScanState according to the CustomScan */
+	/*
+	 * Allocate the CustomScanState object.  We let the custom scan provider
+	 * do the palloc, in case it wants to make a larger object that embeds
+	 * CustomScanState as the first field.  It must set the node tag and the
+	 * methods field correctly at this time.  Other standard fields should be
+	 * set to zero.
+	 */
 	css = (CustomScanState *) cscan->methods->CreateCustomScanState(cscan);
 	Assert(IsA(css, CustomScanState));
 
+	/* ensure flags is filled correctly */
+	css->flags = cscan->flags;
+
 	/* fill up fields of ScanState */
 	css->ss.ps.plan = &cscan->scan.plan;
 	css->ss.ps.state = estate;
@@ -36,6 +47,8 @@ ExecInitCustomScan(CustomScan *cscan, EState *estate, int eflags)
 	/* create expression context for node */
 	ExecAssignExprContext(estate, &css->ss.ps);
 
+	css->ss.ps.ps_TupFromTlist = false;
+
 	/* initialize child expressions */
 	css->ss.ps.targetlist = (List *)
 		ExecInitExpr((Expr *) cscan->scan.plan.targetlist,
@@ -48,19 +61,41 @@ ExecInitCustomScan(CustomScan *cscan, EState *estate, int eflags)
 	ExecInitScanTupleSlot(estate, &css->ss);
 	ExecInitResultTupleSlot(estate, &css->ss.ps);
 
-	/* initialize scan relation */
-	scan_rel = ExecOpenScanRelation(estate, cscan->scan.scanrelid, eflags);
-	css->ss.ss_currentRelation = scan_rel;
-	css->ss.ss_currentScanDesc = NULL;	/* set by provider */
-	ExecAssignScanType(&css->ss, RelationGetDescr(scan_rel));
+	/*
+	 * open the base relation, if any, and acquire an appropriate lock on it
+	 */
+	if (scanrelid > 0)
+	{
+		scan_rel = ExecOpenScanRelation(estate, scanrelid, eflags);
+		css->ss.ss_currentRelation = scan_rel;
+	}
 
-	css->ss.ps.ps_TupFromTlist = false;
+	/*
+	 * Determine the scan tuple type.  If the custom scan provider provided a
+	 * targetlist describing the scan tuples, use that; else use base
+	 * relation's rowtype.
+	 */
+	if (cscan->custom_scan_tlist != NIL || scan_rel == NULL)
+	{
+		TupleDesc	scan_tupdesc;
+
+		scan_tupdesc = ExecTypeFromTL(cscan->custom_scan_tlist, false);
+		ExecAssignScanType(&css->ss, scan_tupdesc);
+		/* Node's targetlist will contain Vars with varno = INDEX_VAR */
+		tlistvarno = INDEX_VAR;
+	}
+	else
+	{
+		ExecAssignScanType(&css->ss, RelationGetDescr(scan_rel));
+		/* Node's targetlist will contain Vars with varno = scanrelid */
+		tlistvarno = scanrelid;
+	}
 
 	/*
 	 * Initialize result tuple type and projection info.
 	 */
 	ExecAssignResultTypeFromTL(&css->ss.ps);
-	ExecAssignScanProjectionInfo(&css->ss);
+	ExecAssignScanProjectionInfoWithVarno(&css->ss, tlistvarno);
 
 	/*
 	 * The callback of custom-scan provider applies the final initialization
@@ -89,11 +124,11 @@ ExecEndCustomScan(CustomScanState *node)
 
 	/* Clean out the tuple table */
 	ExecClearTuple(node->ss.ps.ps_ResultTupleSlot);
-	if (node->ss.ss_ScanTupleSlot)
-		ExecClearTuple(node->ss.ss_ScanTupleSlot);
+	ExecClearTuple(node->ss.ss_ScanTupleSlot);
 
 	/* Close the heap relation */
-	ExecCloseScanRelation(node->ss.ss_currentRelation);
+	if (node->ss.ss_currentRelation)
+		ExecCloseScanRelation(node->ss.ss_currentRelation);
 }
 
 void
diff --git a/src/backend/executor/nodeForeignscan.c b/src/backend/executor/nodeForeignscan.c
index a58dcf323f..d5e933e196 100644
--- a/src/backend/executor/nodeForeignscan.c
+++ b/src/backend/executor/nodeForeignscan.c
@@ -110,7 +110,9 @@ ForeignScanState *
 ExecInitForeignScan(ForeignScan *node, EState *estate, int eflags)
 {
 	ForeignScanState *scanstate;
-	Relation	currentRelation;
+	Relation	currentRelation = NULL;
+	Index		scanrelid = node->scan.scanrelid;
+	Index		tlistvarno;
 	FdwRoutine *fdwroutine;
 
 	/* check for unsupported flags */
@@ -149,32 +151,55 @@ ExecInitForeignScan(ForeignScan *node, EState *estate, int eflags)
 	ExecInitScanTupleSlot(estate, &scanstate->ss);
 
 	/*
-	 * open the base relation and acquire appropriate lock on it.
+	 * open the base relation, if any, and acquire an appropriate lock on it;
+	 * also acquire function pointers from the FDW's handler
 	 */
-	currentRelation = ExecOpenScanRelation(estate, node->scan.scanrelid, eflags);
-	scanstate->ss.ss_currentRelation = currentRelation;
+	if (scanrelid > 0)
+	{
+		currentRelation = ExecOpenScanRelation(estate, scanrelid, eflags);
+		scanstate->ss.ss_currentRelation = currentRelation;
+		fdwroutine = GetFdwRoutineForRelation(currentRelation, true);
+	}
+	else
+	{
+		/* We can't use the relcache, so get fdwroutine the hard way */
+		fdwroutine = GetFdwRoutineByServerId(node->fs_server);
+	}
 
 	/*
-	 * get the scan type from the relation descriptor.  (XXX at some point we
-	 * might want to let the FDW editorialize on the scan tupdesc.)
+	 * Determine the scan tuple type.  If the FDW provided a targetlist
+	 * describing the scan tuples, use that; else use base relation's rowtype.
 	 */
-	ExecAssignScanType(&scanstate->ss, RelationGetDescr(currentRelation));
+	if (node->fdw_scan_tlist != NIL || currentRelation == NULL)
+	{
+		TupleDesc	scan_tupdesc;
+
+		scan_tupdesc = ExecTypeFromTL(node->fdw_scan_tlist, false);
+		ExecAssignScanType(&scanstate->ss, scan_tupdesc);
+		/* Node's targetlist will contain Vars with varno = INDEX_VAR */
+		tlistvarno = INDEX_VAR;
+	}
+	else
+	{
+		ExecAssignScanType(&scanstate->ss, RelationGetDescr(currentRelation));
+		/* Node's targetlist will contain Vars with varno = scanrelid */
+		tlistvarno = scanrelid;
+	}
 
 	/*
 	 * Initialize result tuple type and projection info.
 	 */
 	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
-	ExecAssignScanProjectionInfo(&scanstate->ss);
+	ExecAssignScanProjectionInfoWithVarno(&scanstate->ss, tlistvarno);
 
 	/*
-	 * Acquire function pointers from the FDW's handler, and init fdw_state.
+	 * Initialize FDW-related state.
 	 */
-	fdwroutine = GetFdwRoutineForRelation(currentRelation, true);
 	scanstate->fdwroutine = fdwroutine;
 	scanstate->fdw_state = NULL;
 
 	/*
-	 * Tell the FDW to initiate the scan.
+	 * Tell the FDW to initialize the scan.
 	 */
 	fdwroutine->BeginForeignScan(scanstate, eflags);
 
@@ -201,7 +226,8 @@ ExecEndForeignScan(ForeignScanState *node)
 	ExecClearTuple(node->ss.ss_ScanTupleSlot);
 
 	/* close the relation. */
-	ExecCloseScanRelation(node->ss.ss_currentRelation);
+	if (node->ss.ss_currentRelation)
+		ExecCloseScanRelation(node->ss.ss_currentRelation);
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 83d562e511..5e4785423e 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -280,6 +280,8 @@ ExecEndGroup(GroupState *node)
 void
 ExecReScanGroup(GroupState *node)
 {
+	PlanState  *outerPlan = outerPlanState(node);
+
 	node->grp_done = FALSE;
 	node->ss.ps.ps_TupFromTlist = false;
 	/* must clear first tuple */
@@ -289,7 +291,6 @@ ExecReScanGroup(GroupState *node)
 	 * if chgParam of subnode is not null then plan will be re-scanned by
 	 * first ExecProcNode.
 	 */
-	if (node->ss.ps.lefttree &&
-		node->ss.ps.lefttree->chgParam == NULL)
-		ExecReScan(node->ss.ps.lefttree);
+	if (outerPlan->chgParam == NULL)
+		ExecReScan(outerPlan);
 }
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index b1f6c82432..906cb46b65 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -500,8 +500,8 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 	bucket_bytes = sizeof(HashJoinTuple) * nbuckets;
 
 	/*
-	 * If there's not enough space to store the projected number of tuples
-	 * and the required bucket headers, we will need multiple batches.
+	 * If there's not enough space to store the projected number of tuples and
+	 * the required bucket headers, we will need multiple batches.
 	 */
 	if (inner_rel_bytes + bucket_bytes > hash_table_bytes)
 	{
@@ -512,8 +512,8 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 		long		bucket_size;
 
 		/*
-		 * Estimate the number of buckets we'll want to have when work_mem
-		 * is entirely full.  Each bucket will contain a bucket pointer plus
+		 * Estimate the number of buckets we'll want to have when work_mem is
+		 * entirely full.  Each bucket will contain a bucket pointer plus
 		 * NTUP_PER_BUCKET tuples, whose projected size already includes
 		 * overhead for the hash code, pointer to the next tuple, etc.
 		 */
@@ -527,9 +527,9 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 		 * Buckets are simple pointers to hashjoin tuples, while tupsize
 		 * includes the pointer, hash code, and MinimalTupleData.  So buckets
 		 * should never really exceed 25% of work_mem (even for
-		 * NTUP_PER_BUCKET=1); except maybe * for work_mem values that are
-		 * not 2^N bytes, where we might get more * because of doubling.
-		 * So let's look for 50% here.
+		 * NTUP_PER_BUCKET=1); except maybe for work_mem values that are not
+		 * 2^N bytes, where we might get more because of doubling. So let's
+		 * look for 50% here.
 		 */
 		Assert(bucket_bytes <= hash_table_bytes / 2);
 
@@ -655,7 +655,7 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 		hashtable->log2_nbuckets = hashtable->log2_nbuckets_optimal;
 
 		hashtable->buckets = repalloc(hashtable->buckets,
-									  sizeof(HashJoinTuple) * hashtable->nbuckets);
+								sizeof(HashJoinTuple) * hashtable->nbuckets);
 	}
 
 	/*
@@ -671,6 +671,7 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 	while (oldchunks != NULL)
 	{
 		HashMemoryChunk nextchunk = oldchunks->next;
+
 		/* position within the buffer (up to oldchunks->used) */
 		size_t		idx = 0;
 
@@ -690,8 +691,9 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 			if (batchno == curbatch)
 			{
 				/* keep tuple in memory - copy it into the new chunk */
-				HashJoinTuple copyTuple =
-					(HashJoinTuple) dense_alloc(hashtable, hashTupleSize);
+				HashJoinTuple copyTuple;
+
+				copyTuple = (HashJoinTuple) dense_alloc(hashtable, hashTupleSize);
 				memcpy(copyTuple, hashTuple, hashTupleSize);
 
 				/* and add it back to the appropriate bucket */
@@ -749,15 +751,15 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 static void
 ExecHashIncreaseNumBuckets(HashJoinTable hashtable)
 {
-	HashMemoryChunk	chunk;
+	HashMemoryChunk chunk;
 
 	/* do nothing if not an increase (it's called increase for a reason) */
 	if (hashtable->nbuckets >= hashtable->nbuckets_optimal)
 		return;
 
 	/*
-	 * We already know the optimal number of buckets, so let's just
-	 * compute the log2_nbuckets for it.
+	 * We already know the optimal number of buckets, so let's just compute
+	 * the log2_nbuckets for it.
 	 */
 	hashtable->nbuckets = hashtable->nbuckets_optimal;
 	hashtable->log2_nbuckets = my_log2(hashtable->nbuckets_optimal);
@@ -771,14 +773,14 @@ ExecHashIncreaseNumBuckets(HashJoinTable hashtable)
 #endif
 
 	/*
-	 * Just reallocate the proper number of buckets - we don't need to
-	 * walk through them - we can walk the dense-allocated chunks
-	 * (just like in ExecHashIncreaseNumBatches, but without all the
-	 * copying into new chunks)
+	 * Just reallocate the proper number of buckets - we don't need to walk
+	 * through them - we can walk the dense-allocated chunks (just like in
+	 * ExecHashIncreaseNumBatches, but without all the copying into new
+	 * chunks)
 	 */
 	hashtable->buckets =
 		(HashJoinTuple *) repalloc(hashtable->buckets,
-								   hashtable->nbuckets * sizeof(HashJoinTuple));
+								hashtable->nbuckets * sizeof(HashJoinTuple));
 
 	memset(hashtable->buckets, 0, sizeof(void *) * hashtable->nbuckets);
 
@@ -786,12 +788,13 @@ ExecHashIncreaseNumBuckets(HashJoinTable hashtable)
 	for (chunk = hashtable->chunks; chunk != NULL; chunk = chunk->next)
 	{
 		/* process all tuples stored in this chunk */
-		size_t idx = 0;
+		size_t		idx = 0;
+
 		while (idx < chunk->used)
 		{
 			HashJoinTuple hashTuple = (HashJoinTuple) (chunk->data + idx);
-			int		bucketno;
-			int		batchno;
+			int			bucketno;
+			int			batchno;
 
 			ExecHashGetBucketAndBatch(hashtable, hashTuple->hashvalue,
 									  &bucketno, &batchno);
@@ -869,10 +872,11 @@ ExecHashTableInsert(HashJoinTable hashtable,
 
 		/*
 		 * Increase the (optimal) number of buckets if we just exceeded the
-		 * NTUP_PER_BUCKET threshold, but only when there's still a single batch.
+		 * NTUP_PER_BUCKET threshold, but only when there's still a single
+		 * batch.
 		 */
 		if ((hashtable->nbatch == 1) &&
-			(hashtable->nbuckets_optimal <= INT_MAX/2) &&	/* overflow protection */
+			(hashtable->nbuckets_optimal <= INT_MAX / 2) &&		/* overflow protection */
 			(ntuples >= (hashtable->nbuckets_optimal * NTUP_PER_BUCKET)))
 		{
 			hashtable->nbuckets_optimal *= 2;
@@ -1636,7 +1640,7 @@ dense_alloc(HashJoinTable hashtable, Size size)
 	{
 		/* allocate new chunk and put it at the beginning of the list */
 		newChunk = (HashMemoryChunk) MemoryContextAlloc(hashtable->batchCxt,
-								  offsetof(HashMemoryChunkData, data) + size);
+								 offsetof(HashMemoryChunkData, data) + size);
 		newChunk->maxlen = size;
 		newChunk->used = 0;
 		newChunk->ntuples = 0;
@@ -1663,15 +1667,15 @@ dense_alloc(HashJoinTable hashtable, Size size)
 	}
 
 	/*
-	 * See if we have enough space for it in the current chunk (if any).
-	 * If not, allocate a fresh chunk.
+	 * See if we have enough space for it in the current chunk (if any). If
+	 * not, allocate a fresh chunk.
 	 */
 	if ((hashtable->chunks == NULL) ||
 		(hashtable->chunks->maxlen - hashtable->chunks->used) < size)
 	{
 		/* allocate new chunk and put it at the beginning of the list */
 		newChunk = (HashMemoryChunk) MemoryContextAlloc(hashtable->batchCxt,
-					   offsetof(HashMemoryChunkData, data) + HASH_CHUNK_SIZE);
+					  offsetof(HashMemoryChunkData, data) + HASH_CHUNK_SIZE);
 
 		newChunk->maxlen = HASH_CHUNK_SIZE;
 		newChunk->used = size;
diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c
index 06b7c3c457..9f54c4633e 100644
--- a/src/backend/executor/nodeIndexonlyscan.c
+++ b/src/backend/executor/nodeIndexonlyscan.c
@@ -106,8 +106,8 @@ IndexOnlyNext(IndexOnlyScanState *node)
 		 * away, because the tuple is still visible until the deleting
 		 * transaction commits or the statement ends (if it's our
 		 * transaction). In either case, the lock on the VM buffer will have
-		 * been released (acting as a write barrier) after clearing the
-		 * bit. And for us to have a snapshot that includes the deleting
+		 * been released (acting as a write barrier) after clearing the bit.
+		 * And for us to have a snapshot that includes the deleting
 		 * transaction (making the tuple invisible), we must have acquired
 		 * ProcArrayLock after that time, acting as a read barrier.
 		 *
@@ -166,6 +166,19 @@ IndexOnlyNext(IndexOnlyScanState *node)
 		}
 
 		/*
+		 * We don't currently support rechecking ORDER BY distances.  (In
+		 * principle, if the index can support retrieval of the originally
+		 * indexed value, it should be able to produce an exact distance
+		 * calculation too.  So it's not clear that adding code here for
+		 * recheck/re-sort would be worth the trouble.  But we should at least
+		 * throw an error if someone tries it.)
+		 */
+		if (scandesc->numberOfOrderBys > 0 && scandesc->xs_recheckorderby)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("lossy distance functions are not supported in index-only scans")));
+
+		/*
 		 * Predicate locks for index-only scans must be acquired at the page
 		 * level when the heap is not accessed, since tuple-level predicate
 		 * locks need the tuple's xmin value.  If we had to visit the tuple
@@ -442,10 +455,12 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
 	ExecAssignScanType(&indexstate->ss, tupDesc);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result tuple type and projection info.  The node's
+	 * targetlist will contain Vars with varno = INDEX_VAR, referencing the
+	 * scan tuple.
 	 */
 	ExecAssignResultTypeFromTL(&indexstate->ss.ps);
-	ExecAssignScanProjectionInfo(&indexstate->ss);
+	ExecAssignScanProjectionInfoWithVarno(&indexstate->ss, INDEX_VAR);
 
 	/*
 	 * If we are just doing EXPLAIN (ie, aren't going to run the plan), stop
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 48fa91981f..c0f14dbfa9 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -16,6 +16,7 @@
  * INTERFACE ROUTINES
  *		ExecIndexScan			scans a relation using an index
  *		IndexNext				retrieve next tuple using index
+ *		IndexNextWithReorder	same, but recheck ORDER BY expressions
  *		ExecInitIndexScan		creates and initializes state info.
  *		ExecReScanIndexScan		rescans the indexed relation.
  *		ExecEndIndexScan		releases all storage.
@@ -28,14 +29,39 @@
 #include "access/relscan.h"
 #include "executor/execdebug.h"
 #include "executor/nodeIndexscan.h"
+#include "lib/pairingheap.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "utils/array.h"
+#include "utils/datum.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 
+/*
+ * When an ordering operator is used, tuples fetched from the index that
+ * need to be reordered are queued in a pairing heap, as ReorderTuples.
+ */
+typedef struct
+{
+	pairingheap_node ph_node;
+	HeapTuple	htup;
+	Datum	   *orderbyvals;
+	bool	   *orderbynulls;
+} ReorderTuple;
 
 static TupleTableSlot *IndexNext(IndexScanState *node);
+static TupleTableSlot *IndexNextWithReorder(IndexScanState *node);
+static void EvalOrderByExpressions(IndexScanState *node, ExprContext *econtext);
+static bool IndexRecheck(IndexScanState *node, TupleTableSlot *slot);
+static int cmp_orderbyvals(const Datum *adist, const bool *anulls,
+				const Datum *bdist, const bool *bnulls,
+				IndexScanState *node);
+static int reorderqueue_cmp(const pairingheap_node *a,
+				 const pairingheap_node *b, void *arg);
+static void reorderqueue_push(IndexScanState *node, HeapTuple tuple,
+				  Datum *orderbyvals, bool *orderbynulls);
+static HeapTuple reorderqueue_pop(IndexScanState *node);
 
 
 /* ----------------------------------------------------------------
@@ -110,10 +136,214 @@ IndexNext(IndexScanState *node)
 	 * if we get here it means the index scan failed so we are at the end of
 	 * the scan..
 	 */
+	node->iss_ReachedEnd = true;
+	return ExecClearTuple(slot);
+}
+
+/* ----------------------------------------------------------------
+ *		IndexNextWithReorder
+ *
+ *		Like IndexNext, but this version can also re-check ORDER BY
+ *		expressions, and reorder the tuples as necessary.
+ * ----------------------------------------------------------------
+ */
+static TupleTableSlot *
+IndexNextWithReorder(IndexScanState *node)
+{
+	ExprContext *econtext;
+	IndexScanDesc scandesc;
+	HeapTuple	tuple;
+	TupleTableSlot *slot;
+	ReorderTuple *topmost = NULL;
+	bool		was_exact;
+	Datum	   *lastfetched_vals;
+	bool	   *lastfetched_nulls;
+	int			cmp;
+
+	/*
+	 * Only forward scan is supported with reordering.  Note: we can get away
+	 * with just Asserting here because the system will not try to run the
+	 * plan backwards if ExecSupportsBackwardScan() says it won't work.
+	 * Currently, that is guaranteed because no index AMs support both
+	 * amcanorderbyop and amcanbackward; if any ever do,
+	 * ExecSupportsBackwardScan() will need to consider indexorderbys
+	 * explicitly.
+	 */
+	Assert(!ScanDirectionIsBackward(((IndexScan *) node->ss.ps.plan)->indexorderdir));
+	Assert(ScanDirectionIsForward(node->ss.ps.state->es_direction));
+
+	scandesc = node->iss_ScanDesc;
+	econtext = node->ss.ps.ps_ExprContext;
+	slot = node->ss.ss_ScanTupleSlot;
+
+	for (;;)
+	{
+		/*
+		 * Check the reorder queue first.  If the topmost tuple in the queue
+		 * has an ORDER BY value smaller than (or equal to) the value last
+		 * returned by the index, we can return it now.
+		 */
+		if (!pairingheap_is_empty(node->iss_ReorderQueue))
+		{
+			topmost = (ReorderTuple *) pairingheap_first(node->iss_ReorderQueue);
+
+			if (node->iss_ReachedEnd ||
+				cmp_orderbyvals(topmost->orderbyvals,
+								topmost->orderbynulls,
+								scandesc->xs_orderbyvals,
+								scandesc->xs_orderbynulls,
+								node) <= 0)
+			{
+				tuple = reorderqueue_pop(node);
+
+				/* Pass 'true', as the tuple in the queue is a palloc'd copy */
+				ExecStoreTuple(tuple, slot, InvalidBuffer, true);
+				return slot;
+			}
+		}
+		else if (node->iss_ReachedEnd)
+		{
+			/* Queue is empty, and no more tuples from index.  We're done. */
+			return ExecClearTuple(slot);
+		}
+
+		/*
+		 * Fetch next tuple from the index.
+		 */
+next_indextuple:
+		tuple = index_getnext(scandesc, ForwardScanDirection);
+		if (!tuple)
+		{
+			/*
+			 * No more tuples from the index.  But we still need to drain any
+			 * remaining tuples from the queue before we're done.
+			 */
+			node->iss_ReachedEnd = true;
+			continue;
+		}
+
+		/*
+		 * Store the scanned tuple in the scan tuple slot of the scan state.
+		 * Note: we pass 'false' because tuples returned by amgetnext are
+		 * pointers onto disk pages and must not be pfree()'d.
+		 */
+		ExecStoreTuple(tuple,	/* tuple to store */
+					   slot,	/* slot to store in */
+					   scandesc->xs_cbuf,		/* buffer containing tuple */
+					   false);	/* don't pfree */
+
+		/*
+		 * If the index was lossy, we have to recheck the index quals and
+		 * ORDER BY expressions using the fetched tuple.
+		 */
+		if (scandesc->xs_recheck)
+		{
+			econtext->ecxt_scantuple = slot;
+			ResetExprContext(econtext);
+			if (!ExecQual(node->indexqualorig, econtext, false))
+			{
+				/* Fails recheck, so drop it and loop back for another */
+				InstrCountFiltered2(node, 1);
+				goto next_indextuple;
+			}
+		}
+
+		if (scandesc->xs_recheckorderby)
+		{
+			econtext->ecxt_scantuple = slot;
+			ResetExprContext(econtext);
+			EvalOrderByExpressions(node, econtext);
+
+			/*
+			 * Was the ORDER BY value returned by the index accurate?  The
+			 * recheck flag means that the index can return inaccurate values,
+			 * but then again, the value returned for any particular tuple
+			 * could also be exactly correct.  Compare the value returned by
+			 * the index with the recalculated value.  (If the value returned
+			 * by the index happened to be exact right, we can often avoid
+			 * pushing the tuple to the queue, just to pop it back out again.)
+			 */
+			cmp = cmp_orderbyvals(node->iss_OrderByValues,
+								  node->iss_OrderByNulls,
+								  scandesc->xs_orderbyvals,
+								  scandesc->xs_orderbynulls,
+								  node);
+			if (cmp < 0)
+				elog(ERROR, "index returned tuples in wrong order");
+			else if (cmp == 0)
+				was_exact = true;
+			else
+				was_exact = false;
+			lastfetched_vals = node->iss_OrderByValues;
+			lastfetched_nulls = node->iss_OrderByNulls;
+		}
+		else
+		{
+			was_exact = true;
+			lastfetched_vals = scandesc->xs_orderbyvals;
+			lastfetched_nulls = scandesc->xs_orderbynulls;
+		}
+
+		/*
+		 * Can we return this tuple immediately, or does it need to be pushed
+		 * to the reorder queue?  If the ORDER BY expression values returned
+		 * by the index were inaccurate, we can't return it yet, because the
+		 * next tuple from the index might need to come before this one. Also,
+		 * we can't return it yet if there are any smaller tuples in the queue
+		 * already.
+		 */
+		if (!was_exact || (topmost && cmp_orderbyvals(lastfetched_vals,
+													  lastfetched_nulls,
+													  topmost->orderbyvals,
+													  topmost->orderbynulls,
+													  node) > 0))
+		{
+			/* Put this tuple to the queue */
+			reorderqueue_push(node, tuple, lastfetched_vals, lastfetched_nulls);
+			continue;
+		}
+		else
+		{
+			/* Can return this tuple immediately. */
+			return slot;
+		}
+	}
+
+	/*
+	 * if we get here it means the index scan failed so we are at the end of
+	 * the scan..
+	 */
 	return ExecClearTuple(slot);
 }
 
 /*
+ * Calculate the expressions in the ORDER BY clause, based on the heap tuple.
+ */
+static void
+EvalOrderByExpressions(IndexScanState *node, ExprContext *econtext)
+{
+	int			i;
+	ListCell   *l;
+	MemoryContext oldContext;
+
+	oldContext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
+
+	i = 0;
+	foreach(l, node->indexorderbyorig)
+	{
+		ExprState  *orderby = (ExprState *) lfirst(l);
+
+		node->iss_OrderByValues[i] = ExecEvalExpr(orderby,
+												  econtext,
+												  &node->iss_OrderByNulls[i],
+												  NULL);
+		i++;
+	}
+
+	MemoryContextSwitchTo(oldContext);
+}
+
+/*
  * IndexRecheck -- access method routine to recheck a tuple in EvalPlanQual
  */
 static bool
@@ -134,6 +364,119 @@ IndexRecheck(IndexScanState *node, TupleTableSlot *slot)
 	return ExecQual(node->indexqualorig, econtext, false);
 }
 
+
+/*
+ * Compare ORDER BY expression values.
+ */
+static int
+cmp_orderbyvals(const Datum *adist, const bool *anulls,
+				const Datum *bdist, const bool *bnulls,
+				IndexScanState *node)
+{
+	int			i;
+	int			result;
+
+	for (i = 0; i < node->iss_NumOrderByKeys; i++)
+	{
+		SortSupport ssup = &node->iss_SortSupport[i];
+
+		/*
+		 * Handle nulls.  We only need to support NULLS LAST ordering, because
+		 * match_pathkeys_to_index() doesn't consider indexorderby
+		 * implementation otherwise.
+		 */
+		if (anulls[i] && !bnulls[i])
+			return 1;
+		else if (!anulls[i] && bnulls[i])
+			return -1;
+		else if (anulls[i] && bnulls[i])
+			return 0;
+
+		result = ssup->comparator(adist[i], bdist[i], ssup);
+		if (result != 0)
+			return result;
+	}
+
+	return 0;
+}
+
+/*
+ * Pairing heap provides getting topmost (greatest) element while KNN provides
+ * ascending sort.  That's why we invert the sort order.
+ */
+static int
+reorderqueue_cmp(const pairingheap_node *a, const pairingheap_node *b,
+				 void *arg)
+{
+	ReorderTuple *rta = (ReorderTuple *) a;
+	ReorderTuple *rtb = (ReorderTuple *) b;
+	IndexScanState *node = (IndexScanState *) arg;
+
+	return -cmp_orderbyvals(rta->orderbyvals, rta->orderbynulls,
+							rtb->orderbyvals, rtb->orderbynulls,
+							node);
+}
+
+/*
+ * Helper function to push a tuple to the reorder queue.
+ */
+static void
+reorderqueue_push(IndexScanState *node, HeapTuple tuple,
+				  Datum *orderbyvals, bool *orderbynulls)
+{
+	IndexScanDesc scandesc = node->iss_ScanDesc;
+	EState	   *estate = node->ss.ps.state;
+	MemoryContext oldContext = MemoryContextSwitchTo(estate->es_query_cxt);
+	ReorderTuple *rt;
+	int			i;
+
+	rt = (ReorderTuple *) palloc(sizeof(ReorderTuple));
+	rt->htup = heap_copytuple(tuple);
+	rt->orderbyvals =
+		(Datum *) palloc(sizeof(Datum) * scandesc->numberOfOrderBys);
+	rt->orderbynulls =
+		(bool *) palloc(sizeof(bool) * scandesc->numberOfOrderBys);
+	for (i = 0; i < node->iss_NumOrderByKeys; i++)
+	{
+		if (!orderbynulls[i])
+			rt->orderbyvals[i] = datumCopy(orderbyvals[i],
+										   node->iss_OrderByTypByVals[i],
+										   node->iss_OrderByTypLens[i]);
+		else
+			rt->orderbyvals[i] = (Datum) 0;
+		rt->orderbynulls[i] = orderbynulls[i];
+	}
+	pairingheap_add(node->iss_ReorderQueue, &rt->ph_node);
+
+	MemoryContextSwitchTo(oldContext);
+}
+
+/*
+ * Helper function to pop the next tuple from the reorder queue.
+ */
+static HeapTuple
+reorderqueue_pop(IndexScanState *node)
+{
+	HeapTuple	result;
+	ReorderTuple *topmost;
+	int			i;
+
+	topmost = (ReorderTuple *) pairingheap_remove_first(node->iss_ReorderQueue);
+
+	result = topmost->htup;
+	for (i = 0; i < node->iss_NumOrderByKeys; i++)
+	{
+		if (!node->iss_OrderByTypByVals[i] && !topmost->orderbynulls[i])
+			pfree(DatumGetPointer(topmost->orderbyvals[i]));
+	}
+	pfree(topmost->orderbyvals);
+	pfree(topmost->orderbynulls);
+	pfree(topmost);
+
+	return result;
+}
+
+
 /* ----------------------------------------------------------------
  *		ExecIndexScan(node)
  * ----------------------------------------------------------------
@@ -147,9 +490,14 @@ ExecIndexScan(IndexScanState *node)
 	if (node->iss_NumRuntimeKeys != 0 && !node->iss_RuntimeKeysReady)
 		ExecReScan((PlanState *) node);
 
-	return ExecScan(&node->ss,
-					(ExecScanAccessMtd) IndexNext,
-					(ExecScanRecheckMtd) IndexRecheck);
+	if (node->iss_NumOrderByKeys > 0)
+		return ExecScan(&node->ss,
+						(ExecScanAccessMtd) IndexNextWithReorder,
+						(ExecScanRecheckMtd) IndexRecheck);
+	else
+		return ExecScan(&node->ss,
+						(ExecScanAccessMtd) IndexNext,
+						(ExecScanRecheckMtd) IndexRecheck);
 }
 
 /* ----------------------------------------------------------------
@@ -184,10 +532,18 @@ ExecReScanIndexScan(IndexScanState *node)
 	}
 	node->iss_RuntimeKeysReady = true;
 
+	/* flush the reorder queue */
+	if (node->iss_ReorderQueue)
+	{
+		while (!pairingheap_is_empty(node->iss_ReorderQueue))
+			reorderqueue_pop(node);
+	}
+
 	/* reset index scan */
 	index_rescan(node->iss_ScanDesc,
 				 node->iss_ScanKeys, node->iss_NumScanKeys,
 				 node->iss_OrderByKeys, node->iss_NumOrderByKeys);
+	node->iss_ReachedEnd = false;
 
 	ExecScanReScan(&node->ss);
 }
@@ -501,6 +857,9 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags)
 	indexstate->indexqualorig = (List *)
 		ExecInitExpr((Expr *) node->indexqualorig,
 					 (PlanState *) indexstate);
+	indexstate->indexorderbyorig = (List *)
+		ExecInitExpr((Expr *) node->indexorderbyorig,
+					 (PlanState *) indexstate);
 
 	/*
 	 * tuple table initialization
@@ -581,6 +940,52 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags)
 						   NULL,	/* no ArrayKeys */
 						   NULL);
 
+	/* Initialize sort support, if we need to re-check ORDER BY exprs */
+	if (indexstate->iss_NumOrderByKeys > 0)
+	{
+		int			numOrderByKeys = indexstate->iss_NumOrderByKeys;
+		int			i;
+		ListCell   *lco;
+		ListCell   *lcx;
+
+		/*
+		 * Prepare sort support, and look up the data type for each ORDER BY
+		 * expression.
+		 */
+		Assert(numOrderByKeys == list_length(node->indexorderbyops));
+		Assert(numOrderByKeys == list_length(node->indexorderbyorig));
+		indexstate->iss_SortSupport = (SortSupportData *)
+			palloc0(numOrderByKeys * sizeof(SortSupportData));
+		indexstate->iss_OrderByTypByVals = (bool *)
+			palloc(numOrderByKeys * sizeof(bool));
+		indexstate->iss_OrderByTypLens = (int16 *)
+			palloc(numOrderByKeys * sizeof(int16));
+		i = 0;
+		forboth(lco, node->indexorderbyops, lcx, node->indexorderbyorig)
+		{
+			Oid			orderbyop = lfirst_oid(lco);
+			Node	   *orderbyexpr = (Node *) lfirst(lcx);
+			Oid			orderbyType = exprType(orderbyexpr);
+
+			PrepareSortSupportFromOrderingOp(orderbyop,
+											 &indexstate->iss_SortSupport[i]);
+			get_typlenbyval(orderbyType,
+							&indexstate->iss_OrderByTypLens[i],
+							&indexstate->iss_OrderByTypByVals[i]);
+			i++;
+		}
+
+		/* allocate arrays to hold the re-calculated distances */
+		indexstate->iss_OrderByValues = (Datum *)
+			palloc(numOrderByKeys * sizeof(Datum));
+		indexstate->iss_OrderByNulls = (bool *)
+			palloc(numOrderByKeys * sizeof(bool));
+
+		/* and initialize the reorder queue */
+		indexstate->iss_ReorderQueue = pairingheap_allocate(reorderqueue_cmp,
+															indexstate);
+	}
+
 	/*
 	 * If we have runtime keys, we need an ExprContext to evaluate them. The
 	 * node's standard context won't do because we want to reset that context
diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c
index bb6df47a95..b9b0f06882 100644
--- a/src/backend/executor/nodeLockRows.c
+++ b/src/backend/executor/nodeLockRows.c
@@ -25,6 +25,7 @@
 #include "access/xact.h"
 #include "executor/executor.h"
 #include "executor/nodeLockRows.h"
+#include "foreign/fdwapi.h"
 #include "storage/bufmgr.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
@@ -40,7 +41,7 @@ ExecLockRows(LockRowsState *node)
 	TupleTableSlot *slot;
 	EState	   *estate;
 	PlanState  *outerPlan;
-	bool		epq_started;
+	bool		epq_needed;
 	ListCell   *lc;
 
 	/*
@@ -58,15 +59,18 @@ lnext:
 	if (TupIsNull(slot))
 		return NULL;
 
+	/* We don't need EvalPlanQual unless we get updated tuple version(s) */
+	epq_needed = false;
+
 	/*
 	 * Attempt to lock the source tuple(s).  (Note we only have locking
 	 * rowmarks in lr_arowMarks.)
 	 */
-	epq_started = false;
 	foreach(lc, node->lr_arowMarks)
 	{
 		ExecAuxRowMark *aerm = (ExecAuxRowMark *) lfirst(lc);
 		ExecRowMark *erm = aerm->rowmark;
+		HeapTuple  *testTuple;
 		Datum		datum;
 		bool		isNull;
 		HeapTupleData tuple;
@@ -77,8 +81,10 @@ lnext:
 		HeapTuple	copyTuple;
 
 		/* clear any leftover test tuple for this rel */
-		if (node->lr_epqstate.estate != NULL)
-			EvalPlanQualSetTuple(&node->lr_epqstate, erm->rti, NULL);
+		testTuple = &(node->lr_curtuples[erm->rti - 1]);
+		if (*testTuple != NULL)
+			heap_freetuple(*testTuple);
+		*testTuple = NULL;
 
 		/* if child rel, must check whether it produced this row */
 		if (erm->rti != erm->prti)
@@ -97,10 +103,12 @@ lnext:
 			if (tableoid != erm->relid)
 			{
 				/* this child is inactive right now */
+				erm->ermActive = false;
 				ItemPointerSetInvalid(&(erm->curCtid));
 				continue;
 			}
 		}
+		erm->ermActive = true;
 
 		/* fetch the tuple's ctid */
 		datum = ExecGetJunkAttribute(slot,
@@ -109,9 +117,45 @@ lnext:
 		/* shouldn't ever get a null result... */
 		if (isNull)
 			elog(ERROR, "ctid is NULL");
-		tuple.t_self = *((ItemPointer) DatumGetPointer(datum));
+
+		/* requests for foreign tables must be passed to their FDW */
+		if (erm->relation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+		{
+			FdwRoutine *fdwroutine;
+			bool		updated = false;
+
+			fdwroutine = GetFdwRoutineForRelation(erm->relation, false);
+			/* this should have been checked already, but let's be safe */
+			if (fdwroutine->RefetchForeignRow == NULL)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("cannot lock rows in foreign table \"%s\"",
+								RelationGetRelationName(erm->relation))));
+			copyTuple = fdwroutine->RefetchForeignRow(estate,
+													  erm,
+													  datum,
+													  &updated);
+			if (copyTuple == NULL)
+			{
+				/* couldn't get the lock, so skip this row */
+				goto lnext;
+			}
+
+			/* save locked tuple for possible EvalPlanQual testing below */
+			*testTuple = copyTuple;
+
+			/*
+			 * if FDW says tuple was updated before getting locked, we need to
+			 * perform EPQ testing to see if quals are still satisfied
+			 */
+			if (updated)
+				epq_needed = true;
+
+			continue;
+		}
 
 		/* okay, try to lock the tuple */
+		tuple.t_self = *((ItemPointer) DatumGetPointer(datum));
 		switch (erm->markType)
 		{
 			case ROW_MARK_EXCLUSIVE:
@@ -152,10 +196,12 @@ lnext:
 				 * case, so as to avoid the "Halloween problem" of repeated
 				 * update attempts.  In the latter case it might be sensible
 				 * to fetch the updated tuple instead, but doing so would
-				 * require changing heap_lock_tuple as well as heap_update and
-				 * heap_delete to not complain about updating "invisible"
-				 * tuples, which seems pretty scary.  So for now, treat the
-				 * tuple as deleted and do not process.
+				 * require changing heap_update and heap_delete to not
+				 * complain about updating "invisible" tuples, which seems
+				 * pretty scary (heap_lock_tuple will not complain, but few
+				 * callers expect HeapTupleInvisible, and we're not one of
+				 * them).  So for now, treat the tuple as deleted and do not
+				 * process.
 				 */
 				goto lnext;
 
@@ -190,60 +236,52 @@ lnext:
 				/* remember the actually locked tuple's TID */
 				tuple.t_self = copyTuple->t_self;
 
-				/*
-				 * Need to run a recheck subquery.  Initialize EPQ state if we
-				 * didn't do so already.
-				 */
-				if (!epq_started)
-				{
-					ListCell   *lc2;
-
-					EvalPlanQualBegin(&node->lr_epqstate, estate);
+				/* Save locked tuple for EvalPlanQual testing below */
+				*testTuple = copyTuple;
 
-					/*
-					 * Ensure that rels with already-visited rowmarks are told
-					 * not to return tuples during the first EPQ test.  We can
-					 * exit this loop once it reaches the current rowmark;
-					 * rels appearing later in the list will be set up
-					 * correctly by the EvalPlanQualSetTuple call at the top
-					 * of the loop.
-					 */
-					foreach(lc2, node->lr_arowMarks)
-					{
-						ExecAuxRowMark *aerm2 = (ExecAuxRowMark *) lfirst(lc2);
-
-						if (lc2 == lc)
-							break;
-						EvalPlanQualSetTuple(&node->lr_epqstate,
-											 aerm2->rowmark->rti,
-											 NULL);
-					}
-
-					epq_started = true;
-				}
-
-				/* Store target tuple for relation's scan node */
-				EvalPlanQualSetTuple(&node->lr_epqstate, erm->rti, copyTuple);
+				/* Remember we need to do EPQ testing */
+				epq_needed = true;
 
 				/* Continue loop until we have all target tuples */
 				break;
 
+			case HeapTupleInvisible:
+				elog(ERROR, "attempted to lock invisible tuple");
+
 			default:
 				elog(ERROR, "unrecognized heap_lock_tuple status: %u",
 					 test);
 		}
 
-		/* Remember locked tuple's TID for WHERE CURRENT OF */
+		/* Remember locked tuple's TID for EPQ testing and WHERE CURRENT OF */
 		erm->curCtid = tuple.t_self;
 	}
 
 	/*
 	 * If we need to do EvalPlanQual testing, do so.
 	 */
-	if (epq_started)
+	if (epq_needed)
 	{
+		int			i;
+
+		/* Initialize EPQ machinery */
+		EvalPlanQualBegin(&node->lr_epqstate, estate);
+
 		/*
-		 * First, fetch a copy of any rows that were successfully locked
+		 * Transfer already-fetched tuples into the EPQ state, and make sure
+		 * its test tuples for other tables are reset to NULL.
+		 */
+		for (i = 0; i < node->lr_ntables; i++)
+		{
+			EvalPlanQualSetTuple(&node->lr_epqstate,
+								 i + 1,
+								 node->lr_curtuples[i]);
+			/* freeing this tuple is now the responsibility of EPQ */
+			node->lr_curtuples[i] = NULL;
+		}
+
+		/*
+		 * Next, fetch a copy of any rows that were successfully locked
 		 * without any update having occurred.  (We do this in a separate pass
 		 * so as to avoid overhead in the common case where there are no
 		 * concurrent updates.)
@@ -256,7 +294,7 @@ lnext:
 			Buffer		buffer;
 
 			/* ignore non-active child tables */
-			if (!ItemPointerIsValid(&(erm->curCtid)))
+			if (!erm->ermActive)
 			{
 				Assert(erm->rti != erm->prti);	/* check it's child table */
 				continue;
@@ -265,6 +303,10 @@ lnext:
 			if (EvalPlanQualGetTuple(&node->lr_epqstate, erm->rti) != NULL)
 				continue;		/* it was updated and fetched above */
 
+			/* foreign tables should have been fetched above */
+			Assert(erm->relation->rd_rel->relkind != RELKIND_FOREIGN_TABLE);
+			Assert(ItemPointerIsValid(&(erm->curCtid)));
+
 			/* okay, fetch the tuple */
 			tuple.t_self = erm->curCtid;
 			if (!heap_fetch(erm->relation, SnapshotAny, &tuple, &buffer,
@@ -348,6 +390,13 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags)
 	lrstate->ps.ps_ProjInfo = NULL;
 
 	/*
+	 * Create workspace in which we can remember per-RTE locked tuples
+	 */
+	lrstate->lr_ntables = list_length(estate->es_range_table);
+	lrstate->lr_curtuples = (HeapTuple *)
+		palloc0(lrstate->lr_ntables * sizeof(HeapTuple));
+
+	/*
 	 * Locate the ExecRowMark(s) that this node is responsible for, and
 	 * construct ExecAuxRowMarks for them.  (InitPlan should already have
 	 * built the global list of ExecRowMarks.)
@@ -366,8 +415,11 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags)
 		if (rc->isParent)
 			continue;
 
+		/* safety check on size of lr_curtuples array */
+		Assert(rc->rti > 0 && rc->rti <= lrstate->lr_ntables);
+
 		/* find ExecRowMark and build ExecAuxRowMark */
-		erm = ExecFindRowMark(estate, rc->rti);
+		erm = ExecFindRowMark(estate, rc->rti, false);
 		aerm = ExecBuildAuxRowMark(erm, outerPlan->targetlist);
 
 		/*
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 1158825869..b2b5aa7e8e 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -317,6 +317,8 @@ ExecMaterialRestrPos(MaterialState *node)
 void
 ExecReScanMaterial(MaterialState *node)
 {
+	PlanState  *outerPlan = outerPlanState(node);
+
 	ExecClearTuple(node->ss.ps.ps_ResultTupleSlot);
 
 	if (node->eflags != 0)
@@ -339,13 +341,13 @@ ExecReScanMaterial(MaterialState *node)
 		 * Otherwise we can just rewind and rescan the stored output. The
 		 * state of the subnode does not change.
 		 */
-		if (node->ss.ps.lefttree->chgParam != NULL ||
+		if (outerPlan->chgParam != NULL ||
 			(node->eflags & EXEC_FLAG_REWIND) == 0)
 		{
 			tuplestore_end(node->tuplestorestate);
 			node->tuplestorestate = NULL;
-			if (node->ss.ps.lefttree->chgParam == NULL)
-				ExecReScan(node->ss.ps.lefttree);
+			if (outerPlan->chgParam == NULL)
+				ExecReScan(outerPlan);
 			node->eof_underlying = false;
 		}
 		else
@@ -359,8 +361,8 @@ ExecReScanMaterial(MaterialState *node)
 		 * if chgParam of subnode is not null then plan will be re-scanned by
 		 * first ExecProcNode.
 		 */
-		if (node->ss.ps.lefttree->chgParam == NULL)
-			ExecReScan(node->ss.ps.lefttree);
+		if (outerPlan->chgParam == NULL)
+			ExecReScan(outerPlan);
 		node->eof_underlying = false;
 	}
 }
diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c
index 0c814f0e72..bdf76808a8 100644
--- a/src/backend/executor/nodeMergeAppend.c
+++ b/src/backend/executor/nodeMergeAppend.c
@@ -139,10 +139,10 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags)
 
 		/*
 		 * It isn't feasible to perform abbreviated key conversion, since
-		 * tuples are pulled into mergestate's binary heap as needed.  It would
-		 * likely be counter-productive to convert tuples into an abbreviated
-		 * representation as they're pulled up, so opt out of that additional
-		 * optimization entirely.
+		 * tuples are pulled into mergestate's binary heap as needed.  It
+		 * would likely be counter-productive to convert tuples into an
+		 * abbreviated representation as they're pulled up, so opt out of that
+		 * additional optimization entirely.
 		 */
 		sortKey->abbreviate = false;
 
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 15742c574a..34b6cf61e0 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -232,8 +232,8 @@ MJExamineQuals(List *mergeclauses,
 		/*
 		 * sortsupport routine must know if abbreviation optimization is
 		 * applicable in principle.  It is never applicable for merge joins
-		 * because there is no convenient opportunity to convert to alternative
-		 * representation.
+		 * because there is no convenient opportunity to convert to
+		 * alternative representation.
 		 */
 		clause->ssup.abbreviate = false;
 
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index dfc1785635..101fdbddc7 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -57,12 +57,22 @@
 #endif
 #endif
 #include "storage/bufmgr.h"
+#include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
 
 
+static bool ExecOnConflictUpdate(ModifyTableState *mtstate,
+					 ResultRelInfo *resultRelInfo,
+					 ItemPointer conflictTid,
+					 TupleTableSlot *planSlot,
+					 TupleTableSlot *excludedSlot,
+					 EState *estate,
+					 bool canSetTag,
+					 TupleTableSlot **returning);
+
 /*
  * Verify that the tuples to be produced by INSERT or UPDATE match the
  * target relation's rowtype
@@ -162,6 +172,51 @@ ExecProcessReturning(ProjectionInfo *projectReturning,
 	return ExecProject(projectReturning, NULL);
 }
 
+/*
+ * ExecCheckHeapTupleVisible -- verify heap tuple is visible
+ *
+ * It would not be consistent with guarantees of the higher isolation levels to
+ * proceed with avoiding insertion (taking speculative insertion's alternative
+ * path) on the basis of another tuple that is not visible to MVCC snapshot.
+ * Check for the need to raise a serialization failure, and do so as necessary.
+ */
+static void
+ExecCheckHeapTupleVisible(EState *estate,
+						  HeapTuple tuple,
+						  Buffer buffer)
+{
+	if (!IsolationUsesXactSnapshot())
+		return;
+
+	if (!HeapTupleSatisfiesVisibility(tuple, estate->es_snapshot, buffer))
+		ereport(ERROR,
+				(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+			 errmsg("could not serialize access due to concurrent update")));
+}
+
+/*
+ * ExecCheckTIDVisible -- convenience variant of ExecCheckHeapTupleVisible()
+ */
+static void
+ExecCheckTIDVisible(EState *estate,
+					ResultRelInfo *relinfo,
+					ItemPointer tid)
+{
+	Relation	rel = relinfo->ri_RelationDesc;
+	Buffer		buffer;
+	HeapTupleData tuple;
+
+	/* Redundantly check isolation level */
+	if (!IsolationUsesXactSnapshot())
+		return;
+
+	tuple.t_self = *tid;
+	if (!heap_fetch(rel, SnapshotAny, &tuple, &buffer, false, NULL))
+		elog(ERROR, "failed to fetch conflicting tuple for ON CONFLICT");
+	ExecCheckHeapTupleVisible(estate, &tuple, buffer);
+	ReleaseBuffer(buffer);
+}
+
 /* ----------------------------------------------------------------
  *		ExecInsert
  *
@@ -172,8 +227,11 @@ ExecProcessReturning(ProjectionInfo *projectReturning,
  * ----------------------------------------------------------------
  */
 static TupleTableSlot *
-ExecInsert(TupleTableSlot *slot,
+ExecInsert(ModifyTableState *mtstate,
+		   TupleTableSlot *slot,
 		   TupleTableSlot *planSlot,
+		   List *arbiterIndexes,
+		   OnConflictAction onconflict,
 		   EState *estate,
 		   bool canSetTag)
 {
@@ -219,7 +277,15 @@ ExecInsert(TupleTableSlot *slot,
 	if (resultRelationDesc->rd_rel->relhasoids)
 		HeapTupleSetOid(tuple, InvalidOid);
 
-	/* BEFORE ROW INSERT Triggers */
+	/*
+	 * BEFORE ROW INSERT Triggers.
+	 *
+	 * Note: We fire BEFORE ROW TRIGGERS for every attempted insertion in an
+	 * INSERT ... ON CONFLICT statement.  We cannot check for constraint
+	 * violations before firing these triggers, because they can change the
+	 * values to insert.  Also, they can run arbitrary user-defined code with
+	 * side-effects that we can't cancel by just not inserting the tuple.
+	 */
 	if (resultRelInfo->ri_TrigDesc &&
 		resultRelInfo->ri_TrigDesc->trig_insert_before_row)
 	{
@@ -273,44 +339,146 @@ ExecInsert(TupleTableSlot *slot,
 		tuple->t_tableOid = RelationGetRelid(resultRelationDesc);
 
 		/*
+		 * Check any RLS INSERT WITH CHECK policies
+		 *
+		 * ExecWithCheckOptions() will skip any WCOs which are not of the kind
+		 * we are looking for at this point.
+		 */
+		if (resultRelInfo->ri_WithCheckOptions != NIL)
+			ExecWithCheckOptions(WCO_RLS_INSERT_CHECK,
+								 resultRelInfo, slot, estate);
+
+		/*
 		 * Check the constraints of the tuple
 		 */
 		if (resultRelationDesc->rd_att->constr)
 			ExecConstraints(resultRelInfo, slot, estate);
 
-#ifdef PGXC
-#ifndef XCP
-		if (IS_PGXC_COORDINATOR && resultRemoteRel)
+		if (onconflict != ONCONFLICT_NONE && resultRelInfo->ri_NumIndices > 0)
 		{
-			ExecRemoteQueryStandard(resultRelationDesc, (RemoteQueryState *)resultRemoteRel, slot);
+			/* Perform a speculative insertion. */
+			uint32		specToken;
+			ItemPointerData conflictTid;
+			bool		specConflict;
 
 			/*
-			 * PGXCTODO: If target table uses WITH OIDS, this should be set to the Oid inserted
-			 * but Oids are not consistent among nodes in Postgres-XC, so this is set to the
-			 * default value InvalidOid for the time being. It corrects at least tags for all
-			 * the other INSERT commands.
+			 * Do a non-conclusive check for conflicts first.
+			 *
+			 * We're not holding any locks yet, so this doesn't guarantee that
+			 * the later insert won't conflict.  But it avoids leaving behind
+			 * a lot of canceled speculative insertions, if you run a lot of
+			 * INSERT ON CONFLICT statements that do conflict.
+			 *
+			 * We loop back here if we find a conflict below, either during
+			 * the pre-check, or when we re-check after inserting the tuple
+			 * speculatively.  See the executor README for a full discussion
+			 * of speculative insertion.
 			 */
-			newId = InvalidOid;
+	vlock:
+			specConflict = false;
+			if (!ExecCheckIndexConstraints(slot, estate, &conflictTid,
+										   arbiterIndexes))
+			{
+				/* committed conflict tuple found */
+				if (onconflict == ONCONFLICT_UPDATE)
+				{
+					/*
+					 * In case of ON CONFLICT DO UPDATE, execute the UPDATE
+					 * part.  Be prepared to retry if the UPDATE fails because
+					 * of another concurrent UPDATE/DELETE to the conflict
+					 * tuple.
+					 */
+					TupleTableSlot *returning = NULL;
+
+					if (ExecOnConflictUpdate(mtstate, resultRelInfo,
+											 &conflictTid, planSlot, slot,
+											 estate, canSetTag, &returning))
+					{
+						InstrCountFiltered2(&mtstate->ps, 1);
+						return returning;
+					}
+					else
+						goto vlock;
+				}
+				else
+				{
+					/*
+					 * In case of ON CONFLICT DO NOTHING, do nothing. However,
+					 * verify that the tuple is visible to the executor's MVCC
+					 * snapshot at higher isolation levels.
+					 */
+					Assert(onconflict == ONCONFLICT_NOTHING);
+					ExecCheckTIDVisible(estate, resultRelInfo, &conflictTid);
+					InstrCountFiltered2(&mtstate->ps, 1);
+					return NULL;
+				}
+			}
+
+			/*
+			 * Before we start insertion proper, acquire our "speculative
+			 * insertion lock".  Others can use that to wait for us to decide
+			 * if we're going to go ahead with the insertion, instead of
+			 * waiting for the whole transaction to complete.
+			 */
+			specToken = SpeculativeInsertionLockAcquire(GetCurrentTransactionId());
+			HeapTupleHeaderSetSpeculativeToken(tuple->t_data, specToken);
+
+			/* insert the tuple, with the speculative token */
+			newId = heap_insert(resultRelationDesc, tuple,
+								estate->es_output_cid,
+								HEAP_INSERT_SPECULATIVE,
+								NULL);
+
+			/* insert index entries for tuple */
+			recheckIndexes = ExecInsertIndexTuples(slot, &(tuple->t_self),
+												 estate, true, &specConflict,
+												   arbiterIndexes);
+
+			/* adjust the tuple's state accordingly */
+			if (!specConflict)
+				heap_finish_speculative(resultRelationDesc, tuple);
+			else
+				heap_abort_speculative(resultRelationDesc, tuple);
+
+			/*
+			 * Wake up anyone waiting for our decision.  They will re-check
+			 * the tuple, see that it's no longer speculative, and wait on our
+			 * XID as if this was a regularly inserted tuple all along.  Or if
+			 * we killed the tuple, they will see it's dead, and proceed as if
+			 * the tuple never existed.
+			 */
+			SpeculativeInsertionLockRelease(GetCurrentTransactionId());
+
+			/*
+			 * If there was a conflict, start from the beginning.  We'll do
+			 * the pre-check again, which will now find the conflicting tuple
+			 * (unless it aborts before we get there).
+			 */
+			if (specConflict)
+			{
+				list_free(recheckIndexes);
+				goto vlock;
+			}
+
+			/* Since there was no insertion conflict, we're done */
 		}
 		else
-#endif
-#endif
 		{
 			/*
-			 * insert the tuple
+			 * insert the tuple normally.
 			 *
-			 * Note: heap_insert returns the tid (location) of the new tuple in
-			 * the t_self field.
+			 * Note: heap_insert returns the tid (location) of the new tuple
+			 * in the t_self field.
 			 */
 			newId = heap_insert(resultRelationDesc, tuple,
-								estate->es_output_cid, 0, NULL);
+								estate->es_output_cid,
+								0, NULL);
 
-			/*
-			 * insert index entries for tuple
-			 */
+			/* insert index entries for tuple */
 			if (resultRelInfo->ri_NumIndices > 0)
 				recheckIndexes = ExecInsertIndexTuples(slot, &(tuple->t_self),
-													   estate);
+													   estate, false, NULL,
+													   arbiterIndexes);
 		}
 	}
 
@@ -326,9 +494,20 @@ ExecInsert(TupleTableSlot *slot,
 
 	list_free(recheckIndexes);
 
-	/* Check any WITH CHECK OPTION constraints */
+	/*
+	 * Check any WITH CHECK OPTION constraints from parent views.  We are
+	 * required to do this after testing all constraints and uniqueness
+	 * violations per the SQL spec, so we do it after actually inserting the
+	 * record into the heap and all indexes.
+	 *
+	 * ExecWithCheckOptions will elog(ERROR) if a violation is found, so the
+	 * tuple will never be seen, if it violates the WITH CHECK OPTION.
+	 *
+	 * ExecWithCheckOptions() will skip any WCOs which are not of the kind we
+	 * are looking for at this point.
+	 */
 	if (resultRelInfo->ri_WithCheckOptions != NIL)
-		ExecWithCheckOptions(resultRelInfo, slot, estate);
+		ExecWithCheckOptions(WCO_VIEW_CHECK, resultRelInfo, slot, estate);
 
 	/* Process RETURNING if present */
 	if (resultRelInfo->ri_projectReturning)
@@ -736,15 +915,25 @@ ExecUpdate(ItemPointer tupleid,
 		tuple->t_tableOid = RelationGetRelid(resultRelationDesc);
 
 		/*
-		 * Check the constraints of the tuple
+		 * Check any RLS UPDATE WITH CHECK policies
 		 *
 		 * If we generate a new candidate tuple after EvalPlanQual testing, we
-		 * must loop back here and recheck constraints.  (We don't need to
-		 * redo triggers, however.  If there are any BEFORE triggers then
-		 * trigger.c will have done heap_lock_tuple to lock the correct tuple,
-		 * so there's no need to do them again.)
+		 * must loop back here and recheck any RLS policies and constraints.
+		 * (We don't need to redo triggers, however.  If there are any BEFORE
+		 * triggers then trigger.c will have done heap_lock_tuple to lock the
+		 * correct tuple, so there's no need to do them again.)
+		 *
+		 * ExecWithCheckOptions() will skip any WCOs which are not of the kind
+		 * we are looking for at this point.
 		 */
 lreplace:;
+		if (resultRelInfo->ri_WithCheckOptions != NIL)
+			ExecWithCheckOptions(WCO_RLS_UPDATE_CHECK,
+								 resultRelInfo, slot, estate);
+
+		/*
+		 * Check the constraints of the tuple
+		 */
 		if (resultRelationDesc->rd_att->constr)
 			ExecConstraints(resultRelInfo, slot, estate);
 
@@ -861,12 +1050,7 @@ lreplace:;
 		 */
 		if (resultRelInfo->ri_NumIndices > 0 && !HeapTupleIsHeapOnly(tuple))
 			recheckIndexes = ExecInsertIndexTuples(slot, &(tuple->t_self),
-												   estate);
-#ifdef PGXC
-#ifndef XCP
-		}
-#endif
-#endif
+												   estate, false, NULL, NIL);
 	}
 
 	if (canSetTag)
@@ -886,9 +1070,17 @@ lreplace:;
 
 	list_free(recheckIndexes);
 
-	/* Check any WITH CHECK OPTION constraints */
+	/*
+	 * Check any WITH CHECK OPTION constraints from parent views.  We are
+	 * required to do this after testing all constraints and uniqueness
+	 * violations per the SQL spec, so we do it after actually updating the
+	 * record in the heap and all indexes.
+	 *
+	 * ExecWithCheckOptions() will skip any WCOs which are not of the kind we
+	 * are looking for at this point.
+	 */
 	if (resultRelInfo->ri_WithCheckOptions != NIL)
-		ExecWithCheckOptions(resultRelInfo, slot, estate);
+		ExecWithCheckOptions(WCO_VIEW_CHECK, resultRelInfo, slot, estate);
 
 	/* Process RETURNING if present */
 	if (resultRelInfo->ri_projectReturning)
@@ -898,6 +1090,190 @@ lreplace:;
 	return NULL;
 }
 
+/*
+ * ExecOnConflictUpdate --- execute UPDATE of INSERT ON CONFLICT DO UPDATE
+ *
+ * Try to lock tuple for update as part of speculative insertion.  If
+ * a qual originating from ON CONFLICT DO UPDATE is satisfied, update
+ * (but still lock row, even though it may not satisfy estate's
+ * snapshot).
+ *
+ * Returns true if if we're done (with or without an update), or false if
+ * the caller must retry the INSERT from scratch.
+ */
+static bool
+ExecOnConflictUpdate(ModifyTableState *mtstate,
+					 ResultRelInfo *resultRelInfo,
+					 ItemPointer conflictTid,
+					 TupleTableSlot *planSlot,
+					 TupleTableSlot *excludedSlot,
+					 EState *estate,
+					 bool canSetTag,
+					 TupleTableSlot **returning)
+{
+	ExprContext *econtext = mtstate->ps.ps_ExprContext;
+	Relation	relation = resultRelInfo->ri_RelationDesc;
+	List	   *onConflictSetWhere = resultRelInfo->ri_onConflictSetWhere;
+	HeapTupleData tuple;
+	HeapUpdateFailureData hufd;
+	LockTupleMode lockmode;
+	HTSU_Result test;
+	Buffer		buffer;
+
+	/* Determine lock mode to use */
+	lockmode = ExecUpdateLockMode(estate, resultRelInfo);
+
+	/*
+	 * Lock tuple for update.  Don't follow updates when tuple cannot be
+	 * locked without doing so.  A row locking conflict here means our
+	 * previous conclusion that the tuple is conclusively committed is not
+	 * true anymore.
+	 */
+	tuple.t_self = *conflictTid;
+	test = heap_lock_tuple(relation, &tuple, estate->es_output_cid,
+						   lockmode, LockWaitBlock, false, &buffer,
+						   &hufd);
+	switch (test)
+	{
+		case HeapTupleMayBeUpdated:
+			/* success! */
+			break;
+
+		case HeapTupleInvisible:
+
+			/*
+			 * This can occur when a just inserted tuple is updated again in
+			 * the same command. E.g. because multiple rows with the same
+			 * conflicting key values are inserted.
+			 *
+			 * This is somewhat similar to the ExecUpdate()
+			 * HeapTupleSelfUpdated case.  We do not want to proceed because
+			 * it would lead to the same row being updated a second time in
+			 * some unspecified order, and in contrast to plain UPDATEs
+			 * there's no historical behavior to break.
+			 *
+			 * It is the user's responsibility to prevent this situation from
+			 * occurring.  These problems are why SQL-2003 similarly specifies
+			 * that for SQL MERGE, an exception must be raised in the event of
+			 * an attempt to update the same row twice.
+			 */
+			if (TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmin(tuple.t_data)))
+				ereport(ERROR,
+						(errcode(ERRCODE_CARDINALITY_VIOLATION),
+						 errmsg("ON CONFLICT DO UPDATE command cannot affect row a second time"),
+						 errhint("Ensure that no rows proposed for insertion within the same command have duplicate constrained values.")));
+
+			/* This shouldn't happen */
+			elog(ERROR, "attempted to lock invisible tuple");
+
+		case HeapTupleSelfUpdated:
+
+			/*
+			 * This state should never be reached. As a dirty snapshot is used
+			 * to find conflicting tuples, speculative insertion wouldn't have
+			 * seen this row to conflict with.
+			 */
+			elog(ERROR, "unexpected self-updated tuple");
+
+		case HeapTupleUpdated:
+			if (IsolationUsesXactSnapshot())
+				ereport(ERROR,
+						(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+						 errmsg("could not serialize access due to concurrent update")));
+
+			/*
+			 * Tell caller to try again from the very start.
+			 *
+			 * It does not make sense to use the usual EvalPlanQual() style
+			 * loop here, as the new version of the row might not conflict
+			 * anymore, or the conflicting tuple has actually been deleted.
+			 */
+			ReleaseBuffer(buffer);
+			return false;
+
+		default:
+			elog(ERROR, "unrecognized heap_lock_tuple status: %u", test);
+	}
+
+	/*
+	 * Success, the tuple is locked.
+	 *
+	 * Reset per-tuple memory context to free any expression evaluation
+	 * storage allocated in the previous cycle.
+	 */
+	ResetExprContext(econtext);
+
+	/*
+	 * Verify that the tuple is visible to our MVCC snapshot if the current
+	 * isolation level mandates that.
+	 *
+	 * It's not sufficient to rely on the check within ExecUpdate() as e.g.
+	 * CONFLICT ... WHERE clause may prevent us from reaching that.
+	 *
+	 * This means we only ever continue when a new command in the current
+	 * transaction could see the row, even though in READ COMMITTED mode the
+	 * tuple will not be visible according to the current statement's
+	 * snapshot.  This is in line with the way UPDATE deals with newer tuple
+	 * versions.
+	 */
+	ExecCheckHeapTupleVisible(estate, &tuple, buffer);
+
+	/* Store target's existing tuple in the state's dedicated slot */
+	ExecStoreTuple(&tuple, mtstate->mt_existing, buffer, false);
+
+	/*
+	 * Make tuple and any needed join variables available to ExecQual and
+	 * ExecProject.  The EXCLUDED tuple is installed in ecxt_innertuple, while
+	 * the target's existing tuple is installed in the scantuple.  EXCLUDED
+	 * has been made to reference INNER_VAR in setrefs.c, but there is no
+	 * other redirection.
+	 */
+	econtext->ecxt_scantuple = mtstate->mt_existing;
+	econtext->ecxt_innertuple = excludedSlot;
+	econtext->ecxt_outertuple = NULL;
+
+	if (!ExecQual(onConflictSetWhere, econtext, false))
+	{
+		ReleaseBuffer(buffer);
+		InstrCountFiltered1(&mtstate->ps, 1);
+		return true;			/* done with the tuple */
+	}
+
+	if (resultRelInfo->ri_WithCheckOptions != NIL)
+	{
+		/*
+		 * Check target's existing tuple against UPDATE-applicable USING
+		 * security barrier quals (if any), enforced here as RLS checks/WCOs.
+		 *
+		 * The rewriter creates UPDATE RLS checks/WCOs for UPDATE security
+		 * quals, and stores them as WCOs of "kind" WCO_RLS_CONFLICT_CHECK,
+		 * but that's almost the extent of its special handling for ON
+		 * CONFLICT DO UPDATE.
+		 *
+		 * The rewriter will also have associated UPDATE applicable straight
+		 * RLS checks/WCOs for the benefit of the ExecUpdate() call that
+		 * follows.  INSERTs and UPDATEs naturally have mutually exclusive WCO
+		 * kinds, so there is no danger of spurious over-enforcement in the
+		 * INSERT or UPDATE path.
+		 */
+		ExecWithCheckOptions(WCO_RLS_CONFLICT_CHECK, resultRelInfo,
+							 mtstate->mt_existing,
+							 mtstate->ps.state);
+	}
+
+	/* Project the new tuple version */
+	ExecProject(resultRelInfo->ri_onConflictSetProj, NULL);
+
+	/* Execute UPDATE with projection */
+	*returning = ExecUpdate(&tuple.t_data->t_ctid, NULL,
+							mtstate->mt_conflproj, planSlot,
+							&mtstate->mt_epqstate, mtstate->ps.state,
+							canSetTag);
+
+	ReleaseBuffer(buffer);
+	return true;
+}
+
 
 /*
  * Process BEFORE EACH STATEMENT triggers
@@ -909,6 +1285,9 @@ fireBSTriggers(ModifyTableState *node)
 	{
 		case CMD_INSERT:
 			ExecBSInsertTriggers(node->ps.state, node->resultRelInfo);
+			if (node->mt_onconflict == ONCONFLICT_UPDATE)
+				ExecBSUpdateTriggers(node->ps.state,
+									 node->resultRelInfo);
 			break;
 		case CMD_UPDATE:
 			ExecBSUpdateTriggers(node->ps.state, node->resultRelInfo);
@@ -931,6 +1310,9 @@ fireASTriggers(ModifyTableState *node)
 	switch (node->operation)
 	{
 		case CMD_INSERT:
+			if (node->mt_onconflict == ONCONFLICT_UPDATE)
+				ExecASUpdateTriggers(node->ps.state,
+									 node->resultRelInfo);
 			ExecASInsertTriggers(node->ps.state, node->resultRelInfo);
 			break;
 		case CMD_UPDATE:
@@ -1156,7 +1538,9 @@ ExecModifyTable(ModifyTableState *node)
 		switch (operation)
 		{
 			case CMD_INSERT:
-				slot = ExecInsert(slot, planSlot, estate, node->canSetTag);
+				slot = ExecInsert(node, slot, planSlot,
+								node->mt_arbiterindexes, node->mt_onconflict,
+								  estate, node->canSetTag);
 				break;
 			case CMD_UPDATE:
 				slot = ExecUpdate(tupleid, oldtuple, slot, planSlot,
@@ -1241,6 +1625,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	mtstate->resultRelInfo = estate->es_result_relations + node->resultRelIndex;
 	mtstate->mt_arowmarks = (List **) palloc0(sizeof(List *) * nplans);
 	mtstate->mt_nplans = nplans;
+	mtstate->mt_onconflict = node->onConflictAction;
+	mtstate->mt_arbiterindexes = node->arbiterIndexes;
 
 	/* set up epqstate with dummy subplan data for the moment */
 	EvalPlanQualInit(&mtstate->mt_epqstate, estate, NULL, NIL, node->epqParam);
@@ -1292,7 +1678,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 		if (resultRelInfo->ri_RelationDesc->rd_rel->relhasindex &&
 			operation != CMD_DELETE &&
 			resultRelInfo->ri_IndexRelationDescs == NULL)
-			ExecOpenIndices(resultRelInfo);
+			ExecOpenIndices(resultRelInfo, mtstate->mt_onconflict != ONCONFLICT_NONE);
 
 		/* Now init the plan for this result rel */
 		estate->es_result_relation_info = resultRelInfo;
@@ -1409,6 +1795,59 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	}
 
 	/*
+	 * If needed, Initialize target list, projection and qual for ON CONFLICT
+	 * DO UPDATE.
+	 */
+	resultRelInfo = mtstate->resultRelInfo;
+	if (node->onConflictAction == ONCONFLICT_UPDATE)
+	{
+		ExprContext *econtext;
+		ExprState  *setexpr;
+		TupleDesc	tupDesc;
+
+		/* insert may only have one plan, inheritance is not expanded */
+		Assert(nplans == 1);
+
+		/* already exists if created by RETURNING processing above */
+		if (mtstate->ps.ps_ExprContext == NULL)
+			ExecAssignExprContext(estate, &mtstate->ps);
+
+		econtext = mtstate->ps.ps_ExprContext;
+
+		/* initialize slot for the existing tuple */
+		mtstate->mt_existing = ExecInitExtraTupleSlot(mtstate->ps.state);
+		ExecSetSlotDescriptor(mtstate->mt_existing,
+							  resultRelInfo->ri_RelationDesc->rd_att);
+
+		/* carried forward solely for the benefit of explain */
+		mtstate->mt_excludedtlist = node->exclRelTlist;
+
+		/* create target slot for UPDATE SET projection */
+		tupDesc = ExecTypeFromTL((List *) node->onConflictSet,
+								 false);
+		mtstate->mt_conflproj = ExecInitExtraTupleSlot(mtstate->ps.state);
+		ExecSetSlotDescriptor(mtstate->mt_conflproj, tupDesc);
+
+		/* build UPDATE SET expression and projection state */
+		setexpr = ExecInitExpr((Expr *) node->onConflictSet, &mtstate->ps);
+		resultRelInfo->ri_onConflictSetProj =
+			ExecBuildProjectionInfo((List *) setexpr, econtext,
+									mtstate->mt_conflproj,
+									resultRelInfo->ri_RelationDesc->rd_att);
+
+		/* build DO UPDATE WHERE clause expression */
+		if (node->onConflictWhere)
+		{
+			ExprState  *qualexpr;
+
+			qualexpr = ExecInitExpr((Expr *) node->onConflictWhere,
+									&mtstate->ps);
+
+			resultRelInfo->ri_onConflictSetWhere = (List *) qualexpr;
+		}
+	}
+
+	/*
 	 * If we have any secondary relations in an UPDATE or DELETE, they need to
 	 * be treated like non-locked relations in SELECT FOR UPDATE, ie, the
 	 * EvalPlanQual mechanism needs to be told about them.  Locate the
@@ -1426,7 +1865,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 			continue;
 
 		/* find ExecRowMark (same for all subplans) */
-		erm = ExecFindRowMark(estate, rc->rti);
+		erm = ExecFindRowMark(estate, rc->rti, false);
 
 		/* build ExecAuxRowMark for each subplan */
 		for (i = 0; i < nplans; i++)
diff --git a/src/backend/executor/nodeSamplescan.c b/src/backend/executor/nodeSamplescan.c
new file mode 100644
index 0000000000..4c1c5237b7
--- /dev/null
+++ b/src/backend/executor/nodeSamplescan.c
@@ -0,0 +1,257 @@
+/*-------------------------------------------------------------------------
+ *
+ * nodeSamplescan.c
+ *	  Support routines for sample scans of relations (table sampling).
+ *
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/executor/nodeSamplescan.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/tablesample.h"
+#include "executor/executor.h"
+#include "executor/nodeSamplescan.h"
+#include "miscadmin.h"
+#include "parser/parsetree.h"
+#include "pgstat.h"
+#include "storage/bufmgr.h"
+#include "storage/predicate.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
+#include "utils/tqual.h"
+
+static void InitScanRelation(SampleScanState *node, EState *estate,
+				 int eflags, TableSampleClause *tablesample);
+static TupleTableSlot *SampleNext(SampleScanState *node);
+
+
+/* ----------------------------------------------------------------
+ *						Scan Support
+ * ----------------------------------------------------------------
+ */
+
+/* ----------------------------------------------------------------
+ *		SampleNext
+ *
+ *		This is a workhorse for ExecSampleScan
+ * ----------------------------------------------------------------
+ */
+static TupleTableSlot *
+SampleNext(SampleScanState *node)
+{
+	TupleTableSlot *slot;
+	TableSampleDesc *tsdesc;
+	HeapTuple	tuple;
+
+	/*
+	 * get information from the scan state
+	 */
+	slot = node->ss.ss_ScanTupleSlot;
+	tsdesc = node->tsdesc;
+
+	tuple = tablesample_getnext(tsdesc);
+
+	if (tuple)
+		ExecStoreTuple(tuple,	/* tuple to store */
+					   slot,	/* slot to store in */
+					   tsdesc->heapScan->rs_cbuf,		/* buffer associated
+														 * with this tuple */
+					   false);	/* don't pfree this pointer */
+	else
+		ExecClearTuple(slot);
+
+	return slot;
+}
+
+/*
+ * SampleRecheck -- access method routine to recheck a tuple in EvalPlanQual
+ */
+static bool
+SampleRecheck(SampleScanState *node, TupleTableSlot *slot)
+{
+	/* No need to recheck for SampleScan */
+	return true;
+}
+
+/* ----------------------------------------------------------------
+ *		ExecSampleScan(node)
+ *
+ *		Scans the relation using the sampling method and returns
+ *		the next qualifying tuple.
+ *		We call the ExecScan() routine and pass it the appropriate
+ *		access method functions.
+ * ----------------------------------------------------------------
+ */
+TupleTableSlot *
+ExecSampleScan(SampleScanState *node)
+{
+	return ExecScan((ScanState *) node,
+					(ExecScanAccessMtd) SampleNext,
+					(ExecScanRecheckMtd) SampleRecheck);
+}
+
+/* ----------------------------------------------------------------
+ *		InitScanRelation
+ *
+ *		Set up to access the scan relation.
+ * ----------------------------------------------------------------
+ */
+static void
+InitScanRelation(SampleScanState *node, EState *estate, int eflags,
+				 TableSampleClause *tablesample)
+{
+	Relation	currentRelation;
+
+	/*
+	 * get the relation object id from the relid'th entry in the range table,
+	 * open that relation and acquire appropriate lock on it.
+	 */
+	currentRelation = ExecOpenScanRelation(estate,
+								((SampleScan *) node->ss.ps.plan)->scanrelid,
+										   eflags);
+
+	node->ss.ss_currentRelation = currentRelation;
+
+	/*
+	 * Even though we aren't going to do a conventional seqscan, it is useful
+	 * to create a HeapScanDesc --- many of the fields in it are usable.
+	 */
+	node->ss.ss_currentScanDesc =
+		heap_beginscan_sampling(currentRelation, estate->es_snapshot, 0, NULL,
+								tablesample->tsmseqscan,
+								tablesample->tsmpagemode);
+
+	/* and report the scan tuple slot's rowtype */
+	ExecAssignScanType(&node->ss, RelationGetDescr(currentRelation));
+}
+
+
+/* ----------------------------------------------------------------
+ *		ExecInitSampleScan
+ * ----------------------------------------------------------------
+ */
+SampleScanState *
+ExecInitSampleScan(SampleScan *node, EState *estate, int eflags)
+{
+	SampleScanState *scanstate;
+	RangeTblEntry *rte = rt_fetch(node->scanrelid,
+								  estate->es_range_table);
+
+	Assert(outerPlan(node) == NULL);
+	Assert(innerPlan(node) == NULL);
+	Assert(rte->tablesample != NULL);
+
+	/*
+	 * create state structure
+	 */
+	scanstate = makeNode(SampleScanState);
+	scanstate->ss.ps.plan = (Plan *) node;
+	scanstate->ss.ps.state = estate;
+
+	/*
+	 * Miscellaneous initialization
+	 *
+	 * create expression context for node
+	 */
+	ExecAssignExprContext(estate, &scanstate->ss.ps);
+
+	/*
+	 * initialize child expressions
+	 */
+	scanstate->ss.ps.targetlist = (List *)
+		ExecInitExpr((Expr *) node->plan.targetlist,
+					 (PlanState *) scanstate);
+	scanstate->ss.ps.qual = (List *)
+		ExecInitExpr((Expr *) node->plan.qual,
+					 (PlanState *) scanstate);
+
+	/*
+	 * tuple table initialization
+	 */
+	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
+	ExecInitScanTupleSlot(estate, &scanstate->ss);
+
+	/*
+	 * initialize scan relation
+	 */
+	InitScanRelation(scanstate, estate, eflags, rte->tablesample);
+
+	scanstate->ss.ps.ps_TupFromTlist = false;
+
+	/*
+	 * Initialize result tuple type and projection info.
+	 */
+	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
+	ExecAssignScanProjectionInfo(&scanstate->ss);
+
+	scanstate->tsdesc = tablesample_init(scanstate, rte->tablesample);
+
+	return scanstate;
+}
+
+/* ----------------------------------------------------------------
+ *		ExecEndSampleScan
+ *
+ *		frees any storage allocated through C routines.
+ * ----------------------------------------------------------------
+ */
+void
+ExecEndSampleScan(SampleScanState *node)
+{
+	/*
+	 * Tell sampling function that we finished the scan.
+	 */
+	tablesample_end(node->tsdesc);
+
+	/*
+	 * Free the exprcontext
+	 */
+	ExecFreeExprContext(&node->ss.ps);
+
+	/*
+	 * clean out the tuple table
+	 */
+	ExecClearTuple(node->ss.ps.ps_ResultTupleSlot);
+	ExecClearTuple(node->ss.ss_ScanTupleSlot);
+
+	/*
+	 * close heap scan
+	 */
+	heap_endscan(node->ss.ss_currentScanDesc);
+
+	/*
+	 * close the heap relation.
+	 */
+	ExecCloseScanRelation(node->ss.ss_currentRelation);
+}
+
+/* ----------------------------------------------------------------
+ *						Join Support
+ * ----------------------------------------------------------------
+ */
+
+/* ----------------------------------------------------------------
+ *		ExecReScanSampleScan
+ *
+ *		Rescans the relation.
+ *
+ * ----------------------------------------------------------------
+ */
+void
+ExecReScanSampleScan(SampleScanState *node)
+{
+	heap_rescan(node->ss.ss_currentScanDesc, NULL);
+
+	/*
+	 * Tell sampling function to reset its state for rescan.
+	 */
+	tablesample_reset(node->tsdesc);
+
+	ExecScanReScan(&node->ss);
+}
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index a815cde2cc..af1dccfb31 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -290,6 +290,8 @@ ExecSortRestrPos(SortState *node)
 void
 ExecReScanSort(SortState *node)
 {
+	PlanState  *outerPlan = outerPlanState(node);
+
 	/*
 	 * If we haven't sorted yet, just return. If outerplan's chgParam is not
 	 * NULL then it will be re-scanned by ExecProcNode, else no reason to
@@ -308,7 +310,7 @@ ExecReScanSort(SortState *node)
 	 *
 	 * Otherwise we can just rewind and rescan the sorted output.
 	 */
-	if (node->ss.ps.lefttree->chgParam != NULL ||
+	if (outerPlan->chgParam != NULL ||
 		node->bounded != node->bounded_Done ||
 		node->bound != node->bound_Done ||
 		!node->randomAccess)
@@ -321,8 +323,8 @@ ExecReScanSort(SortState *node)
 		 * if chgParam of subnode is not null then plan will be re-scanned by
 		 * first ExecProcNode.
 		 */
-		if (node->ss.ps.lefttree->chgParam == NULL)
-			ExecReScan(node->ss.ps.lefttree);
+		if (outerPlan->chgParam == NULL)
+			ExecReScan(outerPlan);
 	}
 	else
 		tuplesort_rescan((Tuplesortstate *) node->tuplesortstate);
diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c
index 3f66e243d2..e5d1e540c4 100644
--- a/src/backend/executor/nodeSubqueryscan.c
+++ b/src/backend/executor/nodeSubqueryscan.c
@@ -56,7 +56,15 @@ SubqueryNext(SubqueryScanState *node)
 	 * We just return the subplan's result slot, rather than expending extra
 	 * cycles for ExecCopySlot().  (Our own ScanTupleSlot is used only for
 	 * EvalPlanQual rechecks.)
+	 *
+	 * We do need to mark the slot contents read-only to prevent interference
+	 * between different functions reading the same datum from the slot. It's
+	 * a bit hokey to do this to the subplan's slot, but should be safe
+	 * enough.
 	 */
+	if (!TupIsNull(slot))
+		slot = ExecMakeSlotContentsReadOnly(slot);
+
 	return slot;
 }
 
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index 7f61211b28..e27aba23eb 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -2065,6 +2065,7 @@ ExecEndWindowAgg(WindowAggState *node)
 void
 ExecReScanWindowAgg(WindowAggState *node)
 {
+	PlanState  *outerPlan = outerPlanState(node);
 	ExprContext *econtext = node->ss.ps.ps_ExprContext;
 
 	node->all_done = false;
@@ -2090,8 +2091,8 @@ ExecReScanWindowAgg(WindowAggState *node)
 	 * if chgParam of subnode is not null then plan will be re-scanned by
 	 * first ExecProcNode.
 	 */
-	if (node->ss.ps.lefttree->chgParam == NULL)
-		ExecReScan(node->ss.ps.lefttree);
+	if (outerPlan->chgParam == NULL)
+		ExecReScan(outerPlan);
 }
 
 /*
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index a05c9e0358..c0e9b543df 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -23,6 +23,7 @@
 #include "commands/trigger.h"
 #include "executor/executor.h"
 #include "executor/spi_priv.h"
+#include "miscadmin.h"
 #include "tcop/pquery.h"
 #include "tcop/utility.h"
 #include "utils/builtins.h"
@@ -1069,6 +1070,27 @@ SPI_pfree(void *pointer)
 	pfree(pointer);
 }
 
+Datum
+SPI_datumTransfer(Datum value, bool typByVal, int typLen)
+{
+	MemoryContext oldcxt = NULL;
+	Datum		result;
+
+	if (_SPI_curid + 1 == _SPI_connected)		/* connected */
+	{
+		if (_SPI_current != &(_SPI_stack[_SPI_curid + 1]))
+			elog(ERROR, "SPI stack corrupted");
+		oldcxt = MemoryContextSwitchTo(_SPI_current->savedcxt);
+	}
+
+	result = datumTransfer(value, typByVal, typLen);
+
+	if (oldcxt)
+		MemoryContextSwitchTo(oldcxt);
+
+	return result;
+}
+
 void
 SPI_freetuple(HeapTuple tuple)
 {
@@ -1377,13 +1399,14 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	}
 
 	/*
-	 * If told to be read-only, we'd better check for read-only queries. This
-	 * can't be done earlier because we need to look at the finished, planned
-	 * queries.  (In particular, we don't want to do it between GetCachedPlan
-	 * and PortalDefineQuery, because throwing an error between those steps
-	 * would result in leaking our plancache refcount.)
+	 * If told to be read-only, or in parallel mode, verify that this query is
+	 * in fact read-only.  This can't be done earlier because we need to look
+	 * at the finished, planned queries.  (In particular, we don't want to do
+	 * it between GetCachedPlan and PortalDefineQuery, because throwing an
+	 * error between those steps would result in leaking our plancache
+	 * refcount.)
 	 */
-	if (read_only)
+	if (read_only || IsInParallelMode())
 	{
 		ListCell   *lc;
 
@@ -1392,11 +1415,16 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 			Node	   *pstmt = (Node *) lfirst(lc);
 
 			if (!CommandIsReadOnly(pstmt))
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				/* translator: %s is a SQL statement name */
+			{
+				if (read_only)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					/* translator: %s is a SQL statement name */
 					   errmsg("%s is not allowed in a non-volatile function",
 							  CreateCommandTag(pstmt))));
+				else
+					PreventCommandIfParallelMode(CreateCommandTag(pstmt));
+			}
 		}
 	}
 
@@ -2206,6 +2234,9 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI,
 					   errmsg("%s is not allowed in a non-volatile function",
 							  CreateCommandTag(stmt))));
 
+			if (IsInParallelMode() && !CommandIsReadOnly(stmt))
+				PreventCommandIfParallelMode(CreateCommandTag(stmt));
+
 			/*
 			 * If not read-only mode, advance the command counter before each
 			 * command and update the snapshot.
diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c
index cbe8b78be9..763ee7c9bc 100644
--- a/src/backend/foreign/foreign.c
+++ b/src/backend/foreign/foreign.c
@@ -304,21 +304,16 @@ GetFdwRoutine(Oid fdwhandler)
 
 
 /*
- * GetFdwRoutineByRelId - look up the handler of the foreign-data wrapper
- * for the given foreign table, and retrieve its FdwRoutine struct.
+ * GetForeignServerIdByRelId - look up the foreign server
+ * for the given foreign table, and return its OID.
  */
-FdwRoutine *
-GetFdwRoutineByRelId(Oid relid)
+Oid
+GetForeignServerIdByRelId(Oid relid)
 {
 	HeapTuple	tp;
-	Form_pg_foreign_data_wrapper fdwform;
-	Form_pg_foreign_server serverform;
 	Form_pg_foreign_table tableform;
 	Oid			serverid;
-	Oid			fdwid;
-	Oid			fdwhandler;
 
-	/* Get server OID for the foreign table. */
 	tp = SearchSysCache1(FOREIGNTABLEREL, ObjectIdGetDatum(relid));
 	if (!HeapTupleIsValid(tp))
 		elog(ERROR, "cache lookup failed for foreign table %u", relid);
@@ -326,6 +321,23 @@ GetFdwRoutineByRelId(Oid relid)
 	serverid = tableform->ftserver;
 	ReleaseSysCache(tp);
 
+	return serverid;
+}
+
+
+/*
+ * GetFdwRoutineByServerId - look up the handler of the foreign-data wrapper
+ * for the given foreign server, and retrieve its FdwRoutine struct.
+ */
+FdwRoutine *
+GetFdwRoutineByServerId(Oid serverid)
+{
+	HeapTuple	tp;
+	Form_pg_foreign_data_wrapper fdwform;
+	Form_pg_foreign_server serverform;
+	Oid			fdwid;
+	Oid			fdwhandler;
+
 	/* Get foreign-data wrapper OID for the server. */
 	tp = SearchSysCache1(FOREIGNSERVEROID, ObjectIdGetDatum(serverid));
 	if (!HeapTupleIsValid(tp))
@@ -354,6 +366,23 @@ GetFdwRoutineByRelId(Oid relid)
 	return GetFdwRoutine(fdwhandler);
 }
 
+
+/*
+ * GetFdwRoutineByRelId - look up the handler of the foreign-data wrapper
+ * for the given foreign table, and retrieve its FdwRoutine struct.
+ */
+FdwRoutine *
+GetFdwRoutineByRelId(Oid relid)
+{
+	Oid			serverid;
+
+	/* Get server OID for the foreign table. */
+	serverid = GetForeignServerIdByRelId(relid);
+
+	/* Now retrieve server's FdwRoutine struct. */
+	return GetFdwRoutineByServerId(serverid);
+}
+
 /*
  * GetFdwRoutineForRelation - look up the handler of the foreign-data wrapper
  * for the given foreign table, and retrieve its FdwRoutine struct.
@@ -645,7 +674,7 @@ get_foreign_data_wrapper_oid(const char *fdwname, bool missing_ok)
 
 
 /*
- * get_foreign_server_oid - given a FDW name, look up the OID
+ * get_foreign_server_oid - given a server name, look up the OID
  *
  * If missing_ok is false, throw an error if name not found.  If true, just
  * return InvalidOid.
diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile
index fe4781a8e8..2d2ba84fe9 100644
--- a/src/backend/lib/Makefile
+++ b/src/backend/lib/Makefile
@@ -12,6 +12,7 @@ subdir = src/backend/lib
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = ilist.o binaryheap.o hyperloglog.o pairingheap.o rbtree.o stringinfo.o
+OBJS = binaryheap.o bipartite_match.o hyperloglog.o ilist.o pairingheap.o \
+       rbtree.o stringinfo.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/lib/bipartite_match.c b/src/backend/lib/bipartite_match.c
new file mode 100644
index 0000000000..037dd1de30
--- /dev/null
+++ b/src/backend/lib/bipartite_match.c
@@ -0,0 +1,163 @@
+/*-------------------------------------------------------------------------
+ *
+ * bipartite_match.c
+ *	  Hopcroft-Karp maximum cardinality algorithm for bipartite graphs
+ *
+ * This implementation is based on pseudocode found at:
+ *
+ * http://en.wikipedia.org/w/index.php?title=Hopcroft%E2%80%93Karp_algorithm&oldid=593898016
+ *
+ * Copyright (c) 2015, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  src/backend/lib/bipartite_match.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <float.h>
+#include <math.h>
+#include <limits.h>
+
+#include "lib/bipartite_match.h"
+#include "miscadmin.h"
+#include "utils/builtins.h"
+
+
+static bool hk_breadth_search(BipartiteMatchState *state);
+static bool hk_depth_search(BipartiteMatchState *state, int u, int depth);
+
+/*
+ * Given the size of U and V, where each is indexed 1..size, and an adjacency
+ * list, perform the matching and return the resulting state.
+ */
+BipartiteMatchState *
+BipartiteMatch(int u_size, int v_size, short **adjacency)
+{
+	BipartiteMatchState *state = palloc(sizeof(BipartiteMatchState));
+
+	Assert(u_size < SHRT_MAX);
+	Assert(v_size < SHRT_MAX);
+
+	state->u_size = u_size;
+	state->v_size = v_size;
+	state->matching = 0;
+	state->adjacency = adjacency;
+	state->pair_uv = palloc0((u_size + 1) * sizeof(short));
+	state->pair_vu = palloc0((v_size + 1) * sizeof(short));
+	state->distance = palloc((u_size + 1) * sizeof(float));
+	state->queue = palloc((u_size + 2) * sizeof(short));
+
+	while (hk_breadth_search(state))
+	{
+		int			u;
+
+		for (u = 1; u <= u_size; ++u)
+			if (state->pair_uv[u] == 0)
+				if (hk_depth_search(state, u, 1))
+					state->matching++;
+
+		CHECK_FOR_INTERRUPTS(); /* just in case */
+	}
+
+	return state;
+}
+
+/*
+ * Free a state returned by BipartiteMatch, except for the original adjacency
+ * list, which is owned by the caller. This only frees memory, so it's optional.
+ */
+void
+BipartiteMatchFree(BipartiteMatchState *state)
+{
+	/* adjacency matrix is treated as owned by the caller */
+	pfree(state->pair_uv);
+	pfree(state->pair_vu);
+	pfree(state->distance);
+	pfree(state->queue);
+	pfree(state);
+}
+
+static bool
+hk_breadth_search(BipartiteMatchState *state)
+{
+	int			usize = state->u_size;
+	short	   *queue = state->queue;
+	float	   *distance = state->distance;
+	int			qhead = 0;		/* we never enqueue any node more than once */
+	int			qtail = 0;		/* so don't have to worry about wrapping */
+	int			u;
+
+	distance[0] = get_float4_infinity();
+
+	for (u = 1; u <= usize; ++u)
+	{
+		if (state->pair_uv[u] == 0)
+		{
+			distance[u] = 0;
+			queue[qhead++] = u;
+		}
+		else
+			distance[u] = get_float4_infinity();
+	}
+
+	while (qtail < qhead)
+	{
+		u = queue[qtail++];
+
+		if (distance[u] < distance[0])
+		{
+			short	   *u_adj = state->adjacency[u];
+			int			i = u_adj ? u_adj[0] : 0;
+
+			for (; i > 0; --i)
+			{
+				int			u_next = state->pair_vu[u_adj[i]];
+
+				if (isinf(distance[u_next]))
+				{
+					distance[u_next] = 1 + distance[u];
+					queue[qhead++] = u_next;
+					Assert(qhead <= usize + 2);
+				}
+			}
+		}
+	}
+
+	return !isinf(distance[0]);
+}
+
+static bool
+hk_depth_search(BipartiteMatchState *state, int u, int depth)
+{
+	float	   *distance = state->distance;
+	short	   *pair_uv = state->pair_uv;
+	short	   *pair_vu = state->pair_vu;
+	short	   *u_adj = state->adjacency[u];
+	int			i = u_adj ? u_adj[0] : 0;
+
+	if (u == 0)
+		return true;
+
+	if ((depth % 8) == 0)
+		check_stack_depth();
+
+	for (; i > 0; --i)
+	{
+		int			v = u_adj[i];
+
+		if (distance[pair_vu[v]] == distance[u] + 1)
+		{
+			if (hk_depth_search(state, pair_vu[v], depth + 1))
+			{
+				pair_vu[v] = u;
+				pair_uv[u] = v;
+				return true;
+			}
+		}
+	}
+
+	distance[u] = get_float4_infinity();
+	return false;
+}
diff --git a/src/backend/lib/hyperloglog.c b/src/backend/lib/hyperloglog.c
index 4b37048c37..718afb84e0 100644
--- a/src/backend/lib/hyperloglog.c
+++ b/src/backend/lib/hyperloglog.c
@@ -153,7 +153,7 @@ estimateHyperLogLog(hyperLogLogState *cState)
 	if (result <= (5.0 / 2.0) * cState->nRegisters)
 	{
 		/* Small range correction */
-		int 	zero_count = 0;
+		int			zero_count = 0;
 
 		for (i = 0; i < cState->nRegisters; i++)
 		{
@@ -183,7 +183,7 @@ estimateHyperLogLog(hyperLogLogState *cState)
 void
 mergeHyperLogLog(hyperLogLogState *cState, const hyperLogLogState *oState)
 {
-	int		r;
+	int			r;
 
 	if (cState->nRegisters != oState->nRegisters)
 		elog(ERROR, "number of registers mismatch: %zu != %zu",
@@ -216,7 +216,7 @@ mergeHyperLogLog(hyperLogLogState *cState, const hyperLogLogState *oState)
 static inline uint8
 rho(uint32 x, uint8 b)
 {
-	uint8	j = 1;
+	uint8		j = 1;
 
 	while (j <= b && !(x & 0x80000000))
 	{
diff --git a/src/backend/lib/pairingheap.c b/src/backend/lib/pairingheap.c
index 17278fde6e..3d8a5ea561 100644
--- a/src/backend/lib/pairingheap.c
+++ b/src/backend/lib/pairingheap.c
@@ -295,7 +295,7 @@ merge_children(pairingheap *heap, pairingheap_node *children)
 static void
 pairingheap_dump_recurse(StringInfo buf,
 						 pairingheap_node *node,
-						 void (*dumpfunc) (pairingheap_node *node, StringInfo buf, void *opaque),
+	 void (*dumpfunc) (pairingheap_node *node, StringInfo buf, void *opaque),
 						 void *opaque,
 						 int depth,
 						 pairingheap_node *prev_or_parent)
@@ -316,7 +316,7 @@ pairingheap_dump_recurse(StringInfo buf,
 
 char *
 pairingheap_dump(pairingheap *heap,
-				 void (*dumpfunc) (pairingheap_node *node, StringInfo buf, void *opaque),
+	 void (*dumpfunc) (pairingheap_node *node, StringInfo buf, void *opaque),
 				 void *opaque)
 {
 	StringInfoData buf;
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 28b050af0e..4699efacd0 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -371,7 +371,7 @@ ClientAuthentication(Port *port)
 					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
 						errmsg("pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s",
 							   hostinfo, port->user_name,
-							   port->ssl_in_use ? _("SSL on") : _("SSL off"))));
+							port->ssl_in_use ? _("SSL on") : _("SSL off"))));
 #else
 					ereport(FATAL,
 					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
@@ -387,7 +387,7 @@ ClientAuthentication(Port *port)
 						errmsg("pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s",
 							   hostinfo, port->user_name,
 							   port->database_name,
-							   port->ssl_in_use ? _("SSL on") : _("SSL off"))));
+							port->ssl_in_use ? _("SSL on") : _("SSL off"))));
 #else
 					ereport(FATAL,
 					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
@@ -811,15 +811,16 @@ pg_GSS_recvauth(Port *port)
 			size_t		kt_len = strlen(pg_krb_server_keyfile) + 14;
 			char	   *kt_path = malloc(kt_len);
 
-			if (!kt_path)
+			if (!kt_path ||
+				snprintf(kt_path, kt_len, "KRB5_KTNAME=%s",
+						 pg_krb_server_keyfile) != kt_len - 2 ||
+				putenv(kt_path) != 0)
 			{
 				ereport(LOG,
 						(errcode(ERRCODE_OUT_OF_MEMORY),
 						 errmsg("out of memory")));
 				return STATUS_ERROR;
 			}
-			snprintf(kt_path, kt_len, "KRB5_KTNAME=%s", pg_krb_server_keyfile);
-			putenv(kt_path);
 		}
 	}
 
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
index f7f6618bc2..f0774fe8c9 100644
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@ -77,10 +77,10 @@
 #include "utils/memutils.h"
 
 
-static int my_sock_read(BIO *h, char *buf, int size);
-static int my_sock_write(BIO *h, const char *buf, int size);
+static int	my_sock_read(BIO *h, char *buf, int size);
+static int	my_sock_write(BIO *h, const char *buf, int size);
 static BIO_METHOD *my_BIO_s_socket(void);
-static int my_SSL_set_fd(Port *port, int fd);
+static int	my_SSL_set_fd(Port *port, int fd);
 
 static DH  *load_dh_file(int keylength);
 static DH  *load_dh_buffer(const char *, size_t);
@@ -353,7 +353,6 @@ be_tls_open_server(Port *port)
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("could not initialize SSL connection: %s",
 						SSLerrmessage())));
-		be_tls_close(port);
 		return -1;
 	}
 	if (!my_SSL_set_fd(port, port->sock))
@@ -362,7 +361,6 @@ be_tls_open_server(Port *port)
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("could not set SSL socket: %s",
 						SSLerrmessage())));
-		be_tls_close(port);
 		return -1;
 	}
 	port->ssl_in_use = true;
@@ -419,7 +417,6 @@ aloop:
 								err)));
 				break;
 		}
-		be_tls_close(port);
 		return -1;
 	}
 
@@ -449,7 +446,6 @@ aloop:
 			{
 				/* shouldn't happen */
 				pfree(peer_cn);
-				be_tls_close(port);
 				return -1;
 			}
 
@@ -463,7 +459,6 @@ aloop:
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
 						 errmsg("SSL certificate's common name contains embedded null")));
 				pfree(peer_cn);
-				be_tls_close(port);
 				return -1;
 			}
 
@@ -576,10 +571,9 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
 	int			err;
 
 	/*
-	 * If SSL renegotiations are enabled and we're getting close to the
-	 * limit, start one now; but avoid it if there's one already in
-	 * progress.  Request the renegotiation 1kB before the limit has
-	 * actually expired.
+	 * If SSL renegotiations are enabled and we're getting close to the limit,
+	 * start one now; but avoid it if there's one already in progress.
+	 * Request the renegotiation 1kB before the limit has actually expired.
 	 */
 	if (ssl_renegotiation_limit && !in_ssl_renegotiation &&
 		port->count > (ssl_renegotiation_limit - 1) * 1024L)
@@ -588,12 +582,12 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
 
 		/*
 		 * The way we determine that a renegotiation has completed is by
-		 * observing OpenSSL's internal renegotiation counter.  Make sure
-		 * we start out at zero, and assume that the renegotiation is
-		 * complete when the counter advances.
+		 * observing OpenSSL's internal renegotiation counter.  Make sure we
+		 * start out at zero, and assume that the renegotiation is complete
+		 * when the counter advances.
 		 *
-		 * OpenSSL provides SSL_renegotiation_pending(), but this doesn't
-		 * seem to work in testing.
+		 * OpenSSL provides SSL_renegotiation_pending(), but this doesn't seem
+		 * to work in testing.
 		 */
 		SSL_clear_num_renegotiations(port->ssl);
 
@@ -663,9 +657,9 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
 		}
 
 		/*
-		 * if renegotiation is still ongoing, and we've gone beyond the
-		 * limit, kill the connection now -- continuing to use it can be
-		 * considered a security problem.
+		 * if renegotiation is still ongoing, and we've gone beyond the limit,
+		 * kill the connection now -- continuing to use it can be considered a
+		 * security problem.
 		 */
 		if (in_ssl_renegotiation &&
 			port->count > ssl_renegotiation_limit * 1024L)
@@ -705,7 +699,7 @@ my_sock_read(BIO *h, char *buf, int size)
 
 	if (buf != NULL)
 	{
-		res = secure_raw_read(((Port *)h->ptr), buf, size);
+		res = secure_raw_read(((Port *) h->ptr), buf, size);
 		BIO_clear_retry_flags(h);
 		if (res <= 0)
 		{
@@ -1049,7 +1043,7 @@ SSLerrmessage(void)
 int
 be_tls_get_cipher_bits(Port *port)
 {
-	int bits;
+	int			bits;
 
 	if (port->ssl)
 	{
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 4e7acbe080..4a650cc001 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -51,7 +51,7 @@ char	   *ssl_crl_file;
 int			ssl_renegotiation_limit;
 
 #ifdef USE_SSL
-bool ssl_loaded_verify_locations = false;
+bool		ssl_loaded_verify_locations = false;
 #endif
 
 /* GUC variable controlling SSL cipher list */
@@ -146,7 +146,7 @@ retry:
 	/* In blocking mode, wait until the socket is ready */
 	if (n < 0 && !port->noblock && (errno == EWOULDBLOCK || errno == EAGAIN))
 	{
-		int		w;
+		int			w;
 
 		Assert(waitfor);
 
@@ -162,8 +162,8 @@ retry:
 
 			/*
 			 * We'll retry the read. Most likely it will return immediately
-			 * because there's still no data available, and we'll wait
-			 * for the socket to become ready again.
+			 * because there's still no data available, and we'll wait for the
+			 * socket to become ready again.
 			 */
 		}
 		goto retry;
@@ -225,7 +225,7 @@ retry:
 
 	if (n < 0 && !port->noblock && (errno == EWOULDBLOCK || errno == EAGAIN))
 	{
-		int		w;
+		int			w;
 
 		Assert(waitfor);
 
@@ -241,8 +241,8 @@ retry:
 
 			/*
 			 * We'll retry the write. Most likely it will return immediately
-			 * because there's still no data available, and we'll wait
-			 * for the socket to become ready again.
+			 * because there's still no data available, and we'll wait for the
+			 * socket to become ready again.
 			 */
 		}
 		goto retry;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 9d99101ec7..b2a145f8cf 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1381,6 +1381,19 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
 	hbaline->ldapscope = LDAP_SCOPE_SUBTREE;
 #endif
 
+	/*
+	 * For GSS and SSPI, set the default value of include_realm to true.
+	 * Having include_realm set to false is dangerous in multi-realm
+	 * situations and is generally considered bad practice.  We keep the
+	 * capability around for backwards compatibility, but we might want to
+	 * remove it at some point in the future.  Users who still need to strip
+	 * the realm off would be better served by using an appropriate regex in a
+	 * pg_ident.conf mapping.
+	 */
+	if (hbaline->auth_method == uaGSS ||
+		hbaline->auth_method == uaSSPI)
+		hbaline->include_realm = true;
+
 	if (strcmp(name, "map") == 0)
 	{
 		if (hbaline->auth_method != uaIdent &&
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 34efac4865..a4b37ed5a2 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -220,32 +220,45 @@ socket_comm_reset(void)
 /* --------------------------------
  *		socket_close - shutdown libpq at backend exit
  *
- * Note: in a standalone backend MyProcPort will be null,
- * don't crash during exit...
+ * This is the one pg_on_exit_callback in place during BackendInitialize().
+ * That function's unusual signal handling constrains that this callback be
+ * safe to run at any instant.
  * --------------------------------
  */
 static void
 socket_close(int code, Datum arg)
 {
+	/* Nothing to do in a standalone backend, where MyProcPort is NULL. */
 	if (MyProcPort != NULL)
 	{
 #if defined(ENABLE_GSS) || defined(ENABLE_SSPI)
 #ifdef ENABLE_GSS
 		OM_uint32	min_s;
 
-		/* Shutdown GSSAPI layer */
+		/*
+		 * Shutdown GSSAPI layer.  This section does nothing when interrupting
+		 * BackendInitialize(), because pg_GSS_recvauth() makes first use of
+		 * "ctx" and "cred".
+		 */
 		if (MyProcPort->gss->ctx != GSS_C_NO_CONTEXT)
 			gss_delete_sec_context(&min_s, &MyProcPort->gss->ctx, NULL);
 
 		if (MyProcPort->gss->cred != GSS_C_NO_CREDENTIAL)
 			gss_release_cred(&min_s, &MyProcPort->gss->cred);
 #endif   /* ENABLE_GSS */
-		/* GSS and SSPI share the port->gss struct */
 
+		/*
+		 * GSS and SSPI share the port->gss struct.  Since nowhere else does a
+		 * postmaster child free this, doing so is safe when interrupting
+		 * BackendInitialize().
+		 */
 		free(MyProcPort->gss);
 #endif   /* ENABLE_GSS || ENABLE_SSPI */
 
-		/* Cleanly shut down SSL layer */
+		/*
+		 * Cleanly shut down SSL layer.  Nowhere else does a postmaster child
+		 * call this, so this is safe when interrupting BackendInitialize().
+		 */
 		secure_close(MyProcPort);
 
 		/*
@@ -1112,7 +1125,7 @@ pq_getstring(StringInfo s)
 
 
 /* --------------------------------
- *		pq_startmsgread	- begin reading a message from the client.
+ *		pq_startmsgread - begin reading a message from the client.
  *
  *		This must be called before any of the pq_get* functions.
  * --------------------------------
@@ -1127,7 +1140,7 @@ pq_startmsgread(void)
 	if (PqCommReadingMsg)
 		ereport(FATAL,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
-				 errmsg("terminating connection because protocol sync was lost")));
+		   errmsg("terminating connection because protocol sync was lost")));
 
 	PqCommReadingMsg = true;
 }
@@ -1561,7 +1574,7 @@ socket_endcopyout(bool errorAbort)
 /*
  * On Windows, we need to set both idle and interval at the same time.
  * We also cannot reset them to the default (setting to zero will
- * actually set them to zero, not default), therefor we fallback to
+ * actually set them to zero, not default), therefore we fallback to
  * the out-of-the-box default instead.
  */
 #if defined(WIN32) && defined(SIO_KEEPALIVE_VALS)
diff --git a/src/backend/libpq/pqmq.c b/src/backend/libpq/pqmq.c
index 307fb60665..9ca6b7ce0d 100644
--- a/src/backend/libpq/pqmq.c
+++ b/src/backend/libpq/pqmq.c
@@ -16,12 +16,15 @@
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "libpq/pqmq.h"
+#include "miscadmin.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 
 static shm_mq *pq_mq;
 static shm_mq_handle *pq_mq_handle;
 static bool pq_mq_busy = false;
+static pid_t pq_mq_parallel_master_pid = 0;
+static pid_t pq_mq_parallel_master_backend_id = InvalidBackendId;
 
 static void mq_comm_reset(void);
 static int	mq_flush(void);
@@ -57,6 +60,18 @@ pq_redirect_to_shm_mq(shm_mq *mq, shm_mq_handle *mqh)
 	FrontendProtocol = PG_PROTOCOL_LATEST;
 }
 
+/*
+ * Arrange to SendProcSignal() to the parallel master each time we transmit
+ * message data via the shm_mq.
+ */
+void
+pq_set_parallel_master(pid_t pid, BackendId backend_id)
+{
+	Assert(PqCommMethods == &PqCommMqMethods);
+	pq_mq_parallel_master_pid = pid;
+	pq_mq_parallel_master_backend_id = backend_id;
+}
+
 static void
 mq_comm_reset(void)
 {
@@ -92,17 +107,16 @@ mq_is_send_pending(void)
 static int
 mq_putmessage(char msgtype, const char *s, size_t len)
 {
-	shm_mq_iovec	iov[2];
-	shm_mq_result	result;
+	shm_mq_iovec iov[2];
+	shm_mq_result result;
 
 	/*
-	 * If we're sending a message, and we have to wait because the
-	 * queue is full, and then we get interrupted, and that interrupt
-	 * results in trying to send another message, we respond by detaching
-	 * the queue.  There's no way to return to the original context, but
-	 * even if there were, just queueing the message would amount to
-	 * indefinitely postponing the response to the interrupt.  So we do
-	 * this instead.
+	 * If we're sending a message, and we have to wait because the queue is
+	 * full, and then we get interrupted, and that interrupt results in trying
+	 * to send another message, we respond by detaching the queue.  There's no
+	 * way to return to the original context, but even if there were, just
+	 * queueing the message would amount to indefinitely postponing the
+	 * response to the interrupt.  So we do this instead.
 	 */
 	if (pq_mq_busy)
 	{
@@ -120,7 +134,23 @@ mq_putmessage(char msgtype, const char *s, size_t len)
 	iov[1].len = len;
 
 	Assert(pq_mq_handle != NULL);
-	result = shm_mq_sendv(pq_mq_handle, iov, 2, false);
+
+	for (;;)
+	{
+		result = shm_mq_sendv(pq_mq_handle, iov, 2, true);
+
+		if (pq_mq_parallel_master_pid != 0)
+			SendProcSignal(pq_mq_parallel_master_pid,
+						   PROCSIG_PARALLEL_MESSAGE,
+						   pq_mq_parallel_master_backend_id);
+
+		if (result != SHM_MQ_WOULD_BLOCK)
+			break;
+
+		WaitLatch(&MyProc->procLatch, WL_LATCH_SET, 0);
+		CHECK_FOR_INTERRUPTS();
+		ResetLatch(&MyProc->procLatch);
+	}
 
 	pq_mq_busy = false;
 
@@ -135,10 +165,10 @@ mq_putmessage_noblock(char msgtype, const char *s, size_t len)
 {
 	/*
 	 * While the shm_mq machinery does support sending a message in
-	 * non-blocking mode, there's currently no way to try sending beginning
-	 * to send the message that doesn't also commit us to completing the
-	 * transmission.  This could be improved in the future, but for now
-	 * we don't need it.
+	 * non-blocking mode, there's currently no way to try sending beginning to
+	 * send the message that doesn't also commit us to completing the
+	 * transmission.  This could be improved in the future, but for now we
+	 * don't need it.
 	 */
 	elog(ERROR, "not currently supported");
 }
@@ -170,7 +200,7 @@ pq_parse_errornotice(StringInfo msg, ErrorData *edata)
 	/* Loop over fields and extract each one. */
 	for (;;)
 	{
-		char	code = pq_getmsgbyte(msg);
+		char		code = pq_getmsgbyte(msg);
 		const char *value;
 
 		if (code == '\0')
@@ -184,9 +214,9 @@ pq_parse_errornotice(StringInfo msg, ErrorData *edata)
 		{
 			case PG_DIAG_SEVERITY:
 				if (strcmp(value, "DEBUG") == 0)
-					edata->elevel = DEBUG1;	/* or some other DEBUG level */
+					edata->elevel = DEBUG1;		/* or some other DEBUG level */
 				else if (strcmp(value, "LOG") == 0)
-					edata->elevel = LOG;	/* can't be COMMERROR */
+					edata->elevel = LOG;		/* can't be COMMERROR */
 				else if (strcmp(value, "INFO") == 0)
 					edata->elevel = INFO;
 				else if (strcmp(value, "NOTICE") == 0)
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index ebb8fb7521..1be12a7c10 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -213,6 +213,12 @@ _copyModifyTable(const ModifyTable *from)
 	COPY_NODE_FIELD(remote_plans);
 #endif
 #endif
+	COPY_SCALAR_FIELD(onConflictAction);
+	COPY_NODE_FIELD(arbiterIndexes);
+	COPY_NODE_FIELD(onConflictSet);
+	COPY_NODE_FIELD(onConflictWhere);
+	COPY_SCALAR_FIELD(exclRelRTI);
+	COPY_NODE_FIELD(exclRelTlist);
 
 	return newnode;
 }
@@ -402,6 +408,7 @@ _copyIndexScan(const IndexScan *from)
 	COPY_NODE_FIELD(indexqualorig);
 	COPY_NODE_FIELD(indexorderby);
 	COPY_NODE_FIELD(indexorderbyorig);
+	COPY_NODE_FIELD(indexorderbyops);
 	COPY_SCALAR_FIELD(indexorderdir);
 
 	return newnode;
@@ -620,8 +627,11 @@ _copyForeignScan(const ForeignScan *from)
 	/*
 	 * copy remainder of node
 	 */
+	COPY_SCALAR_FIELD(fs_server);
 	COPY_NODE_FIELD(fdw_exprs);
 	COPY_NODE_FIELD(fdw_private);
+	COPY_NODE_FIELD(fdw_scan_tlist);
+	COPY_BITMAPSET_FIELD(fs_relids);
 	COPY_SCALAR_FIELD(fsSystemCol);
 
 	return newnode;
@@ -646,6 +656,8 @@ _copyCustomScan(const CustomScan *from)
 	COPY_SCALAR_FIELD(flags);
 	COPY_NODE_FIELD(custom_exprs);
 	COPY_NODE_FIELD(custom_private);
+	COPY_NODE_FIELD(custom_scan_tlist);
+	COPY_BITMAPSET_FIELD(custom_relids);
 
 	/*
 	 * NOTE: The method field of CustomScan is required to be a pointer to a
@@ -658,6 +670,22 @@ _copyCustomScan(const CustomScan *from)
 }
 
 /*
+ * _copySampleScan
+ */
+static SampleScan *
+_copySampleScan(const SampleScan *from)
+{
+	SampleScan *newnode = makeNode(SampleScan);
+
+	/*
+	 * copy node superclass fields
+	 */
+	CopyScanFields((const Scan *) from, (Scan *) newnode);
+
+	return newnode;
+}
+
+/*
  * CopyJoinFields
  *
  *		This function copies the fields of the Join node.  It is used by
@@ -842,6 +870,8 @@ _copyAgg(const Agg *from)
 		COPY_POINTER_FIELD(grpOperators, from->numCols * sizeof(Oid));
 	}
 	COPY_SCALAR_FIELD(numGroups);
+	COPY_NODE_FIELD(groupingSets);
+	COPY_NODE_FIELD(chain);
 
 	return newnode;
 }
@@ -1375,6 +1405,23 @@ _copyAggref(const Aggref *from)
 }
 
 /*
+ * _copyGroupingFunc
+ */
+static GroupingFunc *
+_copyGroupingFunc(const GroupingFunc *from)
+{
+	GroupingFunc *newnode = makeNode(GroupingFunc);
+
+	COPY_NODE_FIELD(args);
+	COPY_NODE_FIELD(refs);
+	COPY_NODE_FIELD(cols);
+	COPY_SCALAR_FIELD(agglevelsup);
+	COPY_LOCATION_FIELD(location);
+
+	return newnode;
+}
+
+/*
  * _copyWindowFunc
  */
 static WindowFunc *
@@ -1976,6 +2023,21 @@ _copyCurrentOfExpr(const CurrentOfExpr *from)
 }
 
 /*
+ * _copyInferenceElem
+ */
+static InferenceElem *
+_copyInferenceElem(const InferenceElem *from)
+{
+	InferenceElem *newnode = makeNode(InferenceElem);
+
+	COPY_NODE_FIELD(expr);
+	COPY_SCALAR_FIELD(infercollid);
+	COPY_SCALAR_FIELD(inferopclass);
+
+	return newnode;
+}
+
+/*
  * _copyTargetEntry
  */
 static TargetEntry *
@@ -2041,6 +2103,26 @@ _copyFromExpr(const FromExpr *from)
 	return newnode;
 }
 
+/*
+ * _copyOnConflictExpr
+ */
+static OnConflictExpr *
+_copyOnConflictExpr(const OnConflictExpr *from)
+{
+	OnConflictExpr *newnode = makeNode(OnConflictExpr);
+
+	COPY_SCALAR_FIELD(action);
+	COPY_NODE_FIELD(arbiterElems);
+	COPY_NODE_FIELD(arbiterWhere);
+	COPY_NODE_FIELD(onConflictSet);
+	COPY_NODE_FIELD(onConflictWhere);
+	COPY_SCALAR_FIELD(constraint);
+	COPY_SCALAR_FIELD(exclRelIndex);
+	COPY_NODE_FIELD(exclRelTlist);
+
+	return newnode;
+}
+
 /* ****************************************************************
  *						relation.h copy functions
  *
@@ -2216,6 +2298,7 @@ _copyRangeTblEntry(const RangeTblEntry *from)
 
 	COPY_SCALAR_FIELD(relid);
 	COPY_SCALAR_FIELD(relkind);
+	COPY_NODE_FIELD(tablesample);
 	COPY_NODE_FIELD(subquery);
 	COPY_SCALAR_FIELD(security_barrier);
 	COPY_SCALAR_FIELD(jointype);
@@ -2238,7 +2321,8 @@ _copyRangeTblEntry(const RangeTblEntry *from)
 	COPY_SCALAR_FIELD(requiredPerms);
 	COPY_SCALAR_FIELD(checkAsUser);
 	COPY_BITMAPSET_FIELD(selectedCols);
-	COPY_BITMAPSET_FIELD(modifiedCols);
+	COPY_BITMAPSET_FIELD(insertedCols);
+	COPY_BITMAPSET_FIELD(updatedCols);
 	COPY_NODE_FIELD(securityQuals);
 
 	return newnode;
@@ -2265,7 +2349,8 @@ _copyWithCheckOption(const WithCheckOption *from)
 {
 	WithCheckOption *newnode = makeNode(WithCheckOption);
 
-	COPY_STRING_FIELD(viewname);
+	COPY_SCALAR_FIELD(kind);
+	COPY_STRING_FIELD(relname);
 	COPY_NODE_FIELD(qual);
 	COPY_SCALAR_FIELD(cascaded);
 
@@ -2286,6 +2371,18 @@ _copySortGroupClause(const SortGroupClause *from)
 	return newnode;
 }
 
+static GroupingSet *
+_copyGroupingSet(const GroupingSet *from)
+{
+	GroupingSet *newnode = makeNode(GroupingSet);
+
+	COPY_SCALAR_FIELD(kind);
+	COPY_NODE_FIELD(content);
+	COPY_LOCATION_FIELD(location);
+
+	return newnode;
+}
+
 static WindowClause *
 _copyWindowClause(const WindowClause *from)
 {
@@ -2329,6 +2426,33 @@ _copyWithClause(const WithClause *from)
 	return newnode;
 }
 
+static InferClause *
+_copyInferClause(const InferClause *from)
+{
+	InferClause *newnode = makeNode(InferClause);
+
+	COPY_NODE_FIELD(indexElems);
+	COPY_NODE_FIELD(whereClause);
+	COPY_STRING_FIELD(conname);
+	COPY_LOCATION_FIELD(location);
+
+	return newnode;
+}
+
+static OnConflictClause *
+_copyOnConflictClause(const OnConflictClause *from)
+{
+	OnConflictClause *newnode = makeNode(OnConflictClause);
+
+	COPY_SCALAR_FIELD(action);
+	COPY_NODE_FIELD(infer);
+	COPY_NODE_FIELD(targetList);
+	COPY_NODE_FIELD(whereClause);
+	COPY_LOCATION_FIELD(location);
+
+	return newnode;
+}
+
 static CommonTableExpr *
 _copyCommonTableExpr(const CommonTableExpr *from)
 {
@@ -2348,6 +2472,40 @@ _copyCommonTableExpr(const CommonTableExpr *from)
 	return newnode;
 }
 
+static RangeTableSample *
+_copyRangeTableSample(const RangeTableSample *from)
+{
+	RangeTableSample *newnode = makeNode(RangeTableSample);
+
+	COPY_NODE_FIELD(relation);
+	COPY_STRING_FIELD(method);
+	COPY_NODE_FIELD(repeatable);
+	COPY_NODE_FIELD(args);
+
+	return newnode;
+}
+
+static TableSampleClause *
+_copyTableSampleClause(const TableSampleClause *from)
+{
+	TableSampleClause *newnode = makeNode(TableSampleClause);
+
+	COPY_SCALAR_FIELD(tsmid);
+	COPY_SCALAR_FIELD(tsmseqscan);
+	COPY_SCALAR_FIELD(tsmpagemode);
+	COPY_SCALAR_FIELD(tsminit);
+	COPY_SCALAR_FIELD(tsmnextblock);
+	COPY_SCALAR_FIELD(tsmnexttuple);
+	COPY_SCALAR_FIELD(tsmexaminetuple);
+	COPY_SCALAR_FIELD(tsmend);
+	COPY_SCALAR_FIELD(tsmreset);
+	COPY_SCALAR_FIELD(tsmcost);
+	COPY_NODE_FIELD(repeatable);
+	COPY_NODE_FIELD(args);
+
+	return newnode;
+}
+
 static A_Expr *
 _copyAExpr(const A_Expr *from)
 {
@@ -2746,8 +2904,10 @@ _copyQuery(const Query *from)
 	COPY_NODE_FIELD(jointree);
 	COPY_NODE_FIELD(targetList);
 	COPY_NODE_FIELD(withCheckOptions);
+	COPY_NODE_FIELD(onConflict);
 	COPY_NODE_FIELD(returningList);
 	COPY_NODE_FIELD(groupClause);
+	COPY_NODE_FIELD(groupingSets);
 	COPY_NODE_FIELD(havingQual);
 	COPY_NODE_FIELD(windowClause);
 	COPY_NODE_FIELD(distinctClause);
@@ -2775,6 +2935,7 @@ _copyInsertStmt(const InsertStmt *from)
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(cols);
 	COPY_NODE_FIELD(selectStmt);
+	COPY_NODE_FIELD(onConflictClause);
 	COPY_NODE_FIELD(returningList);
 	COPY_NODE_FIELD(withClause);
 
@@ -3864,6 +4025,20 @@ _copyImportForeignSchemaStmt(const ImportForeignSchemaStmt *from)
 	return newnode;
 }
 
+static CreateTransformStmt *
+_copyCreateTransformStmt(const CreateTransformStmt *from)
+{
+	CreateTransformStmt *newnode = makeNode(CreateTransformStmt);
+
+	COPY_SCALAR_FIELD(replace);
+	COPY_NODE_FIELD(type_name);
+	COPY_STRING_FIELD(lang);
+	COPY_NODE_FIELD(fromsql);
+	COPY_NODE_FIELD(tosql);
+
+	return newnode;
+}
+
 static CreateTrigStmt *
 _copyCreateTrigStmt(const CreateTrigStmt *from)
 {
@@ -4003,6 +4178,7 @@ _copyReindexStmt(const ReindexStmt *from)
 	COPY_SCALAR_FIELD(kind);
 	COPY_NODE_FIELD(relation);
 	COPY_STRING_FIELD(name);
+	COPY_SCALAR_FIELD(options);
 
 	return newnode;
 }
@@ -4119,6 +4295,7 @@ _copyAlterTSConfigurationStmt(const AlterTSConfigurationStmt *from)
 {
 	AlterTSConfigurationStmt *newnode = makeNode(AlterTSConfigurationStmt);
 
+	COPY_SCALAR_FIELD(kind);
 	COPY_NODE_FIELD(cfgname);
 	COPY_NODE_FIELD(tokentype);
 	COPY_NODE_FIELD(dicts);
@@ -4430,6 +4607,9 @@ copyObject(const void *from)
 		case T_CustomScan:
 			retval = _copyCustomScan(from);
 			break;
+		case T_SampleScan:
+			retval = _copySampleScan(from);
+			break;
 		case T_Join:
 			retval = _copyJoin(from);
 			break;
@@ -4530,6 +4710,9 @@ copyObject(const void *from)
 		case T_Aggref:
 			retval = _copyAggref(from);
 			break;
+		case T_GroupingFunc:
+			retval = _copyGroupingFunc(from);
+			break;
 		case T_WindowFunc:
 			retval = _copyWindowFunc(from);
 			break;
@@ -4632,6 +4815,9 @@ copyObject(const void *from)
 		case T_CurrentOfExpr:
 			retval = _copyCurrentOfExpr(from);
 			break;
+		case T_InferenceElem:
+			retval = _copyInferenceElem(from);
+			break;
 		case T_TargetEntry:
 			retval = _copyTargetEntry(from);
 			break;
@@ -4644,6 +4830,9 @@ copyObject(const void *from)
 		case T_FromExpr:
 			retval = _copyFromExpr(from);
 			break;
+		case T_OnConflictExpr:
+			retval = _copyOnConflictExpr(from);
+			break;
 
 			/*
 			 * RELATION NODES
@@ -4937,6 +5126,9 @@ copyObject(const void *from)
 		case T_ImportForeignSchemaStmt:
 			retval = _copyImportForeignSchemaStmt(from);
 			break;
+		case T_CreateTransformStmt:
+			retval = _copyCreateTransformStmt(from);
+			break;
 		case T_CreateTrigStmt:
 			retval = _copyCreateTrigStmt(from);
 			break;
@@ -5118,6 +5310,9 @@ copyObject(const void *from)
 		case T_SortGroupClause:
 			retval = _copySortGroupClause(from);
 			break;
+		case T_GroupingSet:
+			retval = _copyGroupingSet(from);
+			break;
 		case T_WindowClause:
 			retval = _copyWindowClause(from);
 			break;
@@ -5127,9 +5322,21 @@ copyObject(const void *from)
 		case T_WithClause:
 			retval = _copyWithClause(from);
 			break;
+		case T_InferClause:
+			retval = _copyInferClause(from);
+			break;
+		case T_OnConflictClause:
+			retval = _copyOnConflictClause(from);
+			break;
 		case T_CommonTableExpr:
 			retval = _copyCommonTableExpr(from);
 			break;
+		case T_RangeTableSample:
+			retval = _copyRangeTableSample(from);
+			break;
+		case T_TableSampleClause:
+			retval = _copyTableSampleClause(from);
+			break;
 		case T_FuncWithArgs:
 			retval = _copyFuncWithArgs(from);
 			break;
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 7e8b277970..ab88afbc28 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -224,6 +224,21 @@ _equalAggref(const Aggref *a, const Aggref *b)
 }
 
 static bool
+_equalGroupingFunc(const GroupingFunc *a, const GroupingFunc *b)
+{
+	COMPARE_NODE_FIELD(args);
+
+	/*
+	 * We must not compare the refs or cols field
+	 */
+
+	COMPARE_SCALAR_FIELD(agglevelsup);
+	COMPARE_LOCATION_FIELD(location);
+
+	return true;
+}
+
+static bool
 _equalWindowFunc(const WindowFunc *a, const WindowFunc *b)
 {
 	COMPARE_SCALAR_FIELD(winfnoid);
@@ -699,6 +714,16 @@ _equalCurrentOfExpr(const CurrentOfExpr *a, const CurrentOfExpr *b)
 }
 
 static bool
+_equalInferenceElem(const InferenceElem *a, const InferenceElem *b)
+{
+	COMPARE_NODE_FIELD(expr);
+	COMPARE_SCALAR_FIELD(infercollid);
+	COMPARE_SCALAR_FIELD(inferopclass);
+
+	return true;
+}
+
+static bool
 _equalTargetEntry(const TargetEntry *a, const TargetEntry *b)
 {
 	COMPARE_NODE_FIELD(expr);
@@ -744,6 +769,20 @@ _equalFromExpr(const FromExpr *a, const FromExpr *b)
 	return true;
 }
 
+static bool
+_equalOnConflictExpr(const OnConflictExpr *a, const OnConflictExpr *b)
+{
+	COMPARE_SCALAR_FIELD(action);
+	COMPARE_NODE_FIELD(arbiterElems);
+	COMPARE_NODE_FIELD(arbiterWhere);
+	COMPARE_NODE_FIELD(onConflictSet);
+	COMPARE_NODE_FIELD(onConflictWhere);
+	COMPARE_SCALAR_FIELD(constraint);
+	COMPARE_SCALAR_FIELD(exclRelIndex);
+	COMPARE_NODE_FIELD(exclRelTlist);
+
+	return true;
+}
 
 /*
  * Stuff from relation.h
@@ -884,8 +923,10 @@ _equalQuery(const Query *a, const Query *b)
 	COMPARE_NODE_FIELD(jointree);
 	COMPARE_NODE_FIELD(targetList);
 	COMPARE_NODE_FIELD(withCheckOptions);
+	COMPARE_NODE_FIELD(onConflict);
 	COMPARE_NODE_FIELD(returningList);
 	COMPARE_NODE_FIELD(groupClause);
+	COMPARE_NODE_FIELD(groupingSets);
 	COMPARE_NODE_FIELD(havingQual);
 	COMPARE_NODE_FIELD(windowClause);
 	COMPARE_NODE_FIELD(distinctClause);
@@ -911,6 +952,7 @@ _equalInsertStmt(const InsertStmt *a, const InsertStmt *b)
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(cols);
 	COMPARE_NODE_FIELD(selectStmt);
+	COMPARE_NODE_FIELD(onConflictClause);
 	COMPARE_NODE_FIELD(returningList);
 	COMPARE_NODE_FIELD(withClause);
 
@@ -1811,6 +1853,18 @@ _equalImportForeignSchemaStmt(const ImportForeignSchemaStmt *a, const ImportFore
 }
 
 static bool
+_equalCreateTransformStmt(const CreateTransformStmt *a, const CreateTransformStmt *b)
+{
+	COMPARE_SCALAR_FIELD(replace);
+	COMPARE_NODE_FIELD(type_name);
+	COMPARE_STRING_FIELD(lang);
+	COMPARE_NODE_FIELD(fromsql);
+	COMPARE_NODE_FIELD(tosql);
+
+	return true;
+}
+
+static bool
 _equalCreateTrigStmt(const CreateTrigStmt *a, const CreateTrigStmt *b)
 {
 	COMPARE_STRING_FIELD(trigname);
@@ -1927,6 +1981,7 @@ _equalReindexStmt(const ReindexStmt *a, const ReindexStmt *b)
 	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_STRING_FIELD(name);
+	COMPARE_SCALAR_FIELD(options);
 
 	return true;
 }
@@ -2024,6 +2079,7 @@ static bool
 _equalAlterTSConfigurationStmt(const AlterTSConfigurationStmt *a,
 							   const AlterTSConfigurationStmt *b)
 {
+	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_NODE_FIELD(cfgname);
 	COMPARE_NODE_FIELD(tokentype);
 	COMPARE_NODE_FIELD(dicts);
@@ -2349,6 +2405,7 @@ _equalRangeTblEntry(const RangeTblEntry *a, const RangeTblEntry *b)
 	COMPARE_SCALAR_FIELD(rtekind);
 	COMPARE_SCALAR_FIELD(relid);
 	COMPARE_SCALAR_FIELD(relkind);
+	COMPARE_NODE_FIELD(tablesample);
 	COMPARE_NODE_FIELD(subquery);
 	COMPARE_SCALAR_FIELD(security_barrier);
 	COMPARE_SCALAR_FIELD(jointype);
@@ -2371,7 +2428,8 @@ _equalRangeTblEntry(const RangeTblEntry *a, const RangeTblEntry *b)
 	COMPARE_SCALAR_FIELD(requiredPerms);
 	COMPARE_SCALAR_FIELD(checkAsUser);
 	COMPARE_BITMAPSET_FIELD(selectedCols);
-	COMPARE_BITMAPSET_FIELD(modifiedCols);
+	COMPARE_BITMAPSET_FIELD(insertedCols);
+	COMPARE_BITMAPSET_FIELD(updatedCols);
 	COMPARE_NODE_FIELD(securityQuals);
 
 	return true;
@@ -2394,7 +2452,8 @@ _equalRangeTblFunction(const RangeTblFunction *a, const RangeTblFunction *b)
 static bool
 _equalWithCheckOption(const WithCheckOption *a, const WithCheckOption *b)
 {
-	COMPARE_STRING_FIELD(viewname);
+	COMPARE_SCALAR_FIELD(kind);
+	COMPARE_STRING_FIELD(relname);
 	COMPARE_NODE_FIELD(qual);
 	COMPARE_SCALAR_FIELD(cascaded);
 
@@ -2414,6 +2473,16 @@ _equalSortGroupClause(const SortGroupClause *a, const SortGroupClause *b)
 }
 
 static bool
+_equalGroupingSet(const GroupingSet *a, const GroupingSet *b)
+{
+	COMPARE_SCALAR_FIELD(kind);
+	COMPARE_NODE_FIELD(content);
+	COMPARE_LOCATION_FIELD(location);
+
+	return true;
+}
+
+static bool
 _equalWindowClause(const WindowClause *a, const WindowClause *b)
 {
 	COMPARE_STRING_FIELD(name);
@@ -2451,6 +2520,29 @@ _equalWithClause(const WithClause *a, const WithClause *b)
 }
 
 static bool
+_equalInferClause(const InferClause *a, const InferClause *b)
+{
+	COMPARE_NODE_FIELD(indexElems);
+	COMPARE_NODE_FIELD(whereClause);
+	COMPARE_STRING_FIELD(conname);
+	COMPARE_LOCATION_FIELD(location);
+
+	return true;
+}
+
+static bool
+_equalOnConflictClause(const OnConflictClause *a, const OnConflictClause *b)
+{
+	COMPARE_SCALAR_FIELD(action);
+	COMPARE_NODE_FIELD(infer);
+	COMPARE_NODE_FIELD(targetList);
+	COMPARE_NODE_FIELD(whereClause);
+	COMPARE_LOCATION_FIELD(location);
+
+	return true;
+}
+
+static bool
 _equalCommonTableExpr(const CommonTableExpr *a, const CommonTableExpr *b)
 {
 	COMPARE_STRING_FIELD(ctename);
@@ -2468,6 +2560,36 @@ _equalCommonTableExpr(const CommonTableExpr *a, const CommonTableExpr *b)
 }
 
 static bool
+_equalRangeTableSample(const RangeTableSample *a, const RangeTableSample *b)
+{
+	COMPARE_NODE_FIELD(relation);
+	COMPARE_STRING_FIELD(method);
+	COMPARE_NODE_FIELD(repeatable);
+	COMPARE_NODE_FIELD(args);
+
+	return true;
+}
+
+static bool
+_equalTableSampleClause(const TableSampleClause *a, const TableSampleClause *b)
+{
+	COMPARE_SCALAR_FIELD(tsmid);
+	COMPARE_SCALAR_FIELD(tsmseqscan);
+	COMPARE_SCALAR_FIELD(tsmpagemode);
+	COMPARE_SCALAR_FIELD(tsminit);
+	COMPARE_SCALAR_FIELD(tsmnextblock);
+	COMPARE_SCALAR_FIELD(tsmnexttuple);
+	COMPARE_SCALAR_FIELD(tsmexaminetuple);
+	COMPARE_SCALAR_FIELD(tsmend);
+	COMPARE_SCALAR_FIELD(tsmreset);
+	COMPARE_SCALAR_FIELD(tsmcost);
+	COMPARE_NODE_FIELD(repeatable);
+	COMPARE_NODE_FIELD(args);
+
+	return true;
+}
+
+static bool
 _equalXmlSerialize(const XmlSerialize *a, const XmlSerialize *b)
 {
 	COMPARE_SCALAR_FIELD(xmloption);
@@ -2724,6 +2846,9 @@ equal(const void *a, const void *b)
 		case T_Aggref:
 			retval = _equalAggref(a, b);
 			break;
+		case T_GroupingFunc:
+			retval = _equalGroupingFunc(a, b);
+			break;
 		case T_WindowFunc:
 			retval = _equalWindowFunc(a, b);
 			break;
@@ -2826,6 +2951,9 @@ equal(const void *a, const void *b)
 		case T_CurrentOfExpr:
 			retval = _equalCurrentOfExpr(a, b);
 			break;
+		case T_InferenceElem:
+			retval = _equalInferenceElem(a, b);
+			break;
 		case T_TargetEntry:
 			retval = _equalTargetEntry(a, b);
 			break;
@@ -2835,6 +2963,9 @@ equal(const void *a, const void *b)
 		case T_FromExpr:
 			retval = _equalFromExpr(a, b);
 			break;
+		case T_OnConflictExpr:
+			retval = _equalOnConflictExpr(a, b);
+			break;
 		case T_JoinExpr:
 			retval = _equalJoinExpr(a, b);
 			break;
@@ -3118,6 +3249,9 @@ equal(const void *a, const void *b)
 		case T_ImportForeignSchemaStmt:
 			retval = _equalImportForeignSchemaStmt(a, b);
 			break;
+		case T_CreateTransformStmt:
+			retval = _equalCreateTransformStmt(a, b);
+			break;
 		case T_CreateTrigStmt:
 			retval = _equalCreateTrigStmt(a, b);
 			break;
@@ -3299,6 +3433,9 @@ equal(const void *a, const void *b)
 		case T_SortGroupClause:
 			retval = _equalSortGroupClause(a, b);
 			break;
+		case T_GroupingSet:
+			retval = _equalGroupingSet(a, b);
+			break;
 		case T_WindowClause:
 			retval = _equalWindowClause(a, b);
 			break;
@@ -3308,9 +3445,21 @@ equal(const void *a, const void *b)
 		case T_WithClause:
 			retval = _equalWithClause(a, b);
 			break;
+		case T_InferClause:
+			retval = _equalInferClause(a, b);
+			break;
+		case T_OnConflictClause:
+			retval = _equalOnConflictClause(a, b);
+			break;
 		case T_CommonTableExpr:
 			retval = _equalCommonTableExpr(a, b);
 			break;
+		case T_RangeTableSample:
+			retval = _equalRangeTableSample(a, b);
+			break;
+		case T_TableSampleClause:
+			retval = _equalTableSampleClause(a, b);
+			break;
 		case T_FuncWithArgs:
 			retval = _equalFuncWithArgs(a, b);
 			break;
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index 28de778ed0..a6737514ef 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -822,15 +822,14 @@ list_intersection(const List *list1, const List *list2)
 	return result;
 }
 
-#ifdef PGXC
 /*
- * This variant of list_intersection() operates upon lists of integers.
+ * As list_intersection but operates on lists of integers.
  */
 List *
 list_intersection_int(const List *list1, const List *list2)
 {
 	List	   *result;
-	ListCell   *cell;
+	const ListCell *cell;
 
 	if (list1 == NIL || list2 == NIL)
 		return NIL;
@@ -848,7 +847,6 @@ list_intersection_int(const List *list1, const List *list2)
 	check_list_invariants(result);
 	return result;
 }
-#endif
 
 /*
  * Return a list that contains all the cells in list1 that are not in
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index ca17c738a3..e1adaca48f 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -560,3 +560,18 @@ makeFuncCall(List *name, List *args, int location)
 	n->location = location;
 	return n;
 }
+
+/*
+ * makeGroupingSet
+ *
+ */
+GroupingSet *
+makeGroupingSet(GroupingSetKind kind, List *content, int location)
+{
+	GroupingSet *n = makeNode(GroupingSet);
+
+	n->kind = kind;
+	n->content = content;
+	n->location = location;
+	return n;
+}
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 0945d5d953..a09240a55f 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -54,6 +54,9 @@ exprType(const Node *expr)
 		case T_Aggref:
 			type = ((const Aggref *) expr)->aggtype;
 			break;
+		case T_GroupingFunc:
+			type = INT4OID;
+			break;
 		case T_WindowFunc:
 			type = ((const WindowFunc *) expr)->wintype;
 			break;
@@ -235,6 +238,13 @@ exprType(const Node *expr)
 		case T_CurrentOfExpr:
 			type = BOOLOID;
 			break;
+		case T_InferenceElem:
+			{
+				const InferenceElem *n = (const InferenceElem *) expr;
+
+				type = exprType((Node *) n->expr);
+			}
+			break;
 		case T_PlaceHolderVar:
 			type = exprType((Node *) ((const PlaceHolderVar *) expr)->phexpr);
 			break;
@@ -743,6 +753,9 @@ exprCollation(const Node *expr)
 		case T_Aggref:
 			coll = ((const Aggref *) expr)->aggcollid;
 			break;
+		case T_GroupingFunc:
+			coll = InvalidOid;
+			break;
 		case T_WindowFunc:
 			coll = ((const WindowFunc *) expr)->wincollid;
 			break;
@@ -894,6 +907,9 @@ exprCollation(const Node *expr)
 		case T_CurrentOfExpr:
 			coll = InvalidOid;	/* result is always boolean */
 			break;
+		case T_InferenceElem:
+			coll = exprCollation((Node *) ((const InferenceElem *) expr)->expr);
+			break;
 		case T_PlaceHolderVar:
 			coll = exprCollation((Node *) ((const PlaceHolderVar *) expr)->phexpr);
 			break;
@@ -976,6 +992,9 @@ exprSetCollation(Node *expr, Oid collation)
 		case T_Aggref:
 			((Aggref *) expr)->aggcollid = collation;
 			break;
+		case T_GroupingFunc:
+			Assert(!OidIsValid(collation));
+			break;
 		case T_WindowFunc:
 			((WindowFunc *) expr)->wincollid = collation;
 			break;
@@ -1192,6 +1211,9 @@ exprLocation(const Node *expr)
 			/* function name should always be the first thing */
 			loc = ((const Aggref *) expr)->location;
 			break;
+		case T_GroupingFunc:
+			loc = ((const GroupingFunc *) expr)->location;
+			break;
 		case T_WindowFunc:
 			/* function name should always be the first thing */
 			loc = ((const WindowFunc *) expr)->location;
@@ -1481,9 +1503,18 @@ exprLocation(const Node *expr)
 			/* XMLSERIALIZE keyword should always be the first thing */
 			loc = ((const XmlSerialize *) expr)->location;
 			break;
+		case T_GroupingSet:
+			loc = ((const GroupingSet *) expr)->location;
+			break;
 		case T_WithClause:
 			loc = ((const WithClause *) expr)->location;
 			break;
+		case T_InferClause:
+			loc = ((const InferClause *) expr)->location;
+			break;
+		case T_OnConflictClause:
+			loc = ((const OnConflictClause *) expr)->location;
+			break;
 		case T_CommonTableExpr:
 			loc = ((const CommonTableExpr *) expr)->location;
 			break;
@@ -1491,6 +1522,10 @@ exprLocation(const Node *expr)
 			/* just use argument's location */
 			loc = exprLocation((Node *) ((const PlaceHolderVar *) expr)->phexpr);
 			break;
+		case T_InferenceElem:
+			/* just use nested expr's location */
+			loc = exprLocation((Node *) ((const InferenceElem *) expr)->expr);
+			break;
 		default:
 			/* for any other node type it's just unknown... */
 			loc = -1;
@@ -1665,6 +1700,15 @@ expression_tree_walker(Node *node,
 					return true;
 			}
 			break;
+		case T_GroupingFunc:
+			{
+				GroupingFunc *grouping = (GroupingFunc *) node;
+
+				if (expression_tree_walker((Node *) grouping->args,
+										   walker, context))
+					return true;
+			}
+			break;
 		case T_WindowFunc:
 			{
 				WindowFunc *expr = (WindowFunc *) node;
@@ -1890,6 +1934,22 @@ expression_tree_walker(Node *node,
 					return true;
 			}
 			break;
+		case T_OnConflictExpr:
+			{
+				OnConflictExpr *onconflict = (OnConflictExpr *) node;
+
+				if (walker((Node *) onconflict->arbiterElems, context))
+					return true;
+				if (walker(onconflict->arbiterWhere, context))
+					return true;
+				if (walker(onconflict->onConflictSet, context))
+					return true;
+				if (walker(onconflict->onConflictWhere, context))
+					return true;
+				if (walker(onconflict->exclRelTlist, context))
+					return true;
+			}
+			break;
 		case T_JoinExpr:
 			{
 				JoinExpr   *join = (JoinExpr *) node;
@@ -1920,6 +1980,8 @@ expression_tree_walker(Node *node,
 			break;
 		case T_PlaceHolderVar:
 			return walker(((PlaceHolderVar *) node)->phexpr, context);
+		case T_InferenceElem:
+			return walker(((InferenceElem *) node)->expr, context);
 		case T_AppendRelInfo:
 			{
 				AppendRelInfo *appinfo = (AppendRelInfo *) node;
@@ -1968,6 +2030,8 @@ query_tree_walker(Query *query,
 		return true;
 	if (walker((Node *) query->withCheckOptions, context))
 		return true;
+	if (walker((Node *) query->onConflict, context))
+		return true;
 	if (walker((Node *) query->returningList, context))
 		return true;
 	if (walker((Node *) query->jointree, context))
@@ -2018,6 +2082,14 @@ range_table_walker(List *rtable,
 		switch (rte->rtekind)
 		{
 			case RTE_RELATION:
+				if (rte->tablesample)
+				{
+					if (walker(rte->tablesample->args, context))
+						return true;
+					if (walker(rte->tablesample->repeatable, context))
+						return true;
+				}
+				break;
 			case RTE_CTE:
 				/* nothing to do */
 				break;
@@ -2200,6 +2272,29 @@ expression_tree_mutator(Node *node,
 				return (Node *) newnode;
 			}
 			break;
+		case T_GroupingFunc:
+			{
+				GroupingFunc *grouping = (GroupingFunc *) node;
+				GroupingFunc *newnode;
+
+				FLATCOPY(newnode, grouping, GroupingFunc);
+				MUTATE(newnode->args, grouping->args, List *);
+
+				/*
+				 * We assume here that mutating the arguments does not change
+				 * the semantics, i.e. that the arguments are not mutated in a
+				 * way that makes them semantically different from their
+				 * previously matching expressions in the GROUP BY clause.
+				 *
+				 * If a mutator somehow wanted to do this, it would have to
+				 * handle the refs and cols lists itself as appropriate.
+				 */
+				newnode->refs = list_copy(grouping->refs);
+				newnode->cols = list_copy(grouping->cols);
+
+				return (Node *) newnode;
+			}
+			break;
 		case T_WindowFunc:
 			{
 				WindowFunc *wfunc = (WindowFunc *) node;
@@ -2599,6 +2694,21 @@ expression_tree_mutator(Node *node,
 				return (Node *) newnode;
 			}
 			break;
+		case T_OnConflictExpr:
+			{
+				OnConflictExpr *oc = (OnConflictExpr *) node;
+				OnConflictExpr *newnode;
+
+				FLATCOPY(newnode, oc, OnConflictExpr);
+				MUTATE(newnode->arbiterElems, oc->arbiterElems, List *);
+				MUTATE(newnode->arbiterWhere, oc->arbiterWhere, Node *);
+				MUTATE(newnode->onConflictSet, oc->onConflictSet, List *);
+				MUTATE(newnode->onConflictWhere, oc->onConflictWhere, Node *);
+				MUTATE(newnode->exclRelTlist, oc->exclRelTlist, List *);
+
+				return (Node *) newnode;
+			}
+			break;
 		case T_JoinExpr:
 			{
 				JoinExpr   *join = (JoinExpr *) node;
@@ -2635,6 +2745,16 @@ expression_tree_mutator(Node *node,
 				return (Node *) newnode;
 			}
 			break;
+		case T_InferenceElem:
+			{
+				InferenceElem *inferenceelemdexpr = (InferenceElem *) node;
+				InferenceElem *newnode;
+
+				FLATCOPY(newnode, inferenceelemdexpr, InferenceElem);
+				MUTATE(newnode->expr, newnode->expr, Node *);
+				return (Node *) newnode;
+			}
+			break;
 		case T_AppendRelInfo:
 			{
 				AppendRelInfo *appinfo = (AppendRelInfo *) node;
@@ -2714,6 +2834,7 @@ query_tree_mutator(Query *query,
 
 	MUTATE(query->targetList, query->targetList, List *);
 	MUTATE(query->withCheckOptions, query->withCheckOptions, List *);
+	MUTATE(query->onConflict, query->onConflict, OnConflictExpr *);
 	MUTATE(query->returningList, query->returningList, List *);
 	MUTATE(query->jointree, query->jointree, FromExpr *);
 	MUTATE(query->setOperations, query->setOperations, Node *);
@@ -2752,6 +2873,14 @@ range_table_mutator(List *rtable,
 		switch (rte->rtekind)
 		{
 			case RTE_RELATION:
+				if (rte->tablesample)
+				{
+					MUTATE(rte->tablesample->args, rte->tablesample->args,
+						   List *);
+					MUTATE(rte->tablesample->repeatable,
+						   rte->tablesample->repeatable, Node *);
+				}
+				break;
 			case RTE_CTE:
 #ifdef PGXC
 			case RTE_REMOTE_DUMMY:
@@ -2888,6 +3017,8 @@ raw_expression_tree_walker(Node *node,
 			break;
 		case T_RangeVar:
 			return walker(((RangeVar *) node)->alias, context);
+		case T_GroupingFunc:
+			return walker(((GroupingFunc *) node)->args, context);
 		case T_SubLink:
 			{
 				SubLink    *sublink = (SubLink *) node;
@@ -2986,6 +3117,8 @@ raw_expression_tree_walker(Node *node,
 					return true;
 				if (walker(stmt->selectStmt, context))
 					return true;
+				if (walker(stmt->onConflictClause, context))
+					return true;
 				if (walker(stmt->returningList, context))
 					return true;
 				if (walker(stmt->withClause, context))
@@ -3211,6 +3344,8 @@ raw_expression_tree_walker(Node *node,
 				/* for now, constraints are ignored */
 			}
 			break;
+		case T_GroupingSet:
+			return walker(((GroupingSet *) node)->content, context);
 		case T_LockingClause:
 			return walker(((LockingClause *) node)->lockedRels, context);
 		case T_XmlSerialize:
@@ -3225,8 +3360,42 @@ raw_expression_tree_walker(Node *node,
 			break;
 		case T_WithClause:
 			return walker(((WithClause *) node)->ctes, context);
+		case T_InferClause:
+			{
+				InferClause *stmt = (InferClause *) node;
+
+				if (walker(stmt->indexElems, context))
+					return true;
+				if (walker(stmt->whereClause, context))
+					return true;
+			}
+			break;
+		case T_OnConflictClause:
+			{
+				OnConflictClause *stmt = (OnConflictClause *) node;
+
+				if (walker(stmt->infer, context))
+					return true;
+				if (walker(stmt->targetList, context))
+					return true;
+				if (walker(stmt->whereClause, context))
+					return true;
+			}
+			break;
 		case T_CommonTableExpr:
 			return walker(((CommonTableExpr *) node)->ctequery, context);
+		case T_RangeTableSample:
+			{
+				RangeTableSample *rts = (RangeTableSample *) node;
+
+				if (walker(rts->relation, context))
+					return true;
+				if (walker(rts->repeatable, context))
+					return true;
+				if (walker(rts->args, context))
+					return true;
+			}
+			break;
 		default:
 			elog(ERROR, "unrecognized node type: %d",
 				 (int) nodeTag(node));
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 6bdaf22fdb..02382151bf 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -517,6 +517,12 @@ _outModifyTable(StringInfo str, const ModifyTable *node)
 	WRITE_NODE_FIELD(remote_plans);
 #endif
 #endif
+	WRITE_ENUM_FIELD(onConflictAction, OnConflictAction);
+	WRITE_NODE_FIELD(arbiterIndexes);
+	WRITE_NODE_FIELD(onConflictSet);
+	WRITE_NODE_FIELD(onConflictWhere);
+	WRITE_INT_FIELD(exclRelRTI);
+	WRITE_NODE_FIELD(exclRelTlist);
 }
 
 static void
@@ -703,6 +709,7 @@ _outIndexScan(StringInfo str, const IndexScan *node)
 	WRITE_NODE_FIELD(indexqualorig);
 	WRITE_NODE_FIELD(indexorderby);
 	WRITE_NODE_FIELD(indexorderbyorig);
+	WRITE_NODE_FIELD(indexorderbyops);
 	WRITE_ENUM_FIELD(indexorderdir, ScanDirection);
 }
 
@@ -867,8 +874,11 @@ _outForeignScan(StringInfo str, const ForeignScan *node)
 
 	_outScanInfo(str, (const Scan *) node);
 
+	WRITE_OID_FIELD(fs_server);
 	WRITE_NODE_FIELD(fdw_exprs);
 	WRITE_NODE_FIELD(fdw_private);
+	WRITE_NODE_FIELD(fdw_scan_tlist);
+	WRITE_BITMAPSET_FIELD(fs_relids);
 	WRITE_BOOL_FIELD(fsSystemCol);
 }
 
@@ -882,6 +892,8 @@ _outCustomScan(StringInfo str, const CustomScan *node)
 	WRITE_UINT_FIELD(flags);
 	WRITE_NODE_FIELD(custom_exprs);
 	WRITE_NODE_FIELD(custom_private);
+	WRITE_NODE_FIELD(custom_scan_tlist);
+	WRITE_BITMAPSET_FIELD(custom_relids);
 	appendStringInfoString(str, " :methods ");
 	_outToken(str, node->methods->CustomName);
 	if (node->methods->TextOutCustomScan)
@@ -889,6 +901,14 @@ _outCustomScan(StringInfo str, const CustomScan *node)
 }
 
 static void
+_outSampleScan(StringInfo str, const SampleScan *node)
+{
+	WRITE_NODE_TYPE("SAMPLESCAN");
+
+	_outScanInfo(str, (const Scan *) node);
+}
+
+static void
 _outJoin(StringInfo str, const Join *node)
 {
 	WRITE_NODE_TYPE("JOIN");
@@ -1014,6 +1034,9 @@ _outAgg(StringInfo str, const Agg *node)
 		appendStringInfo(str, " %u", node->grpOperators[i]);
 
 	WRITE_LONG_FIELD(numGroups);
+
+	WRITE_NODE_FIELD(groupingSets);
+	WRITE_NODE_FIELD(chain);
 }
 
 static void
@@ -1711,6 +1734,18 @@ _outAggref(StringInfo str, const Aggref *node)
 }
 
 static void
+_outGroupingFunc(StringInfo str, const GroupingFunc *node)
+{
+	WRITE_NODE_TYPE("GROUPINGFUNC");
+
+	WRITE_NODE_FIELD(args);
+	WRITE_NODE_FIELD(refs);
+	WRITE_NODE_FIELD(cols);
+	WRITE_INT_FIELD(agglevelsup);
+	WRITE_LOCATION_FIELD(location);
+}
+
+static void
 _outWindowFunc(StringInfo str, const WindowFunc *node)
 {
 	WRITE_NODE_TYPE("WINDOWFUNC");
@@ -2469,6 +2504,16 @@ _outCurrentOfExpr(StringInfo str, const CurrentOfExpr *node)
 }
 
 static void
+_outInferenceElem(StringInfo str, const InferenceElem *node)
+{
+	WRITE_NODE_TYPE("INFERENCEELEM");
+
+	WRITE_NODE_FIELD(expr);
+	WRITE_OID_FIELD(infercollid);
+	WRITE_OID_FIELD(inferopclass);
+}
+
+static void
 _outTargetEntry(StringInfo str, const TargetEntry *node)
 {
 	WRITE_NODE_TYPE("TARGETENTRY");
@@ -2519,6 +2564,21 @@ _outFromExpr(StringInfo str, const FromExpr *node)
 	WRITE_NODE_FIELD(quals);
 }
 
+static void
+_outOnConflictExpr(StringInfo str, const OnConflictExpr *node)
+{
+	WRITE_NODE_TYPE("ONCONFLICTEXPR");
+
+	WRITE_ENUM_FIELD(action, OnConflictAction);
+	WRITE_NODE_FIELD(arbiterElems);
+	WRITE_NODE_FIELD(arbiterWhere);
+	WRITE_NODE_FIELD(onConflictSet);
+	WRITE_NODE_FIELD(onConflictWhere);
+	WRITE_OID_FIELD(constraint);
+	WRITE_INT_FIELD(exclRelIndex);
+	WRITE_NODE_FIELD(exclRelTlist);
+}
+
 /*****************************************************************************
  *
  *	Stuff from relation.h.
@@ -2832,6 +2892,7 @@ _outRelOptInfo(StringInfo str, const RelOptInfo *node)
 	WRITE_FLOAT_FIELD(rows, "%.0f");
 	WRITE_INT_FIELD(width);
 	WRITE_BOOL_FIELD(consider_startup);
+	WRITE_BOOL_FIELD(consider_param_startup);
 	WRITE_NODE_FIELD(reltargetlist);
 	WRITE_NODE_FIELD(pathlist);
 	WRITE_NODE_FIELD(ppilist);
@@ -2854,6 +2915,7 @@ _outRelOptInfo(StringInfo str, const RelOptInfo *node)
 	WRITE_NODE_FIELD(subplan);
 	WRITE_NODE_FIELD(subroot);
 	WRITE_NODE_FIELD(subplan_params);
+	WRITE_OID_FIELD(serverid);
 	/* we don't try to print fdwroutine or fdw_private */
 	WRITE_NODE_FIELD(baserestrictinfo);
 	WRITE_NODE_FIELD(joininfo);
@@ -3372,8 +3434,10 @@ _outQuery(StringInfo str, const Query *node)
 	WRITE_NODE_FIELD(jointree);
 	WRITE_NODE_FIELD(targetList);
 	WRITE_NODE_FIELD(withCheckOptions);
+	WRITE_NODE_FIELD(onConflict);
 	WRITE_NODE_FIELD(returningList);
 	WRITE_NODE_FIELD(groupClause);
+	WRITE_NODE_FIELD(groupingSets);
 	WRITE_NODE_FIELD(havingQual);
 	WRITE_NODE_FIELD(windowClause);
 	WRITE_NODE_FIELD(distinctClause);
@@ -3390,7 +3454,8 @@ _outWithCheckOption(StringInfo str, const WithCheckOption *node)
 {
 	WRITE_NODE_TYPE("WITHCHECKOPTION");
 
-	WRITE_STRING_FIELD(viewname);
+	WRITE_ENUM_FIELD(kind, WCOKind);
+	WRITE_STRING_FIELD(relname);
 	WRITE_NODE_FIELD(qual);
 	WRITE_BOOL_FIELD(cascaded);
 }
@@ -3418,6 +3483,16 @@ _outSortGroupClause(StringInfo str, const SortGroupClause *node)
 }
 
 static void
+_outGroupingSet(StringInfo str, const GroupingSet *node)
+{
+	WRITE_NODE_TYPE("GROUPINGSET");
+
+	WRITE_ENUM_FIELD(kind, GroupingSetKind);
+	WRITE_NODE_FIELD(content);
+	WRITE_LOCATION_FIELD(location);
+}
+
+static void
 _outWindowClause(StringInfo str, const WindowClause *node)
 {
 	WRITE_NODE_TYPE("WINDOWCLAUSE");
@@ -3472,6 +3547,36 @@ _outCommonTableExpr(StringInfo str, const CommonTableExpr *node)
 }
 
 static void
+_outRangeTableSample(StringInfo str, const RangeTableSample *node)
+{
+	WRITE_NODE_TYPE("RANGETABLESAMPLE");
+
+	WRITE_NODE_FIELD(relation);
+	WRITE_STRING_FIELD(method);
+	WRITE_NODE_FIELD(repeatable);
+	WRITE_NODE_FIELD(args);
+}
+
+static void
+_outTableSampleClause(StringInfo str, const TableSampleClause *node)
+{
+	WRITE_NODE_TYPE("TABLESAMPLECLAUSE");
+
+	WRITE_OID_FIELD(tsmid);
+	WRITE_BOOL_FIELD(tsmseqscan);
+	WRITE_BOOL_FIELD(tsmpagemode);
+	WRITE_OID_FIELD(tsminit);
+	WRITE_OID_FIELD(tsmnextblock);
+	WRITE_OID_FIELD(tsmnexttuple);
+	WRITE_OID_FIELD(tsmexaminetuple);
+	WRITE_OID_FIELD(tsmend);
+	WRITE_OID_FIELD(tsmreset);
+	WRITE_OID_FIELD(tsmcost);
+	WRITE_NODE_FIELD(repeatable);
+	WRITE_NODE_FIELD(args);
+}
+
+static void
 _outSetOperationStmt(StringInfo str, const SetOperationStmt *node)
 {
 	WRITE_NODE_TYPE("SETOPERATIONSTMT");
@@ -3511,6 +3616,7 @@ _outRangeTblEntry(StringInfo str, const RangeTblEntry *node)
 #endif
 			WRITE_OID_FIELD(relid);
 			WRITE_CHAR_FIELD(relkind);
+			WRITE_NODE_FIELD(tablesample);
 			break;
 		case RTE_SUBQUERY:
 			WRITE_NODE_FIELD(subquery);
@@ -3558,7 +3664,8 @@ _outRangeTblEntry(StringInfo str, const RangeTblEntry *node)
 #endif
 	WRITE_OID_FIELD(checkAsUser);
 	WRITE_BITMAPSET_FIELD(selectedCols);
-	WRITE_BITMAPSET_FIELD(modifiedCols);
+	WRITE_BITMAPSET_FIELD(insertedCols);
+	WRITE_BITMAPSET_FIELD(updatedCols);
 	WRITE_NODE_FIELD(securityQuals);
 }
 
@@ -4025,6 +4132,9 @@ _outNode(StringInfo str, const void *obj)
 			case T_CustomScan:
 				_outCustomScan(str, obj);
 				break;
+			case T_SampleScan:
+				_outSampleScan(str, obj);
+				break;
 			case T_Join:
 				_outJoin(str, obj);
 				break;
@@ -4108,6 +4218,9 @@ _outNode(StringInfo str, const void *obj)
 			case T_Aggref:
 				_outAggref(str, obj);
 				break;
+			case T_GroupingFunc:
+				_outGroupingFunc(str, obj);
+				break;
 			case T_WindowFunc:
 				_outWindowFunc(str, obj);
 				break;
@@ -4210,6 +4323,9 @@ _outNode(StringInfo str, const void *obj)
 			case T_CurrentOfExpr:
 				_outCurrentOfExpr(str, obj);
 				break;
+			case T_InferenceElem:
+				_outInferenceElem(str, obj);
+				break;
 			case T_TargetEntry:
 				_outTargetEntry(str, obj);
 				break;
@@ -4222,7 +4338,9 @@ _outNode(StringInfo str, const void *obj)
 			case T_FromExpr:
 				_outFromExpr(str, obj);
 				break;
-
+			case T_OnConflictExpr:
+				_outOnConflictExpr(str, obj);
+				break;
 			case T_Path:
 				_outPath(str, obj);
 				break;
@@ -4365,6 +4483,9 @@ _outNode(StringInfo str, const void *obj)
 			case T_SortGroupClause:
 				_outSortGroupClause(str, obj);
 				break;
+			case T_GroupingSet:
+				_outGroupingSet(str, obj);
+				break;
 			case T_WindowClause:
 				_outWindowClause(str, obj);
 				break;
@@ -4377,6 +4498,12 @@ _outNode(StringInfo str, const void *obj)
 			case T_CommonTableExpr:
 				_outCommonTableExpr(str, obj);
 				break;
+			case T_RangeTableSample:
+				_outRangeTableSample(str, obj);
+				break;
+			case T_TableSampleClause:
+				_outTableSampleClause(str, obj);
+				break;
 			case T_SetOperationStmt:
 				_outSetOperationStmt(str, obj);
 				break;
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index be17c03c36..84fce71dba 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -464,8 +464,10 @@ _readQuery(void)
 	READ_NODE_FIELD(jointree);
 	READ_NODE_FIELD(targetList);
 	READ_NODE_FIELD(withCheckOptions);
+	READ_NODE_FIELD(onConflict);
 	READ_NODE_FIELD(returningList);
 	READ_NODE_FIELD(groupClause);
+	READ_NODE_FIELD(groupingSets);
 	READ_NODE_FIELD(havingQual);
 	READ_NODE_FIELD(windowClause);
 	READ_NODE_FIELD(distinctClause);
@@ -516,7 +518,8 @@ _readWithCheckOption(void)
 {
 	READ_LOCALS(WithCheckOption);
 
-	READ_STRING_FIELD(viewname);
+	READ_ENUM_FIELD(kind, WCOKind);
+	READ_STRING_FIELD(relname);
 	READ_NODE_FIELD(qual);
 	READ_BOOL_FIELD(cascaded);
 
@@ -551,6 +554,21 @@ _readSortGroupClause(void)
 }
 
 /*
+ * _readGroupingSet
+ */
+static GroupingSet *
+_readGroupingSet(void)
+{
+	READ_LOCALS(GroupingSet);
+
+	READ_ENUM_FIELD(kind, GroupingSetKind);
+	READ_NODE_FIELD(content);
+	READ_LOCATION_FIELD(location);
+
+	READ_DONE();
+}
+
+/*
  * _readWindowClause
  */
 static WindowClause *
@@ -610,6 +628,46 @@ _readCommonTableExpr(void)
 }
 
 /*
+ * _readRangeTableSample
+ */
+static RangeTableSample *
+_readRangeTableSample(void)
+{
+	READ_LOCALS(RangeTableSample);
+
+	READ_NODE_FIELD(relation);
+	READ_STRING_FIELD(method);
+	READ_NODE_FIELD(repeatable);
+	READ_NODE_FIELD(args);
+
+	READ_DONE();
+}
+
+/*
+ * _readTableSampleClause
+ */
+static TableSampleClause *
+_readTableSampleClause(void)
+{
+	READ_LOCALS(TableSampleClause);
+
+	READ_OID_FIELD(tsmid);
+	READ_BOOL_FIELD(tsmseqscan);
+	READ_BOOL_FIELD(tsmpagemode);
+	READ_OID_FIELD(tsminit);
+	READ_OID_FIELD(tsmnextblock);
+	READ_OID_FIELD(tsmnexttuple);
+	READ_OID_FIELD(tsmexaminetuple);
+	READ_OID_FIELD(tsmend);
+	READ_OID_FIELD(tsmreset);
+	READ_OID_FIELD(tsmcost);
+	READ_NODE_FIELD(repeatable);
+	READ_NODE_FIELD(args);
+
+	READ_DONE();
+}
+
+/*
  * _readSetOperationStmt
  */
 static SetOperationStmt *
@@ -832,6 +890,23 @@ _readAggref(void)
 }
 
 /*
+ * _readGroupingFunc
+ */
+static GroupingFunc *
+_readGroupingFunc(void)
+{
+	READ_LOCALS(GroupingFunc);
+
+	READ_NODE_FIELD(args);
+	READ_NODE_FIELD(refs);
+	READ_NODE_FIELD(cols);
+	READ_INT_FIELD(agglevelsup);
+	READ_LOCATION_FIELD(location);
+
+	READ_DONE();
+}
+
+/*
  * _readWindowFunc
  */
 static WindowFunc *
@@ -1792,6 +1867,21 @@ _readCurrentOfExpr(void)
 }
 
 /*
+ * _readInferenceElem
+ */
+static InferenceElem *
+_readInferenceElem(void)
+{
+	READ_LOCALS(InferenceElem);
+
+	READ_NODE_FIELD(expr);
+	READ_OID_FIELD(infercollid);
+	READ_OID_FIELD(inferopclass);
+
+	READ_DONE();
+}
+
+/*
  * _readTargetEntry
  */
 static TargetEntry *
@@ -1862,6 +1952,25 @@ _readFromExpr(void)
 	READ_DONE();
 }
 
+/*
+ * _readOnConflictExpr
+ */
+static OnConflictExpr *
+_readOnConflictExpr(void)
+{
+	READ_LOCALS(OnConflictExpr);
+
+	READ_ENUM_FIELD(action, OnConflictAction);
+	READ_NODE_FIELD(arbiterElems);
+	READ_NODE_FIELD(arbiterWhere);
+	READ_NODE_FIELD(onConflictSet);
+	READ_NODE_FIELD(onConflictWhere);
+	READ_OID_FIELD(constraint);
+	READ_INT_FIELD(exclRelIndex);
+	READ_NODE_FIELD(exclRelTlist);
+
+	READ_DONE();
+}
 
 /*
  *	Stuff from parsenodes.h.
@@ -1895,6 +2004,7 @@ _readRangeTblEntry(void)
 #endif
 			READ_OID_FIELD(relid);
 			READ_CHAR_FIELD(relkind);
+			READ_NODE_FIELD(tablesample);
 			break;
 		case RTE_SUBQUERY:
 			READ_NODE_FIELD(subquery);
@@ -1947,7 +2057,8 @@ _readRangeTblEntry(void)
 #endif
 	READ_OID_FIELD(checkAsUser);
 	READ_BITMAPSET_FIELD(selectedCols);
-	READ_BITMAPSET_FIELD(modifiedCols);
+	READ_BITMAPSET_FIELD(insertedCols);
+	READ_BITMAPSET_FIELD(updatedCols);
 	READ_NODE_FIELD(securityQuals);
 
 	READ_DONE();
@@ -2026,6 +2137,13 @@ _readModifyTable(void)
 #endif
 #endif
 
+	READ_ENUM_FIELD(onConflictAction, OnConflictAction);
+	READ_NODE_FIELD(arbiterIndexes);
+	READ_NODE_FIELD(onConflictSet);
+	READ_NODE_FIELD(onConflictWhere);
+	READ_INT_FIELD(exclRelRTI);
+	READ_NODE_FIELD(exclRelTlist);
+
 	READ_DONE();
 }
 
@@ -2251,6 +2369,7 @@ _readIndexScan(void)
 	READ_NODE_FIELD(indexqualorig);
 	READ_NODE_FIELD(indexorderby);
 	READ_NODE_FIELD(indexorderbyorig);
+	READ_NODE_FIELD(indexorderbyops);
 	READ_ENUM_FIELD(indexorderdir, ScanDirection);
 
 	READ_DONE();
@@ -2760,6 +2879,9 @@ _readAgg(void)
 
 	READ_LONG_FIELD(numGroups);
 
+	READ_NODE_FIELD(groupingSets);
+	READ_NODE_FIELD(chain);
+
 	READ_DONE();
 }
 
@@ -3310,12 +3432,18 @@ parseNodeString(void)
 		return_value = _readWithCheckOption();
 	else if (MATCH("SORTGROUPCLAUSE", 15))
 		return_value = _readSortGroupClause();
+	else if (MATCH("GROUPINGSET", 11))
+		return_value = _readGroupingSet();
 	else if (MATCH("WINDOWCLAUSE", 12))
 		return_value = _readWindowClause();
 	else if (MATCH("ROWMARKCLAUSE", 13))
 		return_value = _readRowMarkClause();
 	else if (MATCH("COMMONTABLEEXPR", 15))
 		return_value = _readCommonTableExpr();
+	else if (MATCH("RANGETABLESAMPLE", 16))
+		return_value = _readRangeTableSample();
+	else if (MATCH("TABLESAMPLECLAUSE", 17))
+		return_value = _readTableSampleClause();
 	else if (MATCH("SETOPERATIONSTMT", 16))
 		return_value = _readSetOperationStmt();
 	else if (MATCH("ALIAS", 5))
@@ -3332,6 +3460,8 @@ parseNodeString(void)
 		return_value = _readParam();
 	else if (MATCH("AGGREF", 6))
 		return_value = _readAggref();
+	else if (MATCH("GROUPINGFUNC", 12))
+		return_value = _readGroupingFunc();
 	else if (MATCH("WINDOWFUNC", 10))
 		return_value = _readWindowFunc();
 	else if (MATCH("ARRAYREF", 8))
@@ -3400,6 +3530,8 @@ parseNodeString(void)
 		return_value = _readSetToDefault();
 	else if (MATCH("CURRENTOFEXPR", 13))
 		return_value = _readCurrentOfExpr();
+	else if (MATCH("INFERENCEELEM", 13))
+		return_value = _readInferenceElem();
 	else if (MATCH("TARGETENTRY", 11))
 		return_value = _readTargetEntry();
 	else if (MATCH("RANGETBLREF", 11))
@@ -3408,6 +3540,8 @@ parseNodeString(void)
 		return_value = _readJoinExpr();
 	else if (MATCH("FROMEXPR", 8))
 		return_value = _readFromExpr();
+	else if (MATCH("ONCONFLICTEXPR", 14))
+		return_value = _readOnConflictExpr();
 	else if (MATCH("RTE", 3))
 		return_value = _readRangeTblEntry();
 	else if (MATCH("RANGETBLFUNCTION", 16))
diff --git a/src/backend/optimizer/README b/src/backend/optimizer/README
index 6cae9e8b48..99c300a657 100644
--- a/src/backend/optimizer/README
+++ b/src/backend/optimizer/README
@@ -656,7 +656,7 @@ EquivalenceClasses and PathKeys after query_planner has completed.
 In these cases, the extra ECs/PKs are needed to represent sort orders
 that were not considered during query_planner.  Such situations should be
 minimized since it is impossible for query_planner to return a plan
-producing such a sort order, meaning a explicit sort will always be needed.
+producing such a sort order, meaning an explicit sort will always be needed.
 Currently this happens only for queries involving multiple window functions
 with different orderings, for which extra sorts are needed anyway.
 
@@ -795,7 +795,7 @@ a nestloop that provides parameters to the lower join's inputs).  While we
 do not ignore merge joins entirely, joinpath.c does not fully explore the
 space of potential merge joins with parameterized inputs.  Also, add_path
 treats parameterized paths as having no pathkeys, so that they compete
-only on total cost and rowcount; they don't get preference for producing a
+only on cost and rowcount; they don't get preference for producing a
 special sort order.  This creates additional bias against merge joins,
 since we might discard a path that could have been useful for performing
 a merge without an explicit sort step.  Since a parameterized path must
@@ -804,6 +804,13 @@ uninteresting, these choices do not affect any requirement for the final
 output order of a query --- they only make it harder to use a merge join
 at a lower level.  The savings in planning work justifies that.
 
+Similarly, parameterized paths do not normally get preference in add_path
+for having cheap startup cost; that's seldom of much value when on the
+inside of a nestloop, so it seems not worth keeping extra paths solely for
+that.  An exception occurs for parameterized paths for the RHS relation of
+a SEMI or ANTI join: in those cases, we can stop the inner scan after the
+first match, so it's primarily startup not total cost that we care about.
+
 
 LATERAL subqueries
 ------------------
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index 69ac077616..1a43ab7288 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -138,7 +138,7 @@ gimme_edge_table(PlannerInfo *root, Gene *tour1, Gene *tour2,
  *	  registers edge from city1 to city2 in input edge table
  *
  *	  no assumptions about directionality are made;
- *	  therefor it is up to the calling routine to
+ *	  therefore it is up to the calling routine to
  *	  call gimme_edge twice to make a bi-directional edge
  *	  between city1 and city2;
  *	  uni-directional edges are possible as well (just call gimme_edge
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 22c2b338ca..5dab4d7a1c 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -77,6 +77,7 @@ set_rel_pathlist_hook_type set_rel_pathlist_hook = NULL;
 join_search_hook_type join_search_hook = NULL;
 
 
+static void set_base_rel_consider_startup(PlannerInfo *root);
 static void set_base_rel_sizes(PlannerInfo *root);
 static void set_base_rel_pathlists(PlannerInfo *root);
 static void set_rel_size(PlannerInfo *root, RelOptInfo *rel,
@@ -87,6 +88,10 @@ static void set_plain_rel_size(PlannerInfo *root, RelOptInfo *rel,
 				   RangeTblEntry *rte);
 static void set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 					   RangeTblEntry *rte);
+static void set_tablesample_rel_size(PlannerInfo *root, RelOptInfo *rel,
+						 RangeTblEntry *rte);
+static void set_tablesample_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
+							 RangeTblEntry *rte);
 static void set_foreign_size(PlannerInfo *root, RelOptInfo *rel,
 				 RangeTblEntry *rte);
 static void set_foreign_pathlist(PlannerInfo *root, RelOptInfo *rel,
@@ -164,6 +169,9 @@ make_one_rel(PlannerInfo *root, List *joinlist)
 		root->all_baserels = bms_add_member(root->all_baserels, brel->relid);
 	}
 
+	/* Mark base rels as to whether we care about fast-start plans */
+	set_base_rel_consider_startup(root);
+
 	/*
 	 * Generate access paths for the base rels.
 	 */
@@ -184,6 +192,49 @@ make_one_rel(PlannerInfo *root, List *joinlist)
 }
 
 /*
+ * set_base_rel_consider_startup
+ *	  Set the consider_[param_]startup flags for each base-relation entry.
+ *
+ * For the moment, we only deal with consider_param_startup here; because the
+ * logic for consider_startup is pretty trivial and is the same for every base
+ * relation, we just let build_simple_rel() initialize that flag correctly to
+ * start with.  If that logic ever gets more complicated it would probably
+ * be better to move it here.
+ */
+static void
+set_base_rel_consider_startup(PlannerInfo *root)
+{
+	/*
+	 * Since parameterized paths can only be used on the inside of a nestloop
+	 * join plan, there is usually little value in considering fast-start
+	 * plans for them.  However, for relations that are on the RHS of a SEMI
+	 * or ANTI join, a fast-start plan can be useful because we're only going
+	 * to care about fetching one tuple anyway.
+	 *
+	 * To minimize growth of planning time, we currently restrict this to
+	 * cases where the RHS is a single base relation, not a join; there is no
+	 * provision for consider_param_startup to get set at all on joinrels.
+	 * Also we don't worry about appendrels.  costsize.c's costing rules for
+	 * nestloop semi/antijoins don't consider such cases either.
+	 */
+	ListCell   *lc;
+
+	foreach(lc, root->join_info_list)
+	{
+		SpecialJoinInfo *sjinfo = (SpecialJoinInfo *) lfirst(lc);
+		int			varno;
+
+		if ((sjinfo->jointype == JOIN_SEMI || sjinfo->jointype == JOIN_ANTI) &&
+			bms_get_singleton_member(sjinfo->syn_righthand, &varno))
+		{
+			RelOptInfo *rel = find_base_rel(root, varno);
+
+			rel->consider_param_startup = true;
+		}
+	}
+}
+
+/*
  * set_base_rel_sizes
  *	  Set the size estimates (rows and widths) for each base-relation entry.
  *
@@ -257,7 +308,7 @@ set_rel_size(PlannerInfo *root, RelOptInfo *rel,
 		 * We proved we don't need to scan the rel via constraint exclusion,
 		 * so set up a single dummy path for it.  Here we only check this for
 		 * regular baserels; if it's an otherrel, CE was already checked in
-		 * set_append_rel_pathlist().
+		 * set_append_rel_size().
 		 *
 		 * In this case, we go ahead and set up the relation's path right away
 		 * instead of leaving it for set_rel_pathlist to do.  This is because
@@ -281,6 +332,11 @@ set_rel_size(PlannerInfo *root, RelOptInfo *rel,
 					/* Foreign table */
 					set_foreign_size(root, rel, rte);
 				}
+				else if (rte->tablesample != NULL)
+				{
+					/* Sampled relation */
+					set_tablesample_rel_size(root, rel, rte);
+				}
 				else
 				{
 					/* Plain relation */
@@ -348,6 +404,11 @@ set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 					/* Foreign table */
 					set_foreign_pathlist(root, rel, rte);
 				}
+				else if (rte->tablesample != NULL)
+				{
+					/* Build sample scan on relation */
+					set_tablesample_rel_pathlist(root, rel, rte);
+				}
 				else
 				{
 					/* Plain relation */
@@ -458,6 +519,41 @@ set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 }
 
 /*
+ * set_tablesample_rel_size
+ *	  Set size estimates for a sampled relation.
+ */
+static void
+set_tablesample_rel_size(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
+{
+	/* Mark rel with estimated output rows, width, etc */
+	set_baserel_size_estimates(root, rel);
+}
+
+/*
+ * set_tablesample_rel_pathlist
+ *	  Build access paths for a sampled relation
+ *
+ * There is only one possible path - sampling scan
+ */
+static void
+set_tablesample_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
+{
+	Relids		required_outer;
+	Path	   *path;
+
+	/*
+	 * We don't support pushing join clauses into the quals of a seqscan, but
+	 * it could still have required parameterization due to LATERAL refs in
+	 * its tlist.
+	 */
+	required_outer = rel->lateral_relids;
+
+	/* We only do sample scan if it was requested */
+	path = create_samplescan_path(root, rel, required_outer);
+	rel->pathlist = list_make1(path);
+}
+
+/*
  * set_foreign_size
  *		Set size estimates for a foreign table RTE
  */
@@ -1284,6 +1380,7 @@ set_subquery_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	 */
 	if (parse->hasAggs ||
 		parse->groupClause ||
+		parse->groupingSets ||
 		parse->havingQual ||
 		parse->distinctClause ||
 		parse->sortClause ||
@@ -2072,7 +2169,9 @@ targetIsInAllPartitionLists(TargetEntry *tle, Query *query)
  * 2. If unsafeVolatile is set, the qual must not contain any volatile
  * functions.
  *
- * 3. If unsafeLeaky is set, the qual must not contain any leaky functions.
+ * 3. If unsafeLeaky is set, the qual must not contain any leaky functions
+ * that are passed Var nodes, and therefore might reveal values from the
+ * subquery as side effects.
  *
  * 4. The qual must not refer to the whole-row output of the subquery
  * (since there is no easy way to name that within the subquery itself).
@@ -2099,7 +2198,7 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual,
 
 	/* Refuse leaky quals if told to (point 3) */
 	if (safetyInfo->unsafeLeaky &&
-		contain_leaky_functions(qual))
+		contain_leaked_vars(qual))
 		return false;
 
 	/*
@@ -2189,7 +2288,7 @@ subquery_push_qual(Query *subquery, RangeTblEntry *rte, Index rti, Node *qual)
 		 * subquery uses grouping or aggregation, put it in HAVING (since the
 		 * qual really refers to the group-result rows).
 		 */
-		if (subquery->hasAggs || subquery->groupClause || subquery->havingQual)
+		if (subquery->hasAggs || subquery->groupClause || subquery->groupingSets || subquery->havingQual)
 			subquery->havingQual = make_and_qual(subquery->havingQual, qual);
 		else
 			subquery->jointree->quals =
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index a55b4929df..50231d1df9 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -233,6 +233,73 @@ cost_seqscan(Path *path, PlannerInfo *root,
 }
 
 /*
+ * cost_samplescan
+ *	  Determines and returns the cost of scanning a relation using sampling.
+ *
+ * From planner/optimizer perspective, we don't care all that much about cost
+ * itself since there is always only one scan path to consider when sampling
+ * scan is present, but number of rows estimation is still important.
+ *
+ * 'baserel' is the relation to be scanned
+ * 'param_info' is the ParamPathInfo if this is a parameterized path, else NULL
+ */
+void
+cost_samplescan(Path *path, PlannerInfo *root, RelOptInfo *baserel)
+{
+	Cost		startup_cost = 0;
+	Cost		run_cost = 0;
+	double		spc_seq_page_cost,
+				spc_random_page_cost,
+				spc_page_cost;
+	QualCost	qpqual_cost;
+	Cost		cpu_per_tuple;
+	BlockNumber pages;
+	double		tuples;
+	RangeTblEntry *rte = planner_rt_fetch(baserel->relid, root);
+	TableSampleClause *tablesample = rte->tablesample;
+
+	/* Should only be applied to base relations */
+	Assert(baserel->relid > 0);
+	Assert(baserel->rtekind == RTE_RELATION);
+
+	/* Mark the path with the correct row estimate */
+	if (path->param_info)
+		path->rows = path->param_info->ppi_rows;
+	else
+		path->rows = baserel->rows;
+
+	/* Call the sampling method's costing function. */
+	OidFunctionCall6(tablesample->tsmcost, PointerGetDatum(root),
+					 PointerGetDatum(path), PointerGetDatum(baserel),
+					 PointerGetDatum(tablesample->args),
+					 PointerGetDatum(&pages), PointerGetDatum(&tuples));
+
+	/* fetch estimated page cost for tablespace containing table */
+	get_tablespace_page_costs(baserel->reltablespace,
+							  &spc_random_page_cost,
+							  &spc_seq_page_cost);
+
+
+	spc_page_cost = tablesample->tsmseqscan ? spc_seq_page_cost :
+		spc_random_page_cost;
+
+	/*
+	 * disk costs
+	 */
+	run_cost += spc_page_cost * pages;
+
+	/* CPU costs */
+	get_restriction_qual_cost(root, baserel, path->param_info, &qpqual_cost);
+
+	startup_cost += qpqual_cost.startup;
+	cpu_per_tuple = cpu_tuple_cost + qpqual_cost.per_tuple;
+	run_cost += cpu_per_tuple * tuples;
+
+	path->startup_cost = startup_cost;
+	path->total_cost = startup_cost + run_cost;
+}
+
+/*
  * cost_index
  *	  Determines and returns the cost of scanning a relation using an index.
  *
@@ -1713,7 +1780,8 @@ cost_group(Path *path, PlannerInfo *root,
  * estimate and getting a tight lower bound.  We choose to not examine the
  * join quals here, since that's by far the most expensive part of the
  * calculations.  The end result is that CPU-cost considerations must be
- * left for the second phase.
+ * left for the second phase; and for SEMI/ANTI joins, we must also postpone
+ * incorporation of the inner path's run cost.
  *
  * 'workspace' is to be filled with startup_cost, total_cost, and perhaps
  *		other data to be used by final_cost_nestloop
@@ -1761,44 +1829,16 @@ initial_cost_nestloop(PlannerInfo *root, JoinCostWorkspace *workspace,
 
 	if (jointype == JOIN_SEMI || jointype == JOIN_ANTI)
 	{
-		double		outer_matched_rows;
-		Selectivity inner_scan_frac;
-
 		/*
 		 * SEMI or ANTI join: executor will stop after first match.
 		 *
-		 * For an outer-rel row that has at least one match, we can expect the
-		 * inner scan to stop after a fraction 1/(match_count+1) of the inner
-		 * rows, if the matches are evenly distributed.  Since they probably
-		 * aren't quite evenly distributed, we apply a fuzz factor of 2.0 to
-		 * that fraction.  (If we used a larger fuzz factor, we'd have to
-		 * clamp inner_scan_frac to at most 1.0; but since match_count is at
-		 * least 1, no such clamp is needed now.)
-		 *
-		 * A complicating factor is that rescans may be cheaper than first
-		 * scans.  If we never scan all the way to the end of the inner rel,
-		 * it might be (depending on the plan type) that we'd never pay the
-		 * whole inner first-scan run cost.  However it is difficult to
-		 * estimate whether that will happen, so be conservative and always
-		 * charge the whole first-scan cost once.
-		 */
-		run_cost += inner_run_cost;
-
-		outer_matched_rows = rint(outer_path_rows * semifactors->outer_match_frac);
-		inner_scan_frac = 2.0 / (semifactors->match_count + 1.0);
-
-		/* Add inner run cost for additional outer tuples having matches */
-		if (outer_matched_rows > 1)
-			run_cost += (outer_matched_rows - 1) * inner_rescan_run_cost * inner_scan_frac;
-
-		/*
-		 * The cost of processing unmatched rows varies depending on the
-		 * details of the joinclauses, so we leave that part for later.
+		 * Getting decent estimates requires inspection of the join quals,
+		 * which we choose to postpone to final_cost_nestloop.
 		 */
 
 		/* Save private data for final_cost_nestloop */
-		workspace->outer_matched_rows = outer_matched_rows;
-		workspace->inner_scan_frac = inner_scan_frac;
+		workspace->inner_run_cost = inner_run_cost;
+		workspace->inner_rescan_run_cost = inner_rescan_run_cost;
 	}
 	else
 	{
@@ -1815,7 +1855,6 @@ initial_cost_nestloop(PlannerInfo *root, JoinCostWorkspace *workspace,
 	workspace->total_cost = startup_cost + run_cost;
 	/* Save private data for final_cost_nestloop */
 	workspace->run_cost = run_cost;
-	workspace->inner_rescan_run_cost = inner_rescan_run_cost;
 }
 
 /*
@@ -1839,7 +1878,6 @@ final_cost_nestloop(PlannerInfo *root, NestPath *path,
 	double		inner_path_rows = inner_path->rows;
 	Cost		startup_cost = workspace->startup_cost;
 	Cost		run_cost = workspace->run_cost;
-	Cost		inner_rescan_run_cost = workspace->inner_rescan_run_cost;
 	Cost		cpu_per_tuple;
 	QualCost	restrict_qual_cost;
 	double		ntuples;
@@ -1858,42 +1896,101 @@ final_cost_nestloop(PlannerInfo *root, NestPath *path,
 	if (!enable_nestloop)
 		startup_cost += disable_cost;
 
-	/* cost of source data */
+	/* cost of inner-relation source data (we already dealt with outer rel) */
 
 	if (path->jointype == JOIN_SEMI || path->jointype == JOIN_ANTI)
 	{
-		double		outer_matched_rows = workspace->outer_matched_rows;
-		Selectivity inner_scan_frac = workspace->inner_scan_frac;
-
 		/*
 		 * SEMI or ANTI join: executor will stop after first match.
 		 */
+		Cost		inner_run_cost = workspace->inner_run_cost;
+		Cost		inner_rescan_run_cost = workspace->inner_rescan_run_cost;
+		double		outer_matched_rows;
+		Selectivity inner_scan_frac;
 
-		/* Compute number of tuples processed (not number emitted!) */
+		/*
+		 * For an outer-rel row that has at least one match, we can expect the
+		 * inner scan to stop after a fraction 1/(match_count+1) of the inner
+		 * rows, if the matches are evenly distributed.  Since they probably
+		 * aren't quite evenly distributed, we apply a fuzz factor of 2.0 to
+		 * that fraction.  (If we used a larger fuzz factor, we'd have to
+		 * clamp inner_scan_frac to at most 1.0; but since match_count is at
+		 * least 1, no such clamp is needed now.)
+		 */
+		outer_matched_rows = rint(outer_path_rows * semifactors->outer_match_frac);
+		inner_scan_frac = 2.0 / (semifactors->match_count + 1.0);
+
+		/*
+		 * Compute number of tuples processed (not number emitted!).  First,
+		 * account for successfully-matched outer rows.
+		 */
 		ntuples = outer_matched_rows * inner_path_rows * inner_scan_frac;
 
 		/*
-		 * For unmatched outer-rel rows, there are two cases.  If the inner
-		 * path is an indexscan using all the joinquals as indexquals, then an
-		 * unmatched row results in an indexscan returning no rows, which is
-		 * probably quite cheap.  We estimate this case as the same cost to
-		 * return the first tuple of a nonempty scan.  Otherwise, the executor
-		 * will have to scan the whole inner rel; not so cheap.
+		 * Now we need to estimate the actual costs of scanning the inner
+		 * relation, which may be quite a bit less than N times inner_run_cost
+		 * due to early scan stops.  We consider two cases.  If the inner path
+		 * is an indexscan using all the joinquals as indexquals, then an
+		 * unmatched outer row results in an indexscan returning no rows,
+		 * which is probably quite cheap.  Otherwise, the executor will have
+		 * to scan the whole inner rel for an unmatched row; not so cheap.
 		 */
 		if (has_indexed_join_quals(path))
 		{
+			/*
+			 * Successfully-matched outer rows will only require scanning
+			 * inner_scan_frac of the inner relation.  In this case, we don't
+			 * need to charge the full inner_run_cost even when that's more
+			 * than inner_rescan_run_cost, because we can assume that none of
+			 * the inner scans ever scan the whole inner relation.  So it's
+			 * okay to assume that all the inner scan executions can be
+			 * fractions of the full cost, even if materialization is reducing
+			 * the rescan cost.  At this writing, it's impossible to get here
+			 * for a materialized inner scan, so inner_run_cost and
+			 * inner_rescan_run_cost will be the same anyway; but just in
+			 * case, use inner_run_cost for the first matched tuple and
+			 * inner_rescan_run_cost for additional ones.
+			 */
+			run_cost += inner_run_cost * inner_scan_frac;
+			if (outer_matched_rows > 1)
+				run_cost += (outer_matched_rows - 1) * inner_rescan_run_cost * inner_scan_frac;
+
+			/*
+			 * Add the cost of inner-scan executions for unmatched outer rows.
+			 * We estimate this as the same cost as returning the first tuple
+			 * of a nonempty scan.  We consider that these are all rescans,
+			 * since we used inner_run_cost once already.
+			 */
 			run_cost += (outer_path_rows - outer_matched_rows) *
 				inner_rescan_run_cost / inner_path_rows;
 
 			/*
-			 * We won't be evaluating any quals at all for these rows, so
+			 * We won't be evaluating any quals at all for unmatched rows, so
 			 * don't add them to ntuples.
 			 */
 		}
 		else
 		{
+			/*
+			 * Here, a complicating factor is that rescans may be cheaper than
+			 * first scans.  If we never scan all the way to the end of the
+			 * inner rel, it might be (depending on the plan type) that we'd
+			 * never pay the whole inner first-scan run cost.  However it is
+			 * difficult to estimate whether that will happen (and it could
+			 * not happen if there are any unmatched outer rows!), so be
+			 * conservative and always charge the whole first-scan cost once.
+			 */
+			run_cost += inner_run_cost;
+
+			/* Add inner run cost for additional outer tuples having matches */
+			if (outer_matched_rows > 1)
+				run_cost += (outer_matched_rows - 1) * inner_rescan_run_cost * inner_scan_frac;
+
+			/* Add inner run cost for unmatched outer tuples */
 			run_cost += (outer_path_rows - outer_matched_rows) *
 				inner_rescan_run_cost;
+
+			/* And count the unmatched join tuples as being processed */
 			ntuples += (outer_path_rows - outer_matched_rows) *
 				inner_path_rows;
 		}
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
index eb65c970d7..80021d57bd 100644
--- a/src/backend/optimizer/path/equivclass.c
+++ b/src/backend/optimizer/path/equivclass.c
@@ -16,7 +16,7 @@
  */
 #include "postgres.h"
 
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index fdd6baba6c..9da544453b 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -17,7 +17,7 @@
 
 #include <math.h>
 
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "access/sysattr.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_collation.h"
@@ -1954,7 +1954,8 @@ adjust_rowcount_for_semijoins(PlannerInfo *root,
 			nraw = approximate_joinrel_size(root, sjinfo->syn_righthand);
 			nunique = estimate_num_groups(root,
 										  sjinfo->semi_rhs_exprs,
-										  nraw);
+										  nraw,
+										  NULL);
 			if (rowcount > nunique)
 				rowcount = nunique;
 		}
@@ -3967,7 +3968,7 @@ prefix_quals(Node *leftop, Oid opfamily, Oid collation,
 }
 
 /*
- * Given a leftop and a rightop, and a inet-family sup/sub operator,
+ * Given a leftop and a rightop, and an inet-family sup/sub operator,
  * generate suitable indexqual condition(s).  expr_op is the original
  * operator, and opfamily is the index opfamily.
  */
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 1da953f6d3..ba78252b8f 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -17,31 +17,26 @@
 #include <math.h>
 
 #include "executor/executor.h"
+#include "foreign/fdwapi.h"
 #include "optimizer/cost.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 
+/* Hook for plugins to get control in add_paths_to_joinrel() */
+set_join_pathlist_hook_type set_join_pathlist_hook = NULL;
 
 #define PATH_PARAM_BY_REL(path, rel)  \
 	((path)->param_info && bms_overlap(PATH_REQ_OUTER(path), (rel)->relids))
 
 static void sort_inner_and_outer(PlannerInfo *root, RelOptInfo *joinrel,
 					 RelOptInfo *outerrel, RelOptInfo *innerrel,
-					 List *restrictlist, List *mergeclause_list,
-					 JoinType jointype, SpecialJoinInfo *sjinfo,
-					 Relids param_source_rels, Relids extra_lateral_rels);
+					 JoinType jointype, JoinPathExtraData *extra);
 static void match_unsorted_outer(PlannerInfo *root, RelOptInfo *joinrel,
 					 RelOptInfo *outerrel, RelOptInfo *innerrel,
-					 List *restrictlist, List *mergeclause_list,
-					 JoinType jointype, SpecialJoinInfo *sjinfo,
-					 SemiAntiJoinFactors *semifactors,
-					 Relids param_source_rels, Relids extra_lateral_rels);
+					 JoinType jointype, JoinPathExtraData *extra);
 static void hash_inner_and_outer(PlannerInfo *root, RelOptInfo *joinrel,
 					 RelOptInfo *outerrel, RelOptInfo *innerrel,
-					 List *restrictlist,
-					 JoinType jointype, SpecialJoinInfo *sjinfo,
-					 SemiAntiJoinFactors *semifactors,
-					 Relids param_source_rels, Relids extra_lateral_rels);
+					 JoinType jointype, JoinPathExtraData *extra);
 static List *select_mergejoin_clauses(PlannerInfo *root,
 						 RelOptInfo *joinrel,
 						 RelOptInfo *outerrel,
@@ -83,13 +78,16 @@ add_paths_to_joinrel(PlannerInfo *root,
 					 SpecialJoinInfo *sjinfo,
 					 List *restrictlist)
 {
-	List	   *mergeclause_list = NIL;
+	JoinPathExtraData extra;
 	bool		mergejoin_allowed = true;
-	SemiAntiJoinFactors semifactors;
-	Relids		param_source_rels = NULL;
-	Relids		extra_lateral_rels = NULL;
 	ListCell   *lc;
 
+	extra.restrictlist = restrictlist;
+	extra.mergeclause_list = NIL;
+	extra.sjinfo = sjinfo;
+	extra.param_source_rels = NULL;
+	extra.extra_lateral_rels = NULL;
+
 	/*
 	 * Find potential mergejoin clauses.  We can skip this if we are not
 	 * interested in doing a mergejoin.  However, mergejoin may be our only
@@ -97,13 +95,13 @@ add_paths_to_joinrel(PlannerInfo *root,
 	 * it's a full join.
 	 */
 	if (enable_mergejoin || jointype == JOIN_FULL)
-		mergeclause_list = select_mergejoin_clauses(root,
-													joinrel,
-													outerrel,
-													innerrel,
-													restrictlist,
-													jointype,
-													&mergejoin_allowed);
+		extra.mergeclause_list = select_mergejoin_clauses(root,
+														  joinrel,
+														  outerrel,
+														  innerrel,
+														  restrictlist,
+														  jointype,
+														  &mergejoin_allowed);
 
 	/*
 	 * If it's SEMI or ANTI join, compute correction factors for cost
@@ -112,7 +110,7 @@ add_paths_to_joinrel(PlannerInfo *root,
 	if (jointype == JOIN_SEMI || jointype == JOIN_ANTI)
 		compute_semi_anti_join_factors(root, outerrel, innerrel,
 									   jointype, sjinfo, restrictlist,
-									   &semifactors);
+									   &extra.semifactors);
 
 	/*
 	 * Decide whether it's sensible to generate parameterized paths for this
@@ -139,16 +137,16 @@ add_paths_to_joinrel(PlannerInfo *root,
 		 */
 		if (bms_overlap(joinrel->relids, sjinfo->min_righthand) &&
 			!bms_overlap(joinrel->relids, sjinfo->min_lefthand))
-			param_source_rels = bms_join(param_source_rels,
-										 bms_difference(root->all_baserels,
+			extra.param_source_rels = bms_join(extra.param_source_rels,
+										   bms_difference(root->all_baserels,
 													 sjinfo->min_righthand));
 
 		/* full joins constrain both sides symmetrically */
 		if (sjinfo->jointype == JOIN_FULL &&
 			bms_overlap(joinrel->relids, sjinfo->min_lefthand) &&
 			!bms_overlap(joinrel->relids, sjinfo->min_righthand))
-			param_source_rels = bms_join(param_source_rels,
-										 bms_difference(root->all_baserels,
+			extra.param_source_rels = bms_join(extra.param_source_rels,
+										   bms_difference(root->all_baserels,
 													  sjinfo->min_lefthand));
 	}
 
@@ -165,9 +163,9 @@ add_paths_to_joinrel(PlannerInfo *root,
 		LateralJoinInfo *ljinfo = (LateralJoinInfo *) lfirst(lc);
 
 		if (bms_is_subset(ljinfo->lateral_rhs, joinrel->relids))
-			param_source_rels = bms_join(param_source_rels,
-										 bms_difference(ljinfo->lateral_lhs,
-														joinrel->relids));
+			extra.param_source_rels = bms_join(extra.param_source_rels,
+										  bms_difference(ljinfo->lateral_lhs,
+														 joinrel->relids));
 	}
 
 	/*
@@ -192,8 +190,8 @@ add_paths_to_joinrel(PlannerInfo *root,
 			!bms_is_subset(phinfo->ph_eval_at, innerrel->relids))
 		{
 			/* Yes, remember its lateral rels */
-			extra_lateral_rels = bms_add_members(extra_lateral_rels,
-												 phinfo->ph_lateral);
+			extra.extra_lateral_rels = bms_add_members(extra.extra_lateral_rels,
+													   phinfo->ph_lateral);
 		}
 	}
 
@@ -203,9 +201,10 @@ add_paths_to_joinrel(PlannerInfo *root,
 	 * it to required_outer below, while preserving the property that
 	 * required_outer is exactly NULL if empty.)
 	 */
-	extra_lateral_rels = bms_del_members(extra_lateral_rels, joinrel->relids);
-	if (bms_is_empty(extra_lateral_rels))
-		extra_lateral_rels = NULL;
+	extra.extra_lateral_rels = bms_del_members(extra.extra_lateral_rels,
+											   joinrel->relids);
+	if (bms_is_empty(extra.extra_lateral_rels))
+		extra.extra_lateral_rels = NULL;
 
 	/*
 	 * 1. Consider mergejoin paths where both relations must be explicitly
@@ -213,9 +212,7 @@ add_paths_to_joinrel(PlannerInfo *root,
 	 */
 	if (mergejoin_allowed)
 		sort_inner_and_outer(root, joinrel, outerrel, innerrel,
-							 restrictlist, mergeclause_list, jointype,
-							 sjinfo,
-							 param_source_rels, extra_lateral_rels);
+							 jointype, &extra);
 
 	/*
 	 * 2. Consider paths where the outer relation need not be explicitly
@@ -226,9 +223,7 @@ add_paths_to_joinrel(PlannerInfo *root,
 	 */
 	if (mergejoin_allowed)
 		match_unsorted_outer(root, joinrel, outerrel, innerrel,
-							 restrictlist, mergeclause_list, jointype,
-							 sjinfo, &semifactors,
-							 param_source_rels, extra_lateral_rels);
+							 jointype, &extra);
 
 #ifdef NOT_USED
 
@@ -245,9 +240,7 @@ add_paths_to_joinrel(PlannerInfo *root,
 	 */
 	if (mergejoin_allowed)
 		match_unsorted_inner(root, joinrel, outerrel, innerrel,
-							 restrictlist, mergeclause_list, jointype,
-							 sjinfo, &semifactors,
-							 param_source_rels, extra_lateral_rels);
+							 jointype, &extra);
 #endif
 
 	/*
@@ -257,9 +250,24 @@ add_paths_to_joinrel(PlannerInfo *root,
 	 */
 	if (enable_hashjoin || jointype == JOIN_FULL)
 		hash_inner_and_outer(root, joinrel, outerrel, innerrel,
-							 restrictlist, jointype,
-							 sjinfo, &semifactors,
-							 param_source_rels, extra_lateral_rels);
+							 jointype, &extra);
+
+	/*
+	 * 5. If inner and outer relations are foreign tables (or joins) belonging
+	 * to the same server, give the FDW a chance to push down joins.
+	 */
+	if (joinrel->fdwroutine &&
+		joinrel->fdwroutine->GetForeignJoinPaths)
+		joinrel->fdwroutine->GetForeignJoinPaths(root, joinrel,
+												 outerrel, innerrel,
+												 jointype, &extra);
+
+	/*
+	 * 6. Finally, give extensions a chance to manipulate the path list.
+	 */
+	if (set_join_pathlist_hook)
+		set_join_pathlist_hook(root, joinrel, outerrel, innerrel,
+							   jointype, &extra);
 }
 
 /*
@@ -270,15 +278,11 @@ add_paths_to_joinrel(PlannerInfo *root,
 static void
 try_nestloop_path(PlannerInfo *root,
 				  RelOptInfo *joinrel,
-				  JoinType jointype,
-				  SpecialJoinInfo *sjinfo,
-				  SemiAntiJoinFactors *semifactors,
-				  Relids param_source_rels,
-				  Relids extra_lateral_rels,
 				  Path *outer_path,
 				  Path *inner_path,
-				  List *restrict_clauses,
-				  List *pathkeys)
+				  List *pathkeys,
+				  JoinType jointype,
+				  JoinPathExtraData *extra)
 {
 	Relids		required_outer;
 	JoinCostWorkspace workspace;
@@ -290,7 +294,7 @@ try_nestloop_path(PlannerInfo *root,
 	required_outer = calc_nestloop_required_outer(outer_path,
 												  inner_path);
 	if (required_outer &&
-		!bms_overlap(required_outer, param_source_rels))
+		!bms_overlap(required_outer, extra->param_source_rels))
 	{
 		/*
 		 * We override the param_source_rels heuristic to accept nestloop
@@ -321,7 +325,7 @@ try_nestloop_path(PlannerInfo *root,
 	 * Independently of that, add parameterization needed for any
 	 * PlaceHolderVars that need to be computed at the join.
 	 */
-	required_outer = bms_add_members(required_outer, extra_lateral_rels);
+	required_outer = bms_add_members(required_outer, extra->extra_lateral_rels);
 
 	/*
 	 * Do a precheck to quickly eliminate obviously-inferior paths.  We
@@ -334,7 +338,7 @@ try_nestloop_path(PlannerInfo *root,
 	 */
 	initial_cost_nestloop(root, &workspace, jointype,
 						  outer_path, inner_path,
-						  sjinfo, semifactors);
+						  extra->sjinfo, &extra->semifactors);
 
 	if (add_path_precheck(joinrel,
 						  workspace.startup_cost, workspace.total_cost,
@@ -345,11 +349,11 @@ try_nestloop_path(PlannerInfo *root,
 									  joinrel,
 									  jointype,
 									  &workspace,
-									  sjinfo,
-									  semifactors,
+									  extra->sjinfo,
+									  &extra->semifactors,
 									  outer_path,
 									  inner_path,
-									  restrict_clauses,
+									  extra->restrictlist,
 									  pathkeys,
 									  required_outer));
 	}
@@ -368,17 +372,14 @@ try_nestloop_path(PlannerInfo *root,
 static void
 try_mergejoin_path(PlannerInfo *root,
 				   RelOptInfo *joinrel,
-				   JoinType jointype,
-				   SpecialJoinInfo *sjinfo,
-				   Relids param_source_rels,
-				   Relids extra_lateral_rels,
 				   Path *outer_path,
 				   Path *inner_path,
-				   List *restrict_clauses,
 				   List *pathkeys,
 				   List *mergeclauses,
 				   List *outersortkeys,
-				   List *innersortkeys)
+				   List *innersortkeys,
+				   JoinType jointype,
+				   JoinPathExtraData *extra)
 {
 	Relids		required_outer;
 	JoinCostWorkspace workspace;
@@ -390,7 +391,7 @@ try_mergejoin_path(PlannerInfo *root,
 	required_outer = calc_non_nestloop_required_outer(outer_path,
 													  inner_path);
 	if (required_outer &&
-		!bms_overlap(required_outer, param_source_rels))
+		!bms_overlap(required_outer, extra->param_source_rels))
 	{
 		/* Waste no memory when we reject a path here */
 		bms_free(required_outer);
@@ -401,7 +402,7 @@ try_mergejoin_path(PlannerInfo *root,
 	 * Independently of that, add parameterization needed for any
 	 * PlaceHolderVars that need to be computed at the join.
 	 */
-	required_outer = bms_add_members(required_outer, extra_lateral_rels);
+	required_outer = bms_add_members(required_outer, extra->extra_lateral_rels);
 
 	/*
 	 * If the given paths are already well enough ordered, we can skip doing
@@ -420,7 +421,7 @@ try_mergejoin_path(PlannerInfo *root,
 	initial_cost_mergejoin(root, &workspace, jointype, mergeclauses,
 						   outer_path, inner_path,
 						   outersortkeys, innersortkeys,
-						   sjinfo);
+						   extra->sjinfo);
 
 	if (add_path_precheck(joinrel,
 						  workspace.startup_cost, workspace.total_cost,
@@ -431,10 +432,10 @@ try_mergejoin_path(PlannerInfo *root,
 									   joinrel,
 									   jointype,
 									   &workspace,
-									   sjinfo,
+									   extra->sjinfo,
 									   outer_path,
 									   inner_path,
-									   restrict_clauses,
+									   extra->restrictlist,
 									   pathkeys,
 									   required_outer,
 									   mergeclauses,
@@ -456,15 +457,11 @@ try_mergejoin_path(PlannerInfo *root,
 static void
 try_hashjoin_path(PlannerInfo *root,
 				  RelOptInfo *joinrel,
-				  JoinType jointype,
-				  SpecialJoinInfo *sjinfo,
-				  SemiAntiJoinFactors *semifactors,
-				  Relids param_source_rels,
-				  Relids extra_lateral_rels,
 				  Path *outer_path,
 				  Path *inner_path,
-				  List *restrict_clauses,
-				  List *hashclauses)
+				  List *hashclauses,
+				  JoinType jointype,
+				  JoinPathExtraData *extra)
 {
 	Relids		required_outer;
 	JoinCostWorkspace workspace;
@@ -476,7 +473,7 @@ try_hashjoin_path(PlannerInfo *root,
 	required_outer = calc_non_nestloop_required_outer(outer_path,
 													  inner_path);
 	if (required_outer &&
-		!bms_overlap(required_outer, param_source_rels))
+		!bms_overlap(required_outer, extra->param_source_rels))
 	{
 		/* Waste no memory when we reject a path here */
 		bms_free(required_outer);
@@ -487,7 +484,7 @@ try_hashjoin_path(PlannerInfo *root,
 	 * Independently of that, add parameterization needed for any
 	 * PlaceHolderVars that need to be computed at the join.
 	 */
-	required_outer = bms_add_members(required_outer, extra_lateral_rels);
+	required_outer = bms_add_members(required_outer, extra->extra_lateral_rels);
 
 	/*
 	 * See comments in try_nestloop_path().  Also note that hashjoin paths
@@ -495,7 +492,7 @@ try_hashjoin_path(PlannerInfo *root,
 	 */
 	initial_cost_hashjoin(root, &workspace, jointype, hashclauses,
 						  outer_path, inner_path,
-						  sjinfo, semifactors);
+						  extra->sjinfo, &extra->semifactors);
 
 	if (add_path_precheck(joinrel,
 						  workspace.startup_cost, workspace.total_cost,
@@ -506,11 +503,11 @@ try_hashjoin_path(PlannerInfo *root,
 									  joinrel,
 									  jointype,
 									  &workspace,
-									  sjinfo,
-									  semifactors,
+									  extra->sjinfo,
+									  &extra->semifactors,
 									  outer_path,
 									  inner_path,
-									  restrict_clauses,
+									  extra->restrictlist,
 									  required_outer,
 									  hashclauses));
 	}
@@ -560,26 +557,16 @@ clause_sides_match_join(RestrictInfo *rinfo, RelOptInfo *outerrel,
  * 'joinrel' is the join relation
  * 'outerrel' is the outer join relation
  * 'innerrel' is the inner join relation
- * 'restrictlist' contains all of the RestrictInfo nodes for restriction
- *		clauses that apply to this join
- * 'mergeclause_list' is a list of RestrictInfo nodes for available
- *		mergejoin clauses in this join
  * 'jointype' is the type of join to do
- * 'sjinfo' is extra info about the join for selectivity estimation
- * 'param_source_rels' are OK targets for parameterization of result paths
- * 'extra_lateral_rels' are additional parameterization for result paths
+ * 'extra' contains additional input values
  */
 static void
 sort_inner_and_outer(PlannerInfo *root,
 					 RelOptInfo *joinrel,
 					 RelOptInfo *outerrel,
 					 RelOptInfo *innerrel,
-					 List *restrictlist,
-					 List *mergeclause_list,
 					 JoinType jointype,
-					 SpecialJoinInfo *sjinfo,
-					 Relids param_source_rels,
-					 Relids extra_lateral_rels)
+					 JoinPathExtraData *extra)
 {
 	Path	   *outer_path;
 	Path	   *inner_path;
@@ -619,14 +606,14 @@ sort_inner_and_outer(PlannerInfo *root,
 	if (jointype == JOIN_UNIQUE_OUTER)
 	{
 		outer_path = (Path *) create_unique_path(root, outerrel,
-												 outer_path, sjinfo);
+												 outer_path, extra->sjinfo);
 		Assert(outer_path);
 		jointype = JOIN_INNER;
 	}
 	else if (jointype == JOIN_UNIQUE_INNER)
 	{
 		inner_path = (Path *) create_unique_path(root, innerrel,
-												 inner_path, sjinfo);
+												 inner_path, extra->sjinfo);
 		Assert(inner_path);
 		jointype = JOIN_INNER;
 	}
@@ -660,7 +647,7 @@ sort_inner_and_outer(PlannerInfo *root,
 	 * exactly as-is as well as making variants.
 	 */
 	all_pathkeys = select_outer_pathkeys_for_merge(root,
-												   mergeclause_list,
+												   extra->mergeclause_list,
 												   joinrel);
 
 	foreach(l, all_pathkeys)
@@ -683,10 +670,10 @@ sort_inner_and_outer(PlannerInfo *root,
 		cur_mergeclauses = find_mergeclauses_for_pathkeys(root,
 														  outerkeys,
 														  true,
-														  mergeclause_list);
+													extra->mergeclause_list);
 
 		/* Should have used them all... */
-		Assert(list_length(cur_mergeclauses) == list_length(mergeclause_list));
+		Assert(list_length(cur_mergeclauses) == list_length(extra->mergeclause_list));
 
 		/* Build sort pathkeys for the inner side */
 		innerkeys = make_inner_pathkeys_for_merge(root,
@@ -706,17 +693,14 @@ sort_inner_and_outer(PlannerInfo *root,
 		 */
 		try_mergejoin_path(root,
 						   joinrel,
-						   jointype,
-						   sjinfo,
-						   param_source_rels,
-						   extra_lateral_rels,
 						   outer_path,
 						   inner_path,
-						   restrictlist,
 						   merge_pathkeys,
 						   cur_mergeclauses,
 						   outerkeys,
-						   innerkeys);
+						   innerkeys,
+						   jointype,
+						   extra);
 	}
 }
 
@@ -747,28 +731,16 @@ sort_inner_and_outer(PlannerInfo *root,
  * 'joinrel' is the join relation
  * 'outerrel' is the outer join relation
  * 'innerrel' is the inner join relation
- * 'restrictlist' contains all of the RestrictInfo nodes for restriction
- *		clauses that apply to this join
- * 'mergeclause_list' is a list of RestrictInfo nodes for available
- *		mergejoin clauses in this join
  * 'jointype' is the type of join to do
- * 'sjinfo' is extra info about the join for selectivity estimation
- * 'semifactors' contains valid data if jointype is SEMI or ANTI
- * 'param_source_rels' are OK targets for parameterization of result paths
- * 'extra_lateral_rels' are additional parameterization for result paths
+ * 'extra' contains additional input values
  */
 static void
 match_unsorted_outer(PlannerInfo *root,
 					 RelOptInfo *joinrel,
 					 RelOptInfo *outerrel,
 					 RelOptInfo *innerrel,
-					 List *restrictlist,
-					 List *mergeclause_list,
 					 JoinType jointype,
-					 SpecialJoinInfo *sjinfo,
-					 SemiAntiJoinFactors *semifactors,
-					 Relids param_source_rels,
-					 Relids extra_lateral_rels)
+					 JoinPathExtraData *extra)
 {
 	JoinType	save_jointype = jointype;
 	bool		nestjoinOK;
@@ -830,7 +802,7 @@ match_unsorted_outer(PlannerInfo *root,
 		if (inner_cheapest_total == NULL)
 			return;
 		inner_cheapest_total = (Path *)
-			create_unique_path(root, innerrel, inner_cheapest_total, sjinfo);
+			create_unique_path(root, innerrel, inner_cheapest_total, extra->sjinfo);
 		Assert(inner_cheapest_total);
 	}
 	else if (nestjoinOK)
@@ -874,7 +846,7 @@ match_unsorted_outer(PlannerInfo *root,
 			if (outerpath != outerrel->cheapest_total_path)
 				continue;
 			outerpath = (Path *) create_unique_path(root, outerrel,
-													outerpath, sjinfo);
+													outerpath, extra->sjinfo);
 			Assert(outerpath);
 		}
 
@@ -894,15 +866,11 @@ match_unsorted_outer(PlannerInfo *root,
 			 */
 			try_nestloop_path(root,
 							  joinrel,
-							  jointype,
-							  sjinfo,
-							  semifactors,
-							  param_source_rels,
-							  extra_lateral_rels,
 							  outerpath,
 							  inner_cheapest_total,
-							  restrictlist,
-							  merge_pathkeys);
+							  merge_pathkeys,
+							  jointype,
+							  extra);
 		}
 		else if (nestjoinOK)
 		{
@@ -920,30 +888,22 @@ match_unsorted_outer(PlannerInfo *root,
 
 				try_nestloop_path(root,
 								  joinrel,
-								  jointype,
-								  sjinfo,
-								  semifactors,
-								  param_source_rels,
-								  extra_lateral_rels,
 								  outerpath,
 								  innerpath,
-								  restrictlist,
-								  merge_pathkeys);
+								  merge_pathkeys,
+								  jointype,
+								  extra);
 			}
 
 			/* Also consider materialized form of the cheapest inner path */
 			if (matpath != NULL)
 				try_nestloop_path(root,
 								  joinrel,
-								  jointype,
-								  sjinfo,
-								  semifactors,
-								  param_source_rels,
-								  extra_lateral_rels,
 								  outerpath,
 								  matpath,
-								  restrictlist,
-								  merge_pathkeys);
+								  merge_pathkeys,
+								  jointype,
+								  extra);
 		}
 
 		/* Can't do anything else if outer path needs to be unique'd */
@@ -958,7 +918,7 @@ match_unsorted_outer(PlannerInfo *root,
 		mergeclauses = find_mergeclauses_for_pathkeys(root,
 													  outerpath->pathkeys,
 													  true,
-													  mergeclause_list);
+													extra->mergeclause_list);
 
 		/*
 		 * Done with this outer path if no chance for a mergejoin.
@@ -976,7 +936,7 @@ match_unsorted_outer(PlannerInfo *root,
 			else
 				continue;
 		}
-		if (useallclauses && list_length(mergeclauses) != list_length(mergeclause_list))
+		if (useallclauses && list_length(mergeclauses) != list_length(extra->mergeclause_list))
 			continue;
 
 		/* Compute the required ordering of the inner path */
@@ -992,17 +952,14 @@ match_unsorted_outer(PlannerInfo *root,
 		 */
 		try_mergejoin_path(root,
 						   joinrel,
-						   jointype,
-						   sjinfo,
-						   param_source_rels,
-						   extra_lateral_rels,
 						   outerpath,
 						   inner_cheapest_total,
-						   restrictlist,
 						   merge_pathkeys,
 						   mergeclauses,
 						   NIL,
-						   innersortkeys);
+						   innersortkeys,
+						   jointype,
+						   extra);
 
 		/* Can't do anything else if inner path needs to be unique'd */
 		if (save_jointype == JOIN_UNIQUE_INNER)
@@ -1091,17 +1048,14 @@ match_unsorted_outer(PlannerInfo *root,
 					newclauses = mergeclauses;
 				try_mergejoin_path(root,
 								   joinrel,
-								   jointype,
-								   sjinfo,
-								   param_source_rels,
-								   extra_lateral_rels,
 								   outerpath,
 								   innerpath,
-								   restrictlist,
 								   merge_pathkeys,
 								   newclauses,
 								   NIL,
-								   NIL);
+								   NIL,
+								   jointype,
+								   extra);
 				cheapest_total_inner = innerpath;
 			}
 			/* Same on the basis of cheapest startup cost ... */
@@ -1137,17 +1091,14 @@ match_unsorted_outer(PlannerInfo *root,
 					}
 					try_mergejoin_path(root,
 									   joinrel,
-									   jointype,
-									   sjinfo,
-									   param_source_rels,
-									   extra_lateral_rels,
 									   outerpath,
 									   innerpath,
-									   restrictlist,
 									   merge_pathkeys,
 									   newclauses,
 									   NIL,
-									   NIL);
+									   NIL,
+									   jointype,
+									   extra);
 				}
 				cheapest_startup_inner = innerpath;
 			}
@@ -1169,25 +1120,16 @@ match_unsorted_outer(PlannerInfo *root,
  * 'joinrel' is the join relation
  * 'outerrel' is the outer join relation
  * 'innerrel' is the inner join relation
- * 'restrictlist' contains all of the RestrictInfo nodes for restriction
- *		clauses that apply to this join
  * 'jointype' is the type of join to do
- * 'sjinfo' is extra info about the join for selectivity estimation
- * 'semifactors' contains valid data if jointype is SEMI or ANTI
- * 'param_source_rels' are OK targets for parameterization of result paths
- * 'extra_lateral_rels' are additional parameterization for result paths
+ * 'extra' contains additional input values
  */
 static void
 hash_inner_and_outer(PlannerInfo *root,
 					 RelOptInfo *joinrel,
 					 RelOptInfo *outerrel,
 					 RelOptInfo *innerrel,
-					 List *restrictlist,
 					 JoinType jointype,
-					 SpecialJoinInfo *sjinfo,
-					 SemiAntiJoinFactors *semifactors,
-					 Relids param_source_rels,
-					 Relids extra_lateral_rels)
+					 JoinPathExtraData *extra)
 {
 	bool		isouterjoin = IS_OUTER_JOIN(jointype);
 	List	   *hashclauses;
@@ -1201,7 +1143,7 @@ hash_inner_and_outer(PlannerInfo *root,
 	 * usable with this pair of sub-relations.
 	 */
 	hashclauses = NIL;
-	foreach(l, restrictlist)
+	foreach(l, extra->restrictlist)
 	{
 		RestrictInfo *restrictinfo = (RestrictInfo *) lfirst(l);
 
@@ -1252,53 +1194,41 @@ hash_inner_and_outer(PlannerInfo *root,
 		{
 			cheapest_total_outer = (Path *)
 				create_unique_path(root, outerrel,
-								   cheapest_total_outer, sjinfo);
+								   cheapest_total_outer, extra->sjinfo);
 			Assert(cheapest_total_outer);
 			jointype = JOIN_INNER;
 			try_hashjoin_path(root,
 							  joinrel,
-							  jointype,
-							  sjinfo,
-							  semifactors,
-							  param_source_rels,
-							  extra_lateral_rels,
 							  cheapest_total_outer,
 							  cheapest_total_inner,
-							  restrictlist,
-							  hashclauses);
+							  hashclauses,
+							  jointype,
+							  extra);
 			/* no possibility of cheap startup here */
 		}
 		else if (jointype == JOIN_UNIQUE_INNER)
 		{
 			cheapest_total_inner = (Path *)
 				create_unique_path(root, innerrel,
-								   cheapest_total_inner, sjinfo);
+								   cheapest_total_inner, extra->sjinfo);
 			Assert(cheapest_total_inner);
 			jointype = JOIN_INNER;
 			try_hashjoin_path(root,
 							  joinrel,
-							  jointype,
-							  sjinfo,
-							  semifactors,
-							  param_source_rels,
-							  extra_lateral_rels,
 							  cheapest_total_outer,
 							  cheapest_total_inner,
-							  restrictlist,
-							  hashclauses);
+							  hashclauses,
+							  jointype,
+							  extra);
 			if (cheapest_startup_outer != NULL &&
 				cheapest_startup_outer != cheapest_total_outer)
 				try_hashjoin_path(root,
 								  joinrel,
-								  jointype,
-								  sjinfo,
-								  semifactors,
-								  param_source_rels,
-								  extra_lateral_rels,
 								  cheapest_startup_outer,
 								  cheapest_total_inner,
-								  restrictlist,
-								  hashclauses);
+								  hashclauses,
+								  jointype,
+								  extra);
 		}
 		else
 		{
@@ -1315,15 +1245,11 @@ hash_inner_and_outer(PlannerInfo *root,
 			if (cheapest_startup_outer != NULL)
 				try_hashjoin_path(root,
 								  joinrel,
-								  jointype,
-								  sjinfo,
-								  semifactors,
-								  param_source_rels,
-								  extra_lateral_rels,
 								  cheapest_startup_outer,
 								  cheapest_total_inner,
-								  restrictlist,
-								  hashclauses);
+								  hashclauses,
+								  jointype,
+								  extra);
 
 			foreach(lc1, outerrel->cheapest_parameterized_paths)
 			{
@@ -1353,15 +1279,11 @@ hash_inner_and_outer(PlannerInfo *root,
 
 					try_hashjoin_path(root,
 									  joinrel,
-									  jointype,
-									  sjinfo,
-									  semifactors,
-									  param_source_rels,
-									  extra_lateral_rels,
 									  outerpath,
 									  innerpath,
-									  restrictlist,
-									  hashclauses);
+									  hashclauses,
+									  jointype,
+									  extra);
 				}
 			}
 		}
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index 42183dfecb..8b25222b93 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -17,7 +17,7 @@
  */
 #include "postgres.h"
 
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/plannodes.h"
diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c
index 11d39336b1..470db87817 100644
--- a/src/backend/optimizer/plan/analyzejoins.c
+++ b/src/backend/optimizer/plan/analyzejoins.c
@@ -581,6 +581,7 @@ query_supports_distinctness(Query *query)
 {
 	if (query->distinctClause != NIL ||
 		query->groupClause != NIL ||
+		query->groupingSets != NIL ||
 		query->hasAggs ||
 		query->havingQual ||
 		query->setOperations)
@@ -649,10 +650,10 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 	}
 
 	/*
-	 * Similarly, GROUP BY guarantees uniqueness if all the grouped columns
-	 * appear in colnos and operator semantics match.
+	 * Similarly, GROUP BY without GROUPING SETS guarantees uniqueness if all
+	 * the grouped columns appear in colnos and operator semantics match.
 	 */
-	if (query->groupClause)
+	if (query->groupClause && !query->groupingSets)
 	{
 		foreach(l, query->groupClause)
 		{
@@ -668,6 +669,27 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 		if (l == NULL)			/* had matches for all? */
 			return true;
 	}
+	else if (query->groupingSets)
+	{
+		/*
+		 * If we have grouping sets with expressions, we probably don't have
+		 * uniqueness and analysis would be hard. Punt.
+		 */
+		if (query->groupClause)
+			return false;
+
+		/*
+		 * If we have no groupClause (therefore no grouping expressions), we
+		 * might have one or many empty grouping sets. If there's just one,
+		 * then we're returning only one row and are certainly unique. But
+		 * otherwise, we know we're certainly not unique.
+		 */
+		if (list_length(query->groupingSets) == 1 &&
+			((GroupingSet *) linitial(query->groupingSets))->kind == GROUPING_SET_EMPTY)
+			return true;
+		else
+			return false;
+	}
 	else
 	{
 		/*
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index b5b0e71a10..7e969a7495 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <math.h>
 
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "access/sysattr.h"
 #include "catalog/pg_class.h"
 #include "foreign/fdwapi.h"
@@ -95,6 +95,8 @@ static char *get_internal_cursor(void);
 #endif
 static SeqScan *create_seqscan_plan(PlannerInfo *root, Path *best_path,
 					List *tlist, List *scan_clauses);
+static SampleScan *create_samplescan_plan(PlannerInfo *root, Path *best_path,
+					   List *tlist, List *scan_clauses);
 static Scan *create_indexscan_plan(PlannerInfo *root, IndexPath *best_path,
 					  List *tlist, List *scan_clauses, bool indexonly);
 static BitmapHeapScan *create_bitmap_scan_plan(PlannerInfo *root,
@@ -163,9 +165,11 @@ static List *order_qual_clauses(PlannerInfo *root, List *clauses);
 static void copy_path_costsize(Plan *dest, Path *src);
 static void copy_plan_costsize(Plan *dest, Plan *src);
 static SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid);
+static SampleScan *make_samplescan(List *qptlist, List *qpqual, Index scanrelid);
 static IndexScan *make_indexscan(List *qptlist, List *qpqual, Index scanrelid,
 			   Oid indexid, List *indexqual, List *indexqualorig,
 			   List *indexorderby, List *indexorderbyorig,
+			   List *indexorderbyops,
 			   ScanDirection indexscandir);
 static IndexOnlyScan *make_indexonlyscan(List *qptlist, List *qpqual,
 				   Index scanrelid, Oid indexid,
@@ -317,6 +321,7 @@ create_plan_recurse(PlannerInfo *root, Path *best_path)
 	switch (best_path->pathtype)
 	{
 		case T_SeqScan:
+		case T_SampleScan:
 		case T_IndexScan:
 		case T_IndexOnlyScan:
 		case T_BitmapHeapScan:
@@ -443,6 +448,13 @@ create_scan_plan(PlannerInfo *root, Path *best_path)
 												scan_clauses);
 			break;
 
+		case T_SampleScan:
+			plan = (Plan *) create_samplescan_plan(root,
+												   best_path,
+												   tlist,
+												   scan_clauses);
+			break;
+
 		case T_IndexScan:
 			plan = (Plan *) create_indexscan_plan(root,
 												  (IndexPath *) best_path,
@@ -659,6 +671,7 @@ disuse_physical_tlist(PlannerInfo *root, Plan *plan, Path *path)
 	switch (path->pathtype)
 	{
 		case T_SeqScan:
+		case T_SampleScan:
 		case T_IndexScan:
 		case T_IndexOnlyScan:
 		case T_BitmapHeapScan:
@@ -1782,6 +1795,7 @@ create_unique_plan(PlannerInfo *root, UniquePath *best_path)
 								 numGroupCols,
 								 groupColIdx,
 								 groupOperators,
+								 NIL,
 								 numGroups,
 								 subplan);
 	}
@@ -2064,6 +2078,45 @@ create_seqscan_plan(PlannerInfo *root, Path *best_path,
 }
 
 /*
+ * create_samplescan_plan
+ *	 Returns a samplecan plan for the base relation scanned by 'best_path'
+ *	 with restriction clauses 'scan_clauses' and targetlist 'tlist'.
+ */
+static SampleScan *
+create_samplescan_plan(PlannerInfo *root, Path *best_path,
+					   List *tlist, List *scan_clauses)
+{
+	SampleScan *scan_plan;
+	Index		scan_relid = best_path->parent->relid;
+
+	/* it should be a base rel with tablesample clause... */
+	Assert(scan_relid > 0);
+	Assert(best_path->parent->rtekind == RTE_RELATION);
+	Assert(best_path->pathtype == T_SampleScan);
+
+	/* Sort clauses into best execution order */
+	scan_clauses = order_qual_clauses(root, scan_clauses);
+
+	/* Reduce RestrictInfo list to bare expressions; ignore pseudoconstants */
+	scan_clauses = extract_actual_clauses(scan_clauses, false);
+
+	/* Replace any outer-relation variables with nestloop params */
+	if (best_path->param_info)
+	{
+		scan_clauses = (List *)
+			replace_nestloop_params(root, (Node *) scan_clauses);
+	}
+
+	scan_plan = make_samplescan(tlist,
+								scan_clauses,
+								scan_relid);
+
+	copy_path_costsize(&scan_plan->plan, best_path);
+
+	return scan_plan;
+}
+
+/*
  * create_indexscan_plan
  *	  Returns an indexscan plan for the base relation scanned by 'best_path'
  *	  with restriction clauses 'scan_clauses' and targetlist 'tlist'.
@@ -2089,6 +2142,7 @@ create_indexscan_plan(PlannerInfo *root,
 	List	   *stripped_indexquals;
 	List	   *fixed_indexquals;
 	List	   *fixed_indexorderbys;
+	List	   *indexorderbyops = NIL;
 	ListCell   *l;
 
 	/* it should be a base rel... */
@@ -2200,6 +2254,39 @@ create_indexscan_plan(PlannerInfo *root,
 			replace_nestloop_params(root, (Node *) indexorderbys);
 	}
 
+	/*
+	 * If there are ORDER BY expressions, look up the sort operators for their
+	 * result datatypes.
+	 */
+	if (indexorderbys)
+	{
+		ListCell   *pathkeyCell,
+				   *exprCell;
+
+		/*
+		 * PathKey contains OID of the btree opfamily we're sorting by, but
+		 * that's not quite enough because we need the expression's datatype
+		 * to look up the sort operator in the operator family.
+		 */
+		Assert(list_length(best_path->path.pathkeys) == list_length(indexorderbys));
+		forboth(pathkeyCell, best_path->path.pathkeys, exprCell, indexorderbys)
+		{
+			PathKey    *pathkey = (PathKey *) lfirst(pathkeyCell);
+			Node	   *expr = (Node *) lfirst(exprCell);
+			Oid			exprtype = exprType(expr);
+			Oid			sortop;
+
+			/* Get sort operator from opfamily */
+			sortop = get_opfamily_member(pathkey->pk_opfamily,
+										 exprtype,
+										 exprtype,
+										 pathkey->pk_strategy);
+			if (!OidIsValid(sortop))
+				elog(ERROR, "failed to find sort operator for ORDER BY expression");
+			indexorderbyops = lappend_oid(indexorderbyops, sortop);
+		}
+	}
+
 	/* Finally ready to build the plan node */
 	if (indexonly)
 		scan_plan = (Scan *) make_indexonlyscan(tlist,
@@ -2219,6 +2306,7 @@ create_indexscan_plan(PlannerInfo *root,
 											stripped_indexquals,
 											fixed_indexorderbys,
 											indexorderbys,
+											indexorderbyops,
 											best_path->indexscandir);
 
 	copy_path_costsize(&scan_plan->plan, &best_path->path);
@@ -3211,7 +3299,7 @@ create_remotequery_plan(PlannerInfo *root, Path *best_path,
 
 /*
  * create_foreignscan_plan
- *	 Returns a foreignscan plan for the base relation scanned by 'best_path'
+ *	 Returns a foreignscan plan for the relation scanned by 'best_path'
  *	 with restriction clauses 'scan_clauses' and targetlist 'tlist'.
  */
 static ForeignScan *
@@ -3221,16 +3309,26 @@ create_foreignscan_plan(PlannerInfo *root, ForeignPath *best_path,
 	ForeignScan *scan_plan;
 	RelOptInfo *rel = best_path->path.parent;
 	Index		scan_relid = rel->relid;
-	RangeTblEntry *rte;
+	Oid			rel_oid = InvalidOid;
 	Bitmapset  *attrs_used = NULL;
 	ListCell   *lc;
 	int			i;
 
-	/* it should be a base rel... */
-	Assert(scan_relid > 0);
-	Assert(rel->rtekind == RTE_RELATION);
-	rte = planner_rt_fetch(scan_relid, root);
-	Assert(rte->rtekind == RTE_RELATION);
+	Assert(rel->fdwroutine != NULL);
+
+	/*
+	 * If we're scanning a base relation, fetch its OID.  (Irrelevant if
+	 * scanning a join relation.)
+	 */
+	if (scan_relid > 0)
+	{
+		RangeTblEntry *rte;
+
+		Assert(rel->rtekind == RTE_RELATION);
+		rte = planner_rt_fetch(scan_relid, root);
+		Assert(rte->rtekind == RTE_RELATION);
+		rel_oid = rte->relid;
+	}
 
 	/*
 	 * Sort clauses into best execution order.  We do this first since the FDW
@@ -3245,19 +3343,25 @@ create_foreignscan_plan(PlannerInfo *root, ForeignPath *best_path,
 	 * has selected some join clauses for remote use but also wants them
 	 * rechecked locally).
 	 */
-	scan_plan = rel->fdwroutine->GetForeignPlan(root, rel, rte->relid,
+	scan_plan = rel->fdwroutine->GetForeignPlan(root, rel, rel_oid,
 												best_path,
 												tlist, scan_clauses);
 
 	/* Copy cost data from Path to Plan; no need to make FDW do this */
 	copy_path_costsize(&scan_plan->scan.plan, &best_path->path);
 
+	/* Copy foreign server OID; likewise, no need to make FDW do this */
+	scan_plan->fs_server = rel->serverid;
+
+	/* Likewise, copy the relids that are represented by this foreign scan */
+	scan_plan->fs_relids = best_path->path.parent->relids;
+
 	/*
 	 * Replace any outer-relation variables with nestloop params in the qual
 	 * and fdw_exprs expressions.  We do this last so that the FDW doesn't
 	 * have to be involved.  (Note that parts of fdw_exprs could have come
 	 * from join clauses, so doing this beforehand on the scan_clauses
-	 * wouldn't work.)
+	 * wouldn't work.)  We assume fdw_scan_tlist contains no such variables.
 	 */
 	if (best_path->path.param_info)
 	{
@@ -3315,12 +3419,6 @@ create_customscan_plan(PlannerInfo *root, CustomPath *best_path,
 	RelOptInfo *rel = best_path->path.parent;
 
 	/*
-	 * Right now, all we can support is CustomScan node which is associated
-	 * with a particular base relation to be scanned.
-	 */
-	Assert(rel && rel->reloptkind == RELOPT_BASEREL);
-
-	/*
 	 * Sort clauses into the best execution order, although custom-scan
 	 * provider can reorder them again.
 	 */
@@ -3343,12 +3441,16 @@ create_customscan_plan(PlannerInfo *root, CustomPath *best_path,
 	 */
 	copy_path_costsize(&cplan->scan.plan, &best_path->path);
 
+	/* Likewise, copy the relids that are represented by this custom scan */
+	cplan->custom_relids = best_path->path.parent->relids;
+
 	/*
 	 * Replace any outer-relation variables with nestloop params in the qual
 	 * and custom_exprs expressions.  We do this last so that the custom-plan
 	 * provider doesn't have to be involved.  (Note that parts of custom_exprs
 	 * could have come from join clauses, so doing this beforehand on the
-	 * scan_clauses wouldn't work.)
+	 * scan_clauses wouldn't work.)  We assume custom_scan_tlist contains no
+	 * such variables.
 	 */
 	if (best_path->path.param_info)
 	{
@@ -4602,6 +4704,24 @@ make_seqscan(List *qptlist,
 	return node;
 }
 
+static SampleScan *
+make_samplescan(List *qptlist,
+				List *qpqual,
+				Index scanrelid)
+{
+	SampleScan *node = makeNode(SampleScan);
+	Plan	   *plan = &node->plan;
+
+	/* cost should be inserted by caller */
+	plan->targetlist = qptlist;
+	plan->qual = qpqual;
+	plan->lefttree = NULL;
+	plan->righttree = NULL;
+	node->scanrelid = scanrelid;
+
+	return node;
+}
+
 static IndexScan *
 make_indexscan(List *qptlist,
 			   List *qpqual,
@@ -4611,6 +4731,7 @@ make_indexscan(List *qptlist,
 			   List *indexqualorig,
 			   List *indexorderby,
 			   List *indexorderbyorig,
+			   List *indexorderbyops,
 			   ScanDirection indexscandir)
 {
 	IndexScan  *node = makeNode(IndexScan);
@@ -4627,6 +4748,7 @@ make_indexscan(List *qptlist,
 	node->indexqualorig = indexqualorig;
 	node->indexorderby = indexorderby;
 	node->indexorderbyorig = indexorderbyorig;
+	node->indexorderbyops = indexorderbyops;
 	node->indexorderdir = indexscandir;
 
 	return node;
@@ -4834,7 +4956,6 @@ make_worktablescan(List *qptlist,
 	return node;
 }
 
-
 #ifdef PGXC
 #ifndef XCP
 static RemoteQuery *
@@ -5219,7 +5340,8 @@ make_foreignscan(List *qptlist,
 				 List *qpqual,
 				 Index scanrelid,
 				 List *fdw_exprs,
-				 List *fdw_private)
+				 List *fdw_private,
+				 List *fdw_scan_tlist)
 {
 	ForeignScan *node = makeNode(ForeignScan);
 
@@ -5231,8 +5353,13 @@ make_foreignscan(List *qptlist,
 	plan->lefttree = NULL;
 	plan->righttree = NULL;
 	node->scan.scanrelid = scanrelid;
+	/* fs_server will be filled in by create_foreignscan_plan */
+	node->fs_server = InvalidOid;
 	node->fdw_exprs = fdw_exprs;
 	node->fdw_private = fdw_private;
+	node->fdw_scan_tlist = fdw_scan_tlist;
+	/* fs_relids will be filled in by create_foreignscan_plan */
+	node->fs_relids = NULL;
 	/* fsSystemCol will be filled in by create_foreignscan_plan */
 	node->fsSystemCol = false;
 
@@ -6338,6 +6465,7 @@ Agg *
 make_agg(PlannerInfo *root, List *tlist, List *qual,
 		 AggStrategy aggstrategy, const AggClauseCosts *aggcosts,
 		 int numGroupCols, AttrNumber *grpColIdx, Oid *grpOperators,
+		 List *groupingSets,
 		 long numGroups,
 		 Plan *lefttree)
 {
@@ -6370,10 +6498,12 @@ make_agg(PlannerInfo *root, List *tlist, List *qual,
 	 * group otherwise.
 	 */
 	if (aggstrategy == AGG_PLAIN)
-		plan->plan_rows = 1;
+		plan->plan_rows = groupingSets ? list_length(groupingSets) : 1;
 	else
 		plan->plan_rows = numGroups;
 
+	node->groupingSets = groupingSets;
+
 	/*
 	 * We also need to account for the cost of evaluation of the qual (ie, the
 	 * HAVING clause) and the tlist.  Note that cost_qual_eval doesn't charge
@@ -6394,6 +6524,7 @@ make_agg(PlannerInfo *root, List *tlist, List *qual,
 
 	plan->qual = qual;
 	plan->targetlist = tlist;
+
 	plan->lefttree = lefttree;
 	plan->righttree = NULL;
 
@@ -7073,7 +7204,7 @@ make_modifytable(PlannerInfo *root,
 				 Index nominalRelation,
 				 List *resultRelations, List *subplans,
 				 List *withCheckOptionLists, List *returningLists,
-				 List *rowMarks, int epqParam)
+				 List *rowMarks, OnConflictExpr *onconflict, int epqParam)
 {
 	ModifyTable *node = makeNode(ModifyTable);
 	Plan	   *plan = &node->plan;
@@ -7123,6 +7254,32 @@ make_modifytable(PlannerInfo *root,
 	node->resultRelations = resultRelations;
 	node->resultRelIndex = -1;	/* will be set correctly in setrefs.c */
 	node->plans = subplans;
+	if (!onconflict)
+	{
+		node->onConflictAction = ONCONFLICT_NONE;
+		node->onConflictSet = NIL;
+		node->onConflictWhere = NULL;
+		node->arbiterIndexes = NIL;
+		node->exclRelRTI = 0;
+		node->exclRelTlist = NIL;
+	}
+	else
+	{
+		node->onConflictAction = onconflict->action;
+		node->onConflictSet = onconflict->onConflictSet;
+		node->onConflictWhere = onconflict->onConflictWhere;
+
+		/*
+		 * If a set of unique index inference elements was provided (an
+		 * INSERT...ON CONFLICT "inference specification"), then infer
+		 * appropriate unique indexes (or throw an error if none are
+		 * available).
+		 */
+		node->arbiterIndexes = infer_arbiter_indexes(root);
+
+		node->exclRelRTI = onconflict->exclRelIndex;
+		node->exclRelTlist = onconflict->exclRelTlist;
+	}
 	node->withCheckOptionLists = withCheckOptionLists;
 	node->returningLists = returningLists;
 	node->rowMarks = rowMarks;
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index a7655e4a71..00b2625d34 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -1165,9 +1165,9 @@ make_outerjoininfo(PlannerInfo *root,
 		 * For a lower OJ in our RHS, if our join condition does not use the
 		 * lower join's RHS and the lower OJ's join condition is strict, we
 		 * can interchange the ordering of the two OJs; otherwise we must add
-		 * lower OJ's full syntactic relset to min_righthand.  Here, we must
-		 * preserve ordering anyway if either the current join is a semijoin,
-		 * or the lower OJ is either a semijoin or an antijoin.
+		 * the lower OJ's full syntactic relset to min_righthand.  Also, we
+		 * must preserve ordering anyway if either the current join or the
+		 * lower OJ is either a semijoin or an antijoin.
 		 *
 		 * Here, we have to consider that "our join condition" includes any
 		 * clauses that syntactically appeared above the lower OJ and below
@@ -1184,6 +1184,7 @@ make_outerjoininfo(PlannerInfo *root,
 		{
 			if (bms_overlap(clause_relids, otherinfo->syn_righthand) ||
 				jointype == JOIN_SEMI ||
+				jointype == JOIN_ANTI ||
 				otherinfo->jointype == JOIN_SEMI ||
 				otherinfo->jointype == JOIN_ANTI ||
 				!otherinfo->lhs_strict || otherinfo->delay_upper_joins)
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index a42ba5195a..78f2cee16d 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -101,7 +101,7 @@ preprocess_minmax_aggregates(PlannerInfo *root, List *tlist)
 	 * performs assorted processing related to these features between calling
 	 * preprocess_minmax_aggregates and optimize_minmax_aggregates.)
 	 */
-	if (parse->groupClause || parse->hasWindowFuncs)
+	if (parse->groupClause || list_length(parse->groupingSets) > 1 || parse->hasWindowFuncs)
 		return;
 
 	/*
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 082e70d425..17e1ee56d4 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -21,12 +21,16 @@
 #include "postgres.h"
 
 #include <limits.h>
+#include <math.h>
 
 #include "access/htup_details.h"
 #include "executor/executor.h"
 #include "executor/nodeAgg.h"
+#include "foreign/fdwapi.h"
 #include "miscadmin.h"
+#include "lib/bipartite_match.h"
 #include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
 #ifdef OPTIMIZER_DEBUG
 #include "nodes/print.h"
 #endif
@@ -42,6 +46,7 @@
 #include "optimizer/tlist.h"
 #include "parser/analyze.h"
 #include "parser/parsetree.h"
+#include "parser/parse_agg.h"
 #include "rewrite/rewriteManip.h"
 #include "utils/rel.h"
 #ifdef PGXC
@@ -69,12 +74,14 @@ planner_hook_type planner_hook = NULL;
 #define EXPRKIND_LIMIT			6
 #define EXPRKIND_APPINFO		7
 #define EXPRKIND_PHV			8
+#define EXPRKIND_TABLESAMPLE	9
 
 /* Passthrough data for standard_qp_callback */
 typedef struct
 {
 	List	   *tlist;			/* preprocessed query targetlist */
 	List	   *activeWindows;	/* active windows, if any */
+	List	   *groupClause;	/* overrides parse->groupClause */
 } standard_qp_extra;
 
 /* Local functions */
@@ -87,7 +94,9 @@ static double preprocess_limit(PlannerInfo *root,
 				 double tuple_fraction,
 				 int64 *offset_est, int64 *count_est);
 static bool limit_needed(Query *parse);
-static void preprocess_groupclause(PlannerInfo *root);
+static List *preprocess_groupclause(PlannerInfo *root, List *force);
+static List *extract_rollup_sets(List *groupingSets);
+static List *reorder_grouping_sets(List *groupingSets, List *sortclause);
 static void standard_qp_callback(PlannerInfo *root, void *extra);
 static bool choose_hashed_grouping(PlannerInfo *root,
 					   double tuple_fraction, double limit_tuples,
@@ -135,6 +144,16 @@ static bool equal_distributions(PlannerInfo *root, Distribution *dst1,
 static void separate_rowmarks(PlannerInfo *root);
 #endif
 #endif
+static Plan *build_grouping_chain(PlannerInfo *root,
+					 Query *parse,
+					 List *tlist,
+					 bool need_sort_for_grouping,
+					 List *rollup_groupclauses,
+					 List *rollup_lists,
+					 AttrNumber *groupColIdx,
+					 AggClauseCosts *agg_costs,
+					 long numGroups,
+					 Plan *result_plan);
 
 /*****************************************************************************
  *
@@ -398,7 +417,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 	root->append_rel_list = NIL;
 	root->rowMarks = NIL;
 	root->hasInheritedTarget = false;
-	root->recursiveOk = true;
+	root->grouping_map = NULL;
 
 #ifdef PGXC
 #ifndef XCP
@@ -570,6 +589,17 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 	parse->limitCount = preprocess_expression(root, parse->limitCount,
 											  EXPRKIND_LIMIT);
 
+	if (parse->onConflict)
+	{
+		parse->onConflict->onConflictSet = (List *)
+			preprocess_expression(root, (Node *) parse->onConflict->onConflictSet,
+								  EXPRKIND_TARGET);
+
+		parse->onConflict->onConflictWhere =
+			preprocess_expression(root, (Node *) parse->onConflict->onConflictWhere,
+								  EXPRKIND_QUAL);
+	}
+
 	root->append_rel_list = (List *)
 		preprocess_expression(root, (Node *) root->append_rel_list,
 							  EXPRKIND_APPINFO);
@@ -580,7 +610,19 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 		RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
 		int			kind;
 
-		if (rte->rtekind == RTE_SUBQUERY)
+		if (rte->rtekind == RTE_RELATION)
+		{
+			if (rte->tablesample)
+			{
+				rte->tablesample->args = (List *)
+					preprocess_expression(root, (Node *) rte->tablesample->args,
+										  EXPRKIND_TABLESAMPLE);
+				rte->tablesample->repeatable = (Node *)
+					preprocess_expression(root, rte->tablesample->repeatable,
+										  EXPRKIND_TABLESAMPLE);
+			}
+		}
+		else if (rte->rtekind == RTE_SUBQUERY)
 		{
 			/*
 			 * We don't want to do all preprocessing yet on the subquery's
@@ -640,7 +682,8 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 
 		if (contain_agg_clause(havingclause) ||
 			contain_volatile_functions(havingclause) ||
-			contain_subplans(havingclause))
+			contain_subplans(havingclause) ||
+			parse->groupingSets)
 		{
 			/* keep it in HAVING */
 			newHaving = lappend(newHaving, havingclause);
@@ -727,6 +770,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 											 withCheckOptionLists,
 											 returningLists,
 											 rowMarks,
+											 parse->onConflict,
 											 SS_assign_special_param(root));
 		}
 	}
@@ -967,6 +1011,7 @@ inheritance_planner(PlannerInfo *root)
 {
 	Query	   *parse = root->parse;
 	int			parentRTindex = parse->resultRelation;
+	Bitmapset  *resultRTindexes = NULL;
 	int			nominalRelation = -1;
 	List	   *final_rtable = NIL;
 	int			save_rel_array_size = 0;
@@ -978,6 +1023,8 @@ inheritance_planner(PlannerInfo *root)
 	List	   *rowMarks;
 	ListCell   *lc;
 
+	Assert(parse->commandType != CMD_INSERT);
+
 	/*
 	 * We generate a modified instance of the original Query for each target
 	 * relation, plan that, and put all the plans into a list that will be
@@ -992,7 +1039,22 @@ inheritance_planner(PlannerInfo *root)
 	 * (1) would result in a rangetable of length O(N^2) for N targets, with
 	 * at least O(N^3) work expended here; and (2) would greatly complicate
 	 * management of the rowMarks list.
+	 *
+	 * Note that any RTEs with security barrier quals will be turned into
+	 * subqueries during planning, and so we must create copies of them too,
+	 * except where they are target relations, which will each only be used in
+	 * a single plan.
 	 */
+	resultRTindexes = bms_add_member(resultRTindexes, parentRTindex);
+	foreach(lc, root->append_rel_list)
+	{
+		AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(lc);
+
+		if (appinfo->parent_relid == parentRTindex)
+			resultRTindexes = bms_add_member(resultRTindexes,
+											 appinfo->child_relid);
+	}
+
 	foreach(lc, root->append_rel_list)
 	{
 		AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(lc);
@@ -1063,21 +1125,29 @@ inheritance_planner(PlannerInfo *root)
 			{
 				RangeTblEntry *rte = (RangeTblEntry *) lfirst(lr);
 
-				if (rte->rtekind == RTE_SUBQUERY)
+				/*
+				 * Copy subquery RTEs and RTEs with security barrier quals
+				 * that will be turned into subqueries, except those that are
+				 * target relations.
+				 */
+				if (rte->rtekind == RTE_SUBQUERY ||
+					(rte->securityQuals != NIL &&
+					 !bms_is_member(rti, resultRTindexes)))
 				{
 					Index		newrti;
 
 					/*
 					 * The RTE can't contain any references to its own RT
-					 * index, so we can save a few cycles by applying
-					 * ChangeVarNodes before we append the RTE to the
-					 * rangetable.
+					 * index, except in the security barrier quals, so we can
+					 * save a few cycles by applying ChangeVarNodes before we
+					 * append the RTE to the rangetable.
 					 */
 					newrti = list_length(subroot.parse->rtable) + 1;
 					ChangeVarNodes((Node *) subroot.parse, rti, newrti, 0);
 					ChangeVarNodes((Node *) subroot.rowMarks, rti, newrti, 0);
 					ChangeVarNodes((Node *) subroot.append_rel_list, rti, newrti, 0);
 					rte = copyObject(rte);
+					ChangeVarNodes((Node *) rte->securityQuals, rti, newrti, 0);
 					subroot.parse->rtable = lappend(subroot.parse->rtable,
 													rte);
 				}
@@ -1233,6 +1303,8 @@ inheritance_planner(PlannerInfo *root)
 		if (parse->returningList)
 			returningLists = lappend(returningLists,
 									 subroot.parse->returningList);
+
+		Assert(!parse->onConflict);
 	}
 
 	/* Mark result as unordered (probably unnecessary) */
@@ -1282,6 +1354,7 @@ inheritance_planner(PlannerInfo *root)
 									 withCheckOptionLists,
 									 returningLists,
 									 rowMarks,
+									 NULL,
 									 SS_assign_special_param(root));
 }
 
@@ -1405,11 +1478,6 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		List	   *sub_tlist;
 		AttrNumber *groupColIdx = NULL;
 		bool		need_tlist_eval = true;
-		standard_qp_extra qp_extra;
-		RelOptInfo *final_rel;
-		Path	   *cheapest_path;
-		Path	   *sorted_path;
-		Path	   *best_path;
 		long		numGroups = 0;
 		AggClauseCosts agg_costs;
 		int			numGroupCols;
@@ -1418,20 +1486,104 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		bool		use_hashed_grouping = false;
 		WindowFuncLists *wflists = NULL;
 		List	   *activeWindows = NIL;
+		OnConflictExpr *onconfl;
+		int			maxref = 0;
+		int		   *tleref_to_colnum_map;
+		List	   *rollup_lists = NIL;
+		List	   *rollup_groupclauses = NIL;
+		standard_qp_extra qp_extra;
+		RelOptInfo *final_rel;
+		Path	   *cheapest_path;
+		Path	   *sorted_path;
+		Path	   *best_path;
 
 		MemSet(&agg_costs, 0, sizeof(AggClauseCosts));
 
 		/* A recursive query should always have setOperations */
 		Assert(!root->hasRecursion);
 
-		/* Preprocess GROUP BY clause, if any */
+		/* Preprocess Grouping set, if any */
+		if (parse->groupingSets)
+			parse->groupingSets = expand_grouping_sets(parse->groupingSets, -1);
+
 		if (parse->groupClause)
-			preprocess_groupclause(root);
+		{
+			ListCell   *lc;
+
+			foreach(lc, parse->groupClause)
+			{
+				SortGroupClause *gc = lfirst(lc);
+
+				if (gc->tleSortGroupRef > maxref)
+					maxref = gc->tleSortGroupRef;
+			}
+		}
+
+		tleref_to_colnum_map = palloc((maxref + 1) * sizeof(int));
+
+		if (parse->groupingSets)
+		{
+			ListCell   *lc;
+			ListCell   *lc2;
+			ListCell   *lc_set;
+			List	   *sets = extract_rollup_sets(parse->groupingSets);
+
+			foreach(lc_set, sets)
+			{
+				List	   *current_sets = reorder_grouping_sets(lfirst(lc_set),
+													  (list_length(sets) == 1
+													   ? parse->sortClause
+													   : NIL));
+				List	   *groupclause = preprocess_groupclause(root, linitial(current_sets));
+				int			ref = 0;
+
+				/*
+				 * Now that we've pinned down an order for the groupClause for
+				 * this list of grouping sets, we need to remap the entries in
+				 * the grouping sets from sortgrouprefs to plain indices
+				 * (0-based) into the groupClause for this collection of
+				 * grouping sets.
+				 */
+
+				foreach(lc, groupclause)
+				{
+					SortGroupClause *gc = lfirst(lc);
+
+					tleref_to_colnum_map[gc->tleSortGroupRef] = ref++;
+				}
+
+				foreach(lc, current_sets)
+				{
+					foreach(lc2, (List *) lfirst(lc))
+					{
+						lfirst_int(lc2) = tleref_to_colnum_map[lfirst_int(lc2)];
+					}
+				}
+
+				rollup_lists = lcons(current_sets, rollup_lists);
+				rollup_groupclauses = lcons(groupclause, rollup_groupclauses);
+			}
+		}
+		else
+		{
+			/* Preprocess GROUP BY clause, if any */
+			if (parse->groupClause)
+				parse->groupClause = preprocess_groupclause(root, NIL);
+			rollup_groupclauses = list_make1(parse->groupClause);
+		}
+
 		numGroupCols = list_length(parse->groupClause);
 
 		/* Preprocess targetlist */
 		tlist = preprocess_targetlist(root, tlist);
 
+		onconfl = parse->onConflict;
+		if (onconfl)
+			onconfl->onConflictSet =
+				preprocess_onconflict_targetlist(onconfl->onConflictSet,
+												 parse->resultRelation,
+												 parse->rtable);
+
 		/*
 		 * Expand any rangetable entries that have security barrier quals.
 		 * This may add new security barrier subquery RTEs to the rangetable.
@@ -1499,6 +1651,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		 * grouping/aggregation operations.
 		 */
 		if (parse->groupClause ||
+			parse->groupingSets ||
 			parse->distinctClause ||
 			parse->hasAggs ||
 			parse->hasWindowFuncs ||
@@ -1510,6 +1663,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		/* Set up data needed by standard_qp_callback */
 		qp_extra.tlist = tlist;
 		qp_extra.activeWindows = activeWindows;
+		qp_extra.groupClause = llast(rollup_groupclauses);
 
 		/*
 		 * Generate the best unsorted and presorted paths for this Query (but
@@ -1542,9 +1696,39 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		{
 			List	   *groupExprs;
 
-			groupExprs = get_sortgrouplist_exprs(parse->groupClause,
-												 parse->targetList);
-			dNumGroups = estimate_num_groups(root, groupExprs, path_rows);
+			if (parse->groupingSets)
+			{
+				ListCell   *lc,
+						   *lc2;
+
+				dNumGroups = 0;
+
+				forboth(lc, rollup_groupclauses, lc2, rollup_lists)
+				{
+					ListCell   *lc3;
+
+					groupExprs = get_sortgrouplist_exprs(lfirst(lc),
+														 parse->targetList);
+
+					foreach(lc3, lfirst(lc2))
+					{
+						List	   *gset = lfirst(lc3);
+
+						dNumGroups += estimate_num_groups(root,
+														  groupExprs,
+														  path_rows,
+														  &gset);
+					}
+				}
+			}
+			else
+			{
+				groupExprs = get_sortgrouplist_exprs(parse->groupClause,
+													 parse->targetList);
+
+				dNumGroups = estimate_num_groups(root, groupExprs, path_rows,
+												 NULL);
+			}
 
 			/*
 			 * In GROUP BY mode, an absolute LIMIT is relative to the number
@@ -1556,6 +1740,13 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 				tuple_fraction /= dNumGroups;
 
 			/*
+			 * If there's more than one grouping set, we'll have to sort the
+			 * entire input.
+			 */
+			if (list_length(rollup_lists) > 1)
+				tuple_fraction = 0.0;
+
+			/*
 			 * If both GROUP BY and ORDER BY are specified, we will need two
 			 * levels of sort --- and, therefore, certainly need to read all
 			 * the tuples --- unless ORDER BY is a subset of GROUP BY.
@@ -1570,14 +1761,17 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 									   root->group_pathkeys))
 				tuple_fraction = 0.0;
 		}
-		else if (parse->hasAggs || root->hasHavingQual)
+		else if (parse->hasAggs || root->hasHavingQual || parse->groupingSets)
 		{
 			/*
 			 * Ungrouped aggregate will certainly want to read all the tuples,
-			 * and it will deliver a single result row (so leave dNumGroups
-			 * set to 1).
+			 * and it will deliver a single result row per grouping set (or 1
+			 * if no grouping sets were explicitly given, in which case leave
+			 * dNumGroups as-is)
 			 */
 			tuple_fraction = 0.0;
+			if (parse->groupingSets)
+				dNumGroups = list_length(parse->groupingSets);
 		}
 		else if (parse->distinctClause)
 		{
@@ -1592,7 +1786,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 
 			distinctExprs = get_sortgrouplist_exprs(parse->distinctClause,
 													parse->targetList);
-			dNumGroups = estimate_num_groups(root, distinctExprs, path_rows);
+			dNumGroups = estimate_num_groups(root, distinctExprs, path_rows, NULL);
 
 			/*
 			 * Adjust tuple_fraction the same way as for GROUP BY, too.
@@ -1675,13 +1869,24 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		{
 			/*
 			 * If grouping, decide whether to use sorted or hashed grouping.
+			 * If grouping sets are present, we can currently do only sorted
+			 * grouping.
 			 */
-			use_hashed_grouping =
-				choose_hashed_grouping(root,
-									   tuple_fraction, limit_tuples,
-									   path_rows, path_width,
-									   cheapest_path, sorted_path,
-									   dNumGroups, &agg_costs);
+
+			if (parse->groupingSets)
+			{
+				use_hashed_grouping = false;
+			}
+			else
+			{
+				use_hashed_grouping =
+					choose_hashed_grouping(root,
+										   tuple_fraction, limit_tuples,
+										   path_rows, path_width,
+										   cheapest_path, sorted_path,
+										   dNumGroups, &agg_costs);
+			}
+
 			/* Also convert # groups to long int --- but 'ware overflow! */
 			numGroups = (long) Min(dNumGroups, (double) LONG_MAX);
 		}
@@ -1818,6 +2023,28 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 			}
 
 			/*
+			 * groupColIdx is now cast in stone, so record a mapping from
+			 * tleSortGroupRef to column index. setrefs.c needs this to
+			 * finalize GROUPING() operations.
+			 */
+
+			if (parse->groupingSets)
+			{
+				AttrNumber *grouping_map = palloc0(sizeof(AttrNumber) * (maxref + 1));
+				ListCell   *lc;
+				int			i = 0;
+
+				foreach(lc, parse->groupClause)
+				{
+					SortGroupClause *gc = lfirst(lc);
+
+					grouping_map[gc->tleSortGroupRef] = groupColIdx[i++];
+				}
+
+				root->grouping_map = grouping_map;
+			}
+
+			/*
 			 * Insert AGG or GROUP node if needed, plus an explicit sort step
 			 * if necessary.
 			 *
@@ -1840,6 +2067,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 												numGroupCols,
 												groupColIdx,
 									extract_grouping_ops(parse->groupClause),
+												NIL,
 												numGroups,
 												result_plan);
 #ifdef PGXC
@@ -1857,35 +2085,18 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 				/* Hashed aggregation produces randomly-ordered results */
 				current_pathkeys = NIL;
 			}
-			else if (parse->hasAggs)
+			else if (parse->hasAggs || (parse->groupingSets && parse->groupClause))
 			{
-				/* Plain aggregate plan --- sort if needed */
-				AggStrategy aggstrategy;
-
-				if (parse->groupClause)
-				{
-					if (need_sort_for_grouping)
-					{
-						result_plan = (Plan *)
-							make_sort_from_groupcols(root,
-													 parse->groupClause,
-													 groupColIdx,
-													 result_plan);
-						current_pathkeys = root->group_pathkeys;
-					}
-					aggstrategy = AGG_SORTED;
-
-					/*
-					 * The AGG node will not change the sort ordering of its
-					 * groups, so current_pathkeys describes the result too.
-					 */
-				}
+				/*
+				 * Output is in sorted order by group_pathkeys if, and only
+				 * if, there is a single rollup operation on a non-empty list
+				 * of grouping expressions.
+				 */
+				if (list_length(rollup_groupclauses) == 1
+					&& list_length(linitial(rollup_groupclauses)) > 0)
+					current_pathkeys = root->group_pathkeys;
 				else
-				{
-					aggstrategy = AGG_PLAIN;
-					/* Result will be only one row anyway; no sort order */
 					current_pathkeys = NIL;
-				}
 
 #ifdef XCP
 				result_plan = grouping_distribution(root, result_plan,
@@ -1893,16 +2104,23 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 													current_pathkeys,
 													&distribution);
 #endif
-				result_plan = (Plan *) make_agg(root,
-												tlist,
-												(List *) parse->havingQual,
-												aggstrategy,
-												&agg_costs,
-												numGroupCols,
-												groupColIdx,
-									extract_grouping_ops(parse->groupClause),
-												numGroups,
-												result_plan);
+				result_plan = build_grouping_chain(root,
+												   parse,
+												   tlist,
+												   need_sort_for_grouping,
+												   rollup_groupclauses,
+												   rollup_lists,
+												   groupColIdx,
+												   &agg_costs,
+												   numGroups,
+												   result_plan);
+
+				/*
+				 * these are destroyed by build_grouping_chain, so make sure
+				 * we don't try and touch them again
+				 */
+				rollup_groupclauses = NIL;
+				rollup_lists = NIL;
 			}
 			else if (parse->groupClause)
 			{
@@ -1938,19 +2156,25 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 												  dNumGroups,
 												  result_plan);
 			}
-			else if (root->hasHavingQual)
+			else if (root->hasHavingQual || parse->groupingSets)
 			{
+				int			nrows = list_length(parse->groupingSets);
+
 				/*
-				 * No aggregates, and no GROUP BY, but we have a HAVING qual.
+				 * No aggregates, and no GROUP BY, but we have a HAVING qual
+				 * or grouping sets (which by elimination of cases above must
+				 * consist solely of empty grouping sets, since otherwise
+				 * groupClause will be non-empty).
+				 *
 				 * This is a degenerate case in which we are supposed to emit
-				 * either 0 or 1 row depending on whether HAVING succeeds.
-				 * Furthermore, there cannot be any variables in either HAVING
-				 * or the targetlist, so we actually do not need the FROM
-				 * table at all!  We can just throw away the plan-so-far and
-				 * generate a Result node.  This is a sufficiently unusual
-				 * corner case that it's not worth contorting the structure of
-				 * this routine to avoid having to generate the plan in the
-				 * first place.
+				 * either 0 or 1 row for each grouping set depending on
+				 * whether HAVING succeeds.  Furthermore, there cannot be any
+				 * variables in either HAVING or the targetlist, so we
+				 * actually do not need the FROM table at all!	We can just
+				 * throw away the plan-so-far and generate a Result node. This
+				 * is a sufficiently unusual corner case that it's not worth
+				 * contorting the structure of this routine to avoid having to
+				 * generate the plan in the first place.
 				 */
 #ifdef XCP
 				result_plan = grouping_distribution(root, result_plan, 0, NULL,
@@ -1961,6 +2185,21 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 												   tlist,
 												   parse->havingQual,
 												   NULL);
+
+				/*
+				 * Doesn't seem worthwhile writing code to cons up a
+				 * generate_series or a values scan to emit multiple rows.
+				 * Instead just clone the result in an Append.
+				 */
+				if (nrows > 1)
+				{
+					List	   *plans = list_make1(result_plan);
+
+					while (--nrows > 0)
+						plans = lappend(plans, copyObject(result_plan));
+
+					result_plan = (Plan *) make_append(plans, tlist);
+				}
 			}
 #ifdef PGXC
 #ifndef XCP
@@ -2178,7 +2417,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		 * result was already mostly unique).  If not, use the number of
 		 * distinct-groups calculated previously.
 		 */
-		if (parse->groupClause || root->hasHavingQual || parse->hasAggs)
+		if (parse->groupClause || parse->groupingSets || root->hasHavingQual || parse->hasAggs)
 			dNumDistinctRows = result_plan->plan_rows;
 		else
 			dNumDistinctRows = dNumGroups;
@@ -2227,6 +2466,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 								 extract_grouping_cols(parse->distinctClause,
 													result_plan->targetlist),
 								 extract_grouping_ops(parse->distinctClause),
+											NIL,
 											numDistinctRows,
 											result_plan);
 			/* Hashed aggregation produces randomly-ordered results */
@@ -2503,6 +2743,199 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 	return result_plan;
 }
 
+
+/*
+ * Given a groupclause for a collection of grouping sets, produce the
+ * corresponding groupColIdx.
+ *
+ * root->grouping_map maps the tleSortGroupRef to the actual column position in
+ * the input tuple. So we get the ref from the entries in the groupclause and
+ * look them up there.
+ */
+static AttrNumber *
+remap_groupColIdx(PlannerInfo *root, List *groupClause)
+{
+	AttrNumber *grouping_map = root->grouping_map;
+	AttrNumber *new_grpColIdx;
+	ListCell   *lc;
+	int			i;
+
+	Assert(grouping_map);
+
+	new_grpColIdx = palloc0(sizeof(AttrNumber) * list_length(groupClause));
+
+	i = 0;
+	foreach(lc, groupClause)
+	{
+		SortGroupClause *clause = lfirst(lc);
+
+		new_grpColIdx[i++] = grouping_map[clause->tleSortGroupRef];
+	}
+
+	return new_grpColIdx;
+}
+
+/*
+ * Build Agg and Sort nodes to implement sorted grouping with one or more
+ * grouping sets. (A plain GROUP BY or just the presence of aggregates counts
+ * for this purpose as a single grouping set; the calling code is responsible
+ * for providing a non-empty rollup_groupclauses list for such cases, though
+ * rollup_lists may be null.)
+ *
+ * The last entry in rollup_groupclauses (which is the one the input is sorted
+ * on, if at all) is the one used for the returned Agg node. Any additional
+ * rollups are attached, with corresponding sort info, to subsidiary Agg and
+ * Sort nodes attached to the side of the real Agg node; these nodes don't
+ * participate in the plan directly, but they are both a convenient way to
+ * represent the required data and a convenient way to account for the costs
+ * of execution.
+ *
+ * rollup_groupclauses and rollup_lists are destroyed by this function.
+ */
+static Plan *
+build_grouping_chain(PlannerInfo *root,
+					 Query *parse,
+					 List *tlist,
+					 bool need_sort_for_grouping,
+					 List *rollup_groupclauses,
+					 List *rollup_lists,
+					 AttrNumber *groupColIdx,
+					 AggClauseCosts *agg_costs,
+					 long numGroups,
+					 Plan *result_plan)
+{
+	AttrNumber *top_grpColIdx = groupColIdx;
+	List	   *chain = NIL;
+
+	/*
+	 * Prepare the grpColIdx for the real Agg node first, because we may need
+	 * it for sorting
+	 */
+	if (list_length(rollup_groupclauses) > 1)
+	{
+		Assert(rollup_lists && llast(rollup_lists));
+
+		top_grpColIdx =
+			remap_groupColIdx(root, llast(rollup_groupclauses));
+	}
+
+	/*
+	 * If we need a Sort operation on the input, generate that.
+	 */
+	if (need_sort_for_grouping)
+	{
+		result_plan = (Plan *)
+			make_sort_from_groupcols(root,
+									 llast(rollup_groupclauses),
+									 top_grpColIdx,
+									 result_plan);
+	}
+
+	/*
+	 * Generate the side nodes that describe the other sort and group
+	 * operations besides the top one.
+	 */
+	while (list_length(rollup_groupclauses) > 1)
+	{
+		List	   *groupClause = linitial(rollup_groupclauses);
+		List	   *gsets = linitial(rollup_lists);
+		AttrNumber *new_grpColIdx;
+		Plan	   *sort_plan;
+		Plan	   *agg_plan;
+
+		Assert(groupClause);
+		Assert(gsets);
+
+		new_grpColIdx = remap_groupColIdx(root, groupClause);
+
+		sort_plan = (Plan *)
+			make_sort_from_groupcols(root,
+									 groupClause,
+									 new_grpColIdx,
+									 result_plan);
+
+		/*
+		 * sort_plan includes the cost of result_plan over again, which is not
+		 * what we want (since it's not actually running that plan). So
+		 * correct the cost figures.
+		 */
+
+		sort_plan->startup_cost -= result_plan->total_cost;
+		sort_plan->total_cost -= result_plan->total_cost;
+
+		agg_plan = (Plan *) make_agg(root,
+									 tlist,
+									 (List *) parse->havingQual,
+									 AGG_SORTED,
+									 agg_costs,
+									 list_length(linitial(gsets)),
+									 new_grpColIdx,
+									 extract_grouping_ops(groupClause),
+									 gsets,
+									 numGroups,
+									 sort_plan);
+
+		sort_plan->lefttree = NULL;
+
+		chain = lappend(chain, agg_plan);
+
+		if (rollup_lists)
+			rollup_lists = list_delete_first(rollup_lists);
+
+		rollup_groupclauses = list_delete_first(rollup_groupclauses);
+	}
+
+	/*
+	 * Now make the final Agg node
+	 */
+	{
+		List	   *groupClause = linitial(rollup_groupclauses);
+		List	   *gsets = rollup_lists ? linitial(rollup_lists) : NIL;
+		int			numGroupCols;
+		ListCell   *lc;
+
+		if (gsets)
+			numGroupCols = list_length(linitial(gsets));
+		else
+			numGroupCols = list_length(parse->groupClause);
+
+		result_plan = (Plan *) make_agg(root,
+										tlist,
+										(List *) parse->havingQual,
+								 (numGroupCols > 0) ? AGG_SORTED : AGG_PLAIN,
+										agg_costs,
+										numGroupCols,
+										top_grpColIdx,
+										extract_grouping_ops(groupClause),
+										gsets,
+										numGroups,
+										result_plan);
+
+		((Agg *) result_plan)->chain = chain;
+
+		/*
+		 * Add the additional costs. But only the total costs count, since the
+		 * additional sorts aren't run on startup.
+		 */
+		foreach(lc, chain)
+		{
+			Plan	   *subplan = lfirst(lc);
+
+			result_plan->total_cost += subplan->total_cost;
+
+			/*
+			 * Nuke stuff we don't need to avoid bloating debug output.
+			 */
+
+			subplan->targetlist = NIL;
+			subplan->qual = NIL;
+			subplan->lefttree->targetlist = NIL;
+		}
+	}
+
+	return result_plan;
+}
+
 /*
  * add_tlist_costs_to_plan
  *
@@ -2798,7 +3231,12 @@ select_rowmark_type(RangeTblEntry *rte, LockClauseStrength strength)
 	}
 	else if (rte->relkind == RELKIND_FOREIGN_TABLE)
 	{
-		/* For now, we force all foreign tables to use ROW_MARK_COPY */
+		/* Let the FDW select the rowmark type, if it wants to */
+		FdwRoutine *fdwroutine = GetFdwRoutineByRelId(rte->relid);
+
+		if (fdwroutine->GetForeignRowMarkType != NULL)
+			return fdwroutine->GetForeignRowMarkType(rte, strength);
+		/* Otherwise, use ROW_MARK_COPY by default */
 		return ROW_MARK_COPY;
 	}
 	else
@@ -2807,7 +3245,20 @@ select_rowmark_type(RangeTblEntry *rte, LockClauseStrength strength)
 		switch (strength)
 		{
 			case LCS_NONE:
-				/* don't need tuple lock, only ability to re-fetch the row */
+
+				/*
+				 * We don't need a tuple lock, only the ability to re-fetch
+				 * the row.  Regular tables support ROW_MARK_REFERENCE, but if
+				 * this RTE has security barrier quals, it will be turned into
+				 * a subquery during planning, so use ROW_MARK_COPY.
+				 *
+				 * This is only necessary for LCS_NONE, since real tuple locks
+				 * on an RTE with security barrier quals are supported by
+				 * pushing the lock down into the subquery --- see
+				 * expand_security_qual.
+				 */
+				if (rte->securityQuals != NIL)
+					return ROW_MARK_COPY;
 				return ROW_MARK_REFERENCE;
 				break;
 			case LCS_FORKEYSHARE:
@@ -3085,19 +3536,38 @@ limit_needed(Query *parse)
  *
  * Note: we need no comparable processing of the distinctClause because
  * the parser already enforced that that matches ORDER BY.
+ *
+ * For grouping sets, the order of items is instead forced to agree with that
+ * of the grouping set (and items not in the grouping set are skipped). The
+ * work of sorting the order of grouping set elements to match the ORDER BY if
+ * possible is done elsewhere.
  */
-static void
-preprocess_groupclause(PlannerInfo *root)
+static List *
+preprocess_groupclause(PlannerInfo *root, List *force)
 {
 	Query	   *parse = root->parse;
-	List	   *new_groupclause;
+	List	   *new_groupclause = NIL;
 	bool		partial_match;
 	ListCell   *sl;
 	ListCell   *gl;
 
+	/* For grouping sets, we need to force the ordering */
+	if (force)
+	{
+		foreach(sl, force)
+		{
+			Index		ref = lfirst_int(sl);
+			SortGroupClause *cl = get_sortgroupref_clause(ref, parse->groupClause);
+
+			new_groupclause = lappend(new_groupclause, cl);
+		}
+
+		return new_groupclause;
+	}
+
 	/* If no ORDER BY, nothing useful to do here */
 	if (parse->sortClause == NIL)
-		return;
+		return parse->groupClause;
 
 	/*
 	 * Scan the ORDER BY clause and construct a list of matching GROUP BY
@@ -3105,7 +3575,6 @@ preprocess_groupclause(PlannerInfo *root)
 	 *
 	 * This code assumes that the sortClause contains no duplicate items.
 	 */
-	new_groupclause = NIL;
 	foreach(sl, parse->sortClause)
 	{
 		SortGroupClause *sc = (SortGroupClause *) lfirst(sl);
@@ -3129,7 +3598,7 @@ preprocess_groupclause(PlannerInfo *root)
 
 	/* If no match at all, no point in reordering GROUP BY */
 	if (new_groupclause == NIL)
-		return;
+		return parse->groupClause;
 
 	/*
 	 * Add any remaining GROUP BY items to the new list, but only if we were
@@ -3146,15 +3615,293 @@ preprocess_groupclause(PlannerInfo *root)
 		if (list_member_ptr(new_groupclause, gc))
 			continue;			/* it matched an ORDER BY item */
 		if (partial_match)
-			return;				/* give up, no common sort possible */
+			return parse->groupClause;	/* give up, no common sort possible */
 		if (!OidIsValid(gc->sortop))
-			return;				/* give up, GROUP BY can't be sorted */
+			return parse->groupClause;	/* give up, GROUP BY can't be sorted */
 		new_groupclause = lappend(new_groupclause, gc);
 	}
 
 	/* Success --- install the rearranged GROUP BY list */
 	Assert(list_length(parse->groupClause) == list_length(new_groupclause));
-	parse->groupClause = new_groupclause;
+	return new_groupclause;
+}
+
+/*
+ * Extract lists of grouping sets that can be implemented using a single
+ * rollup-type aggregate pass each. Returns a list of lists of grouping sets.
+ *
+ * Input must be sorted with smallest sets first. Result has each sublist
+ * sorted with smallest sets first.
+ *
+ * We want to produce the absolute minimum possible number of lists here to
+ * avoid excess sorts. Fortunately, there is an algorithm for this; the problem
+ * of finding the minimal partition of a partially-ordered set into chains
+ * (which is what we need, taking the list of grouping sets as a poset ordered
+ * by set inclusion) can be mapped to the problem of finding the maximum
+ * cardinality matching on a bipartite graph, which is solvable in polynomial
+ * time with a worst case of no worse than O(n^2.5) and usually much
+ * better. Since our N is at most 4096, we don't need to consider fallbacks to
+ * heuristic or approximate methods.  (Planning time for a 12-d cube is under
+ * half a second on my modest system even with optimization off and assertions
+ * on.)
+ */
+static List *
+extract_rollup_sets(List *groupingSets)
+{
+	int			num_sets_raw = list_length(groupingSets);
+	int			num_empty = 0;
+	int			num_sets = 0;	/* distinct sets */
+	int			num_chains = 0;
+	List	   *result = NIL;
+	List	  **results;
+	List	  **orig_sets;
+	Bitmapset **set_masks;
+	int		   *chains;
+	short	  **adjacency;
+	short	   *adjacency_buf;
+	BipartiteMatchState *state;
+	int			i;
+	int			j;
+	int			j_size;
+	ListCell   *lc1 = list_head(groupingSets);
+	ListCell   *lc;
+
+	/*
+	 * Start by stripping out empty sets.  The algorithm doesn't require this,
+	 * but the planner currently needs all empty sets to be returned in the
+	 * first list, so we strip them here and add them back after.
+	 */
+	while (lc1 && lfirst(lc1) == NIL)
+	{
+		++num_empty;
+		lc1 = lnext(lc1);
+	}
+
+	/* bail out now if it turns out that all we had were empty sets. */
+	if (!lc1)
+		return list_make1(groupingSets);
+
+	/*----------
+	 * We don't strictly need to remove duplicate sets here, but if we don't,
+	 * they tend to become scattered through the result, which is a bit
+	 * confusing (and irritating if we ever decide to optimize them out).
+	 * So we remove them here and add them back after.
+	 *
+	 * For each non-duplicate set, we fill in the following:
+	 *
+	 * orig_sets[i] = list of the original set lists
+	 * set_masks[i] = bitmapset for testing inclusion
+	 * adjacency[i] = array [n, v1, v2, ... vn] of adjacency indices
+	 *
+	 * chains[i] will be the result group this set is assigned to.
+	 *
+	 * We index all of these from 1 rather than 0 because it is convenient
+	 * to leave 0 free for the NIL node in the graph algorithm.
+	 *----------
+	 */
+	orig_sets = palloc0((num_sets_raw + 1) * sizeof(List *));
+	set_masks = palloc0((num_sets_raw + 1) * sizeof(Bitmapset *));
+	adjacency = palloc0((num_sets_raw + 1) * sizeof(short *));
+	adjacency_buf = palloc((num_sets_raw + 1) * sizeof(short));
+
+	j_size = 0;
+	j = 0;
+	i = 1;
+
+	for_each_cell(lc, lc1)
+	{
+		List	   *candidate = lfirst(lc);
+		Bitmapset  *candidate_set = NULL;
+		ListCell   *lc2;
+		int			dup_of = 0;
+
+		foreach(lc2, candidate)
+		{
+			candidate_set = bms_add_member(candidate_set, lfirst_int(lc2));
+		}
+
+		/* we can only be a dup if we're the same length as a previous set */
+		if (j_size == list_length(candidate))
+		{
+			int			k;
+
+			for (k = j; k < i; ++k)
+			{
+				if (bms_equal(set_masks[k], candidate_set))
+				{
+					dup_of = k;
+					break;
+				}
+			}
+		}
+		else if (j_size < list_length(candidate))
+		{
+			j_size = list_length(candidate);
+			j = i;
+		}
+
+		if (dup_of > 0)
+		{
+			orig_sets[dup_of] = lappend(orig_sets[dup_of], candidate);
+			bms_free(candidate_set);
+		}
+		else
+		{
+			int			k;
+			int			n_adj = 0;
+
+			orig_sets[i] = list_make1(candidate);
+			set_masks[i] = candidate_set;
+
+			/* fill in adjacency list; no need to compare equal-size sets */
+
+			for (k = j - 1; k > 0; --k)
+			{
+				if (bms_is_subset(set_masks[k], candidate_set))
+					adjacency_buf[++n_adj] = k;
+			}
+
+			if (n_adj > 0)
+			{
+				adjacency_buf[0] = n_adj;
+				adjacency[i] = palloc((n_adj + 1) * sizeof(short));
+				memcpy(adjacency[i], adjacency_buf, (n_adj + 1) * sizeof(short));
+			}
+			else
+				adjacency[i] = NULL;
+
+			++i;
+		}
+	}
+
+	num_sets = i - 1;
+
+	/*
+	 * Apply the graph matching algorithm to do the work.
+	 */
+	state = BipartiteMatch(num_sets, num_sets, adjacency);
+
+	/*
+	 * Now, the state->pair* fields have the info we need to assign sets to
+	 * chains. Two sets (u,v) belong to the same chain if pair_uv[u] = v or
+	 * pair_vu[v] = u (both will be true, but we check both so that we can do
+	 * it in one pass)
+	 */
+	chains = palloc0((num_sets + 1) * sizeof(int));
+
+	for (i = 1; i <= num_sets; ++i)
+	{
+		int			u = state->pair_vu[i];
+		int			v = state->pair_uv[i];
+
+		if (u > 0 && u < i)
+			chains[i] = chains[u];
+		else if (v > 0 && v < i)
+			chains[i] = chains[v];
+		else
+			chains[i] = ++num_chains;
+	}
+
+	/* build result lists. */
+	results = palloc0((num_chains + 1) * sizeof(List *));
+
+	for (i = 1; i <= num_sets; ++i)
+	{
+		int			c = chains[i];
+
+		Assert(c > 0);
+
+		results[c] = list_concat(results[c], orig_sets[i]);
+	}
+
+	/* push any empty sets back on the first list. */
+	while (num_empty-- > 0)
+		results[1] = lcons(NIL, results[1]);
+
+	/* make result list */
+	for (i = 1; i <= num_chains; ++i)
+		result = lappend(result, results[i]);
+
+	/*
+	 * Free all the things.
+	 *
+	 * (This is over-fussy for small sets but for large sets we could have
+	 * tied up a nontrivial amount of memory.)
+	 */
+	BipartiteMatchFree(state);
+	pfree(results);
+	pfree(chains);
+	for (i = 1; i <= num_sets; ++i)
+		if (adjacency[i])
+			pfree(adjacency[i]);
+	pfree(adjacency);
+	pfree(adjacency_buf);
+	pfree(orig_sets);
+	for (i = 1; i <= num_sets; ++i)
+		bms_free(set_masks[i]);
+	pfree(set_masks);
+
+	return result;
+}
+
+/*
+ * Reorder the elements of a list of grouping sets such that they have correct
+ * prefix relationships.
+ *
+ * The input must be ordered with smallest sets first; the result is returned
+ * with largest sets first.
+ *
+ * If we're passed in a sortclause, we follow its order of columns to the
+ * extent possible, to minimize the chance that we add unnecessary sorts.
+ * (We're trying here to ensure that GROUPING SETS ((a,b,c),(c)) ORDER BY c,b,a
+ * gets implemented in one pass.)
+ */
+static List *
+reorder_grouping_sets(List *groupingsets, List *sortclause)
+{
+	ListCell   *lc;
+	ListCell   *lc2;
+	List	   *previous = NIL;
+	List	   *result = NIL;
+
+	foreach(lc, groupingsets)
+	{
+		List	   *candidate = lfirst(lc);
+		List	   *new_elems = list_difference_int(candidate, previous);
+
+		if (list_length(new_elems) > 0)
+		{
+			while (list_length(sortclause) > list_length(previous))
+			{
+				SortGroupClause *sc = list_nth(sortclause, list_length(previous));
+				int			ref = sc->tleSortGroupRef;
+
+				if (list_member_int(new_elems, ref))
+				{
+					previous = lappend_int(previous, ref);
+					new_elems = list_delete_int(new_elems, ref);
+				}
+				else
+				{
+					/* diverged from the sortclause; give up on it */
+					sortclause = NIL;
+					break;
+				}
+			}
+
+			foreach(lc2, new_elems)
+			{
+				previous = lappend_int(previous, lfirst_int(lc2));
+			}
+		}
+
+		result = lcons(list_copy(previous), result);
+		list_free(new_elems);
+	}
+
+	list_free(previous);
+
+	return result;
 }
 
 /*
@@ -3173,11 +3920,11 @@ standard_qp_callback(PlannerInfo *root, void *extra)
 	 * sortClause is certainly sort-able, but GROUP BY and DISTINCT might not
 	 * be, in which case we just leave their pathkeys empty.
 	 */
-	if (parse->groupClause &&
-		grouping_is_sortable(parse->groupClause))
+	if (qp_extra->groupClause &&
+		grouping_is_sortable(qp_extra->groupClause))
 		root->group_pathkeys =
 			make_pathkeys_for_sortclauses(root,
-										  parse->groupClause,
+										  qp_extra->groupClause,
 										  tlist);
 	else
 		root->group_pathkeys = NIL;
@@ -3602,7 +4349,7 @@ make_subplanTargetList(PlannerInfo *root,
 	 * If we're not grouping or aggregating, there's nothing to do here;
 	 * query_planner should receive the unmodified target list.
 	 */
-	if (!parse->hasAggs && !parse->groupClause && !root->hasHavingQual &&
+	if (!parse->hasAggs && !parse->groupClause && !parse->groupingSets && !root->hasHavingQual &&
 		!parse->hasWindowFuncs)
 	{
 		*need_tlist_eval = true;
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index f7fdfaf071..e14c15ef7b 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -112,6 +112,12 @@ static Plan *set_subqueryscan_references(PlannerInfo *root,
 							SubqueryScan *plan,
 							int rtoffset);
 static bool trivial_subqueryscan(SubqueryScan *plan);
+static void set_foreignscan_references(PlannerInfo *root,
+						   ForeignScan *fscan,
+						   int rtoffset);
+static void set_customscan_references(PlannerInfo *root,
+						  CustomScan *cscan,
+						  int rtoffset);
 static Node *fix_scan_expr(PlannerInfo *root, Node *node, int rtoffset);
 static Node *fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context);
 static bool fix_scan_expr_walker(Node *node, fix_scan_expr_context *context);
@@ -179,7 +185,6 @@ static void set_remote_references(PlannerInfo *root, RemoteQuery *rscan, int rto
 static void set_remotesubplan_references(PlannerInfo *root, Plan *plan, int rtoffset);
 #endif
 
-
 /*****************************************************************************
  *
  *		SUBPLAN REFERENCES
@@ -412,9 +417,9 @@ flatten_rtes_walker(Node *node, PlannerGlobal *glob)
  *
  * In the flat rangetable, we zero out substructure pointers that are not
  * needed by the executor; this reduces the storage space and copying cost
- * for cached plans.  We keep only the alias and eref Alias fields, which
- * are needed by EXPLAIN, and the selectedCols and modifiedCols bitmaps,
- * which are needed for executor-startup permissions checking and for
+ * for cached plans.  We keep only the alias and eref Alias fields, which are
+ * needed by EXPLAIN, and the selectedCols, insertedCols and updatedCols
+ * bitmaps, which are needed for executor-startup permissions checking and for
  * trigger event checking.
  */
 static void
@@ -490,6 +495,17 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
 					fix_scan_list(root, splan->plan.qual, rtoffset);
 			}
 			break;
+		case T_SampleScan:
+			{
+				SampleScan *splan = (SampleScan *) plan;
+
+				splan->scanrelid += rtoffset;
+				splan->plan.targetlist =
+					fix_scan_list(root, splan->plan.targetlist, rtoffset);
+				splan->plan.qual =
+					fix_scan_list(root, splan->plan.qual, rtoffset);
+			}
+			break;
 		case T_IndexScan:
 			{
 				IndexScan  *splan = (IndexScan *) plan;
@@ -633,17 +649,7 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
 #endif
 #endif
 		case T_ForeignScan:
-			{
-				ForeignScan *splan = (ForeignScan *) plan;
-
-				splan->scan.scanrelid += rtoffset;
-				splan->scan.plan.targetlist =
-					fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
-				splan->scan.plan.qual =
-					fix_scan_list(root, splan->scan.plan.qual, rtoffset);
-				splan->fdw_exprs =
-					fix_scan_list(root, splan->fdw_exprs, rtoffset);
-			}
+			set_foreignscan_references(root, (ForeignScan *) plan, rtoffset);
 			break;
 #ifdef XCP
 		case T_RemoteSubplan:
@@ -652,17 +658,7 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
 #endif /* XCP */
 
 		case T_CustomScan:
-			{
-				CustomScan *splan = (CustomScan *) plan;
-
-				splan->scan.scanrelid += rtoffset;
-				splan->scan.plan.targetlist =
-					fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
-				splan->scan.plan.qual =
-					fix_scan_list(root, splan->scan.plan.qual, rtoffset);
-				splan->custom_exprs =
-					fix_scan_list(root, splan->custom_exprs, rtoffset);
-			}
+			set_customscan_references(root, (CustomScan *) plan, rtoffset);
 			break;
 
 		case T_NestLoop:
@@ -733,6 +729,8 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
 			}
 			break;
 		case T_Agg:
+			set_upper_references(root, plan, rtoffset);
+			break;
 		case T_Group:
 			set_upper_references(root, plan, rtoffset);
 			break;
@@ -826,7 +824,38 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
 					splan->plan.targetlist = copyObject(linitial(newRL));
 				}
 
+				/*
+				 * We treat ModifyTable with ON CONFLICT as a form of 'pseudo
+				 * join', where the inner side is the EXCLUDED tuple.
+				 * Therefore use fix_join_expr to setup the relevant variables
+				 * to INNER_VAR. We explicitly don't create any OUTER_VARs as
+				 * those are already used by RETURNING and it seems better to
+				 * be non-conflicting.
+				 */
+				if (splan->onConflictSet)
+				{
+					indexed_tlist *itlist;
+
+					itlist = build_tlist_index(splan->exclRelTlist);
+
+					splan->onConflictSet =
+						fix_join_expr(root, splan->onConflictSet,
+									  NULL, itlist,
+									  linitial_int(splan->resultRelations),
+									  rtoffset);
+
+					splan->onConflictWhere = (Node *)
+						fix_join_expr(root, (List *) splan->onConflictWhere,
+									  NULL, itlist,
+									  linitial_int(splan->resultRelations),
+									  rtoffset);
+
+					splan->exclRelTlist =
+						fix_scan_list(root, splan->exclRelTlist, rtoffset);
+				}
+
 				splan->nominalRelation += rtoffset;
+				splan->exclRelRTI += rtoffset;
 
 				foreach(l, splan->resultRelations)
 				{
@@ -1141,6 +1170,182 @@ trivial_subqueryscan(SubqueryScan *plan)
 }
 
 /*
+ * set_foreignscan_references
+ *	   Do set_plan_references processing on a ForeignScan
+ */
+static void
+set_foreignscan_references(PlannerInfo *root,
+						   ForeignScan *fscan,
+						   int rtoffset)
+{
+	/* Adjust scanrelid if it's valid */
+	if (fscan->scan.scanrelid > 0)
+		fscan->scan.scanrelid += rtoffset;
+
+	if (fscan->fdw_scan_tlist != NIL || fscan->scan.scanrelid == 0)
+	{
+		/* Adjust tlist, qual, fdw_exprs to reference custom scan tuple */
+		indexed_tlist *itlist = build_tlist_index(fscan->fdw_scan_tlist);
+
+#ifdef XCP
+		fscan->scan.plan.targetlist = (List *)
+			fix_upper_expr(root,
+						   (Node *) fscan->scan.plan.targetlist,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset,
+						   false);
+		fscan->scan.plan.qual = (List *)
+			fix_upper_expr(root,
+						   (Node *) fscan->scan.plan.qual,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset,
+						   false);
+		fscan->fdw_exprs = (List *)
+			fix_upper_expr(root,
+						   (Node *) fscan->fdw_exprs,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset,
+						   false);
+#else		
+		fscan->scan.plan.targetlist = (List *)
+			fix_upper_expr(root,
+						   (Node *) fscan->scan.plan.targetlist,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset);
+		fscan->scan.plan.qual = (List *)
+			fix_upper_expr(root,
+						   (Node *) fscan->scan.plan.qual,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset);
+		fscan->fdw_exprs = (List *)
+			fix_upper_expr(root,
+						   (Node *) fscan->fdw_exprs,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset);
+#endif
+		pfree(itlist);
+		/* fdw_scan_tlist itself just needs fix_scan_list() adjustments */
+		fscan->fdw_scan_tlist =
+			fix_scan_list(root, fscan->fdw_scan_tlist, rtoffset);
+	}
+	else
+	{
+		/* Adjust tlist, qual, fdw_exprs in the standard way */
+		fscan->scan.plan.targetlist =
+			fix_scan_list(root, fscan->scan.plan.targetlist, rtoffset);
+		fscan->scan.plan.qual =
+			fix_scan_list(root, fscan->scan.plan.qual, rtoffset);
+		fscan->fdw_exprs =
+			fix_scan_list(root, fscan->fdw_exprs, rtoffset);
+	}
+
+	/* Adjust fs_relids if needed */
+	if (rtoffset > 0)
+	{
+		Bitmapset  *tempset = NULL;
+		int			x = -1;
+
+		while ((x = bms_next_member(fscan->fs_relids, x)) >= 0)
+			tempset = bms_add_member(tempset, x + rtoffset);
+		fscan->fs_relids = tempset;
+	}
+}
+
+/*
+ * set_customscan_references
+ *	   Do set_plan_references processing on a CustomScan
+ */
+static void
+set_customscan_references(PlannerInfo *root,
+						  CustomScan *cscan,
+						  int rtoffset)
+{
+	/* Adjust scanrelid if it's valid */
+	if (cscan->scan.scanrelid > 0)
+		cscan->scan.scanrelid += rtoffset;
+
+	if (cscan->custom_scan_tlist != NIL || cscan->scan.scanrelid == 0)
+	{
+		/* Adjust tlist, qual, custom_exprs to reference custom scan tuple */
+		indexed_tlist *itlist = build_tlist_index(cscan->custom_scan_tlist);
+
+#ifdef XCP		
+		cscan->scan.plan.targetlist = (List *)
+			fix_upper_expr(root,
+						   (Node *) cscan->scan.plan.targetlist,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset,
+						   false);
+		cscan->scan.plan.qual = (List *)
+			fix_upper_expr(root,
+						   (Node *) cscan->scan.plan.qual,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset,
+						   false);
+		cscan->custom_exprs = (List *)
+			fix_upper_expr(root,
+						   (Node *) cscan->custom_exprs,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset,
+						   false);
+#else
+		cscan->scan.plan.targetlist = (List *)
+			fix_upper_expr(root,
+						   (Node *) cscan->scan.plan.targetlist,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset);
+		cscan->scan.plan.qual = (List *)
+			fix_upper_expr(root,
+						   (Node *) cscan->scan.plan.qual,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset);
+		cscan->custom_exprs = (List *)
+			fix_upper_expr(root,
+						   (Node *) cscan->custom_exprs,
+						   itlist,
+						   INDEX_VAR,
+						   rtoffset);
+#endif
+		pfree(itlist);
+		/* custom_scan_tlist itself just needs fix_scan_list() adjustments */
+		cscan->custom_scan_tlist =
+			fix_scan_list(root, cscan->custom_scan_tlist, rtoffset);
+	}
+	else
+	{
+		/* Adjust tlist, qual, custom_exprs in the standard way */
+		cscan->scan.plan.targetlist =
+			fix_scan_list(root, cscan->scan.plan.targetlist, rtoffset);
+		cscan->scan.plan.qual =
+			fix_scan_list(root, cscan->scan.plan.qual, rtoffset);
+		cscan->custom_exprs =
+			fix_scan_list(root, cscan->custom_exprs, rtoffset);
+	}
+
+	/* Adjust custom_relids if needed */
+	if (rtoffset > 0)
+	{
+		Bitmapset  *tempset = NULL;
+		int			x = -1;
+
+		while ((x = bms_next_member(cscan->custom_relids, x)) >= 0)
+			tempset = bms_add_member(tempset, x + rtoffset);
+		cscan->custom_relids = tempset;
+	}
+}
+
+/*
  * copyVar
  *		Copy a Var node.
  *
@@ -1164,6 +1369,7 @@ copyVar(Var *var)
  * We must look up operator opcode info for OpExpr and related nodes,
  * add OIDs from regclass Const nodes into root->glob->relationOids, and
  * add catalog TIDs for user-defined functions into root->glob->invalItems.
+ * We also fill in column index lists for GROUPING() expressions.
  *
  * We assume it's okay to update opcode info in-place.  So this could possibly
  * scribble on the planner's input data structures, but it's OK.
@@ -1227,6 +1433,31 @@ fix_expr_common(PlannerInfo *root, Node *node)
 				lappend_oid(root->glob->relationOids,
 							DatumGetObjectId(con->constvalue));
 	}
+	else if (IsA(node, GroupingFunc))
+	{
+		GroupingFunc *g = (GroupingFunc *) node;
+		AttrNumber *grouping_map = root->grouping_map;
+
+		/* If there are no grouping sets, we don't need this. */
+
+		Assert(grouping_map || g->cols == NIL);
+
+		if (grouping_map)
+		{
+			ListCell   *lc;
+			List	   *cols = NIL;
+
+			foreach(lc, g->refs)
+			{
+				cols = lappend_int(cols, grouping_map[lfirst_int(lc)]);
+			}
+
+			Assert(!g->cols || equal(cols, g->cols));
+
+			if (!g->cols)
+				g->cols = cols;
+		}
+	}
 }
 
 /*
@@ -1904,7 +2135,8 @@ search_indexed_tlist_for_sortgroupref(Node *node,
  * inner_itlist = NULL and acceptable_rel = the ID of the target relation.
  *
  * 'clauses' is the targetlist or list of join clauses
- * 'outer_itlist' is the indexed target list of the outer join relation
+ * 'outer_itlist' is the indexed target list of the outer join relation,
+ *		or NULL
  * 'inner_itlist' is the indexed target list of the inner join relation,
  *		or NULL
  * 'acceptable_rel' is either zero or the rangetable index of a relation
@@ -1944,12 +2176,17 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 		Var		   *var = (Var *) node;
 
 		/* First look for the var in the input tlists */
-		newvar = search_indexed_tlist_for_var(var,
-											  context->outer_itlist,
-											  OUTER_VAR,
-											  context->rtoffset);
-		if (newvar)
-			return (Node *) newvar;
+		if (context->outer_itlist)
+		{
+			newvar = search_indexed_tlist_for_var(var,
+												  context->outer_itlist,
+												  OUTER_VAR,
+												  context->rtoffset);
+			if (newvar)
+				return (Node *) newvar;
+		}
+
+		/* Then in the outer */
 		if (context->inner_itlist)
 		{
 			newvar = search_indexed_tlist_for_var(var,
@@ -1978,7 +2215,7 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 		PlaceHolderVar *phv = (PlaceHolderVar *) node;
 
 		/* See if the PlaceHolderVar has bubbled up from a lower plan node */
-		if (context->outer_itlist->has_ph_vars)
+		if (context->outer_itlist && context->outer_itlist->has_ph_vars)
 		{
 			newvar = search_indexed_tlist_for_non_var((Node *) phv,
 													  context->outer_itlist,
@@ -2001,7 +2238,7 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 	if (IsA(node, Param))
 		return fix_param_node(context->root, (Param *) node);
 	/* Try matching more complex expressions too, if tlists have any */
-	if (context->outer_itlist->has_non_vars)
+	if (context->outer_itlist && context->outer_itlist->has_non_vars)
 	{
 		newvar = search_indexed_tlist_for_non_var(node,
 												  context->outer_itlist,
@@ -2207,6 +2444,7 @@ set_returning_clause_references(PlannerInfo *root,
 	return rlist;
 }
 
+
 /*****************************************************************************
  *					OPERATOR REGPROC LOOKUP
  *****************************************************************************/
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 1fbffd7e66..d0ebbf1a10 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -343,6 +343,48 @@ replace_outer_agg(PlannerInfo *root, Aggref *agg)
 }
 
 /*
+ * Generate a Param node to replace the given GroupingFunc expression which is
+ * expected to have agglevelsup > 0 (ie, it is not local).
+ */
+static Param *
+replace_outer_grouping(PlannerInfo *root, GroupingFunc *grp)
+{
+	Param	   *retval;
+	PlannerParamItem *pitem;
+	Index		levelsup;
+
+	Assert(grp->agglevelsup > 0 && grp->agglevelsup < root->query_level);
+
+	/* Find the query level the GroupingFunc belongs to */
+	for (levelsup = grp->agglevelsup; levelsup > 0; levelsup--)
+		root = root->parent_root;
+
+	/*
+	 * It does not seem worthwhile to try to match duplicate outer aggs. Just
+	 * make a new slot every time.
+	 */
+	grp = (GroupingFunc *) copyObject(grp);
+	IncrementVarSublevelsUp((Node *) grp, -((int) grp->agglevelsup), 0);
+	Assert(grp->agglevelsup == 0);
+
+	pitem = makeNode(PlannerParamItem);
+	pitem->item = (Node *) grp;
+	pitem->paramId = root->glob->nParamExec++;
+
+	root->plan_params = lappend(root->plan_params, pitem);
+
+	retval = makeNode(Param);
+	retval->paramkind = PARAM_EXEC;
+	retval->paramid = pitem->paramId;
+	retval->paramtype = exprType((Node *) grp);
+	retval->paramtypmod = -1;
+	retval->paramcollid = InvalidOid;
+	retval->location = grp->location;
+
+	return retval;
+}
+
+/*
  * Generate a new Param node that will not conflict with any other.
  *
  * This is used to create Params representing subplan outputs.
@@ -1538,14 +1580,16 @@ simplify_EXISTS_query(PlannerInfo *root, Query *query)
 {
 	/*
 	 * We don't try to simplify at all if the query uses set operations,
-	 * aggregates, modifying CTEs, HAVING, OFFSET, or FOR UPDATE/SHARE; none
-	 * of these seem likely in normal usage and their possible effects are
-	 * complex.  (Note: we could ignore an "OFFSET 0" clause, but that
-	 * traditionally is used as an optimization fence, so we don't.)
+	 * aggregates, grouping sets, modifying CTEs, HAVING, OFFSET, or FOR
+	 * UPDATE/SHARE; none of these seem likely in normal usage and their
+	 * possible effects are complex.  (Note: we could ignore an "OFFSET 0"
+	 * clause, but that traditionally is used as an optimization fence, so we
+	 * don't.)
 	 */
 	if (query->commandType != CMD_SELECT ||
 		query->setOperations ||
 		query->hasAggs ||
+		query->groupingSets ||
 		query->hasWindowFuncs ||
 		query->hasModifyingCTE ||
 		query->havingQual ||
@@ -1895,6 +1939,11 @@ replace_correlation_vars_mutator(Node *node, PlannerInfo *root)
 		if (((Aggref *) node)->agglevelsup > 0)
 			return (Node *) replace_outer_agg(root, (Aggref *) node);
 	}
+	if (IsA(node, GroupingFunc))
+	{
+		if (((GroupingFunc *) node)->agglevelsup > 0)
+			return (Node *) replace_outer_grouping(root, (GroupingFunc *) node);
+	}
 	return expression_tree_mutator(node,
 								   replace_correlation_vars_mutator,
 								   (void *) root);
@@ -2211,6 +2260,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 			break;
 
 		case T_SeqScan:
+		case T_SampleScan:
 			context.paramids = bms_add_members(context.paramids, scan_params);
 			break;
 
@@ -2362,12 +2412,14 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 		case T_ForeignScan:
 			finalize_primnode((Node *) ((ForeignScan *) plan)->fdw_exprs,
 							  &context);
+			/* We assume fdw_scan_tlist cannot contain Params */
 			context.paramids = bms_add_members(context.paramids, scan_params);
 			break;
 
 		case T_CustomScan:
 			finalize_primnode((Node *) ((CustomScan *) plan)->custom_exprs,
 							  &context);
+			/* We assume custom_scan_tlist cannot contain Params */
 			context.paramids = bms_add_members(context.paramids, scan_params);
 			break;
 
@@ -2384,6 +2436,10 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 											 locally_added_param);
 				finalize_primnode((Node *) mtplan->returningLists,
 								  &context);
+				finalize_primnode((Node *) mtplan->onConflictSet,
+								  &context);
+				finalize_primnode((Node *) mtplan->onConflictWhere,
+								  &context);
 				foreach(l, mtplan->plans)
 				{
 					context.paramids =
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
index e4784b68cb..121393702a 100644
--- a/src/backend/optimizer/prep/prepjointree.c
+++ b/src/backend/optimizer/prep/prepjointree.c
@@ -1034,6 +1034,9 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte,
 		pullup_replace_vars((Node *) parse->targetList, &rvcontext);
 	parse->returningList = (List *)
 		pullup_replace_vars((Node *) parse->returningList, &rvcontext);
+	if (parse->onConflict)
+		parse->onConflict->onConflictSet = (List *)
+			pullup_replace_vars((Node *) parse->onConflict->onConflictSet, &rvcontext);
 	replace_vars_in_jointree((Node *) parse->jointree, &rvcontext,
 							 lowest_nulling_outer_join);
 	Assert(parse->setOperations == NULL);
@@ -1416,6 +1419,7 @@ is_simple_subquery(Query *subquery, RangeTblEntry *rte,
 	if (subquery->hasAggs ||
 		subquery->hasWindowFuncs ||
 		subquery->groupClause ||
+		subquery->groupingSets ||
 		subquery->havingQual ||
 		subquery->sortClause ||
 		subquery->distinctClause ||
@@ -1612,6 +1616,9 @@ pull_up_simple_values(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte)
 		pullup_replace_vars((Node *) parse->targetList, &rvcontext);
 	parse->returningList = (List *)
 		pullup_replace_vars((Node *) parse->returningList, &rvcontext);
+	if (parse->onConflict)
+		parse->onConflict->onConflictSet = (List *)
+			pullup_replace_vars((Node *) parse->onConflict->onConflictSet, &rvcontext);
 	replace_vars_in_jointree((Node *) parse->jointree, &rvcontext, NULL);
 	Assert(parse->setOperations == NULL);
 	parse->havingQual = pullup_replace_vars(parse->havingQual, &rvcontext);
diff --git a/src/backend/optimizer/prep/prepsecurity.c b/src/backend/optimizer/prep/prepsecurity.c
index 0be44c1c2f..c4b61df300 100644
--- a/src/backend/optimizer/prep/prepsecurity.c
+++ b/src/backend/optimizer/prep/prepsecurity.c
@@ -125,7 +125,8 @@ expand_security_quals(PlannerInfo *root, List *tlist)
 			rte->requiredPerms = 0;
 			rte->checkAsUser = InvalidOid;
 			rte->selectedCols = NULL;
-			rte->modifiedCols = NULL;
+			rte->insertedCols = NULL;
+			rte->updatedCols = NULL;
 
 			/*
 			 * For the most part, Vars referencing the original relation
@@ -224,7 +225,8 @@ expand_security_qual(PlannerInfo *root, List *tlist, int rt_index,
 			rte->requiredPerms = 0;
 			rte->checkAsUser = InvalidOid;
 			rte->selectedCols = NULL;
-			rte->modifiedCols = NULL;
+			rte->insertedCols = NULL;
+			rte->updatedCols = NULL;
 
 			/*
 			 * Now deal with any PlanRowMark on this RTE by requesting a lock
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 5019c916e9..14b46ef53f 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -233,23 +233,6 @@ preprocess_targetlist(PlannerInfo *root, List *tlist)
 								  pstrdup(resname),
 								  true);
 			tlist = lappend(tlist, tle);
-
-			/* if parent of inheritance tree, need the tableoid too */
-			if (rc->isParent)
-			{
-				var = makeVar(rc->rti,
-							  TableOidAttributeNumber,
-							  OIDOID,
-							  -1,
-							  InvalidOid,
-							  0);
-				snprintf(resname, sizeof(resname), "tableoid%u", rc->rowmarkId);
-				tle = makeTargetEntry((Expr *) var,
-									  list_length(tlist) + 1,
-									  pstrdup(resname),
-									  true);
-				tlist = lappend(tlist, tle);
-			}
 		}
 		if (rc->allMarkTypes & (1 << ROW_MARK_COPY))
 		{
@@ -265,6 +248,23 @@ preprocess_targetlist(PlannerInfo *root, List *tlist)
 								  true);
 			tlist = lappend(tlist, tle);
 		}
+
+		/* If parent of inheritance tree, always fetch the tableoid too. */
+		if (rc->isParent)
+		{
+			var = makeVar(rc->rti,
+						  TableOidAttributeNumber,
+						  OIDOID,
+						  -1,
+						  InvalidOid,
+						  0);
+			snprintf(resname, sizeof(resname), "tableoid%u", rc->rowmarkId);
+			tle = makeTargetEntry((Expr *) var,
+								  list_length(tlist) + 1,
+								  pstrdup(resname),
+								  true);
+			tlist = lappend(tlist, tle);
+		}
 	}
 
 	/*
@@ -307,6 +307,19 @@ preprocess_targetlist(PlannerInfo *root, List *tlist)
 	return tlist;
 }
 
+/*
+ * preprocess_onconflict_targetlist
+ *	  Process ON CONFLICT SET targetlist.
+ *
+ *	  Returns the new targetlist.
+ */
+List *
+preprocess_onconflict_targetlist(List *tlist, int result_relation, List *range_table)
+{
+	return expand_targetlist(tlist, CMD_UPDATE, result_relation, range_table);
+}
+
+
 /*****************************************************************************
  *
  *		TARGETLIST EXPANSION
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 6058b3ecf9..7bc9e302a8 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -286,13 +286,15 @@ recurse_set_operations(Node *setOp, PlannerInfo *root,
 		 */
 		if (pNumGroups)
 		{
-			if (subquery->groupClause || subquery->distinctClause ||
+			if (subquery->groupClause || subquery->groupingSets ||
+				subquery->distinctClause ||
 				subroot->hasHavingQual || subquery->hasAggs)
 				*pNumGroups = subplan->plan_rows;
 			else
 				*pNumGroups = estimate_num_groups(subroot,
 								get_tlist_exprs(subquery->targetList, false),
-												  subplan->plan_rows);
+												  subplan->plan_rows,
+												  NULL);
 		}
 
 		/*
@@ -789,6 +791,7 @@ make_union_unique(SetOperationStmt *op, Plan *plan,
 								 extract_grouping_cols(groupList,
 													   plan->targetlist),
 								 extract_grouping_ops(groupList),
+								 NIL,
 								 numGroups,
 								 plan);
 		/* Hashed aggregation produces randomly-ordered results */
@@ -1386,14 +1389,16 @@ expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)
 		 * if this is the parent table, leave copyObject's result alone.
 		 *
 		 * Note: we need to do this even though the executor won't run any
-		 * permissions checks on the child RTE.  The modifiedCols bitmap may
-		 * be examined for trigger-firing purposes.
+		 * permissions checks on the child RTE.  The insertedCols/updatedCols
+		 * bitmaps may be examined for trigger-firing purposes.
 		 */
 		if (childOID != parentOID)
 		{
 			childrte->selectedCols = translate_col_privs(rte->selectedCols,
 												   appinfo->translated_vars);
-			childrte->modifiedCols = translate_col_privs(rte->modifiedCols,
+			childrte->insertedCols = translate_col_privs(rte->insertedCols,
+												   appinfo->translated_vars);
+			childrte->updatedCols = translate_col_privs(rte->updatedCols,
 												   appinfo->translated_vars);
 		}
 
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 84d58ae595..d40083d396 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -97,7 +97,7 @@ static bool contain_mutable_functions_walker(Node *node, void *context);
 static bool contain_volatile_functions_walker(Node *node, void *context);
 static bool contain_volatile_functions_not_nextval_walker(Node *node, void *context);
 static bool contain_nonstrict_functions_walker(Node *node, void *context);
-static bool contain_leaky_functions_walker(Node *node, void *context);
+static bool contain_leaked_vars_walker(Node *node, void *context);
 static Relids find_nonnullable_rels_walker(Node *node, bool top_level);
 static List *find_nonnullable_vars_walker(Node *node, bool top_level);
 static bool is_strict_saop(ScalarArrayOpExpr *expr, bool falseOK);
@@ -1318,26 +1318,30 @@ contain_nonstrict_functions_walker(Node *node, void *context)
 }
 
 /*****************************************************************************
- *		  Check clauses for non-leakproof functions
+ *		  Check clauses for Vars passed to non-leakproof functions
  *****************************************************************************/
 
 /*
- * contain_leaky_functions
- *		Recursively search for leaky functions within a clause.
+ * contain_leaked_vars
+ *		Recursively scan a clause to discover whether it contains any Var
+ *		nodes (of the current query level) that are passed as arguments to
+ *		leaky functions.
  *
- * Returns true if any function call with side-effect may be present in the
- * clause.  Qualifiers from outside the a security_barrier view should not
- * be pushed down into the view, lest the contents of tuples intended to be
- * filtered out be revealed via side effects.
+ * Returns true if the clause contains any non-leakproof functions that are
+ * passed Var nodes of the current query level, and which might therefore leak
+ * data.  Qualifiers from outside a security_barrier view that might leak data
+ * in this way should not be pushed down into the view in case the contents of
+ * tuples intended to be filtered out by the view are revealed by the leaky
+ * functions.
  */
 bool
-contain_leaky_functions(Node *clause)
+contain_leaked_vars(Node *clause)
 {
-	return contain_leaky_functions_walker(clause, NULL);
+	return contain_leaked_vars_walker(clause, NULL);
 }
 
 static bool
-contain_leaky_functions_walker(Node *node, void *context)
+contain_leaked_vars_walker(Node *node, void *context)
 {
 	if (node == NULL)
 		return false;
@@ -1369,7 +1373,8 @@ contain_leaky_functions_walker(Node *node, void *context)
 			{
 				FuncExpr   *expr = (FuncExpr *) node;
 
-				if (!get_func_leakproof(expr->funcid))
+				if (!get_func_leakproof(expr->funcid) &&
+					contain_var_clause((Node *) expr->args))
 					return true;
 			}
 			break;
@@ -1381,7 +1386,8 @@ contain_leaky_functions_walker(Node *node, void *context)
 				OpExpr	   *expr = (OpExpr *) node;
 
 				set_opfuncid(expr);
-				if (!get_func_leakproof(expr->opfuncid))
+				if (!get_func_leakproof(expr->opfuncid) &&
+					contain_var_clause((Node *) expr->args))
 					return true;
 			}
 			break;
@@ -1391,7 +1397,8 @@ contain_leaky_functions_walker(Node *node, void *context)
 				ScalarArrayOpExpr *expr = (ScalarArrayOpExpr *) node;
 
 				set_sa_opfuncid(expr);
-				if (!get_func_leakproof(expr->opfuncid))
+				if (!get_func_leakproof(expr->opfuncid) &&
+					contain_var_clause((Node *) expr->args))
 					return true;
 			}
 			break;
@@ -1401,15 +1408,29 @@ contain_leaky_functions_walker(Node *node, void *context)
 				CoerceViaIO *expr = (CoerceViaIO *) node;
 				Oid			funcid;
 				Oid			ioparam;
+				bool		leakproof;
 				bool		varlena;
 
+				/*
+				 * Data may be leaked if either the input or the output
+				 * function is leaky.
+				 */
 				getTypeInputInfo(exprType((Node *) expr->arg),
 								 &funcid, &ioparam);
-				if (!get_func_leakproof(funcid))
-					return true;
+				leakproof = get_func_leakproof(funcid);
+
+				/*
+				 * If the input function is leakproof, then check the output
+				 * function.
+				 */
+				if (leakproof)
+				{
+					getTypeOutputInfo(expr->resulttype, &funcid, &varlena);
+					leakproof = get_func_leakproof(funcid);
+				}
 
-				getTypeOutputInfo(expr->resulttype, &funcid, &varlena);
-				if (!get_func_leakproof(funcid))
+				if (!leakproof &&
+					contain_var_clause((Node *) expr->arg))
 					return true;
 			}
 			break;
@@ -1419,14 +1440,29 @@ contain_leaky_functions_walker(Node *node, void *context)
 				ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
 				Oid			funcid;
 				Oid			ioparam;
+				bool		leakproof;
 				bool		varlena;
 
+				/*
+				 * Data may be leaked if either the input or the output
+				 * function is leaky.
+				 */
 				getTypeInputInfo(exprType((Node *) expr->arg),
 								 &funcid, &ioparam);
-				if (!get_func_leakproof(funcid))
-					return true;
-				getTypeOutputInfo(expr->resulttype, &funcid, &varlena);
-				if (!get_func_leakproof(funcid))
+				leakproof = get_func_leakproof(funcid);
+
+				/*
+				 * If the input function is leakproof, then check the output
+				 * function.
+				 */
+				if (leakproof)
+				{
+					getTypeOutputInfo(expr->resulttype, &funcid, &varlena);
+					leakproof = get_func_leakproof(funcid);
+				}
+
+				if (!leakproof &&
+					contain_var_clause((Node *) expr->arg))
 					return true;
 			}
 			break;
@@ -1435,12 +1471,22 @@ contain_leaky_functions_walker(Node *node, void *context)
 			{
 				RowCompareExpr *rcexpr = (RowCompareExpr *) node;
 				ListCell   *opid;
+				ListCell   *larg;
+				ListCell   *rarg;
 
-				foreach(opid, rcexpr->opnos)
+				/*
+				 * Check the comparison function and arguments passed to it
+				 * for each pair of row elements.
+				 */
+				forthree(opid, rcexpr->opnos,
+						 larg, rcexpr->largs,
+						 rarg, rcexpr->rargs)
 				{
 					Oid			funcid = get_opcode(lfirst_oid(opid));
 
-					if (!get_func_leakproof(funcid))
+					if (!get_func_leakproof(funcid) &&
+						(contain_var_clause((Node *) lfirst(larg)) ||
+						 contain_var_clause((Node *) lfirst(rarg))))
 						return true;
 				}
 			}
@@ -1455,7 +1501,7 @@ contain_leaky_functions_walker(Node *node, void *context)
 			 */
 			return true;
 	}
-	return expression_tree_walker(node, contain_leaky_functions_walker,
+	return expression_tree_walker(node, contain_leaked_vars_walker,
 								  context);
 }
 
@@ -4307,6 +4353,7 @@ inline_function(Oid funcid, Oid result_type, Oid result_collid,
 		querytree->jointree->fromlist ||
 		querytree->jointree->quals ||
 		querytree->groupClause ||
+		querytree->groupingSets ||
 		querytree->havingQual ||
 		querytree->windowClause ||
 		querytree->distinctClause ||
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index c0244f9028..fd223d8b9c 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -51,6 +51,13 @@ typedef enum
 	COSTS_DIFFERENT				/* neither path dominates the other on cost */
 } PathCostComparison;
 
+/*
+ * STD_FUZZ_FACTOR is the normal fuzz factor for compare_path_costs_fuzzily.
+ * XXX is it worth making this user-controllable?  It provides a tradeoff
+ * between planner runtime and the accuracy of path cost comparisons.
+ */
+#define STD_FUZZ_FACTOR 1.01
+
 static List *translate_sub_tlist(List *tlist, int relid);
 #ifdef XCP
 static void restrict_distribution(PlannerInfo *root, RestrictInfo *ri,
@@ -159,19 +166,19 @@ compare_fractional_path_costs(Path *path1, Path *path2,
  * total cost, we just say that their costs are "different", since neither
  * dominates the other across the whole performance spectrum.
  *
- * If consider_startup is false, then we don't care about keeping paths with
- * good startup cost, so we'll never return COSTS_DIFFERENT.
- *
- * This function also includes special hacks to support a policy enforced
- * by its sole caller, add_path(): paths that have any parameterization
- * cannot win comparisons on the grounds of having cheaper startup cost,
- * since we deem only total cost to be of interest for a parameterized path.
- * (Unparameterized paths are more common, so we check for this case last.)
+ * This function also enforces a policy rule that paths for which the relevant
+ * one of parent->consider_startup and parent->consider_param_startup is false
+ * cannot survive comparisons solely on the grounds of good startup cost, so
+ * we never return COSTS_DIFFERENT when that is true for the total-cost loser.
+ * (But if total costs are fuzzily equal, we compare startup costs anyway,
+ * in hopes of eliminating one path or the other.)
  */
 static PathCostComparison
-compare_path_costs_fuzzily(Path *path1, Path *path2, double fuzz_factor,
-						   bool consider_startup)
+compare_path_costs_fuzzily(Path *path1, Path *path2, double fuzz_factor)
 {
+#define CONSIDER_PATH_STARTUP_COST(p)  \
+	((p)->param_info == NULL ? (p)->parent->consider_startup : (p)->parent->consider_param_startup)
+
 	/*
 	 * Check total cost first since it's more likely to be different; many
 	 * paths have zero startup cost.
@@ -179,9 +186,8 @@ compare_path_costs_fuzzily(Path *path1, Path *path2, double fuzz_factor,
 	if (path1->total_cost > path2->total_cost * fuzz_factor)
 	{
 		/* path1 fuzzily worse on total cost */
-		if (consider_startup &&
-			path2->startup_cost > path1->startup_cost * fuzz_factor &&
-			path1->param_info == NULL)
+		if (CONSIDER_PATH_STARTUP_COST(path1) &&
+			path2->startup_cost > path1->startup_cost * fuzz_factor)
 		{
 			/* ... but path2 fuzzily worse on startup, so DIFFERENT */
 			return COSTS_DIFFERENT;
@@ -192,9 +198,8 @@ compare_path_costs_fuzzily(Path *path1, Path *path2, double fuzz_factor,
 	if (path2->total_cost > path1->total_cost * fuzz_factor)
 	{
 		/* path2 fuzzily worse on total cost */
-		if (consider_startup &&
-			path1->startup_cost > path2->startup_cost * fuzz_factor &&
-			path2->param_info == NULL)
+		if (CONSIDER_PATH_STARTUP_COST(path2) &&
+			path1->startup_cost > path2->startup_cost * fuzz_factor)
 		{
 			/* ... but path1 fuzzily worse on startup, so DIFFERENT */
 			return COSTS_DIFFERENT;
@@ -202,22 +207,21 @@ compare_path_costs_fuzzily(Path *path1, Path *path2, double fuzz_factor,
 		/* else path1 dominates */
 		return COSTS_BETTER1;
 	}
-	/* fuzzily the same on total cost */
-	/* (so we may as well compare startup cost, even if !consider_startup) */
-	if (path1->startup_cost > path2->startup_cost * fuzz_factor &&
-		path2->param_info == NULL)
+	/* fuzzily the same on total cost ... */
+	if (path1->startup_cost > path2->startup_cost * fuzz_factor)
 	{
 		/* ... but path1 fuzzily worse on startup, so path2 wins */
 		return COSTS_BETTER2;
 	}
-	if (path2->startup_cost > path1->startup_cost * fuzz_factor &&
-		path1->param_info == NULL)
+	if (path2->startup_cost > path1->startup_cost * fuzz_factor)
 	{
 		/* ... but path2 fuzzily worse on startup, so path1 wins */
 		return COSTS_BETTER1;
 	}
 	/* fuzzily the same on both costs */
 	return COSTS_EQUAL;
+
+#undef CONSIDER_PATH_STARTUP_COST
 }
 
 /*
@@ -233,11 +237,11 @@ compare_path_costs_fuzzily(Path *path1, Path *path2, double fuzz_factor,
  *
  * The cheapest_parameterized_paths list collects all parameterized paths
  * that have survived the add_path() tournament for this relation.  (Since
- * add_path ignores pathkeys and startup cost for a parameterized path,
- * these will be paths that have best total cost or best row count for their
- * parameterization.)  cheapest_parameterized_paths always includes the
- * cheapest-total unparameterized path, too, if there is one; the users of
- * that list find it more convenient if that's included.
+ * add_path ignores pathkeys for a parameterized path, these will be paths
+ * that have best cost or best row count for their parameterization.)
+ * cheapest_parameterized_paths always includes the cheapest-total
+ * unparameterized path, too, if there is one; the users of that list find
+ * it more convenient if that's included.
  *
  * This is normally called only after we've finished constructing the path
  * list for the rel node.
@@ -382,14 +386,15 @@ set_cheapest(RelOptInfo *parent_rel)
  *	  cases do arise, so we make the full set of checks anyway.
  *
  *	  There are two policy decisions embedded in this function, along with
- *	  its sibling add_path_precheck: we treat all parameterized paths as
- *	  having NIL pathkeys, and we ignore their startup costs, so that they
- *	  compete only on parameterization, total cost and rowcount.  This is to
- *	  reduce the number of parameterized paths that are kept.  See discussion
- *	  in src/backend/optimizer/README.
+ *	  its sibling add_path_precheck.  First, we treat all parameterized paths
+ *	  as having NIL pathkeys, so that they cannot win comparisons on the
+ *	  basis of sort order.  This is to reduce the number of parameterized
+ *	  paths that are kept; see discussion in src/backend/optimizer/README.
  *
- *	  Another policy that is enforced here is that we only consider cheap
- *	  startup cost to be interesting if parent_rel->consider_startup is true.
+ *	  Second, we only consider cheap startup cost to be interesting if
+ *	  parent_rel->consider_startup is true for an unparameterized path, or
+ *	  parent_rel->consider_param_startup is true for a parameterized one.
+ *	  Again, this allows discarding useless paths sooner.
  *
  *	  The pathlist is kept sorted by total_cost, with cheaper paths
  *	  at the front.  Within this routine, that's simply a speed hack:
@@ -451,11 +456,10 @@ add_path(RelOptInfo *parent_rel, Path *new_path)
 		p1_next = lnext(p1);
 
 		/*
-		 * Do a fuzzy cost comparison with 1% fuzziness limit.  (XXX does this
-		 * percentage need to be user-configurable?)
+		 * Do a fuzzy cost comparison with standard fuzziness limit.
 		 */
-		costcmp = compare_path_costs_fuzzily(new_path, old_path, 1.01,
-											 parent_rel->consider_startup);
+		costcmp = compare_path_costs_fuzzily(new_path, old_path,
+											 STD_FUZZ_FACTOR);
 
 		/*
 		 * If the two paths compare differently for startup and total cost,
@@ -522,8 +526,7 @@ add_path(RelOptInfo *parent_rel, Path *new_path)
 									accept_new = false; /* old dominates new */
 								else if (compare_path_costs_fuzzily(new_path,
 																	old_path,
-																1.0000000001,
-																	parent_rel->consider_startup) == COSTS_BETTER1)
+											  1.0000000001) == COSTS_BETTER1)
 									remove_old = true;	/* new dominates old */
 								else
 									accept_new = false; /* old equals or
@@ -643,11 +646,15 @@ add_path_precheck(RelOptInfo *parent_rel,
 				  List *pathkeys, Relids required_outer)
 {
 	List	   *new_path_pathkeys;
+	bool		consider_startup;
 	ListCell   *p1;
 
 	/* Pretend parameterized paths have no pathkeys, per add_path policy */
 	new_path_pathkeys = required_outer ? NIL : pathkeys;
 
+	/* Decide whether new path's startup cost is interesting */
+	consider_startup = required_outer ? parent_rel->consider_param_startup : parent_rel->consider_startup;
+
 	foreach(p1, parent_rel->pathlist)
 	{
 		Path	   *old_path = (Path *) lfirst(p1);
@@ -659,16 +666,15 @@ add_path_precheck(RelOptInfo *parent_rel,
 		 * pathkeys as well as both cost metrics.  If we find one, we can
 		 * reject the new path.
 		 *
-		 * For speed, we make exact rather than fuzzy cost comparisons. If an
-		 * old path dominates the new path exactly on both costs, it will
-		 * surely do so fuzzily.
+		 * Cost comparisons here should match compare_path_costs_fuzzily.
 		 */
-		if (total_cost >= old_path->total_cost)
+		if (total_cost > old_path->total_cost * STD_FUZZ_FACTOR)
 		{
-			/* can win on startup cost only if unparameterized */
-			if (startup_cost >= old_path->startup_cost || required_outer)
+			/* new path can win on startup cost only if consider_startup */
+			if (startup_cost > old_path->startup_cost * STD_FUZZ_FACTOR ||
+				!consider_startup)
 			{
-				/* new path does not win on cost, so check pathkeys... */
+				/* new path loses on cost, so check pathkeys... */
 				List	   *old_path_pathkeys;
 
 				old_path_pathkeys = old_path->param_info ? NIL : old_path->pathkeys;
@@ -1661,6 +1667,26 @@ create_seqscan_path(PlannerInfo *root, RelOptInfo *rel, Relids required_outer)
 }
 
 /*
+ * create_samplescan_path
+ *	  Like seqscan but uses sampling function while scanning.
+ */
+Path *
+create_samplescan_path(PlannerInfo *root, RelOptInfo *rel, Relids required_outer)
+{
+	Path	   *pathnode = makeNode(Path);
+
+	pathnode->pathtype = T_SampleScan;
+	pathnode->parent = rel;
+	pathnode->param_info = get_baserel_parampathinfo(root, rel,
+													 required_outer);
+	pathnode->pathkeys = NIL;	/* samplescan has unordered result */
+
+	cost_samplescan(pathnode, root, rel);
+
+	return pathnode;
+}
+
+/*
  * create_index_path
  *	  Creates a path node for an index scan.
  *
@@ -2322,7 +2348,8 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 	/* Estimate number of output rows */
 	pathnode->path.rows = estimate_num_groups(root,
 											  sjinfo->semi_rhs_exprs,
-											  rel->rows);
+											  rel->rows,
+											  NULL);
 	numCols = list_length(sjinfo->semi_rhs_exprs);
 
 	if (sjinfo->semi_can_btree)
@@ -3005,6 +3032,8 @@ reparameterize_path(PlannerInfo *root, Path *path,
 			return create_subqueryscan_path(root, rel, path->pathkeys,
 											required_outer);
 #endif
+		case T_SampleScan:
+			return (Path *) create_samplescan_path(root, rel, required_outer);
 		default:
 			break;
 	}
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e60a623b03..218cfa655c 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -30,6 +30,7 @@
 #include "access/transam.h"
 #include "access/xlog.h"
 #include "catalog/catalog.h"
+#include "catalog/dependency.h"
 #include "catalog/heap.h"
 #include "foreign/fdwapi.h"
 #include "miscadmin.h"
@@ -57,6 +58,8 @@ int			constraint_exclusion = CONSTRAINT_EXCLUSION_PARTITION;
 get_relation_info_hook_type get_relation_info_hook = NULL;
 
 
+static bool infer_collation_opclass_match(InferenceElem *elem, Relation idxRel,
+							  Bitmapset *inferAttrs, List *idxExprs);
 static int32 get_rel_data_width(Relation rel, int32 *attr_widths);
 static List *get_relation_constraints(PlannerInfo *root,
 						 Oid relationObjectId, RelOptInfo *rel,
@@ -394,11 +397,17 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 
 	rel->indexlist = indexinfos;
 
-	/* Grab the fdwroutine info using the relcache, while we have it */
+	/* Grab foreign-table info using the relcache, while we have it */
 	if (relation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+	{
+		rel->serverid = GetForeignServerIdByRelId(RelationGetRelid(relation));
 		rel->fdwroutine = GetFdwRoutineForRelation(relation, true);
+	}
 	else
+	{
+		rel->serverid = InvalidOid;
 		rel->fdwroutine = NULL;
+	}
 
 	heap_close(relation, NoLock);
 
@@ -412,6 +421,364 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 }
 
 /*
+ * infer_arbiter_indexes -
+ *	  Determine the unique indexes used to arbitrate speculative insertion.
+ *
+ * Uses user-supplied inference clause expressions and predicate to match a
+ * unique index from those defined and ready on the heap relation (target).
+ * An exact match is required on columns/expressions (although they can appear
+ * in any order).  However, the predicate given by the user need only restrict
+ * insertion to a subset of some part of the table covered by some particular
+ * unique index (in particular, a partial unique index) in order to be
+ * inferred.
+ *
+ * The implementation does not consider which B-Tree operator class any
+ * particular available unique index attribute uses, unless one was specified
+ * in the inference specification. The same is true of collations.  In
+ * particular, there is no system dependency on the default operator class for
+ * the purposes of inference.  If no opclass (or collation) is specified, then
+ * all matching indexes (that may or may not match the default in terms of
+ * each attribute opclass/collation) are used for inference.
+ */
+List *
+infer_arbiter_indexes(PlannerInfo *root)
+{
+	OnConflictExpr *onconflict = root->parse->onConflict;
+
+	/* Iteration state */
+	Relation	relation;
+	Oid			relationObjectId;
+	Oid			indexOidFromConstraint = InvalidOid;
+	List	   *indexList;
+	ListCell   *l;
+
+	/* Normalized inference attributes and inference expressions: */
+	Bitmapset  *inferAttrs = NULL;
+	List	   *inferElems = NIL;
+
+	/* Results */
+	List	   *results = NIL;
+
+	/*
+	 * Quickly return NIL for ON CONFLICT DO NOTHING without an inference
+	 * specification or named constraint.  ON CONFLICT DO UPDATE statements
+	 * must always provide one or the other (but parser ought to have caught
+	 * that already).
+	 */
+	if (onconflict->arbiterElems == NIL &&
+		onconflict->constraint == InvalidOid)
+		return NIL;
+
+	/*
+	 * We need not lock the relation since it was already locked, either by
+	 * the rewriter or when expand_inherited_rtentry() added it to the query's
+	 * rangetable.
+	 */
+	relationObjectId = rt_fetch(root->parse->resultRelation,
+								root->parse->rtable)->relid;
+
+	relation = heap_open(relationObjectId, NoLock);
+
+	/*
+	 * Build normalized/BMS representation of plain indexed attributes, as
+	 * well as direct list of inference elements.  This is required for
+	 * matching the cataloged definition of indexes.
+	 */
+	foreach(l, onconflict->arbiterElems)
+	{
+		InferenceElem *elem;
+		Var		   *var;
+		int			attno;
+
+		elem = (InferenceElem *) lfirst(l);
+
+		/*
+		 * Parse analysis of inference elements performs full parse analysis
+		 * of Vars, even for non-expression indexes (in contrast with utility
+		 * command related use of IndexElem).  However, indexes are cataloged
+		 * with simple attribute numbers for non-expression indexes.  Those
+		 * are handled later.
+		 */
+		if (!IsA(elem->expr, Var))
+		{
+			inferElems = lappend(inferElems, elem->expr);
+			continue;
+		}
+
+		var = (Var *) elem->expr;
+		attno = var->varattno;
+
+		if (attno < 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+					 errmsg("system columns cannot be used in an ON CONFLICT clause")));
+		else if (attno == 0)
+			elog(ERROR, "whole row unique index inference specifications are not valid");
+
+		inferAttrs = bms_add_member(inferAttrs, attno);
+	}
+
+	/*
+	 * Lookup named constraint's index.  This is not immediately returned
+	 * because some additional sanity checks are required.
+	 */
+	if (onconflict->constraint != InvalidOid)
+	{
+		indexOidFromConstraint = get_constraint_index(onconflict->constraint);
+
+		if (indexOidFromConstraint == InvalidOid)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("constraint in ON CONFLICT clause has no associated index")));
+	}
+
+	indexList = RelationGetIndexList(relation);
+
+	/*
+	 * Using that representation, iterate through the list of indexes on the
+	 * target relation to try and find a match
+	 */
+	foreach(l, indexList)
+	{
+		Oid			indexoid = lfirst_oid(l);
+		Relation	idxRel;
+		Form_pg_index idxForm;
+		Bitmapset  *indexedAttrs = NULL;
+		List	   *idxExprs;
+		List	   *predExprs;
+		List	   *whereExplicit;
+		AttrNumber	natt;
+		ListCell   *el;
+
+		/*
+		 * Extract info from the relation descriptor for the index.  We know
+		 * that this is a target, so get lock type it is known will ultimately
+		 * be required by the executor.
+		 *
+		 * Let executor complain about !indimmediate case directly, because
+		 * enforcement needs to occur there anyway when an inference clause is
+		 * omitted.
+		 */
+		idxRel = index_open(indexoid, RowExclusiveLock);
+		idxForm = idxRel->rd_index;
+
+		if (!IndexIsValid(idxForm))
+			goto next;
+
+		/*
+		 * Note that we do not perform a check against indcheckxmin (like e.g.
+		 * get_relation_info()) here to eliminate candidates, because
+		 * uniqueness checking only cares about the most recently committed
+		 * tuple versions.
+		 */
+
+		/*
+		 * Look for match on "ON constraint_name" variant, which may not be
+		 * unique constraint.  This can only be a constraint name.
+		 */
+		if (indexOidFromConstraint == idxForm->indexrelid)
+		{
+			if (!idxForm->indisunique && onconflict->action == ONCONFLICT_UPDATE)
+				ereport(ERROR,
+						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+						 errmsg("ON CONFLICT DO UPDATE not supported with exclusion constraints")));
+
+			results = lappend_oid(results, idxForm->indexrelid);
+			list_free(indexList);
+			index_close(idxRel, NoLock);
+			heap_close(relation, NoLock);
+			return results;
+		}
+		else if (indexOidFromConstraint != InvalidOid)
+		{
+			/* No point in further work for index in named constraint case */
+			goto next;
+		}
+
+		/*
+		 * Only considering conventional inference at this point (not named
+		 * constraints), so index under consideration can be immediately
+		 * skipped if it's not unique
+		 */
+		if (!idxForm->indisunique)
+			goto next;
+
+		/* Build BMS representation of cataloged index attributes */
+		for (natt = 0; natt < idxForm->indnatts; natt++)
+		{
+			int			attno = idxRel->rd_index->indkey.values[natt];
+
+			if (attno < 0)
+				elog(ERROR, "system column in index");
+
+			if (attno != 0)
+				indexedAttrs = bms_add_member(indexedAttrs, attno);
+		}
+
+		/* Non-expression attributes (if any) must match */
+		if (!bms_equal(indexedAttrs, inferAttrs))
+			goto next;
+
+		/* Expression attributes (if any) must match */
+		idxExprs = RelationGetIndexExpressions(idxRel);
+		foreach(el, onconflict->arbiterElems)
+		{
+			InferenceElem *elem = (InferenceElem *) lfirst(el);
+
+			/*
+			 * Ensure that collation/opclass aspects of inference expression
+			 * element match.  Even though this loop is primarily concerned
+			 * with matching expressions, it is a convenient point to check
+			 * this for both expressions and ordinary (non-expression)
+			 * attributes appearing as inference elements.
+			 */
+			if (!infer_collation_opclass_match(elem, idxRel, inferAttrs,
+											   idxExprs))
+				goto next;
+
+			/*
+			 * Plain Vars don't factor into count of expression elements, and
+			 * the question of whether or not they satisfy the index
+			 * definition has already been considered (they must).
+			 */
+			if (IsA(elem->expr, Var))
+				continue;
+
+			/*
+			 * Might as well avoid redundant check in the rare cases where
+			 * infer_collation_opclass_match() is required to do real work.
+			 * Otherwise, check that element expression appears in cataloged
+			 * index definition.
+			 */
+			if (elem->infercollid != InvalidOid ||
+				elem->inferopclass != InvalidOid ||
+				list_member(idxExprs, elem->expr))
+				continue;
+
+			goto next;
+		}
+
+		/*
+		 * Now that all inference elements were matched, ensure that the
+		 * expression elements from inference clause are not missing any
+		 * cataloged expressions.  This does the right thing when unique
+		 * indexes redundantly repeat the same attribute, or if attributes
+		 * redundantly appear multiple times within an inference clause.
+		 */
+		if (list_difference(idxExprs, inferElems) != NIL)
+			goto next;
+
+		/*
+		 * Any user-supplied ON CONFLICT unique index inference WHERE clause
+		 * need only be implied by the cataloged index definitions predicate.
+		 */
+		predExprs = RelationGetIndexPredicate(idxRel);
+		whereExplicit = make_ands_implicit((Expr *) onconflict->arbiterWhere);
+
+		if (!predicate_implied_by(predExprs, whereExplicit))
+			goto next;
+
+		results = lappend_oid(results, idxForm->indexrelid);
+next:
+		index_close(idxRel, NoLock);
+	}
+
+	list_free(indexList);
+	heap_close(relation, NoLock);
+
+	if (results == NIL)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+				 errmsg("there is no unique or exclusion constraint matching the ON CONFLICT specification")));
+
+	return results;
+}
+
+/*
+ * infer_collation_opclass_match - ensure infer element opclass/collation match
+ *
+ * Given unique index inference element from inference specification, if
+ * collation was specified, or if opclass (represented here as opfamily +
+ * opcintype) was specified, verify that there is at least one matching
+ * indexed attribute (occasionally, there may be more).  Skip this in the
+ * common case where inference specification does not include collation or
+ * opclass (instead matching everything, regardless of cataloged
+ * collation/opclass of indexed attribute).
+ *
+ * At least historically, Postgres has not offered collations or opclasses
+ * with alternative-to-default notions of equality, so these additional
+ * criteria should only be required infrequently.
+ *
+ * Don't give up immediately when an inference element matches some attribute
+ * cataloged as indexed but not matching additional opclass/collation
+ * criteria.  This is done so that the implementation is as forgiving as
+ * possible of redundancy within cataloged index attributes (or, less
+ * usefully, within inference specification elements).  If collations actually
+ * differ between apparently redundantly indexed attributes (redundant within
+ * or across indexes), then there really is no redundancy as such.
+ *
+ * Note that if an inference element specifies an opclass and a collation at
+ * once, both must match in at least one particular attribute within index
+ * catalog definition in order for that inference element to be considered
+ * inferred/satisfied.
+ */
+static bool
+infer_collation_opclass_match(InferenceElem *elem, Relation idxRel,
+							  Bitmapset *inferAttrs, List *idxExprs)
+{
+	AttrNumber	natt;
+	Oid			inferopfamily = InvalidOid;		/* OID of att opfamily */
+	Oid			inferopcinputtype = InvalidOid; /* OID of att opfamily */
+
+	/*
+	 * If inference specification element lacks collation/opclass, then no
+	 * need to check for exact match.
+	 */
+	if (elem->infercollid == InvalidOid && elem->inferopclass == InvalidOid)
+		return true;
+
+	/*
+	 * Lookup opfamily and input type, for matching indexes
+	 */
+	if (elem->inferopclass)
+	{
+		inferopfamily = get_opclass_family(elem->inferopclass);
+		inferopcinputtype = get_opclass_input_type(elem->inferopclass);
+	}
+
+	for (natt = 1; natt <= idxRel->rd_att->natts; natt++)
+	{
+		Oid			opfamily = idxRel->rd_opfamily[natt - 1];
+		Oid			opcinputtype = idxRel->rd_opcintype[natt - 1];
+		Oid			collation = idxRel->rd_indcollation[natt - 1];
+
+		if (elem->inferopclass != InvalidOid &&
+			(inferopfamily != opfamily || inferopcinputtype != opcinputtype))
+		{
+			/* Attribute needed to match opclass, but didn't */
+			continue;
+		}
+
+		if (elem->infercollid != InvalidOid &&
+			elem->infercollid != collation)
+		{
+			/* Attribute needed to match collation, but didn't */
+			continue;
+		}
+
+		if ((IsA(elem->expr, Var) &&
+			 bms_is_member(((Var *) elem->expr)->varattno, inferAttrs)) ||
+			list_member(idxExprs, elem->expr))
+		{
+			/* Found one match - good enough */
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/*
  * estimate_rel_size - estimate # pages and # tuples in a table or index
  *
  * We also estimate the fraction of the pages that are marked all-visible in
diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c
index cd34766c9a..d9e49d127e 100644
--- a/src/backend/optimizer/util/predtest.c
+++ b/src/backend/optimizer/util/predtest.c
@@ -1248,7 +1248,7 @@ list_member_strip(List *list, Expr *datum)
  * Define "operator implication tables" for btree operators ("strategies"),
  * and similar tables for refutation.
  *
- * The strategy numbers defined by btree indexes (see access/skey.h) are:
+ * The strategy numbers defined by btree indexes (see access/stratnum.h) are:
  *		1 <		2 <=	3 =		4 >=	5 >
  * and in addition we use 6 to represent <>.  <> is not a btree-indexable
  * operator, but we assume here that if an equality operator of a btree
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 73b59eac50..60084581b0 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -104,6 +104,7 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptKind reloptkind)
 	rel->width = 0;
 	/* cheap startup cost is interesting iff not all tuples to be retrieved */
 	rel->consider_startup = (root->tuple_fraction > 0);
+	rel->consider_param_startup = false;		/* might get changed later */
 	rel->reltargetlist = NIL;
 	rel->pathlist = NIL;
 	rel->ppilist = NIL;
@@ -124,6 +125,7 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptKind reloptkind)
 	rel->subplan = NULL;
 	rel->subroot = NULL;
 	rel->subplan_params = NIL;
+	rel->serverid = InvalidOid;
 	rel->fdwroutine = NULL;
 	rel->fdw_private = NULL;
 	rel->baserestrictinfo = NIL;
@@ -363,6 +365,7 @@ build_join_rel(PlannerInfo *root,
 	joinrel->width = 0;
 	/* cheap startup cost is interesting iff not all tuples to be retrieved */
 	joinrel->consider_startup = (root->tuple_fraction > 0);
+	joinrel->consider_param_startup = false;
 	joinrel->reltargetlist = NIL;
 	joinrel->pathlist = NIL;
 	joinrel->ppilist = NIL;
@@ -386,6 +389,7 @@ build_join_rel(PlannerInfo *root,
 	joinrel->subplan = NULL;
 	joinrel->subroot = NULL;
 	joinrel->subplan_params = NIL;
+	joinrel->serverid = InvalidOid;
 	joinrel->fdwroutine = NULL;
 	joinrel->fdw_private = NULL;
 	joinrel->baserestrictinfo = NIL;
@@ -395,6 +399,17 @@ build_join_rel(PlannerInfo *root,
 	joinrel->has_eclass_joins = false;
 
 	/*
+	 * Set up foreign-join fields if outer and inner relation are foreign
+	 * tables (or joins) belonging to the same server.
+	 */
+	if (OidIsValid(outer_rel->serverid) &&
+		inner_rel->serverid == outer_rel->serverid)
+	{
+		joinrel->serverid = outer_rel->serverid;
+		joinrel->fdwroutine = outer_rel->fdwroutine;
+	}
+
+	/*
 	 * Create a new tlist containing just the vars that need to be output from
 	 * this join (ie, are needed for higher joinclauses or final output).
 	 *
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index a1a504b24d..f702b8c442 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -395,6 +395,28 @@ get_sortgrouplist_exprs(List *sgClauses, List *targetList)
  *****************************************************************************/
 
 /*
+ * get_sortgroupref_clause
+ *		Find the SortGroupClause matching the given SortGroupRef index,
+ *		and return it.
+ */
+SortGroupClause *
+get_sortgroupref_clause(Index sortref, List *clauses)
+{
+	ListCell   *l;
+
+	foreach(l, clauses)
+	{
+		SortGroupClause *cl = (SortGroupClause *) lfirst(l);
+
+		if (cl->tleSortGroupRef == sortref)
+			return cl;
+	}
+
+	elog(ERROR, "ORDER/GROUP BY expression not found in list");
+	return NULL;				/* keep compiler quiet */
+}
+
+/*
  * extract_grouping_ops - make an array of the equality operator OIDs
  *		for a SortGroupClause list
  */
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 8f86432361..773e7b2be1 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -564,6 +564,31 @@ pull_var_clause_walker(Node *node, pull_var_clause_context *context)
 				break;
 		}
 	}
+	else if (IsA(node, GroupingFunc))
+	{
+		if (((GroupingFunc *) node)->agglevelsup != 0)
+			elog(ERROR, "Upper-level GROUPING found where not expected");
+		switch (context->aggbehavior)
+		{
+			case PVC_REJECT_AGGREGATES:
+				elog(ERROR, "GROUPING found where not expected");
+				break;
+			case PVC_INCLUDE_AGGREGATES:
+				context->varlist = lappend(context->varlist, node);
+				/* we do NOT descend into the contained expression */
+				return false;
+			case PVC_RECURSE_AGGREGATES:
+
+				/*
+				 * we do NOT descend into the contained expression, even if
+				 * the caller asked for it, because we never actually evaluate
+				 * it - the result is driven entirely off the associated GROUP
+				 * BY clause, so we never need to extract the actual Vars
+				 * here.
+				 */
+				return false;
+		}
+	}
 	else if (IsA(node, PlaceHolderVar))
 	{
 		if (((PlaceHolderVar *) node)->phlevelsup != 0)
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 1f329cd24f..3e72b0fdbc 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -82,6 +82,8 @@ static Query *transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt);
 static Query *transformInsertStmt(ParseState *pstate, InsertStmt *stmt);
 static List *transformInsertRow(ParseState *pstate, List *exprlist,
 				   List *stmtcols, List *icolumns, List *attrnos);
+static OnConflictExpr *transformOnConflictClause(ParseState *pstate,
+						  OnConflictClause *onConflictClause);
 static int	count_rowexpr_columns(ParseState *pstate, Node *expr);
 static Query *transformSelectStmt(ParseState *pstate, SelectStmt *stmt);
 static Query *transformValuesClause(ParseState *pstate, SelectStmt *stmt);
@@ -92,6 +94,8 @@ static void determineRecursiveColTypes(ParseState *pstate,
 						   Node *larg, List *nrtargetlist);
 static Query *transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt);
 static List *transformReturningList(ParseState *pstate, List *returningList);
+static List *transformUpdateTargetList(ParseState *pstate,
+						  List *targetList);
 static Query *transformDeclareCursorStmt(ParseState *pstate,
 						   DeclareCursorStmt *stmt);
 static Query *transformExplainStmt(ParseState *pstate,
@@ -480,6 +484,8 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 	ListCell   *icols;
 	ListCell   *attnos;
 	ListCell   *lc;
+	bool		isOnConflictUpdate;
+	AclMode		targetPerms;
 
 	/* There can't be any outer WITH to worry about */
 	Assert(pstate->p_ctenamespace == NIL);
@@ -495,6 +501,9 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 		qry->hasModifyingCTE = pstate->p_hasModifyingCTE;
 	}
 
+	isOnConflictUpdate = (stmt->onConflictClause &&
+						stmt->onConflictClause->action == ONCONFLICT_UPDATE);
+
 	/*
 	 * We have three cases to deal with: DEFAULT VALUES (selectStmt == NULL),
 	 * VALUES list, or general SELECT input.  We special-case VALUES, both for
@@ -539,8 +548,11 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 	 * mentioned in the SELECT part.  Note that the target table is not added
 	 * to the joinlist or namespace.
 	 */
+	targetPerms = ACL_INSERT;
+	if (isOnConflictUpdate)
+		targetPerms |= ACL_UPDATE;
 	qry->resultRelation = setTargetTable(pstate, stmt->relation,
-										 false, false, ACL_INSERT);
+										 false, false, targetPerms);
 
 	/* Validate stmt->cols list, or build default list if no list given */
 	icolumns = checkInsertTargets(pstate, stmt->cols, &attrnos);
@@ -817,13 +829,18 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 							  false);
 		qry->targetList = lappend(qry->targetList, tle);
 
-		rte->modifiedCols = bms_add_member(rte->modifiedCols,
+		rte->insertedCols = bms_add_member(rte->insertedCols,
 							  attr_num - FirstLowInvalidHeapAttributeNumber);
 
 		icols = lnext(icols);
 		attnos = lnext(attnos);
 	}
 
+	/* Process ON CONFLICT, if any. */
+	if (stmt->onConflictClause)
+		qry->onConflict = transformOnConflictClause(pstate,
+													stmt->onConflictClause);
+
 	/*
 	 * If we have a RETURNING clause, we need to add the target relation to
 	 * the query namespace before processing it, so that Var references in
@@ -934,6 +951,85 @@ transformInsertRow(ParseState *pstate, List *exprlist,
 }
 
 /*
+ * transformSelectStmt -
+ *	  transforms an OnConflictClause in an INSERT
+ */
+static OnConflictExpr *
+transformOnConflictClause(ParseState *pstate,
+						  OnConflictClause *onConflictClause)
+{
+	List	   *arbiterElems;
+	Node	   *arbiterWhere;
+	Oid			arbiterConstraint;
+	List	   *onConflictSet = NIL;
+	Node	   *onConflictWhere = NULL;
+	RangeTblEntry *exclRte = NULL;
+	int			exclRelIndex = 0;
+	List	   *exclRelTlist = NIL;
+	OnConflictExpr *result;
+
+	/* Process the arbiter clause, ON CONFLICT ON (...) */
+	transformOnConflictArbiter(pstate, onConflictClause, &arbiterElems,
+							   &arbiterWhere, &arbiterConstraint);
+
+	/* Process DO UPDATE */
+	if (onConflictClause->action == ONCONFLICT_UPDATE)
+	{
+		exclRte = addRangeTableEntryForRelation(pstate,
+												pstate->p_target_relation,
+												makeAlias("excluded", NIL),
+												false, false);
+		exclRelIndex = list_length(pstate->p_rtable);
+
+		/*
+		 * Build a targetlist for the EXCLUDED pseudo relation. Out of
+		 * simplicity we do that here, because expandRelAttrs() happens to
+		 * nearly do the right thing; specifically it also works with views.
+		 * It'd be more proper to instead scan some pseudo scan node, but it
+		 * doesn't seem worth the amount of code required.
+		 *
+		 * The only caveat of this hack is that the permissions expandRelAttrs
+		 * adds have to be reset. markVarForSelectPriv() will add the exact
+		 * required permissions back.
+		 */
+		exclRelTlist = expandRelAttrs(pstate, exclRte,
+									  exclRelIndex, 0, -1);
+		exclRte->requiredPerms = 0;
+		exclRte->selectedCols = NULL;
+
+		/*
+		 * Add EXCLUDED and the target RTE to the namespace, so that they can
+		 * be used in the UPDATE statement.
+		 */
+		addRTEtoQuery(pstate, exclRte, false, true, true);
+		addRTEtoQuery(pstate, pstate->p_target_rangetblentry,
+					  false, true, true);
+
+		onConflictSet =
+			transformUpdateTargetList(pstate, onConflictClause->targetList);
+
+		onConflictWhere = transformWhereClause(pstate,
+											   onConflictClause->whereClause,
+											   EXPR_KIND_WHERE, "WHERE");
+	}
+
+	/* Finally, build ON CONFLICT DO [NOTHING | UPDATE] expression */
+	result = makeNode(OnConflictExpr);
+
+	result->action = onConflictClause->action;
+	result->arbiterElems = arbiterElems;
+	result->arbiterWhere = arbiterWhere;
+	result->constraint = arbiterConstraint;
+	result->onConflictSet = onConflictSet;
+	result->onConflictWhere = onConflictWhere;
+	result->exclRelIndex = exclRelIndex;
+	result->exclRelTlist = exclRelTlist;
+
+	return result;
+}
+
+
+/*
  * count_rowexpr_columns -
  *	  get number of columns contained in a ROW() expression;
  *	  return -1 if expression isn't a RowExpr or a Var referencing one.
@@ -1048,6 +1144,7 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
 
 	qry->groupClause = transformGroupClause(pstate,
 											stmt->groupClause,
+											&qry->groupingSets,
 											&qry->targetList,
 											qry->sortClause,
 											EXPR_KIND_GROUP_BY,
@@ -1094,7 +1191,7 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
 	qry->hasSubLinks = pstate->p_hasSubLinks;
 	qry->hasWindowFuncs = pstate->p_hasWindowFuncs;
 	qry->hasAggs = pstate->p_hasAggs;
-	if (pstate->p_hasAggs || qry->groupClause || qry->havingQual)
+	if (pstate->p_hasAggs || qry->groupClause || qry->groupingSets || qry->havingQual)
 		parseCheckAggregates(pstate, qry);
 
 	foreach(l, stmt->lockingClause)
@@ -1554,7 +1651,7 @@ transformSetOperationStmt(ParseState *pstate, SelectStmt *stmt)
 	qry->hasSubLinks = pstate->p_hasSubLinks;
 	qry->hasWindowFuncs = pstate->p_hasWindowFuncs;
 	qry->hasAggs = pstate->p_hasAggs;
-	if (pstate->p_hasAggs || qry->groupClause || qry->havingQual)
+	if (pstate->p_hasAggs || qry->groupClause || qry->groupingSets || qry->havingQual)
 		parseCheckAggregates(pstate, qry);
 
 	foreach(l, lockingClause)
@@ -1983,10 +2080,7 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 {
 	Query	   *qry = makeNode(Query);
 	ParseNamespaceItem *nsitem;
-	RangeTblEntry *target_rte;
 	Node	   *qual;
-	ListCell   *origTargetList;
-	ListCell   *tl;
 
 	qry->commandType = CMD_UPDATE;
 	pstate->p_is_update = true;
@@ -2021,23 +2115,41 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 	nsitem->p_lateral_only = false;
 	nsitem->p_lateral_ok = true;
 
-	qry->targetList = transformTargetList(pstate, stmt->targetList,
-										  EXPR_KIND_UPDATE_SOURCE);
-
 	qual = transformWhereClause(pstate, stmt->whereClause,
 								EXPR_KIND_WHERE, "WHERE");
 
 	qry->returningList = transformReturningList(pstate, stmt->returningList);
 
+	/*
+	 * Now we are done with SELECT-like processing, and can get on with
+	 * transforming the target list to match the UPDATE target columns.
+	 */
+	qry->targetList = transformUpdateTargetList(pstate, stmt->targetList);
+
 	qry->rtable = pstate->p_rtable;
 	qry->jointree = makeFromExpr(pstate->p_joinlist, qual);
 
 	qry->hasSubLinks = pstate->p_hasSubLinks;
 
-	/*
-	 * Now we are done with SELECT-like processing, and can get on with
-	 * transforming the target list to match the UPDATE target columns.
-	 */
+	assign_query_collations(pstate, qry);
+
+	return qry;
+}
+
+/*
+ * transformUpdateTargetList -
+ *	handle SET clause in UPDATE/INSERT ... ON CONFLICT UPDATE
+ */
+static List *
+transformUpdateTargetList(ParseState *pstate, List *origTlist)
+{
+	List	   *tlist = NIL;
+	RangeTblEntry *target_rte;
+	ListCell   *orig_tl;
+	ListCell   *tl;
+
+	tlist = transformTargetList(pstate, origTlist,
+								EXPR_KIND_UPDATE_SOURCE);
 
 	/* Prepare to assign non-conflicting resnos to resjunk attributes */
 	if (pstate->p_next_resno <= pstate->p_target_relation->rd_rel->relnatts)
@@ -2045,9 +2157,9 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 
 	/* Prepare non-junk columns for assignment to target table */
 	target_rte = pstate->p_target_rangetblentry;
-	origTargetList = list_head(stmt->targetList);
+	orig_tl = list_head(origTlist);
 
-	foreach(tl, qry->targetList)
+	foreach(tl, tlist)
 	{
 		TargetEntry *tle = (TargetEntry *) lfirst(tl);
 		ResTarget  *origTarget;
@@ -2065,9 +2177,9 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 			tle->resname = NULL;
 			continue;
 		}
-		if (origTargetList == NULL)
+		if (orig_tl == NULL)
 			elog(ERROR, "UPDATE target count mismatch --- internal error");
-		origTarget = (ResTarget *) lfirst(origTargetList);
+		origTarget = (ResTarget *) lfirst(orig_tl);
 		Assert(IsA(origTarget, ResTarget));
 
 		attrno = attnameAttNum(pstate->p_target_relation,
@@ -2086,17 +2198,15 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 							  origTarget->location);
 
 		/* Mark the target column as requiring update permissions */
-		target_rte->modifiedCols = bms_add_member(target_rte->modifiedCols,
+		target_rte->updatedCols = bms_add_member(target_rte->updatedCols,
 								attrno - FirstLowInvalidHeapAttributeNumber);
 
-		origTargetList = lnext(origTargetList);
+		orig_tl = lnext(orig_tl);
 	}
-	if (origTargetList != NULL)
+	if (orig_tl != NULL)
 		elog(ERROR, "UPDATE target count mismatch --- internal error");
 
-	assign_query_collations(pstate, qry);
-
-	return qry;
+	return tlist;
 }
 
 /*
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 93715324e5..cd0ddbd663 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -221,6 +221,8 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	RangeVar			*range;
 	IntoClause			*into;
 	WithClause			*with;
+	InferClause			*infer;
+	OnConflictClause	*onconflict;
 	A_Indices			*aind;
 	ResTarget			*target;
 	struct PrivTarget	*privtarget;
@@ -249,12 +251,13 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 		CreateOpFamilyStmt AlterOpFamilyStmt CreatePLangStmt
 		CreateSchemaStmt CreateSeqStmt CreateStmt CreateTableSpaceStmt
 		CreateFdwStmt CreateForeignServerStmt CreateForeignTableStmt
-		CreateAssertStmt CreateTrigStmt CreateEventTrigStmt
+		CreateAssertStmt CreateTransformStmt CreateTrigStmt CreateEventTrigStmt
 		CreateUserStmt CreateUserMappingStmt CreateRoleStmt CreatePolicyStmt
 		CreatedbStmt DeclareCursorStmt DefineStmt DeleteStmt DiscardStmt DoStmt
 		DropGroupStmt DropOpClassStmt DropOpFamilyStmt DropPLangStmt DropStmt
 		DropAssertStmt DropTrigStmt DropRuleStmt DropCastStmt DropRoleStmt
 		DropPolicyStmt DropUserStmt DropdbStmt DropTableSpaceStmt DropFdwStmt
+		DropTransformStmt
 		DropForeignServerStmt DropUserMappingStmt ExplainStmt ExecDirectStmt FetchStmt
 		GrantStmt GrantRoleStmt ImportForeignSchemaStmt IndexStmt InsertStmt
 		ListenStmt LoadStmt LockStmt NotifyStmt ExplainableStmt PreparableStmt
@@ -329,7 +332,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 				opt_class opt_inline_handler opt_validator validator_clause
 				opt_collate
 
-%type <range>	qualified_name OptConstrFromTable
+%type <range>	qualified_name insert_target OptConstrFromTable
 
 %type <str>		all_Op MathOp
 
@@ -355,7 +358,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 				OptTableElementList TableElementList OptInherit definition
 				OptTypedTableElementList TypedTableElementList
 				reloptions opt_reloptions
-				OptWith opt_distinct opt_definition func_args func_args_list
+				OptWith distinct_clause opt_all_clause opt_definition func_args func_args_list
 				func_args_with_defaults func_args_with_defaults_list
 				aggr_args aggr_args_list
 				func_as createfunc_opt_list alterfunc_opt_list
@@ -378,6 +381,11 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 				opt_enum_val_list enum_val_list table_func_column_list
 				create_generic_options alter_generic_options
 				relation_expr_list dostmt_opt_list
+				transform_element_list transform_type_list
+
+%type <list>	group_by_list
+%type <node>	group_by_item empty_grouping_set rollup_clause cube_clause
+%type <node>	grouping_sets_clause
 
 %type <list>	opt_fdw_options fdw_options
 %type <defelt>	fdw_option
@@ -399,7 +407,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <node>	for_locking_item
 %type <list>	for_locking_clause opt_for_locking_clause for_locking_items
 %type <list>	locked_rels_list
-%type <boolean>	opt_all
+%type <boolean>	all_or_distinct
 
 %type <node>	join_outer join_qual
 %type <jtype>	join_type
@@ -431,6 +439,8 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <defelt>	SeqOptElem
 
 %type <istmt>	insert_rest
+%type <infer>	opt_conf_expr
+%type <onconflict> opt_on_conflict
 
 %type <vsetstmt> generic_set set_rest set_rest_more generic_reset reset_rest
 				 SetResetClause FunctionSetResetClause
@@ -447,7 +457,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <list>	ExclusionConstraintList ExclusionConstraintElem
 %type <list>	func_arg_list
 %type <node>	func_arg_expr
-%type <list>	row type_list array_expr_list
+%type <list>	row explicit_row implicit_row type_list array_expr_list
 %type <node>	case_expr case_arg when_clause case_default
 %type <list>	when_clause_list
 %type <ival>	sub_type
@@ -463,6 +473,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <range>	relation_expr
 %type <range>	relation_expr_opt_alias
 %type <target>	target_el single_set_clause set_target insert_column_item
+%type <node>	relation_expr_tablesample tablesample_clause opt_repeatable_clause
 
 %type <str>		generic_option_name
 %type <node>	generic_option_arg
@@ -472,6 +483,10 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <node>	explain_option_arg
 %type <defelt>	explain_option_elem
 %type <list>	explain_option_list
+
+%type <ival>	reindex_target_type reindex_target_multitable
+%type <ival>	reindex_option_list reindex_option_elem
+
 %type <node>	copy_generic_opt_arg copy_generic_opt_arg_list_item
 %type <defelt>	copy_generic_opt_elem
 %type <list>	copy_generic_opt_list copy_generic_opt_arg_list
@@ -576,9 +591,9 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	CACHE CALLED CASCADE CASCADED CASE CAST CATALOG_P CHAIN CHAR_P
 	CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLEAN CLOSE
 	CLUSTER COALESCE COLLATE COLLATION COLUMN COMMENT COMMENTS COMMIT
-	COMMITTED CONCURRENTLY CONFIGURATION CONNECTION CONSTRAINT CONSTRAINTS
+	COMMITTED CONCURRENTLY CONFIGURATION CONFLICT CONNECTION CONSTRAINT CONSTRAINTS
 	CONTENT_P CONTINUE_P CONVERSION_P COORDINATOR COPY COST CREATE
-	CROSS CSV CURRENT_P
+	CROSS CSV CUBE CURRENT_P
 	CURRENT_CATALOG CURRENT_DATE CURRENT_ROLE CURRENT_SCHEMA
 	CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR CYCLE
 
@@ -596,7 +611,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	FALSE_P FAMILY FETCH FILTER FIRST_P FLOAT_P FOLLOWING FOR
 	FORCE FOREIGN FORWARD FREEZE FROM FULL FUNCTION FUNCTIONS
 
-	GLOBAL GRANT GRANTED GREATEST GROUP_P
+	GLOBAL GRANT GRANTED GREATEST GROUP_P GROUPING
 
 	HANDLER HAVING HEADER_P HOLD HOUR_P
 
@@ -632,17 +647,17 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 
 	RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFRESH REINDEX
 	RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
-	RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK
+	RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
 	ROW ROWS RULE
 
 	SAVEPOINT SCHEMA SCROLL SEARCH SECOND_P SECURITY SELECT SEQUENCE SEQUENCES
-	SERIALIZABLE SERVER SESSION SESSION_USER SET SETOF SHARE
-	SHOW SIMILAR SIMPLE SKIP SMALLINT SNAPSHOT SOME STABLE STANDALONE_P START
+	SERIALIZABLE SERVER SESSION SESSION_USER SET SETS SETOF SHARE SHOW
+	SIMILAR SIMPLE SKIP SMALLINT SNAPSHOT SOME SQL_P STABLE STANDALONE_P START
 	STATEMENT STATISTICS STDIN STDOUT STORAGE STRICT_P STRIP_P SUBSTRING
 	SYMMETRIC SYSID SYSTEM_P
 
-	TABLE TABLES TABLESPACE TEMP TEMPLATE TEMPORARY TEXT_P THEN TIME TIMESTAMP
-	TO TRAILING TRANSACTION TREAT TRIGGER TRIM TRUE_P
+	TABLE TABLES TABLESAMPLE TABLESPACE TEMP TEMPLATE TEMPORARY TEXT_P THEN
+	TIME TIMESTAMP TO TRAILING TRANSACTION TRANSFORM TREAT TRIGGER TRIM TRUE_P
 	TRUNCATE TRUSTED TYPE_P TYPES_P
 
 	UNBOUNDED UNCOMMITTED UNENCRYPTED UNION UNIQUE UNKNOWN UNLISTEN UNLOGGED
@@ -697,6 +712,11 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
  * and for NULL so that it can follow b_expr in ColQualList without creating
  * postfix-operator problems.
  *
+ * To support CUBE and ROLLUP in GROUP BY without reserving them, we give them
+ * an explicit priority lower than '(', so that a rule with CUBE '(' will shift
+ * rather than reducing a conflicting rule that takes CUBE as a function name.
+ * Using the same precedence as IDENT seems right for the reasons given above.
+ *
  * The frame_bound productions UNBOUNDED PRECEDING and UNBOUNDED FOLLOWING
  * are even messier: since UNBOUNDED is an unreserved keyword (per spec!),
  * there is no principled way to distinguish these from the productions
@@ -707,7 +727,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
  * blame any funny behavior of UNBOUNDED on the SQL standard, though.
  */
 %nonassoc	UNBOUNDED		/* ideally should have same precedence as IDENT */
-%nonassoc	IDENT NULL_P PARTITION RANGE ROWS PRECEDING FOLLOWING
+%nonassoc	IDENT NULL_P PARTITION RANGE ROWS PRECEDING FOLLOWING CUBE ROLLUP
 %left		Op OPERATOR		/* multi-character ops and user-defined operators */
 %left		'+' '-'
 %left		'*' '/' '%'
@@ -821,6 +841,7 @@ stmt :
 			| CreateSeqStmt
 			| CreateStmt
 			| CreateTableSpaceStmt
+			| CreateTransformStmt
 			| CreateTrigStmt
 			| CreateEventTrigStmt
 			| CreateRoleStmt
@@ -848,6 +869,7 @@ stmt :
 			| DropRuleStmt
 			| DropStmt
 			| DropTableSpaceStmt
+			| DropTransformStmt
 			| DropTrigStmt
 			| DropRoleStmt
 			| DropUserStmt
@@ -4313,6 +4335,16 @@ AlterExtensionContentsStmt:
 					n->objname = list_make1(makeString($6));
 					$$ = (Node *)n;
 				}
+			| ALTER EXTENSION name add_drop TRANSFORM FOR Typename LANGUAGE name
+				{
+					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
+					n->extname = $3;
+					n->action = $4;
+					n->objtype = OBJECT_TRANSFORM;
+					n->objname = list_make1($7);
+					n->objargs = list_make1(makeString($9));
+					$$ = (Node *)n;
+				}
 			| ALTER EXTENSION name add_drop TYPE_P Typename
 				{
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -5966,6 +5998,15 @@ CommentStmt:
 					n->comment = $6;
 					$$ = (Node *) n;
 				}
+			| COMMENT ON TRANSFORM FOR Typename LANGUAGE name IS comment_text
+				{
+					CommentStmt *n = makeNode(CommentStmt);
+					n->objtype = OBJECT_TRANSFORM;
+					n->objname = list_make1($5);
+					n->objargs = list_make1(makeString($7));
+					n->comment = $9;
+					$$ = (Node *) n;
+				}
 			| COMMENT ON TRIGGER name ON any_name IS comment_text
 				{
 					CommentStmt *n = makeNode(CommentStmt);
@@ -7245,6 +7286,10 @@ createfunc_opt_item:
 				{
 					$$ = makeDefElem("language", (Node *)makeString($2));
 				}
+			| TRANSFORM transform_type_list
+				{
+					$$ = makeDefElem("transform", (Node *)$2);
+				}
 			| WINDOW
 				{
 					$$ = makeDefElem("window", (Node *)makeInteger(TRUE));
@@ -7262,6 +7307,11 @@ func_as:	Sconst						{ $$ = list_make1(makeString($1)); }
 				}
 		;
 
+transform_type_list:
+			FOR TYPE_P Typename { $$ = list_make1($3); }
+			| transform_type_list ',' FOR TYPE_P Typename { $$ = lappend($1, $5); }
+		;
+
 opt_definition:
 			WITH definition							{ $$ = $2; }
 			| /*EMPTY*/								{ $$ = NIL; }
@@ -7529,54 +7579,115 @@ opt_if_exists: IF_P EXISTS						{ $$ = TRUE; }
 
 /*****************************************************************************
  *
- *		QUERY:
+ *		CREATE TRANSFORM / DROP TRANSFORM
  *
- *		REINDEX type <name>
  *****************************************************************************/
 
-ReindexStmt:
-			REINDEX INDEX qualified_name
+CreateTransformStmt: CREATE opt_or_replace TRANSFORM FOR Typename LANGUAGE name '(' transform_element_list ')'
 				{
-					ReindexStmt *n = makeNode(ReindexStmt);
-					n->kind = REINDEX_OBJECT_INDEX;
-					n->relation = $3;
-					n->name = NULL;
+					CreateTransformStmt *n = makeNode(CreateTransformStmt);
+					n->replace = $2;
+					n->type_name = $5;
+					n->lang = $7;
+					n->fromsql = linitial($9);
+					n->tosql = lsecond($9);
+					$$ = (Node *)n;
+				}
+		;
+
+transform_element_list: FROM SQL_P WITH FUNCTION function_with_argtypes ',' TO SQL_P WITH FUNCTION function_with_argtypes
+				{
+					$$ = list_make2($5, $11);
+				}
+				| TO SQL_P WITH FUNCTION function_with_argtypes ',' FROM SQL_P WITH FUNCTION function_with_argtypes
+				{
+					$$ = list_make2($11, $5);
+				}
+				| FROM SQL_P WITH FUNCTION function_with_argtypes
+				{
+					$$ = list_make2($5, NULL);
+				}
+				| TO SQL_P WITH FUNCTION function_with_argtypes
+				{
+					$$ = list_make2(NULL, $5);
+				}
+		;
+
+
+DropTransformStmt: DROP TRANSFORM opt_if_exists FOR Typename LANGUAGE name opt_drop_behavior
+				{
+					DropStmt *n = makeNode(DropStmt);
+					n->removeType = OBJECT_TRANSFORM;
+					n->objects = list_make1(list_make1($5));
+					n->arguments = list_make1(list_make1(makeString($7)));
+					n->behavior = $8;
+					n->missing_ok = $3;
 					$$ = (Node *)n;
 				}
-			| REINDEX TABLE qualified_name
+		;
+
+
+/*****************************************************************************
+ *
+ *		QUERY:
+ *
+ *		REINDEX [ (options) ] type <name>
+ *****************************************************************************/
+
+ReindexStmt:
+			REINDEX reindex_target_type qualified_name
 				{
 					ReindexStmt *n = makeNode(ReindexStmt);
-					n->kind = REINDEX_OBJECT_TABLE;
+					n->kind = $2;
 					n->relation = $3;
 					n->name = NULL;
+					n->options = 0;
 					$$ = (Node *)n;
 				}
-			| REINDEX SCHEMA name
+			| REINDEX reindex_target_multitable name
 				{
 					ReindexStmt *n = makeNode(ReindexStmt);
-					n->kind = REINDEX_OBJECT_SCHEMA;
+					n->kind = $2;
 					n->name = $3;
 					n->relation = NULL;
+					n->options = 0;
 					$$ = (Node *)n;
 				}
-			| REINDEX SYSTEM_P name
+			| REINDEX '(' reindex_option_list ')' reindex_target_type qualified_name
 				{
 					ReindexStmt *n = makeNode(ReindexStmt);
-					n->kind = REINDEX_OBJECT_SYSTEM;
-					n->name = $3;
-					n->relation = NULL;
+					n->kind = $5;
+					n->relation = $6;
+					n->name = NULL;
+					n->options = $3;
 					$$ = (Node *)n;
 				}
-			| REINDEX DATABASE name
+			| REINDEX '(' reindex_option_list ')' reindex_target_multitable name
 				{
 					ReindexStmt *n = makeNode(ReindexStmt);
-					n->kind = REINDEX_OBJECT_DATABASE;
-					n->name = $3;
+					n->kind = $5;
+					n->name = $6;
 					n->relation = NULL;
+					n->options = $3;
 					$$ = (Node *)n;
 				}
 		;
-
+reindex_target_type:
+			INDEX					{ $$ = REINDEX_OBJECT_INDEX; }
+			| TABLE					{ $$ = REINDEX_OBJECT_TABLE; }
+		;
+reindex_target_multitable:
+			SCHEMA					{ $$ = REINDEX_OBJECT_SCHEMA; }
+			| SYSTEM_P				{ $$ = REINDEX_OBJECT_SYSTEM; }
+			| DATABASE				{ $$ = REINDEX_OBJECT_DATABASE; }
+		;
+reindex_option_list:
+			reindex_option_elem								{ $$ = $1; }
+			| reindex_option_list ',' reindex_option_elem	{ $$ = $1 | $3; }
+		;
+reindex_option_elem:
+			VERBOSE	{ $$ = REINDEXOPT_VERBOSE; }
+		;
 
 /*****************************************************************************
  *
@@ -9142,6 +9253,7 @@ AlterTSConfigurationStmt:
 			ALTER TEXT_P SEARCH CONFIGURATION any_name ADD_P MAPPING FOR name_list any_with any_name_list
 				{
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->kind = ALTER_TSCONFIG_ADD_MAPPING;
 					n->cfgname = $5;
 					n->tokentype = $9;
 					n->dicts = $11;
@@ -9152,6 +9264,7 @@ AlterTSConfigurationStmt:
 			| ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list any_with any_name_list
 				{
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->kind = ALTER_TSCONFIG_ALTER_MAPPING_FOR_TOKEN;
 					n->cfgname = $5;
 					n->tokentype = $9;
 					n->dicts = $11;
@@ -9162,6 +9275,7 @@ AlterTSConfigurationStmt:
 			| ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING REPLACE any_name any_with any_name
 				{
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->kind = ALTER_TSCONFIG_REPLACE_DICT;
 					n->cfgname = $5;
 					n->tokentype = NIL;
 					n->dicts = list_make2($9,$11);
@@ -9172,6 +9286,7 @@ AlterTSConfigurationStmt:
 			| ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list REPLACE any_name any_with any_name
 				{
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->kind = ALTER_TSCONFIG_REPLACE_DICT_FOR_TOKEN;
 					n->cfgname = $5;
 					n->tokentype = $9;
 					n->dicts = list_make2($11,$13);
@@ -9182,6 +9297,7 @@ AlterTSConfigurationStmt:
 			| ALTER TEXT_P SEARCH CONFIGURATION any_name DROP MAPPING FOR name_list
 				{
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->kind = ALTER_TSCONFIG_DROP_MAPPING;
 					n->cfgname = $5;
 					n->tokentype = $9;
 					n->missing_ok = false;
@@ -9190,6 +9306,7 @@ AlterTSConfigurationStmt:
 			| ALTER TEXT_P SEARCH CONFIGURATION any_name DROP MAPPING IF_P EXISTS FOR name_list
 				{
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->kind = ALTER_TSCONFIG_DROP_MAPPING;
 					n->cfgname = $5;
 					n->tokentype = $11;
 					n->missing_ok = true;
@@ -9824,15 +9941,35 @@ DeallocateStmt: DEALLOCATE name
  *****************************************************************************/
 
 InsertStmt:
-			opt_with_clause INSERT INTO qualified_name insert_rest returning_clause
+			opt_with_clause INSERT INTO insert_target insert_rest
+			opt_on_conflict returning_clause
 				{
 					$5->relation = $4;
-					$5->returningList = $6;
+					$5->onConflictClause = $6;
+					$5->returningList = $7;
 					$5->withClause = $1;
 					$$ = (Node *) $5;
 				}
 		;
 
+/*
+ * Can't easily make AS optional here, because VALUES in insert_rest would
+ * have a shift/reduce conflict with VALUES as an optional alias.  We could
+ * easily allow unreserved_keywords as optional aliases, but that'd be an odd
+ * divergence from other places.  So just require AS for now.
+ */
+insert_target:
+			qualified_name
+				{
+					$$ = $1;
+				}
+			| qualified_name AS ColId
+				{
+					$1->alias = makeAlias($3, NIL);
+					$$ = $1;
+				}
+		;
+
 insert_rest:
 			SelectStmt
 				{
@@ -9872,6 +10009,56 @@ insert_column_item:
 				}
 		;
 
+opt_on_conflict:
+			ON CONFLICT opt_conf_expr DO UPDATE SET set_clause_list	where_clause
+				{
+					$$ = makeNode(OnConflictClause);
+					$$->action = ONCONFLICT_UPDATE;
+					$$->infer = $3;
+					$$->targetList = $7;
+					$$->whereClause = $8;
+					$$->location = @1;
+				}
+			|
+			ON CONFLICT opt_conf_expr DO NOTHING
+				{
+					$$ = makeNode(OnConflictClause);
+					$$->action = ONCONFLICT_NOTHING;
+					$$->infer = $3;
+					$$->targetList = NIL;
+					$$->whereClause = NULL;
+					$$->location = @1;
+				}
+			| /*EMPTY*/
+				{
+					$$ = NULL;
+				}
+		;
+
+opt_conf_expr:
+			'(' index_params ')' where_clause
+				{
+					$$ = makeNode(InferClause);
+					$$->indexElems = $2;
+					$$->whereClause = $4;
+					$$->conname = NULL;
+					$$->location = @1;
+				}
+			|
+			ON CONSTRAINT name
+				{
+					$$ = makeNode(InferClause);
+					$$->indexElems = NIL;
+					$$->whereClause = NULL;
+					$$->conname = $3;
+					$$->location = @1;
+				}
+			| /*EMPTY*/
+				{
+					$$ = NULL;
+				}
+		;
+
 returning_clause:
 			RETURNING target_list		{ $$ = $2; }
 			| /* EMPTY */				{ $$ = NIL; }
@@ -10258,7 +10445,21 @@ select_clause:
  * However, this is not checked by the grammar; parse analysis must check it.
  */
 simple_select:
-			SELECT opt_distinct opt_target_list
+			SELECT opt_all_clause opt_target_list
+			into_clause from_clause where_clause
+			group_clause having_clause window_clause
+				{
+					SelectStmt *n = makeNode(SelectStmt);
+					n->targetList = $3;
+					n->intoClause = $4;
+					n->fromClause = $5;
+					n->whereClause = $6;
+					n->groupClause = $7;
+					n->havingClause = $8;
+					n->windowClause = $9;
+					$$ = (Node *)n;
+				}
+			| SELECT distinct_clause target_list
 			into_clause from_clause where_clause
 			group_clause having_clause window_clause
 				{
@@ -10293,15 +10494,15 @@ simple_select:
 					n->fromClause = list_make1($2);
 					$$ = (Node *)n;
 				}
-			| select_clause UNION opt_all select_clause
+			| select_clause UNION all_or_distinct select_clause
 				{
 					$$ = makeSetOp(SETOP_UNION, $3, $1, $4);
 				}
-			| select_clause INTERSECT opt_all select_clause
+			| select_clause INTERSECT all_or_distinct select_clause
 				{
 					$$ = makeSetOp(SETOP_INTERSECT, $3, $1, $4);
 				}
-			| select_clause EXCEPT opt_all select_clause
+			| select_clause EXCEPT all_or_distinct select_clause
 				{
 					$$ = makeSetOp(SETOP_EXCEPT, $3, $1, $4);
 				}
@@ -10440,7 +10641,8 @@ opt_table:	TABLE									{}
 			| /*EMPTY*/								{}
 		;
 
-opt_all:	ALL										{ $$ = TRUE; }
+all_or_distinct:
+			ALL										{ $$ = TRUE; }
 			| DISTINCT								{ $$ = FALSE; }
 			| /*EMPTY*/								{ $$ = FALSE; }
 		;
@@ -10448,10 +10650,13 @@ opt_all:	ALL										{ $$ = TRUE; }
 /* We use (NIL) as a placeholder to indicate that all target expressions
  * should be placed in the DISTINCT list during parsetree analysis.
  */
-opt_distinct:
+distinct_clause:
 			DISTINCT								{ $$ = list_make1(NIL); }
 			| DISTINCT ON '(' expr_list ')'			{ $$ = $4; }
-			| ALL									{ $$ = NIL; }
+		;
+
+opt_all_clause:
+			ALL										{ $$ = NIL;}
 			| /*EMPTY*/								{ $$ = NIL; }
 		;
 
@@ -10570,11 +10775,78 @@ first_or_next: FIRST_P								{ $$ = 0; }
 		;
 
 
+/*
+ * This syntax for group_clause tries to follow the spec quite closely.
+ * However, the spec allows only column references, not expressions,
+ * which introduces an ambiguity between implicit row constructors
+ * (a,b) and lists of column references.
+ *
+ * We handle this by using the a_expr production for what the spec calls
+ * <ordinary grouping set>, which in the spec represents either one column
+ * reference or a parenthesized list of column references. Then, we check the
+ * top node of the a_expr to see if it's an implicit RowExpr, and if so, just
+ * grab and use the list, discarding the node. (this is done in parse analysis,
+ * not here)
+ *
+ * (we abuse the row_format field of RowExpr to distinguish implicit and
+ * explicit row constructors; it's debatable if anyone sanely wants to use them
+ * in a group clause, but if they have a reason to, we make it possible.)
+ *
+ * Each item in the group_clause list is either an expression tree or a
+ * GroupingSet node of some type.
+ */
 group_clause:
-			GROUP_P BY expr_list					{ $$ = $3; }
+			GROUP_P BY group_by_list				{ $$ = $3; }
 			| /*EMPTY*/								{ $$ = NIL; }
 		;
 
+group_by_list:
+			group_by_item							{ $$ = list_make1($1); }
+			| group_by_list ',' group_by_item		{ $$ = lappend($1,$3); }
+		;
+
+group_by_item:
+			a_expr									{ $$ = $1; }
+			| empty_grouping_set					{ $$ = $1; }
+			| cube_clause							{ $$ = $1; }
+			| rollup_clause							{ $$ = $1; }
+			| grouping_sets_clause					{ $$ = $1; }
+		;
+
+empty_grouping_set:
+			'(' ')'
+				{
+					$$ = (Node *) makeGroupingSet(GROUPING_SET_EMPTY, NIL, @1);
+				}
+		;
+
+/*
+ * These hacks rely on setting precedence of CUBE and ROLLUP below that of '(',
+ * so that they shift in these rules rather than reducing the conflicting
+ * unreserved_keyword rule.
+ */
+
+rollup_clause:
+			ROLLUP '(' expr_list ')'
+				{
+					$$ = (Node *) makeGroupingSet(GROUPING_SET_ROLLUP, $3, @1);
+				}
+		;
+
+cube_clause:
+			CUBE '(' expr_list ')'
+				{
+					$$ = (Node *) makeGroupingSet(GROUPING_SET_CUBE, $3, @1);
+				}
+		;
+
+grouping_sets_clause:
+			GROUPING SETS '(' group_by_list ')'
+				{
+					$$ = (Node *) makeGroupingSet(GROUPING_SET_SETS, $4, @1);
+				}
+		;
+
 having_clause:
 			HAVING a_expr							{ $$ = $2; }
 			| /*EMPTY*/								{ $$ = NULL; }
@@ -10661,6 +10933,10 @@ table_ref:	relation_expr opt_alias_clause
 					$1->alias = $2;
 					$$ = (Node *) $1;
 				}
+			| relation_expr_tablesample
+				{
+					$$ = (Node *) $1;
+				}
 			| func_table func_alias_clause
 				{
 					RangeFunction *n = (RangeFunction *) $1;
@@ -10986,6 +11262,32 @@ relation_expr_opt_alias: relation_expr					%prec UMINUS
 				}
 		;
 
+
+relation_expr_tablesample: relation_expr opt_alias_clause tablesample_clause
+				{
+					RangeTableSample *n = (RangeTableSample *) $3;
+					n->relation = $1;
+					n->relation->alias = $2;
+					$$ = (Node *) n;
+				}
+		;
+
+tablesample_clause:
+			TABLESAMPLE ColId '(' expr_list ')' opt_repeatable_clause
+				{
+					RangeTableSample *n = makeNode(RangeTableSample);
+					n->method = $2;
+					n->args = $4;
+					n->repeatable = $6;
+					$$ = (Node *) n;
+				}
+		;
+
+opt_repeatable_clause:
+			REPEATABLE '(' a_expr ')'	{ $$ = (Node *) $3; }
+			| /*EMPTY*/					{ $$ = NULL; }
+		;
+
 /*
  * func_table represents a function invocation in a FROM list. It can be
  * a plain function call, like "foo(...)", or a ROWS FROM expression with
@@ -12197,15 +12499,33 @@ c_expr:		columnref								{ $$ = $1; }
 					n->location = @1;
 					$$ = (Node *)n;
 				}
-			| row
+			| explicit_row
+				{
+					RowExpr *r = makeNode(RowExpr);
+					r->args = $1;
+					r->row_typeid = InvalidOid;	/* not analyzed yet */
+					r->colnames = NIL;	/* to be filled in during analysis */
+					r->row_format = COERCE_EXPLICIT_CALL; /* abuse */
+					r->location = @1;
+					$$ = (Node *)r;
+				}
+			| implicit_row
 				{
 					RowExpr *r = makeNode(RowExpr);
 					r->args = $1;
 					r->row_typeid = InvalidOid;	/* not analyzed yet */
 					r->colnames = NIL;	/* to be filled in during analysis */
+					r->row_format = COERCE_IMPLICIT_CAST; /* abuse */
 					r->location = @1;
 					$$ = (Node *)r;
 				}
+			| GROUPING '(' expr_list ')'
+			  {
+				  GroupingFunc *g = makeNode(GroupingFunc);
+				  g->args = $3;
+				  g->location = @1;
+				  $$ = (Node *)g;
+			  }
 		;
 
 func_application: func_name '(' ')'
@@ -12955,6 +13275,13 @@ row:		ROW '(' expr_list ')'					{ $$ = $3; }
 			| '(' expr_list ',' a_expr ')'			{ $$ = lappend($2, $4); }
 		;
 
+explicit_row:	ROW '(' expr_list ')'				{ $$ = $3; }
+			| ROW '(' ')'							{ $$ = NIL; }
+		;
+
+implicit_row:	'(' expr_list ',' a_expr ')'		{ $$ = lappend($2, $4); }
+		;
+
 sub_type:	ANY										{ $$ = ANY_SUBLINK; }
 			| SOME									{ $$ = ANY_SUBLINK; }
 			| ALL									{ $$ = ALL_SUBLINK; }
@@ -13604,13 +13931,13 @@ RoleId:		RoleSpec
 						case ROLESPEC_SESSION_USER:
 							ereport(ERROR,
 									(errcode(ERRCODE_RESERVED_NAME),
-									 errmsg("%s cannot be used as a role name",
+									 errmsg("%s cannot be used as a role name here",
 											"SESSION_USER"),
 									 parser_errposition(@1)));
 						case ROLESPEC_CURRENT_USER:
 							ereport(ERROR,
 									(errcode(ERRCODE_RESERVED_NAME),
-									 errmsg("%s cannot be used as a role name",
+									 errmsg("%s cannot be used as a role name here",
 											"CURRENT_USER"),
 									 parser_errposition(@1)));
 					}
@@ -13760,6 +14087,7 @@ unreserved_keyword:
 			| COMMIT
 			| COMMITTED
 			| CONFIGURATION
+			| CONFLICT
 			| CONNECTION
 			| CONSTRAINTS
 			| CONTENT_P
@@ -13769,6 +14097,7 @@ unreserved_keyword:
 			| COPY
 			| COST
 			| CSV
+			| CUBE
 			| CURRENT_P
 			| CURSOR
 			| CYCLE
@@ -13928,6 +14257,7 @@ unreserved_keyword:
 			| REVOKE
 			| ROLE
 			| ROLLBACK
+			| ROLLUP
 			| ROWS
 			| RULE
 			| SAVEPOINT
@@ -13942,11 +14272,13 @@ unreserved_keyword:
 			| SERVER
 			| SESSION
 			| SET
+			| SETS
 			| SHARE
 			| SHOW
 			| SIMPLE
 			| SKIP
 			| SNAPSHOT
+			| SQL_P
 			| STABLE
 			| STANDALONE_P
 			| START
@@ -13966,6 +14298,7 @@ unreserved_keyword:
 			| TEMPORARY
 			| TEXT_P
 			| TRANSACTION
+			| TRANSFORM
 			| TRIGGER
 			| TRUNCATE
 			| TRUSTED
@@ -14028,6 +14361,7 @@ col_name_keyword:
 			| EXTRACT
 			| FLOAT_P
 			| GREATEST
+			| GROUPING
 			| INOUT
 			| INT_P
 			| INTEGER
@@ -14096,6 +14430,7 @@ type_func_name_keyword:
 			| OVERLAPS
 			| RIGHT
 			| SIMILAR
+			| TABLESAMPLE
 			| VERBOSE
 		;
 
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 619c7c4117..68f870f488 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -53,7 +53,9 @@ typedef struct
 {
 	ParseState *pstate;
 	Query	   *qry;
+	PlannerInfo *root;
 	List	   *groupClauses;
+	List	   *groupClauseCommonVars;
 	bool		have_non_var_grouping;
 	List	  **func_grouped_rels;
 	int			sublevels_up;
@@ -67,11 +69,18 @@ static int check_agg_arguments(ParseState *pstate,
 static bool check_agg_arguments_walker(Node *node,
 						   check_agg_arguments_context *context);
 static void check_ungrouped_columns(Node *node, ParseState *pstate, Query *qry,
-						List *groupClauses, bool have_non_var_grouping,
+						List *groupClauses, List *groupClauseVars,
+						bool have_non_var_grouping,
 						List **func_grouped_rels);
 static bool check_ungrouped_columns_walker(Node *node,
 							   check_ungrouped_columns_context *context);
-
+static void finalize_grouping_exprs(Node *node, ParseState *pstate, Query *qry,
+						List *groupClauses, PlannerInfo *root,
+						bool have_non_var_grouping);
+static bool finalize_grouping_exprs_walker(Node *node,
+							   check_ungrouped_columns_context *context);
+static void check_agglevels_and_constraints(ParseState *pstate, Node *expr);
+static List *expand_groupingset_node(GroupingSet *gs);
 
 /*
  * transformAggregateCall -
@@ -107,7 +116,6 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 	List	   *tdistinct = NIL;
 	AttrNumber	attno = 1;
 	int			save_next_resno;
-	int			min_varlevel;
 	ListCell   *lc;
 #ifdef PGXC
 #ifndef XCP
@@ -231,15 +239,97 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 	agg->aggorder = torder;
 	agg->aggdistinct = tdistinct;
 
+	check_agglevels_and_constraints(pstate, (Node *) agg);
+}
+
+/*
+ * transformGroupingFunc
+ *		Transform a GROUPING expression
+ *
+ * GROUPING() behaves very like an aggregate.  Processing of levels and nesting
+ * is done as for aggregates.  We set p_hasAggs for these expressions too.
+ */
+Node *
+transformGroupingFunc(ParseState *pstate, GroupingFunc *p)
+{
+	ListCell   *lc;
+	List	   *args = p->args;
+	List	   *result_list = NIL;
+	GroupingFunc *result = makeNode(GroupingFunc);
+
+	if (list_length(args) > 31)
+		ereport(ERROR,
+				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
+				 errmsg("GROUPING must have fewer than 32 arguments"),
+				 parser_errposition(pstate, p->location)));
+
+	foreach(lc, args)
+	{
+		Node	   *current_result;
+
+		current_result = transformExpr(pstate, (Node *) lfirst(lc), pstate->p_expr_kind);
+
+		/* acceptability of expressions is checked later */
+
+		result_list = lappend(result_list, current_result);
+	}
+
+	result->args = result_list;
+	result->location = p->location;
+
+	check_agglevels_and_constraints(pstate, (Node *) result);
+
+	return (Node *) result;
+}
+
+/*
+ * Aggregate functions and grouping operations (which are combined in the spec
+ * as <set function specification>) are very similar with regard to level and
+ * nesting restrictions (though we allow a lot more things than the spec does).
+ * Centralise those restrictions here.
+ */
+static void
+check_agglevels_and_constraints(ParseState *pstate, Node *expr)
+{
+	List	   *directargs = NIL;
+	List	   *args = NIL;
+	Expr	   *filter = NULL;
+	int			min_varlevel;
+	int			location = -1;
+	Index	   *p_levelsup;
+	const char *err;
+	bool		errkind;
+	bool		isAgg = IsA(expr, Aggref);
+
+	if (isAgg)
+	{
+		Aggref	   *agg = (Aggref *) expr;
+
+		directargs = agg->aggdirectargs;
+		args = agg->args;
+		filter = agg->aggfilter;
+		location = agg->location;
+		p_levelsup = &agg->agglevelsup;
+	}
+	else
+	{
+		GroupingFunc *grp = (GroupingFunc *) expr;
+
+		args = grp->args;
+		location = grp->location;
+		p_levelsup = &grp->agglevelsup;
+	}
+
 	/*
 	 * Check the arguments to compute the aggregate's level and detect
 	 * improper nesting.
 	 */
 	min_varlevel = check_agg_arguments(pstate,
-									   agg->aggdirectargs,
-									   agg->args,
-									   agg->aggfilter);
-	agg->agglevelsup = min_varlevel;
+									   directargs,
+									   args,
+									   filter);
+
+	*p_levelsup = min_varlevel;
 
 	/* Mark the correct pstate level as having aggregates */
 	while (min_varlevel-- > 0)
@@ -288,20 +378,40 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 			Assert(false);		/* can't happen */
 			break;
 		case EXPR_KIND_OTHER:
-			/* Accept aggregate here; caller must throw error if wanted */
+
+			/*
+			 * Accept aggregate/grouping here; caller must throw error if
+			 * wanted
+			 */
 			break;
 		case EXPR_KIND_JOIN_ON:
 		case EXPR_KIND_JOIN_USING:
-			err = _("aggregate functions are not allowed in JOIN conditions");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in JOIN conditions");
+			else
+				err = _("grouping operations are not allowed in JOIN conditions");
+
 			break;
 		case EXPR_KIND_FROM_SUBSELECT:
 			/* Should only be possible in a LATERAL subquery */
 			Assert(pstate->p_lateral_active);
-			/* Aggregate scope rules make it worth being explicit here */
-			err = _("aggregate functions are not allowed in FROM clause of their own query level");
+
+			/*
+			 * Aggregate/grouping scope rules make it worth being explicit
+			 * here
+			 */
+			if (isAgg)
+				err = _("aggregate functions are not allowed in FROM clause of their own query level");
+			else
+				err = _("grouping operations are not allowed in FROM clause of their own query level");
+
 			break;
 		case EXPR_KIND_FROM_FUNCTION:
-			err = _("aggregate functions are not allowed in functions in FROM");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in functions in FROM");
+			else
+				err = _("grouping operations are not allowed in functions in FROM");
+
 			break;
 		case EXPR_KIND_WHERE:
 			errkind = true;
@@ -319,10 +429,18 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 			/* okay */
 			break;
 		case EXPR_KIND_WINDOW_FRAME_RANGE:
-			err = _("aggregate functions are not allowed in window RANGE");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in window RANGE");
+			else
+				err = _("grouping operations are not allowed in window RANGE");
+
 			break;
 		case EXPR_KIND_WINDOW_FRAME_ROWS:
-			err = _("aggregate functions are not allowed in window ROWS");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in window ROWS");
+			else
+				err = _("grouping operations are not allowed in window ROWS");
+
 			break;
 		case EXPR_KIND_SELECT_TARGET:
 			/* okay */
@@ -353,26 +471,55 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 			break;
 		case EXPR_KIND_CHECK_CONSTRAINT:
 		case EXPR_KIND_DOMAIN_CHECK:
-			err = _("aggregate functions are not allowed in check constraints");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in check constraints");
+			else
+				err = _("grouping operations are not allowed in check constraints");
+
 			break;
 		case EXPR_KIND_COLUMN_DEFAULT:
 		case EXPR_KIND_FUNCTION_DEFAULT:
-			err = _("aggregate functions are not allowed in DEFAULT expressions");
+
+			if (isAgg)
+				err = _("aggregate functions are not allowed in DEFAULT expressions");
+			else
+				err = _("grouping operations are not allowed in DEFAULT expressions");
+
 			break;
 		case EXPR_KIND_INDEX_EXPRESSION:
-			err = _("aggregate functions are not allowed in index expressions");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in index expressions");
+			else
+				err = _("grouping operations are not allowed in index expressions");
+
 			break;
 		case EXPR_KIND_INDEX_PREDICATE:
-			err = _("aggregate functions are not allowed in index predicates");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in index predicates");
+			else
+				err = _("grouping operations are not allowed in index predicates");
+
 			break;
 		case EXPR_KIND_ALTER_COL_TRANSFORM:
-			err = _("aggregate functions are not allowed in transform expressions");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in transform expressions");
+			else
+				err = _("grouping operations are not allowed in transform expressions");
+
 			break;
 		case EXPR_KIND_EXECUTE_PARAMETER:
-			err = _("aggregate functions are not allowed in EXECUTE parameters");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in EXECUTE parameters");
+			else
+				err = _("grouping operations are not allowed in EXECUTE parameters");
+
 			break;
 		case EXPR_KIND_TRIGGER_WHEN:
-			err = _("aggregate functions are not allowed in trigger WHEN conditions");
+			if (isAgg)
+				err = _("aggregate functions are not allowed in trigger WHEN conditions");
+			else
+				err = _("grouping operations are not allowed in trigger WHEN conditions");
+
 			break;
 
 			/*
@@ -383,18 +530,28 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 			 * which is sane anyway.
 			 */
 	}
+
 	if (err)
 		ereport(ERROR,
 				(errcode(ERRCODE_GROUPING_ERROR),
 				 errmsg_internal("%s", err),
-				 parser_errposition(pstate, agg->location)));
+				 parser_errposition(pstate, location)));
+
 	if (errkind)
+	{
+		if (isAgg)
+			/* translator: %s is name of a SQL construct, eg GROUP BY */
+			err = _("aggregate functions are not allowed in %s");
+		else
+			/* translator: %s is name of a SQL construct, eg GROUP BY */
+			err = _("grouping operations are not allowed in %s");
+
 		ereport(ERROR,
 				(errcode(ERRCODE_GROUPING_ERROR),
-		/* translator: %s is name of a SQL construct, eg GROUP BY */
-				 errmsg("aggregate functions are not allowed in %s",
-						ParseExprKindName(pstate->p_expr_kind)),
-				 parser_errposition(pstate, agg->location)));
+				 errmsg_internal(err,
+								 ParseExprKindName(pstate->p_expr_kind)),
+				 parser_errposition(pstate, location)));
+	}
 }
 
 /*
@@ -507,7 +664,6 @@ check_agg_arguments(ParseState *pstate,
 									 locate_agg_of_level((Node *) directargs,
 													context.min_agglevel))));
 	}
-
 	return agglevel;
 }
 
@@ -548,6 +704,21 @@ check_agg_arguments_walker(Node *node,
 		/* no need to examine args of the inner aggregate */
 		return false;
 	}
+	if (IsA(node, GroupingFunc))
+	{
+		int			agglevelsup = ((GroupingFunc *) node)->agglevelsup;
+
+		/* convert levelsup to frame of reference of original query */
+		agglevelsup -= context->sublevels_up;
+		/* ignore local aggs of subqueries */
+		if (agglevelsup >= 0)
+		{
+			if (context->min_agglevel < 0 ||
+				context->min_agglevel > agglevelsup)
+				context->min_agglevel = agglevelsup;
+		}
+		/* Continue and descend into subtree */
+	}
 	/* We can throw error on sight for a window function */
 	if (IsA(node, WindowFunc))
 		ereport(ERROR,
@@ -568,6 +739,7 @@ check_agg_arguments_walker(Node *node,
 		context->sublevels_up--;
 		return result;
 	}
+
 	return expression_tree_walker(node,
 								  check_agg_arguments_walker,
 								  (void *) context);
@@ -811,17 +983,66 @@ transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc,
 void
 parseCheckAggregates(ParseState *pstate, Query *qry)
 {
+	List	   *gset_common = NIL;
 	List	   *groupClauses = NIL;
+	List	   *groupClauseCommonVars = NIL;
 	bool		have_non_var_grouping;
 	List	   *func_grouped_rels = NIL;
 	ListCell   *l;
 	bool		hasJoinRTEs;
 	bool		hasSelfRefRTEs;
-	PlannerInfo *root;
+	PlannerInfo *root = NULL;
 	Node	   *clause;
 
 	/* This should only be called if we found aggregates or grouping */
-	Assert(pstate->p_hasAggs || qry->groupClause || qry->havingQual);
+	Assert(pstate->p_hasAggs || qry->groupClause || qry->havingQual || qry->groupingSets);
+
+	/*
+	 * If we have grouping sets, expand them and find the intersection of all
+	 * sets.
+	 */
+	if (qry->groupingSets)
+	{
+		/*
+		 * The limit of 4096 is arbitrary and exists simply to avoid resource
+		 * issues from pathological constructs.
+		 */
+		List	   *gsets = expand_grouping_sets(qry->groupingSets, 4096);
+
+		if (!gsets)
+			ereport(ERROR,
+					(errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
+					 errmsg("too many grouping sets present (max 4096)"),
+					 parser_errposition(pstate,
+										qry->groupClause
+									? exprLocation((Node *) qry->groupClause)
+							   : exprLocation((Node *) qry->groupingSets))));
+
+		/*
+		 * The intersection will often be empty, so help things along by
+		 * seeding the intersect with the smallest set.
+		 */
+		gset_common = linitial(gsets);
+
+		if (gset_common)
+		{
+			for_each_cell(l, lnext(list_head(gsets)))
+			{
+				gset_common = list_intersection_int(gset_common, lfirst(l));
+				if (!gset_common)
+					break;
+			}
+		}
+
+		/*
+		 * If there was only one grouping set in the expansion, AND if the
+		 * groupClause is non-empty (meaning that the grouping set is not
+		 * empty either), then we can ditch the grouping set and pretend we
+		 * just had a normal GROUP BY.
+		 */
+		if (list_length(gsets) == 1 && qry->groupClause)
+			qry->groupingSets = NIL;
+	}
 
 	/*
 	 * Scan the range table to see if there are JOIN or self-reference CTE
@@ -841,15 +1062,19 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
 	/*
 	 * Build a list of the acceptable GROUP BY expressions for use by
 	 * check_ungrouped_columns().
+	 *
+	 * We get the TLE, not just the expr, because GROUPING wants to know the
+	 * sortgroupref.
 	 */
 	foreach(l, qry->groupClause)
 	{
 		SortGroupClause *grpcl = (SortGroupClause *) lfirst(l);
-		Node	   *expr;
+		TargetEntry *expr;
 
-		expr = get_sortgroupclause_expr(grpcl, qry->targetList);
+		expr = get_sortgroupclause_tle(grpcl, qry->targetList);
 		if (expr == NULL)
 			continue;			/* probably cannot happen */
+
 		groupClauses = lcons(expr, groupClauses);
 	}
 
@@ -872,21 +1097,29 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
 		groupClauses = (List *) flatten_join_alias_vars(root,
 													  (Node *) groupClauses);
 	}
-	else
-		root = NULL;			/* keep compiler quiet */
 
 	/*
 	 * Detect whether any of the grouping expressions aren't simple Vars; if
 	 * they're all Vars then we don't have to work so hard in the recursive
 	 * scans.  (Note we have to flatten aliases before this.)
+	 *
+	 * Track Vars that are included in all grouping sets separately in
+	 * groupClauseCommonVars, since these are the only ones we can use to
+	 * check for functional dependencies.
 	 */
 	have_non_var_grouping = false;
 	foreach(l, groupClauses)
 	{
-		if (!IsA((Node *) lfirst(l), Var))
+		TargetEntry *tle = lfirst(l);
+
+		if (!IsA(tle->expr, Var))
 		{
 			have_non_var_grouping = true;
-			break;
+		}
+		else if (!qry->groupingSets ||
+				 list_member_int(gset_common, tle->ressortgroupref))
+		{
+			groupClauseCommonVars = lappend(groupClauseCommonVars, tle->expr);
 		}
 	}
 
@@ -897,19 +1130,30 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
 	 * this will also find ungrouped variables that came from ORDER BY and
 	 * WINDOW clauses.  For that matter, it's also going to examine the
 	 * grouping expressions themselves --- but they'll all pass the test ...
+	 *
+	 * We also finalize GROUPING expressions, but for that we need to traverse
+	 * the original (unflattened) clause in order to modify nodes.
 	 */
 	clause = (Node *) qry->targetList;
+	finalize_grouping_exprs(clause, pstate, qry,
+							groupClauses, root,
+							have_non_var_grouping);
 	if (hasJoinRTEs)
 		clause = flatten_join_alias_vars(root, clause);
 	check_ungrouped_columns(clause, pstate, qry,
-							groupClauses, have_non_var_grouping,
+							groupClauses, groupClauseCommonVars,
+							have_non_var_grouping,
 							&func_grouped_rels);
 
 	clause = (Node *) qry->havingQual;
+	finalize_grouping_exprs(clause, pstate, qry,
+							groupClauses, root,
+							have_non_var_grouping);
 	if (hasJoinRTEs)
 		clause = flatten_join_alias_vars(root, clause);
 	check_ungrouped_columns(clause, pstate, qry,
-							groupClauses, have_non_var_grouping,
+							groupClauses, groupClauseCommonVars,
+							have_non_var_grouping,
 							&func_grouped_rels);
 
 	/*
@@ -946,14 +1190,17 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
  */
 static void
 check_ungrouped_columns(Node *node, ParseState *pstate, Query *qry,
-						List *groupClauses, bool have_non_var_grouping,
+						List *groupClauses, List *groupClauseCommonVars,
+						bool have_non_var_grouping,
 						List **func_grouped_rels)
 {
 	check_ungrouped_columns_context context;
 
 	context.pstate = pstate;
 	context.qry = qry;
+	context.root = NULL;
 	context.groupClauses = groupClauses;
+	context.groupClauseCommonVars = groupClauseCommonVars;
 	context.have_non_var_grouping = have_non_var_grouping;
 	context.func_grouped_rels = func_grouped_rels;
 	context.sublevels_up = 0;
@@ -1007,6 +1254,16 @@ check_ungrouped_columns_walker(Node *node,
 			return false;
 	}
 
+	if (IsA(node, GroupingFunc))
+	{
+		GroupingFunc *grp = (GroupingFunc *) node;
+
+		/* handled GroupingFunc separately, no need to recheck at this level */
+
+		if ((int) grp->agglevelsup >= context->sublevels_up)
+			return false;
+	}
+
 	/*
 	 * If we have any GROUP BY items that are not simple Vars, check to see if
 	 * subexpression as a whole matches any GROUP BY item. We need to do this
@@ -1018,7 +1275,9 @@ check_ungrouped_columns_walker(Node *node,
 	{
 		foreach(gl, context->groupClauses)
 		{
-			if (equal(node, lfirst(gl)))
+			TargetEntry *tle = lfirst(gl);
+
+			if (equal(node, tle->expr))
 				return false;	/* acceptable, do not descend more */
 		}
 	}
@@ -1045,7 +1304,7 @@ check_ungrouped_columns_walker(Node *node,
 		{
 			foreach(gl, context->groupClauses)
 			{
-				Var		   *gvar = (Var *) lfirst(gl);
+				Var		   *gvar = (Var *) ((TargetEntry *) lfirst(gl))->expr;
 
 				if (IsA(gvar, Var) &&
 					gvar->varno == var->varno &&
@@ -1082,7 +1341,7 @@ check_ungrouped_columns_walker(Node *node,
 			if (check_functional_grouping(rte->relid,
 										  var->varno,
 										  0,
-										  context->groupClauses,
+										  context->groupClauseCommonVars,
 										  &context->qry->constraintDeps))
 			{
 				*context->func_grouped_rels =
@@ -1127,6 +1386,396 @@ check_ungrouped_columns_walker(Node *node,
 }
 
 /*
+ * finalize_grouping_exprs -
+ *	  Scan the given expression tree for GROUPING() and related calls,
+ *	  and validate and process their arguments.
+ *
+ * This is split out from check_ungrouped_columns above because it needs
+ * to modify the nodes (which it does in-place, not via a mutator) while
+ * check_ungrouped_columns may see only a copy of the original thanks to
+ * flattening of join alias vars. So here, we flatten each individual
+ * GROUPING argument as we see it before comparing it.
+ */
+static void
+finalize_grouping_exprs(Node *node, ParseState *pstate, Query *qry,
+						List *groupClauses, PlannerInfo *root,
+						bool have_non_var_grouping)
+{
+	check_ungrouped_columns_context context;
+
+	context.pstate = pstate;
+	context.qry = qry;
+	context.root = root;
+	context.groupClauses = groupClauses;
+	context.groupClauseCommonVars = NIL;
+	context.have_non_var_grouping = have_non_var_grouping;
+	context.func_grouped_rels = NULL;
+	context.sublevels_up = 0;
+	context.in_agg_direct_args = false;
+	finalize_grouping_exprs_walker(node, &context);
+}
+
+static bool
+finalize_grouping_exprs_walker(Node *node,
+							   check_ungrouped_columns_context *context)
+{
+	ListCell   *gl;
+
+	if (node == NULL)
+		return false;
+	if (IsA(node, Const) ||
+		IsA(node, Param))
+		return false;			/* constants are always acceptable */
+
+	if (IsA(node, Aggref))
+	{
+		Aggref	   *agg = (Aggref *) node;
+
+		if ((int) agg->agglevelsup == context->sublevels_up)
+		{
+			/*
+			 * If we find an aggregate call of the original level, do not
+			 * recurse into its normal arguments, ORDER BY arguments, or
+			 * filter; GROUPING exprs of this level are not allowed there. But
+			 * check direct arguments as though they weren't in an aggregate.
+			 */
+			bool		result;
+
+			Assert(!context->in_agg_direct_args);
+			context->in_agg_direct_args = true;
+			result = finalize_grouping_exprs_walker((Node *) agg->aggdirectargs,
+													context);
+			context->in_agg_direct_args = false;
+			return result;
+		}
+
+		/*
+		 * We can skip recursing into aggregates of higher levels altogether,
+		 * since they could not possibly contain exprs of concern to us (see
+		 * transformAggregateCall).  We do need to look at aggregates of lower
+		 * levels, however.
+		 */
+		if ((int) agg->agglevelsup > context->sublevels_up)
+			return false;
+	}
+
+	if (IsA(node, GroupingFunc))
+	{
+		GroupingFunc *grp = (GroupingFunc *) node;
+
+		/*
+		 * We only need to check GroupingFunc nodes at the exact level to
+		 * which they belong, since they cannot mix levels in arguments.
+		 */
+
+		if ((int) grp->agglevelsup == context->sublevels_up)
+		{
+			ListCell   *lc;
+			List	   *ref_list = NIL;
+
+			foreach(lc, grp->args)
+			{
+				Node	   *expr = lfirst(lc);
+				Index		ref = 0;
+
+				if (context->root)
+					expr = flatten_join_alias_vars(context->root, expr);
+
+				/*
+				 * Each expression must match a grouping entry at the current
+				 * query level. Unlike the general expression case, we don't
+				 * allow functional dependencies or outer references.
+				 */
+
+				if (IsA(expr, Var))
+				{
+					Var		   *var = (Var *) expr;
+
+					if (var->varlevelsup == context->sublevels_up)
+					{
+						foreach(gl, context->groupClauses)
+						{
+							TargetEntry *tle = lfirst(gl);
+							Var		   *gvar = (Var *) tle->expr;
+
+							if (IsA(gvar, Var) &&
+								gvar->varno == var->varno &&
+								gvar->varattno == var->varattno &&
+								gvar->varlevelsup == 0)
+							{
+								ref = tle->ressortgroupref;
+								break;
+							}
+						}
+					}
+				}
+				else if (context->have_non_var_grouping &&
+						 context->sublevels_up == 0)
+				{
+					foreach(gl, context->groupClauses)
+					{
+						TargetEntry *tle = lfirst(gl);
+
+						if (equal(expr, tle->expr))
+						{
+							ref = tle->ressortgroupref;
+							break;
+						}
+					}
+				}
+
+				if (ref == 0)
+					ereport(ERROR,
+							(errcode(ERRCODE_GROUPING_ERROR),
+							 errmsg("arguments to GROUPING must be grouping expressions of the associated query level"),
+							 parser_errposition(context->pstate,
+												exprLocation(expr))));
+
+				ref_list = lappend_int(ref_list, ref);
+			}
+
+			grp->refs = ref_list;
+		}
+
+		if ((int) grp->agglevelsup > context->sublevels_up)
+			return false;
+	}
+
+	if (IsA(node, Query))
+	{
+		/* Recurse into subselects */
+		bool		result;
+
+		context->sublevels_up++;
+		result = query_tree_walker((Query *) node,
+								   finalize_grouping_exprs_walker,
+								   (void *) context,
+								   0);
+		context->sublevels_up--;
+		return result;
+	}
+	return expression_tree_walker(node, finalize_grouping_exprs_walker,
+								  (void *) context);
+}
+
+
+/*
+ * Given a GroupingSet node, expand it and return a list of lists.
+ *
+ * For EMPTY nodes, return a list of one empty list.
+ *
+ * For SIMPLE nodes, return a list of one list, which is the node content.
+ *
+ * For CUBE and ROLLUP nodes, return a list of the expansions.
+ *
+ * For SET nodes, recursively expand contained CUBE and ROLLUP.
+ */
+static List *
+expand_groupingset_node(GroupingSet *gs)
+{
+	List	   *result = NIL;
+
+	switch (gs->kind)
+	{
+		case GROUPING_SET_EMPTY:
+			result = list_make1(NIL);
+			break;
+
+		case GROUPING_SET_SIMPLE:
+			result = list_make1(gs->content);
+			break;
+
+		case GROUPING_SET_ROLLUP:
+			{
+				List	   *rollup_val = gs->content;
+				ListCell   *lc;
+				int			curgroup_size = list_length(gs->content);
+
+				while (curgroup_size > 0)
+				{
+					List	   *current_result = NIL;
+					int			i = curgroup_size;
+
+					foreach(lc, rollup_val)
+					{
+						GroupingSet *gs_current = (GroupingSet *) lfirst(lc);
+
+						Assert(gs_current->kind == GROUPING_SET_SIMPLE);
+
+						current_result
+							= list_concat(current_result,
+										  list_copy(gs_current->content));
+
+						/* If we are done with making the current group, break */
+						if (--i == 0)
+							break;
+					}
+
+					result = lappend(result, current_result);
+					--curgroup_size;
+				}
+
+				result = lappend(result, NIL);
+			}
+			break;
+
+		case GROUPING_SET_CUBE:
+			{
+				List	   *cube_list = gs->content;
+				int			number_bits = list_length(cube_list);
+				uint32		num_sets;
+				uint32		i;
+
+				/* parser should cap this much lower */
+				Assert(number_bits < 31);
+
+				num_sets = (1U << number_bits);
+
+				for (i = 0; i < num_sets; i++)
+				{
+					List	   *current_result = NIL;
+					ListCell   *lc;
+					uint32		mask = 1U;
+
+					foreach(lc, cube_list)
+					{
+						GroupingSet *gs_current = (GroupingSet *) lfirst(lc);
+
+						Assert(gs_current->kind == GROUPING_SET_SIMPLE);
+
+						if (mask & i)
+						{
+							current_result
+								= list_concat(current_result,
+											  list_copy(gs_current->content));
+						}
+
+						mask <<= 1;
+					}
+
+					result = lappend(result, current_result);
+				}
+			}
+			break;
+
+		case GROUPING_SET_SETS:
+			{
+				ListCell   *lc;
+
+				foreach(lc, gs->content)
+				{
+					List	   *current_result = expand_groupingset_node(lfirst(lc));
+
+					result = list_concat(result, current_result);
+				}
+			}
+			break;
+	}
+
+	return result;
+}
+
+static int
+cmp_list_len_asc(const void *a, const void *b)
+{
+	int			la = list_length(*(List *const *) a);
+	int			lb = list_length(*(List *const *) b);
+
+	return (la > lb) ? 1 : (la == lb) ? 0 : -1;
+}
+
+/*
+ * Expand a groupingSets clause to a flat list of grouping sets.
+ * The returned list is sorted by length, shortest sets first.
+ *
+ * This is mainly for the planner, but we use it here too to do
+ * some consistency checks.
+ */
+List *
+expand_grouping_sets(List *groupingSets, int limit)
+{
+	List	   *expanded_groups = NIL;
+	List	   *result = NIL;
+	double		numsets = 1;
+	ListCell   *lc;
+
+	if (groupingSets == NIL)
+		return NIL;
+
+	foreach(lc, groupingSets)
+	{
+		List	   *current_result = NIL;
+		GroupingSet *gs = lfirst(lc);
+
+		current_result = expand_groupingset_node(gs);
+
+		Assert(current_result != NIL);
+
+		numsets *= list_length(current_result);
+
+		if (limit >= 0 && numsets > limit)
+			return NIL;
+
+		expanded_groups = lappend(expanded_groups, current_result);
+	}
+
+	/*
+	 * Do cartesian product between sublists of expanded_groups. While at it,
+	 * remove any duplicate elements from individual grouping sets (we must
+	 * NOT change the number of sets though)
+	 */
+
+	foreach(lc, (List *) linitial(expanded_groups))
+	{
+		result = lappend(result, list_union_int(NIL, (List *) lfirst(lc)));
+	}
+
+	for_each_cell(lc, lnext(list_head(expanded_groups)))
+	{
+		List	   *p = lfirst(lc);
+		List	   *new_result = NIL;
+		ListCell   *lc2;
+
+		foreach(lc2, result)
+		{
+			List	   *q = lfirst(lc2);
+			ListCell   *lc3;
+
+			foreach(lc3, p)
+			{
+				new_result = lappend(new_result,
+									 list_union_int(q, (List *) lfirst(lc3)));
+			}
+		}
+		result = new_result;
+	}
+
+	if (list_length(result) > 1)
+	{
+		int			result_len = list_length(result);
+		List	  **buf = palloc(sizeof(List *) * result_len);
+		List	  **ptr = buf;
+
+		foreach(lc, result)
+		{
+			*ptr++ = lfirst(lc);
+		}
+
+		qsort(buf, result_len, sizeof(List *), cmp_list_len_asc);
+
+		result = NIL;
+		ptr = buf;
+
+		while (result_len-- > 0)
+			result = lappend(result, *ptr++);
+
+		pfree(buf);
+	}
+
+	return result;
+}
+
+/*
  * get_aggregate_argtypes
  *	Identify the specific datatypes passed to an aggregate call.
  *
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 8d90b5098a..e90e1d68e3 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -15,8 +15,13 @@
 
 #include "postgres.h"
 
+#include "miscadmin.h"
+
 #include "access/heapam.h"
+#include "catalog/catalog.h"
+#include "access/htup_details.h"
 #include "catalog/heap.h"
+#include "catalog/pg_constraint.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "nodes/makefuncs.h"
@@ -29,14 +34,16 @@
 #include "parser/parse_coerce.h"
 #include "parser/parse_collate.h"
 #include "parser/parse_expr.h"
+#include "parser/parse_func.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
+#include "parser/parse_type.h"
 #include "rewrite/rewriteManip.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
-
+#include "utils/syscache.h"
 
 /* Convenience macro for the most common makeNamespaceItem() case */
 #define makeDefaultNSItem(rte)	makeNamespaceItem(rte, true, true, false, true)
@@ -75,6 +82,8 @@ static TargetEntry *findTargetlistEntrySQL99(ParseState *pstate, Node *node,
 						 List **tlist, ParseExprKind exprKind);
 static int get_matching_location(int sortgroupref,
 					  List *sortgrouprefs, List *exprs);
+static List *resolve_unique_index_expr(ParseState *pstate, InferClause *infer,
+						  Relation heapRel);
 static List *addTargetToGroupList(ParseState *pstate, TargetEntry *tle,
 					 List *grouplist, List *targetlist, int location,
 					 bool resolveUnknown);
@@ -414,6 +423,40 @@ transformJoinOnClause(ParseState *pstate, JoinExpr *j, List *namespace)
 	return result;
 }
 
+static RangeTblEntry *
+transformTableSampleEntry(ParseState *pstate, RangeTableSample *rv)
+{
+	RangeTblEntry *rte = NULL;
+	CommonTableExpr *cte = NULL;
+	TableSampleClause *tablesample = NULL;
+
+	/* if relation has an unqualified name, it might be a CTE reference */
+	if (!rv->relation->schemaname)
+	{
+		Index		levelsup;
+
+		cte = scanNameSpaceForCTE(pstate, rv->relation->relname, &levelsup);
+	}
+
+	/* We first need to build a range table entry */
+	if (!cte)
+		rte = transformTableEntry(pstate, rv->relation);
+
+	if (!rte ||
+		(rte->relkind != RELKIND_RELATION &&
+		 rte->relkind != RELKIND_MATVIEW))
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("TABLESAMPLE clause can only be used on tables and materialized views"),
+				 parser_errposition(pstate, rv->relation->location)));
+
+	tablesample = ParseTableSample(pstate, rv->method, rv->repeatable,
+								   rv->args, rv->relation->location);
+	rte->tablesample = tablesample;
+
+	return rte;
+}
+
 /*
  * transformTableEntry --- transform a RangeVar (simple relation reference)
  */
@@ -1122,6 +1165,26 @@ transformFromClauseItem(ParseState *pstate, Node *n,
 
 		return (Node *) j;
 	}
+	else if (IsA(n, RangeTableSample))
+	{
+		/* Tablesample reference */
+		RangeTableSample *rv = (RangeTableSample *) n;
+		RangeTblRef *rtr;
+		RangeTblEntry *rte = NULL;
+		int			rtindex;
+
+		rte = transformTableSampleEntry(pstate, rv);
+
+		/* assume new rte is at end */
+		rtindex = list_length(pstate->p_rtable);
+		Assert(rte == rt_fetch(rtindex, pstate->p_rtable));
+		*top_rte = rte;
+		*top_rti = rtindex;
+		*namespace = list_make1(makeDefaultNSItem(rte));
+		rtr = makeNode(RangeTblRef);
+		rtr->rtindex = rtindex;
+		return (Node *) rtr;
+	}
 	else
 		elog(ERROR, "unrecognized node type: %d", (int) nodeTag(n));
 	return NULL;				/* can't get here, keep compiler quiet */
@@ -1664,40 +1727,184 @@ findTargetlistEntrySQL99(ParseState *pstate, Node *node, List **tlist,
 	return target_result;
 }
 
+/*-------------------------------------------------------------------------
+ * Flatten out parenthesized sublists in grouping lists, and some cases
+ * of nested grouping sets.
+ *
+ * Inside a grouping set (ROLLUP, CUBE, or GROUPING SETS), we expect the
+ * content to be nested no more than 2 deep: i.e. ROLLUP((a,b),(c,d)) is
+ * ok, but ROLLUP((a,(b,c)),d) is flattened to ((a,b,c),d), which we then
+ * normalize to ((a,b,c),(d)).
+ *
+ * CUBE or ROLLUP can be nested inside GROUPING SETS (but not the reverse),
+ * and we leave that alone if we find it. But if we see GROUPING SETS inside
+ * GROUPING SETS, we can flatten and normalize as follows:
+ *	 GROUPING SETS (a, (b,c), GROUPING SETS ((c,d),(e)), (f,g))
+ * becomes
+ *	 GROUPING SETS ((a), (b,c), (c,d), (e), (f,g))
+ *
+ * This is per the spec's syntax transformations, but these are the only such
+ * transformations we do in parse analysis, so that queries retain the
+ * originally specified grouping set syntax for CUBE and ROLLUP as much as
+ * possible when deparsed. (Full expansion of the result into a list of
+ * grouping sets is left to the planner.)
+ *
+ * When we're done, the resulting list should contain only these possible
+ * elements:
+ *	 - an expression
+ *	 - a CUBE or ROLLUP with a list of expressions nested 2 deep
+ *	 - a GROUPING SET containing any of:
+ *		- expression lists
+ *		- empty grouping sets
+ *		- CUBE or ROLLUP nodes with lists nested 2 deep
+ * The return is a new list, but doesn't deep-copy the old nodes except for
+ * GroupingSet nodes.
+ *
+ * As a side effect, flag whether the list has any GroupingSet nodes.
+ *-------------------------------------------------------------------------
+ */
+static Node *
+flatten_grouping_sets(Node *expr, bool toplevel, bool *hasGroupingSets)
+{
+	/* just in case of pathological input */
+	check_stack_depth();
+
+	if (expr == (Node *) NIL)
+		return (Node *) NIL;
+
+	switch (expr->type)
+	{
+		case T_RowExpr:
+			{
+				RowExpr    *r = (RowExpr *) expr;
+
+				if (r->row_format == COERCE_IMPLICIT_CAST)
+					return flatten_grouping_sets((Node *) r->args,
+												 false, NULL);
+			}
+			break;
+		case T_GroupingSet:
+			{
+				GroupingSet *gset = (GroupingSet *) expr;
+				ListCell   *l2;
+				List	   *result_set = NIL;
+
+				if (hasGroupingSets)
+					*hasGroupingSets = true;
+
+				/*
+				 * at the top level, we skip over all empty grouping sets; the
+				 * caller can supply the canonical GROUP BY () if nothing is
+				 * left.
+				 */
+
+				if (toplevel && gset->kind == GROUPING_SET_EMPTY)
+					return (Node *) NIL;
+
+				foreach(l2, gset->content)
+				{
+					Node	   *n2 = flatten_grouping_sets(lfirst(l2), false, NULL);
+
+					result_set = lappend(result_set, n2);
+				}
+
+				/*
+				 * At top level, keep the grouping set node; but if we're in a
+				 * nested grouping set, then we need to concat the flattened
+				 * result into the outer list if it's simply nested.
+				 */
+
+				if (toplevel || (gset->kind != GROUPING_SET_SETS))
+				{
+					return (Node *) makeGroupingSet(gset->kind, result_set, gset->location);
+				}
+				else
+					return (Node *) result_set;
+			}
+		case T_List:
+			{
+				List	   *result = NIL;
+				ListCell   *l;
+
+				foreach(l, (List *) expr)
+				{
+					Node	   *n = flatten_grouping_sets(lfirst(l), toplevel, hasGroupingSets);
+
+					if (n != (Node *) NIL)
+					{
+						if (IsA(n, List))
+							result = list_concat(result, (List *) n);
+						else
+							result = lappend(result, n);
+					}
+				}
+
+				return (Node *) result;
+			}
+		default:
+			break;
+	}
+
+	return expr;
+}
+
 /*
- * transformGroupClause -
- *	  transform a GROUP BY clause
+ * Transform a single expression within a GROUP BY clause or grouping set.
  *
- * GROUP BY items will be added to the targetlist (as resjunk columns)
- * if not already present, so the targetlist must be passed by reference.
+ * The expression is added to the targetlist if not already present, and to the
+ * flatresult list (which will become the groupClause) if not already present
+ * there.  The sortClause is consulted for operator and sort order hints.
  *
- * This is also used for window PARTITION BY clauses (which act almost the
- * same, but are always interpreted per SQL99 rules).
+ * Returns the ressortgroupref of the expression.
+ *
+ * flatresult	reference to flat list of SortGroupClause nodes
+ * seen_local	bitmapset of sortgrouprefs already seen at the local level
+ * pstate		ParseState
+ * gexpr		node to transform
+ * targetlist	reference to TargetEntry list
+ * sortClause	ORDER BY clause (SortGroupClause nodes)
+ * exprKind		expression kind
+ * useSQL99		SQL99 rather than SQL92 syntax
+ * toplevel		false if within any grouping set
  */
-List *
-transformGroupClause(ParseState *pstate, List *grouplist,
-					 List **targetlist, List *sortClause,
-					 ParseExprKind exprKind, bool useSQL99)
+static Index
+transformGroupClauseExpr(List **flatresult, Bitmapset *seen_local,
+						 ParseState *pstate, Node *gexpr,
+						 List **targetlist, List *sortClause,
+						 ParseExprKind exprKind, bool useSQL99, bool toplevel)
 {
-	List	   *result = NIL;
-	ListCell   *gl;
+	TargetEntry *tle;
+	bool		found = false;
 
-	foreach(gl, grouplist)
+	if (useSQL99)
+		tle = findTargetlistEntrySQL99(pstate, gexpr,
+									   targetlist, exprKind);
+	else
+		tle = findTargetlistEntrySQL92(pstate, gexpr,
+									   targetlist, exprKind);
+
+	if (tle->ressortgroupref > 0)
 	{
-		Node	   *gexpr = (Node *) lfirst(gl);
-		TargetEntry *tle;
-		bool		found = false;
+		ListCell   *sl;
 
-		if (useSQL99)
-			tle = findTargetlistEntrySQL99(pstate, gexpr,
-										   targetlist, exprKind);
-		else
-			tle = findTargetlistEntrySQL92(pstate, gexpr,
-										   targetlist, exprKind);
+		/*
+		 * Eliminate duplicates (GROUP BY x, x) but only at local level.
+		 * (Duplicates in grouping sets can affect the number of returned
+		 * rows, so can't be dropped indiscriminately.)
+		 *
+		 * Since we don't care about anything except the sortgroupref, we can
+		 * use a bitmapset rather than scanning lists.
+		 */
+		if (bms_is_member(tle->ressortgroupref, seen_local))
+			return 0;
 
-		/* Eliminate duplicates (GROUP BY x, x) */
-		if (targetIsInSortList(tle, InvalidOid, result))
-			continue;
+		/*
+		 * If we're already in the flat clause list, we don't need to consider
+		 * adding ourselves again.
+		 */
+		found = targetIsInSortList(tle, InvalidOid, *flatresult);
+		if (found)
+			return tle->ressortgroupref;
 
 		/*
 		 * If the GROUP BY tlist entry also appears in ORDER BY, copy operator
@@ -1709,35 +1916,310 @@ transformGroupClause(ParseState *pstate, List *grouplist,
 		 * sort step, and it allows the user to choose the equality semantics
 		 * used by GROUP BY, should she be working with a datatype that has
 		 * more than one equality operator.
+		 *
+		 * If we're in a grouping set, though, we force our requested ordering
+		 * to be NULLS LAST, because if we have any hope of using a sorted agg
+		 * for the job, we're going to be tacking on generated NULL values
+		 * after the corresponding groups. If the user demands nulls first,
+		 * another sort step is going to be inevitable, but that's the
+		 * planner's problem.
 		 */
-		if (tle->ressortgroupref > 0)
+
+		foreach(sl, sortClause)
 		{
-			ListCell   *sl;
+			SortGroupClause *sc = (SortGroupClause *) lfirst(sl);
 
-			foreach(sl, sortClause)
+			if (sc->tleSortGroupRef == tle->ressortgroupref)
 			{
-				SortGroupClause *sc = (SortGroupClause *) lfirst(sl);
+				SortGroupClause *grpc = copyObject(sc);
 
-				if (sc->tleSortGroupRef == tle->ressortgroupref)
-				{
-					result = lappend(result, copyObject(sc));
-					found = true;
+				if (!toplevel)
+					grpc->nulls_first = false;
+				*flatresult = lappend(*flatresult, grpc);
+				found = true;
+				break;
+			}
+		}
+	}
+
+	/*
+	 * If no match in ORDER BY, just add it to the result using default
+	 * sort/group semantics.
+	 */
+	if (!found)
+		*flatresult = addTargetToGroupList(pstate, tle,
+										   *flatresult, *targetlist,
+										   exprLocation(gexpr),
+										   true);
+
+	/*
+	 * _something_ must have assigned us a sortgroupref by now...
+	 */
+
+	return tle->ressortgroupref;
+}
+
+/*
+ * Transform a list of expressions within a GROUP BY clause or grouping set.
+ *
+ * The list of expressions belongs to a single clause within which duplicates
+ * can be safely eliminated.
+ *
+ * Returns an integer list of ressortgroupref values.
+ *
+ * flatresult	reference to flat list of SortGroupClause nodes
+ * pstate		ParseState
+ * list			nodes to transform
+ * targetlist	reference to TargetEntry list
+ * sortClause	ORDER BY clause (SortGroupClause nodes)
+ * exprKind		expression kind
+ * useSQL99		SQL99 rather than SQL92 syntax
+ * toplevel		false if within any grouping set
+ */
+static List *
+transformGroupClauseList(List **flatresult,
+						 ParseState *pstate, List *list,
+						 List **targetlist, List *sortClause,
+						 ParseExprKind exprKind, bool useSQL99, bool toplevel)
+{
+	Bitmapset  *seen_local = NULL;
+	List	   *result = NIL;
+	ListCell   *gl;
+
+	foreach(gl, list)
+	{
+		Node	   *gexpr = (Node *) lfirst(gl);
+
+		Index		ref = transformGroupClauseExpr(flatresult,
+												   seen_local,
+												   pstate,
+												   gexpr,
+												   targetlist,
+												   sortClause,
+												   exprKind,
+												   useSQL99,
+												   toplevel);
+
+		if (ref > 0)
+		{
+			seen_local = bms_add_member(seen_local, ref);
+			result = lappend_int(result, ref);
+		}
+	}
+
+	return result;
+}
+
+/*
+ * Transform a grouping set and (recursively) its content.
+ *
+ * The grouping set might be a GROUPING SETS node with other grouping sets
+ * inside it, but SETS within SETS have already been flattened out before
+ * reaching here.
+ *
+ * Returns the transformed node, which now contains SIMPLE nodes with lists
+ * of ressortgrouprefs rather than expressions.
+ *
+ * flatresult	reference to flat list of SortGroupClause nodes
+ * pstate		ParseState
+ * gset			grouping set to transform
+ * targetlist	reference to TargetEntry list
+ * sortClause	ORDER BY clause (SortGroupClause nodes)
+ * exprKind		expression kind
+ * useSQL99		SQL99 rather than SQL92 syntax
+ * toplevel		false if within any grouping set
+ */
+static Node *
+transformGroupingSet(List **flatresult,
+					 ParseState *pstate, GroupingSet *gset,
+					 List **targetlist, List *sortClause,
+					 ParseExprKind exprKind, bool useSQL99, bool toplevel)
+{
+	ListCell   *gl;
+	List	   *content = NIL;
+
+	Assert(toplevel || gset->kind != GROUPING_SET_SETS);
+
+	foreach(gl, gset->content)
+	{
+		Node	   *n = lfirst(gl);
+
+		if (IsA(n, List))
+		{
+			List	   *l = transformGroupClauseList(flatresult,
+													 pstate, (List *) n,
+													 targetlist, sortClause,
+												  exprKind, useSQL99, false);
+
+			content = lappend(content, makeGroupingSet(GROUPING_SET_SIMPLE,
+													   l,
+													   exprLocation(n)));
+		}
+		else if (IsA(n, GroupingSet))
+		{
+			GroupingSet *gset2 = (GroupingSet *) lfirst(gl);
+
+			content = lappend(content, transformGroupingSet(flatresult,
+															pstate, gset2,
+													  targetlist, sortClause,
+												 exprKind, useSQL99, false));
+		}
+		else
+		{
+			Index		ref = transformGroupClauseExpr(flatresult,
+													   NULL,
+													   pstate,
+													   n,
+													   targetlist,
+													   sortClause,
+													   exprKind,
+													   useSQL99,
+													   false);
+
+			content = lappend(content, makeGroupingSet(GROUPING_SET_SIMPLE,
+													   list_make1_int(ref),
+													   exprLocation(n)));
+		}
+	}
+
+	/* Arbitrarily cap the size of CUBE, which has exponential growth */
+	if (gset->kind == GROUPING_SET_CUBE)
+	{
+		if (list_length(content) > 12)
+			ereport(ERROR,
+					(errcode(ERRCODE_TOO_MANY_COLUMNS),
+					 errmsg("CUBE is limited to 12 elements"),
+					 parser_errposition(pstate, gset->location)));
+	}
+
+	return (Node *) makeGroupingSet(gset->kind, content, gset->location);
+}
+
+
+/*
+ * transformGroupClause -
+ *	  transform a GROUP BY clause
+ *
+ * GROUP BY items will be added to the targetlist (as resjunk columns)
+ * if not already present, so the targetlist must be passed by reference.
+ *
+ * This is also used for window PARTITION BY clauses (which act almost the
+ * same, but are always interpreted per SQL99 rules).
+ *
+ * Grouping sets make this a lot more complex than it was. Our goal here is
+ * twofold: we make a flat list of SortGroupClause nodes referencing each
+ * distinct expression used for grouping, with those expressions added to the
+ * targetlist if needed. At the same time, we build the groupingSets tree,
+ * which stores only ressortgrouprefs as integer lists inside GroupingSet nodes
+ * (possibly nested, but limited in depth: a GROUPING_SET_SETS node can contain
+ * nested SIMPLE, CUBE or ROLLUP nodes, but not more sets - we flatten that
+ * out; while CUBE and ROLLUP can contain only SIMPLE nodes).
+ *
+ * We skip much of the hard work if there are no grouping sets.
+ *
+ * One subtlety is that the groupClause list can end up empty while the
+ * groupingSets list is not; this happens if there are only empty grouping
+ * sets, or an explicit GROUP BY (). This has the same effect as specifying
+ * aggregates or a HAVING clause with no GROUP BY; the output is one row per
+ * grouping set even if the input is empty.
+ *
+ * Returns the transformed (flat) groupClause.
+ *
+ * pstate		ParseState
+ * grouplist	clause to transform
+ * groupingSets reference to list to contain the grouping set tree
+ * targetlist	reference to TargetEntry list
+ * sortClause	ORDER BY clause (SortGroupClause nodes)
+ * exprKind		expression kind
+ * useSQL99		SQL99 rather than SQL92 syntax
+ */
+List *
+transformGroupClause(ParseState *pstate, List *grouplist, List **groupingSets,
+					 List **targetlist, List *sortClause,
+					 ParseExprKind exprKind, bool useSQL99)
+{
+	List	   *result = NIL;
+	List	   *flat_grouplist;
+	List	   *gsets = NIL;
+	ListCell   *gl;
+	bool		hasGroupingSets = false;
+	Bitmapset  *seen_local = NULL;
+
+	/*
+	 * Recursively flatten implicit RowExprs. (Technically this is only needed
+	 * for GROUP BY, per the syntax rules for grouping sets, but we do it
+	 * anyway.)
+	 */
+	flat_grouplist = (List *) flatten_grouping_sets((Node *) grouplist,
+													true,
+													&hasGroupingSets);
+
+	/*
+	 * If the list is now empty, but hasGroupingSets is true, it's because we
+	 * elided redundant empty grouping sets. Restore a single empty grouping
+	 * set to leave a canonical form: GROUP BY ()
+	 */
+
+	if (flat_grouplist == NIL && hasGroupingSets)
+	{
+		flat_grouplist = list_make1(makeGroupingSet(GROUPING_SET_EMPTY,
+													NIL,
+										  exprLocation((Node *) grouplist)));
+	}
+
+	foreach(gl, flat_grouplist)
+	{
+		Node	   *gexpr = (Node *) lfirst(gl);
+
+		if (IsA(gexpr, GroupingSet))
+		{
+			GroupingSet *gset = (GroupingSet *) gexpr;
+
+			switch (gset->kind)
+			{
+				case GROUPING_SET_EMPTY:
+					gsets = lappend(gsets, gset);
+					break;
+				case GROUPING_SET_SIMPLE:
+					/* can't happen */
+					Assert(false);
+					break;
+				case GROUPING_SET_SETS:
+				case GROUPING_SET_CUBE:
+				case GROUPING_SET_ROLLUP:
+					gsets = lappend(gsets,
+									transformGroupingSet(&result,
+														 pstate, gset,
+													  targetlist, sortClause,
+												  exprKind, useSQL99, true));
 					break;
-				}
 			}
 		}
+		else
+		{
+			Index		ref = transformGroupClauseExpr(&result, seen_local,
+													   pstate, gexpr,
+													   targetlist, sortClause,
+												   exprKind, useSQL99, true);
 
-		/*
-		 * If no match in ORDER BY, just add it to the result using default
-		 * sort/group semantics.
-		 */
-		if (!found)
-			result = addTargetToGroupList(pstate, tle,
-										  result, *targetlist,
-										  exprLocation(gexpr),
-										  true);
+			if (ref > 0)
+			{
+				seen_local = bms_add_member(seen_local, ref);
+				if (hasGroupingSets)
+					gsets = lappend(gsets,
+									makeGroupingSet(GROUPING_SET_SIMPLE,
+													list_make1_int(ref),
+													exprLocation(gexpr)));
+			}
+		}
 	}
 
+	/* parser should prevent this */
+	Assert(gsets == NIL || groupingSets != NULL);
+
+	if (groupingSets)
+		*groupingSets = gsets;
+
 	return result;
 }
 
@@ -1842,6 +2324,7 @@ transformWindowDefinitions(ParseState *pstate,
 										  true /* force SQL99 rules */ );
 		partitionClause = transformGroupClause(pstate,
 											   windef->partitionClause,
+											   NULL,
 											   targetlist,
 											   orderClause,
 											   EXPR_KIND_WINDOW_PARTITION,
@@ -2167,6 +2650,195 @@ get_matching_location(int sortgroupref, List *sortgrouprefs, List *exprs)
 }
 
 /*
+ * resolve_unique_index_expr
+ *		Infer a unique index from a list of indexElems, for ON
+ *		CONFLICT clause
+ *
+ * Perform parse analysis of expressions and columns appearing within ON
+ * CONFLICT clause.  During planning, the returned list of expressions is used
+ * to infer which unique index to use.
+ */
+static List *
+resolve_unique_index_expr(ParseState *pstate, InferClause *infer,
+						  Relation heapRel)
+{
+	List	   *result = NIL;
+	ListCell   *l;
+
+	foreach(l, infer->indexElems)
+	{
+		IndexElem  *ielem = (IndexElem *) lfirst(l);
+		InferenceElem *pInfer = makeNode(InferenceElem);
+		Node	   *parse;
+
+		/*
+		 * Raw grammar re-uses CREATE INDEX infrastructure for unique index
+		 * inference clause, and so will accept opclasses by name and so on.
+		 *
+		 * Make no attempt to match ASC or DESC ordering or NULLS FIRST/NULLS
+		 * LAST ordering, since those are not significant for inference
+		 * purposes (any unique index matching the inference specification in
+		 * other regards is accepted indifferently).  Actively reject this as
+		 * wrong-headed.
+		 */
+		if (ielem->ordering != SORTBY_DEFAULT)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+					 errmsg("ASC/DESC is not allowed in ON CONFLICT clause"),
+					 parser_errposition(pstate,
+										exprLocation((Node *) infer))));
+		if (ielem->nulls_ordering != SORTBY_NULLS_DEFAULT)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+			 errmsg("NULLS FIRST/LAST is not allowed in ON CONFLICT clause"),
+					 parser_errposition(pstate,
+										exprLocation((Node *) infer))));
+
+		if (!ielem->expr)
+		{
+			/* Simple index attribute */
+			ColumnRef  *n;
+
+			/*
+			 * Grammar won't have built raw expression for us in event of
+			 * plain column reference.  Create one directly, and perform
+			 * expression transformation.  Planner expects this, and performs
+			 * its own normalization for the purposes of matching against
+			 * pg_index.
+			 */
+			n = makeNode(ColumnRef);
+			n->fields = list_make1(makeString(ielem->name));
+			/* Location is approximately that of inference specification */
+			n->location = infer->location;
+			parse = (Node *) n;
+		}
+		else
+		{
+			/* Do parse transformation of the raw expression */
+			parse = (Node *) ielem->expr;
+		}
+
+		/*
+		 * transformExpr() should have already rejected subqueries,
+		 * aggregates, and window functions, based on the EXPR_KIND_ for an
+		 * index expression.  Expressions returning sets won't have been
+		 * rejected, but don't bother doing so here; there should be no
+		 * available expression unique index to match any such expression
+		 * against anyway.
+		 */
+		pInfer->expr = transformExpr(pstate, parse, EXPR_KIND_INDEX_EXPRESSION);
+
+		/* Perform lookup of collation and operator class as required */
+		if (!ielem->collation)
+			pInfer->infercollid = InvalidOid;
+		else
+			pInfer->infercollid = LookupCollation(pstate, ielem->collation,
+												  exprLocation(pInfer->expr));
+
+		if (!ielem->opclass)
+			pInfer->inferopclass = InvalidOid;
+		else
+			pInfer->inferopclass = get_opclass_oid(BTREE_AM_OID,
+												   ielem->opclass, false);
+
+		result = lappend(result, pInfer);
+	}
+
+	return result;
+}
+
+/*
+ * transformOnConflictArbiter -
+ *		transform arbiter expressions in an ON CONFLICT clause.
+ *
+ * Transformed expressions used to infer one unique index relation to serve as
+ * an ON CONFLICT arbiter.  Partial unique indexes may be inferred using WHERE
+ * clause from inference specification clause.
+ */
+void
+transformOnConflictArbiter(ParseState *pstate,
+						   OnConflictClause *onConflictClause,
+						   List **arbiterExpr, Node **arbiterWhere,
+						   Oid *constraint)
+{
+	InferClause *infer = onConflictClause->infer;
+
+	*arbiterExpr = NIL;
+	*arbiterWhere = NULL;
+	*constraint = InvalidOid;
+
+	if (onConflictClause->action == ONCONFLICT_UPDATE && !infer)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("ON CONFLICT DO UPDATE requires inference specification or constraint name"),
+				 errhint("For example, ON CONFLICT (<column>)."),
+				 parser_errposition(pstate,
+								  exprLocation((Node *) onConflictClause))));
+
+	/*
+	 * To simplify certain aspects of its design, speculative insertion into
+	 * system catalogs is disallowed
+	 */
+	if (IsCatalogRelation(pstate->p_target_relation))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			  errmsg("ON CONFLICT not supported with system catalog tables"),
+				 parser_errposition(pstate,
+								  exprLocation((Node *) onConflictClause))));
+
+	/* Same applies to table used by logical decoding as catalog table */
+	if (RelationIsUsedAsCatalogTable(pstate->p_target_relation))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("ON CONFLICT not supported on table \"%s\" used as a catalog table",
+						RelationGetRelationName(pstate->p_target_relation)),
+				 parser_errposition(pstate,
+								  exprLocation((Node *) onConflictClause))));
+
+	/* ON CONFLICT DO NOTHING does not require an inference clause */
+	if (infer)
+	{
+		List	   *save_namespace;
+
+		/*
+		 * While we process the arbiter expressions, accept only non-qualified
+		 * references to the target table. Hide any other relations.
+		 */
+		save_namespace = pstate->p_namespace;
+		pstate->p_namespace = NIL;
+		addRTEtoQuery(pstate, pstate->p_target_rangetblentry,
+					  false, false, true);
+
+		if (infer->indexElems)
+			*arbiterExpr = resolve_unique_index_expr(pstate, infer,
+												  pstate->p_target_relation);
+
+		/*
+		 * Handling inference WHERE clause (for partial unique index
+		 * inference)
+		 */
+		if (infer->whereClause)
+			*arbiterWhere = transformExpr(pstate, infer->whereClause,
+										  EXPR_KIND_INDEX_PREDICATE);
+
+		pstate->p_namespace = save_namespace;
+
+		if (infer->conname)
+			*constraint = get_relation_constraint_oid(RelationGetRelid(pstate->p_target_relation),
+													  infer->conname, false);
+	}
+
+	/*
+	 * It's convenient to form a list of expressions based on the
+	 * representation used by CREATE INDEX, since the same restrictions are
+	 * appropriate (e.g. on subqueries).  However, from here on, a dedicated
+	 * primnode representation is used for inference elements, and so
+	 * assign_query_collations() can be trusted to do the right thing with the
+	 * post parse analysis query tree inference clause representation.
+	 */
+}
+
+/*
  * addTargetToSortList
  *		If the given targetlist entry isn't already in the SortGroupClause
  *		list, add it to the end of the list, using the given sort ordering
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index a59be052a7..42227a0530 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -252,7 +252,7 @@ coerce_type(ParseState *pstate, Node *node,
 		Oid			baseTypeId;
 		int32		baseTypeMod;
 		int32		inputTypeMod;
-		Type		targetType;
+		Type		baseType;
 		ParseCallbackState pcbstate;
 
 		/*
@@ -280,13 +280,13 @@ coerce_type(ParseState *pstate, Node *node,
 		else
 			inputTypeMod = -1;
 
-		targetType = typeidType(baseTypeId);
+		baseType = typeidType(baseTypeId);
 
 		newcon->consttype = baseTypeId;
 		newcon->consttypmod = inputTypeMod;
-		newcon->constcollid = typeTypeCollation(targetType);
-		newcon->constlen = typeLen(targetType);
-		newcon->constbyval = typeByVal(targetType);
+		newcon->constcollid = typeTypeCollation(baseType);
+		newcon->constlen = typeLen(baseType);
+		newcon->constbyval = typeByVal(baseType);
 		newcon->constisnull = con->constisnull;
 
 		/*
@@ -307,11 +307,11 @@ coerce_type(ParseState *pstate, Node *node,
 		 * as CSTRING.
 		 */
 		if (!con->constisnull)
-			newcon->constvalue = stringTypeDatum(targetType,
+			newcon->constvalue = stringTypeDatum(baseType,
 											DatumGetCString(con->constvalue),
 												 inputTypeMod);
 		else
-			newcon->constvalue = stringTypeDatum(targetType,
+			newcon->constvalue = stringTypeDatum(baseType,
 												 NULL,
 												 inputTypeMod);
 
@@ -326,7 +326,7 @@ coerce_type(ParseState *pstate, Node *node,
 									  targetTypeId,
 									  cformat, location, false, false);
 
-		ReleaseSysCache(targetType);
+		ReleaseSysCache(baseType);
 
 		return result;
 	}
diff --git a/src/backend/parser/parse_collate.c b/src/backend/parser/parse_collate.c
index 7c6a11c757..4c85b708d3 100644
--- a/src/backend/parser/parse_collate.c
+++ b/src/backend/parser/parse_collate.c
@@ -479,9 +479,11 @@ assign_collations_walker(Node *node, assign_collations_context *context)
 						 parser_errposition(context->pstate,
 											loccontext.location2)));
 			break;
+		case T_InferenceElem:
 		case T_RangeTblRef:
 		case T_JoinExpr:
 		case T_FromExpr:
+		case T_OnConflictExpr:
 		case T_SortGroupClause:
 			(void) expression_tree_walker(node,
 										  assign_collations_walker,
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index cd5dc89680..8df29d0072 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -32,6 +32,7 @@
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 #include "parser/parse_type.h"
+#include "parser/parse_agg.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/xml.h"
@@ -269,6 +270,10 @@ transformExprRecurse(ParseState *pstate, Node *expr)
 			result = transformMultiAssignRef(pstate, (MultiAssignRef *) expr);
 			break;
 
+		case T_GroupingFunc:
+			result = transformGroupingFunc(pstate, (GroupingFunc *) expr);
+			break;
+
 		case T_NamedArgExpr:
 			{
 				NamedArgExpr *na = (NamedArgExpr *) expr;
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 1385776f6b..fa9761bac3 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -18,6 +18,7 @@
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "catalog/pg_tablesample_method.h"
 #include "funcapi.h"
 #include "lib/stringinfo.h"
 #include "nodes/makefuncs.h"
@@ -26,6 +27,7 @@
 #include "parser/parse_clause.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_func.h"
+#include "parser/parse_expr.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 #include "parser/parse_type.h"
@@ -767,6 +769,148 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 }
 
 
+/*
+ * ParseTableSample
+ *
+ * Parse TABLESAMPLE clause and process the arguments
+ */
+TableSampleClause *
+ParseTableSample(ParseState *pstate, char *samplemethod, Node *repeatable,
+				 List *sampleargs, int location)
+{
+	HeapTuple	tuple;
+	Form_pg_tablesample_method tsm;
+	Form_pg_proc procform;
+	TableSampleClause *tablesample;
+	List	   *fargs;
+	ListCell   *larg;
+	int			nargs,
+				initnargs;
+	Oid			init_arg_types[FUNC_MAX_ARGS];
+
+	/* Load the tablesample method */
+	tuple = SearchSysCache1(TABLESAMPLEMETHODNAME, PointerGetDatum(samplemethod));
+	if (!HeapTupleIsValid(tuple))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("tablesample method \"%s\" does not exist",
+						samplemethod),
+				 parser_errposition(pstate, location)));
+
+	tablesample = makeNode(TableSampleClause);
+	tablesample->tsmid = HeapTupleGetOid(tuple);
+
+	tsm = (Form_pg_tablesample_method) GETSTRUCT(tuple);
+
+	tablesample->tsmseqscan = tsm->tsmseqscan;
+	tablesample->tsmpagemode = tsm->tsmpagemode;
+	tablesample->tsminit = tsm->tsminit;
+	tablesample->tsmnextblock = tsm->tsmnextblock;
+	tablesample->tsmnexttuple = tsm->tsmnexttuple;
+	tablesample->tsmexaminetuple = tsm->tsmexaminetuple;
+	tablesample->tsmend = tsm->tsmend;
+	tablesample->tsmreset = tsm->tsmreset;
+	tablesample->tsmcost = tsm->tsmcost;
+
+	ReleaseSysCache(tuple);
+
+	/* Validate the parameters against init function definition. */
+	tuple = SearchSysCache1(PROCOID,
+							ObjectIdGetDatum(tablesample->tsminit));
+
+	if (!HeapTupleIsValid(tuple))		/* should not happen */
+		elog(ERROR, "cache lookup failed for function %u",
+			 tablesample->tsminit);
+
+	procform = (Form_pg_proc) GETSTRUCT(tuple);
+	initnargs = procform->pronargs;
+	Assert(initnargs >= 3);
+
+	/*
+	 * First parameter is used to pass the SampleScanState, second is seed
+	 * (REPEATABLE), skip the processing for them here, just assert that the
+	 * types are correct.
+	 */
+	Assert(procform->proargtypes.values[0] == INTERNALOID);
+	Assert(procform->proargtypes.values[1] == INT4OID);
+	initnargs -= 2;
+	memcpy(init_arg_types, procform->proargtypes.values + 2,
+		   initnargs * sizeof(Oid));
+
+	/* Now we are done with the catalog */
+	ReleaseSysCache(tuple);
+
+	/* Process repeatable (seed) */
+	if (repeatable != NULL)
+	{
+		Node	   *arg = repeatable;
+
+		if (arg && IsA(arg, A_Const))
+		{
+			A_Const    *con = (A_Const *) arg;
+
+			if (con->val.type == T_Null)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				  errmsg("REPEATABLE clause must be NOT NULL numeric value"),
+						 parser_errposition(pstate, con->location)));
+
+		}
+
+		arg = transformExpr(pstate, arg, EXPR_KIND_FROM_FUNCTION);
+		arg = coerce_to_specific_type(pstate, arg, INT4OID, "REPEATABLE");
+		tablesample->repeatable = arg;
+	}
+	else
+		tablesample->repeatable = NULL;
+
+	/* Check user provided expected number of arguments. */
+	if (list_length(sampleargs) != initnargs)
+		ereport(ERROR,
+				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
+		errmsg_plural("tablesample method \"%s\" expects %d argument got %d",
+					  "tablesample method \"%s\" expects %d arguments got %d",
+					  initnargs,
+					  samplemethod,
+					  initnargs, list_length(sampleargs)),
+				 parser_errposition(pstate, location)));
+
+	/* Transform the arguments, typecasting them as needed. */
+	fargs = NIL;
+	nargs = 0;
+	foreach(larg, sampleargs)
+	{
+		Node	   *inarg = (Node *) lfirst(larg);
+		Node	   *arg = transformExpr(pstate, inarg, EXPR_KIND_FROM_FUNCTION);
+		Oid			argtype = exprType(arg);
+
+		if (argtype != init_arg_types[nargs])
+		{
+			if (!can_coerce_type(1, &argtype, &init_arg_types[nargs],
+								 COERCION_IMPLICIT))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				   errmsg("wrong parameter %d for tablesample method \"%s\"",
+						  nargs + 1, samplemethod),
+						 errdetail("Expected type %s got %s.",
+								   format_type_be(init_arg_types[nargs]),
+								   format_type_be(argtype)),
+						 parser_errposition(pstate, exprLocation(inarg))));
+
+			arg = coerce_type(pstate, arg, argtype, init_arg_types[nargs], -1,
+							  COERCION_IMPLICIT, COERCE_IMPLICIT_CAST, -1);
+		}
+
+		fargs = lappend(fargs, arg);
+		nargs++;
+	}
+
+	/* Pass the arguments down */
+	tablesample->args = fargs;
+
+	return tablesample;
+}
+
 /* func_match_argtypes()
  *
  * Given a list of candidate functions (having the right name and number
@@ -1860,7 +2004,7 @@ funcname_signature_string(const char *funcname, int nargs,
 			appendStringInfoString(&argbuf, ", ");
 		if (i >= numposargs)
 		{
-			appendStringInfo(&argbuf, "%s := ", (char *) lfirst(lc));
+			appendStringInfo(&argbuf, "%s => ", (char *) lfirst(lc));
 			lc = lnext(lc);
 		}
 		appendStringInfoString(&argbuf, format_type_be(argtypes[i]));
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index c1adab97bf..735ffc485f 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -544,8 +544,8 @@ updateFuzzyAttrMatchState(int fuzzy_rte_penalty,
 						  FuzzyAttrMatchState *fuzzystate, RangeTblEntry *rte,
 						  const char *actual, const char *match, int attnum)
 {
-	int		columndistance;
-	int		matchlen;
+	int			columndistance;
+	int			matchlen;
 
 	/* Bail before computing the Levenshtein distance if there's no hope. */
 	if (fuzzy_rte_penalty > fuzzystate->distance)
@@ -564,7 +564,7 @@ updateFuzzyAttrMatchState(int fuzzy_rte_penalty,
 		varstr_levenshtein_less_equal(actual, strlen(actual), match, matchlen,
 									  1, 1, 1,
 									  fuzzystate->distance + 1
-										- fuzzy_rte_penalty);
+									  - fuzzy_rte_penalty);
 
 	/*
 	 * If more than half the characters are different, don't treat it as a
@@ -574,8 +574,8 @@ updateFuzzyAttrMatchState(int fuzzy_rte_penalty,
 		return;
 
 	/*
-	 * From this point on, we can ignore the distinction between the
-	 * RTE-name distance and the column-name distance.
+	 * From this point on, we can ignore the distinction between the RTE-name
+	 * distance and the column-name distance.
 	 */
 	columndistance += fuzzy_rte_penalty;
 
@@ -595,11 +595,11 @@ updateFuzzyAttrMatchState(int fuzzy_rte_penalty,
 	else if (columndistance == fuzzystate->distance)
 	{
 		/*
-		 * This match distance may equal a prior match within this same
-		 * range table.  When that happens, the prior match may also be
-		 * given, but only if there is no more than two equally distant
-		 * matches from the RTE (in turn, our caller will only accept
-		 * two equally distant matches overall).
+		 * This match distance may equal a prior match within this same range
+		 * table.  When that happens, the prior match may also be given, but
+		 * only if there is no more than two equally distant matches from the
+		 * RTE (in turn, our caller will only accept two equally distant
+		 * matches overall).
 		 */
 		if (AttributeNumberIsValid(fuzzystate->second))
 		{
@@ -620,9 +620,9 @@ updateFuzzyAttrMatchState(int fuzzy_rte_penalty,
 		else if (fuzzystate->distance <= MAX_FUZZY_DISTANCE)
 		{
 			/*
-			 * Record as provisional first match (this can occasionally
-			 * occur because previous lowest distance was "too low a
-			 * bar", rather than being associated with a real match)
+			 * Record as provisional first match (this can occasionally occur
+			 * because previous lowest distance was "too low a bar", rather
+			 * than being associated with a real match)
 			 */
 			fuzzystate->rfirst = rte;
 			fuzzystate->first = attnum;
@@ -834,8 +834,8 @@ searchRangeTableForCol(ParseState *pstate, const char *alias, char *colname,
 
 		foreach(l, pstate->p_rtable)
 		{
-			RangeTblEntry	   *rte = (RangeTblEntry *) lfirst(l);
-			int					fuzzy_rte_penalty = 0;
+			RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
+			int			fuzzy_rte_penalty = 0;
 
 			/*
 			 * Typically, it is not useful to look for matches within join
@@ -865,7 +865,7 @@ searchRangeTableForCol(ParseState *pstate, const char *alias, char *colname,
 			 */
 			if (scanRTEForColumn(orig_pstate, rte, colname, location,
 								 fuzzy_rte_penalty, fuzzystate)
-					&& fuzzy_rte_penalty == 0)
+				&& fuzzy_rte_penalty == 0)
 			{
 				fuzzystate->rfirst = rte;
 				fuzzystate->first = InvalidAttrNumber;
@@ -1319,7 +1319,8 @@ addRangeTableEntry(ParseState *pstate,
 	rte->requiredPerms = ACL_SELECT;
 	rte->checkAsUser = InvalidOid;		/* not set-uid by default, either */
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * Add completed RTE to pstate's range table list, but not to join list
@@ -1379,7 +1380,8 @@ addRangeTableEntryForRelation(ParseState *pstate,
 	rte->requiredPerms = ACL_SELECT;
 	rte->checkAsUser = InvalidOid;		/* not set-uid by default, either */
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * Add completed RTE to pstate's range table list, but not to join list
@@ -1458,7 +1460,8 @@ addRangeTableEntryForSubquery(ParseState *pstate,
 	rte->requiredPerms = 0;
 	rte->checkAsUser = InvalidOid;
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * Add completed RTE to pstate's range table list, but not to join list
@@ -1713,7 +1716,8 @@ addRangeTableEntryForFunction(ParseState *pstate,
 	rte->requiredPerms = 0;
 	rte->checkAsUser = InvalidOid;
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * Add completed RTE to pstate's range table list, but not to join list
@@ -1786,7 +1790,8 @@ addRangeTableEntryForValues(ParseState *pstate,
 	rte->requiredPerms = 0;
 	rte->checkAsUser = InvalidOid;
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * Add completed RTE to pstate's range table list, but not to join list
@@ -1855,7 +1860,8 @@ addRangeTableEntryForJoin(ParseState *pstate,
 	rte->requiredPerms = 0;
 	rte->checkAsUser = InvalidOid;
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * Add completed RTE to pstate's range table list, but not to join list
@@ -1965,7 +1971,8 @@ addRangeTableEntryForCTE(ParseState *pstate,
 	rte->requiredPerms = 0;
 	rte->checkAsUser = InvalidOid;
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * Add completed RTE to pstate's range table list, but not to join list
@@ -3154,8 +3161,8 @@ void
 errorMissingColumn(ParseState *pstate,
 				   char *relname, char *colname, int location)
 {
-	FuzzyAttrMatchState	   *state;
-	char				   *closestfirst = NULL;
+	FuzzyAttrMatchState *state;
+	char	   *closestfirst = NULL;
 
 	/*
 	 * Search the entire rtable looking for possible matches.  If we find one,
@@ -3170,10 +3177,10 @@ errorMissingColumn(ParseState *pstate,
 	 * Extract closest col string for best match, if any.
 	 *
 	 * Infer an exact match referenced despite not being visible from the fact
-	 * that an attribute number was not present in state passed back -- this is
-	 * what is reported when !closestfirst.  There might also be an exact match
-	 * that was qualified with an incorrect alias, in which case closestfirst
-	 * will be set (so hint is the same as generic fuzzy case).
+	 * that an attribute number was not present in state passed back -- this
+	 * is what is reported when !closestfirst.  There might also be an exact
+	 * match that was qualified with an incorrect alias, in which case
+	 * closestfirst will be set (so hint is the same as generic fuzzy case).
 	 */
 	if (state->rfirst && AttributeNumberIsValid(state->first))
 		closestfirst = strVal(list_nth(state->rfirst->eref->colnames,
@@ -3188,19 +3195,19 @@ errorMissingColumn(ParseState *pstate,
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_COLUMN),
 				 relname ?
-				 errmsg("column %s.%s does not exist", relname, colname):
+				 errmsg("column %s.%s does not exist", relname, colname) :
 				 errmsg("column \"%s\" does not exist", colname),
 				 state->rfirst ? closestfirst ?
-				 errhint("Perhaps you meant to reference the column \"%s\".\"%s\".",
-						 state->rfirst->eref->aliasname, closestfirst):
+		  errhint("Perhaps you meant to reference the column \"%s\".\"%s\".",
+				  state->rfirst->eref->aliasname, closestfirst) :
 				 errhint("There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query.",
-						 colname, state->rfirst->eref->aliasname): 0,
+						 colname, state->rfirst->eref->aliasname) : 0,
 				 parser_errposition(pstate, location)));
 	}
 	else
 	{
 		/* Handle case where there are two equally useful column hints */
-		char				   *closestsecond;
+		char	   *closestsecond;
 
 		closestsecond = strVal(list_nth(state->rsecond->eref->colnames,
 										state->second - 1));
@@ -3208,7 +3215,7 @@ errorMissingColumn(ParseState *pstate,
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_COLUMN),
 				 relname ?
-				 errmsg("column %s.%s does not exist", relname, colname):
+				 errmsg("column %s.%s does not exist", relname, colname) :
 				 errmsg("column \"%s\" does not exist", colname),
 				 errhint("Perhaps you meant to reference the column \"%s\".\"%s\" or the column \"%s\".\"%s\".",
 						 state->rfirst->eref->aliasname, closestfirst,
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index c2c1944a0e..244817b867 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -542,11 +542,12 @@ transformAssignedExpr(ParseState *pstate,
 
 /*
  * updateTargetListEntry()
- *	This is used in UPDATE statements only. It prepares an UPDATE
- *	TargetEntry for assignment to a column of the target table.
- *	This includes coercing the given value to the target column's type
- *	(if necessary), and dealing with any subfield names or subscripts
- *	attached to the target column itself.
+ *	This is used in UPDATE statements (and ON CONFLICT DO UPDATE)
+ *	only.  It prepares an UPDATE TargetEntry for assignment to a
+ *	column of the target table.  This includes coercing the given
+ *	value to the target column's type (if necessary), and dealing with
+ *	any subfield names or subscripts attached to the target column
+ *	itself.
  *
  * pstate		parse state
  * tle			target list entry to be modified
@@ -1690,6 +1691,10 @@ FigureColnameInternal(Node *node, char **name)
 			break;
 		case T_CollateClause:
 			return FigureColnameInternal(((CollateClause *) node)->arg, name);
+		case T_GroupingFunc:
+			/* make GROUPING() act like a regular function */
+			*name = "grouping";
+			return 2;
 		case T_SubLink:
 			switch (((SubLink *) node)->subLinkType)
 			{
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 1ba6ca76f4..661663994e 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -797,7 +797,7 @@ fail:
 	ereport(ERROR,
 			(errcode(ERRCODE_SYNTAX_ERROR),
 			 errmsg("invalid type name \"%s\"", str)));
-	return NULL; /* keep compiler quiet */
+	return NULL;				/* keep compiler quiet */
 }
 
 /*
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 48f88ca282..a0bb4dd893 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -275,7 +275,6 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	cxt.blist = NIL;
 	cxt.alist = NIL;
 	cxt.pkey = NULL;
-	cxt.hasoids = interpretOidsOption(stmt->options, true);
 #ifdef PGXC
 #ifdef XCP
 	cxt.fallback_source = FBS_NONE;
@@ -287,6 +286,18 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	cxt.subcluster = stmt->subcluster;
 #endif
 
+	/*
+	 * Notice that we allow OIDs here only for plain tables, even though
+	 * foreign tables also support them.  This is necessary because the
+	 * default_with_oids GUC must apply only to plain tables and not any other
+	 * relkind; doing otherwise would break existing pg_dump files.  We could
+	 * allow explicit "WITH OIDS" while not allowing default_with_oids to
+	 * affect other relkinds, but it would complicate interpretOidsOption(),
+	 * and right now there's no WITH OIDS option in CREATE FOREIGN TABLE
+	 * anyway.
+	 */
+	cxt.hasoids = interpretOidsOption(stmt->options, !cxt.isforeign);
+
 	Assert(!stmt->ofTypename || !stmt->inhRelations);	/* grammar enforces */
 
 	if (stmt->ofTypename)
@@ -2026,11 +2037,13 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 
 				Assert(IsA(inh, RangeVar));
 				rel = heap_openrv(inh, AccessShareLock);
-				if (rel->rd_rel->relkind != RELKIND_RELATION)
+				/* check user requested inheritance from valid relkind */
+				if (rel->rd_rel->relkind != RELKIND_RELATION &&
+					rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE)
 					ereport(ERROR,
 							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						   errmsg("inherited relation \"%s\" is not a table",
-								  inh->relname)));
+							 errmsg("inherited relation \"%s\" is not a table or foreign table",
+									inh->relname)));
 				for (count = 0; count < rel->rd_att->natts; count++)
 				{
 					Form_pg_attribute inhattr = rel->rd_att->attrs[count];
@@ -2924,7 +2937,7 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
 
 			case AT_AlterColumnType:
 				{
-					ColumnDef *def = (ColumnDef *) cmd->def;
+					ColumnDef  *def = (ColumnDef *) cmd->def;
 
 					/*
 					 * For ALTER COLUMN TYPE, transform the USING clause if
diff --git a/src/backend/pgxc/barrier/barrier.c b/src/backend/pgxc/barrier/barrier.c
index a538034423..e532d6a262 100644
--- a/src/backend/pgxc/barrier/barrier.c
+++ b/src/backend/pgxc/barrier/barrier.c
@@ -488,15 +488,8 @@ RequestBarrier(const char *id, char *completionTag)
 }
 
 void
-barrier_redo(XLogRecPtr lsn, XLogRecord *record)
+barrier_redo(XLogReaderState *record)
 {
 	/* Nothing to do */
 	return;
 }
-
-void
-barrier_desc(StringInfo buf, uint8 xl_info, char *rec)
-{
-	Assert(xl_info == XLOG_BARRIER_CREATE);
-	appendStringInfo(buf, "BARRIER %s", rec);
-}
diff --git a/src/backend/port/atomics.c b/src/backend/port/atomics.c
index f57e672301..3350fb7df3 100644
--- a/src/backend/port/atomics.c
+++ b/src/backend/port/atomics.c
@@ -15,7 +15,7 @@
 
 /*
  * We want the functions below to be inline; but if the compiler doesn't
- * support that, fall back on providing them as regular functions.	See
+ * support that, fall back on providing them as regular functions.  See
  * STATIC_IF_INLINE in c.h.
  */
 #define ATOMICS_INCLUDE_DEFINITIONS
@@ -50,9 +50,10 @@ pg_atomic_init_flag_impl(volatile pg_atomic_flag *ptr)
 					 "size mismatch of atomic_flag vs slock_t");
 
 #ifndef HAVE_SPINLOCKS
+
 	/*
 	 * NB: If we're using semaphore based TAS emulation, be careful to use a
-	 * separate set of semaphores. Otherwise we'd get in trouble if a atomic
+	 * separate set of semaphores. Otherwise we'd get in trouble if an atomic
 	 * var would be manipulated while spinlock is held.
 	 */
 	s_init_lock_sema((slock_t *) &ptr->sema, true);
@@ -73,7 +74,7 @@ pg_atomic_clear_flag_impl(volatile pg_atomic_flag *ptr)
 	S_UNLOCK((slock_t *) &ptr->sema);
 }
 
-#endif /* PG_HAVE_ATOMIC_FLAG_SIMULATION */
+#endif   /* PG_HAVE_ATOMIC_FLAG_SIMULATION */
 
 #ifdef PG_HAVE_ATOMIC_U32_SIMULATION
 void
@@ -98,7 +99,8 @@ bool
 pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 									uint32 *expected, uint32 newval)
 {
-	bool ret;
+	bool		ret;
+
 	/*
 	 * Do atomic op under a spinlock. It might look like we could just skip
 	 * the cmpxchg if the lock isn't available, but that'd just emulate a
@@ -109,7 +111,7 @@ pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 	 */
 	SpinLockAcquire((slock_t *) &ptr->sema);
 
-	/* perform compare/exchange logic*/
+	/* perform compare/exchange logic */
 	ret = ptr->value == *expected;
 	*expected = ptr->value;
 	if (ret)
@@ -124,7 +126,8 @@ pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 uint32
 pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
 {
-	uint32 oldval;
+	uint32		oldval;
+
 	SpinLockAcquire((slock_t *) &ptr->sema);
 	oldval = ptr->value;
 	ptr->value += add_;
@@ -132,4 +135,4 @@ pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
 	return oldval;
 }
 
-#endif /* PG_HAVE_ATOMIC_U32_SIMULATION */
+#endif   /* PG_HAVE_ATOMIC_U32_SIMULATION */
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index d95ab9273c..8be5bbe1ab 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -391,7 +391,7 @@ CreateAnonymousSegment(Size *size)
 				 (mmap_errno == ENOMEM) ?
 				 errhint("This error usually means that PostgreSQL's request "
 					"for a shared memory segment exceeded available memory, "
-					  "swap space, or huge pages. To reduce the request size "
+					 "swap space, or huge pages. To reduce the request size "
 						 "(currently %zu bytes), reduce PostgreSQL's shared "
 					   "memory usage, perhaps by reducing shared_buffers or "
 						 "max_connections.",
diff --git a/src/backend/port/win32_latch.c b/src/backend/port/win32_latch.c
index c7d4bdddc2..ee9526245f 100644
--- a/src/backend/port/win32_latch.c
+++ b/src/backend/port/win32_latch.c
@@ -151,7 +151,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
 	if (wakeEvents & (WL_SOCKET_READABLE | WL_SOCKET_WRITEABLE))
 	{
 		/* Need an event object to represent events on the socket */
-		int			flags = FD_CLOSE; /* always check for errors/EOF */
+		int			flags = FD_CLOSE;	/* always check for errors/EOF */
 
 		if (wakeEvents & WL_SOCKET_READABLE)
 			flags |= FD_READ;
diff --git a/src/backend/port/win32_sema.c b/src/backend/port/win32_sema.c
index 011e2fd4a6..4fd1e2aa13 100644
--- a/src/backend/port/win32_sema.c
+++ b/src/backend/port/win32_sema.c
@@ -153,6 +153,7 @@ PGSemaphoreLock(PGSemaphore sema)
 				done = true;
 				break;
 			case WAIT_IO_COMPLETION:
+
 				/*
 				 * The system interrupted the wait to execute an I/O
 				 * completion routine or asynchronous procedure call in this
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 9d92887a48..2deb4f13c9 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -306,10 +306,12 @@ static void do_autovacuum(void);
 static void FreeWorkerInfo(int code, Datum arg);
 
 static autovac_table *table_recheck_autovac(Oid relid, HTAB *table_toast_map,
-					  TupleDesc pg_class_desc);
+					  TupleDesc pg_class_desc,
+					  int effective_multixact_freeze_max_age);
 static void relation_needs_vacanalyze(Oid relid, AutoVacOpts *relopts,
 						  Form_pg_class classForm,
 						  PgStat_StatTabEntry *tabentry,
+						  int effective_multixact_freeze_max_age,
 						  bool *dovacuum, bool *doanalyze, bool *wraparound);
 
 static void autovacuum_do_vac_analyze(autovac_table *tab,
@@ -1127,7 +1129,7 @@ do_start_worker(void)
 
 	/* Also determine the oldest datminmxid we will consider. */
 	recentMulti = ReadNextMultiXactId();
-	multiForceLimit = recentMulti - autovacuum_multixact_freeze_max_age;
+	multiForceLimit = recentMulti - MultiXactMemberFreezeThreshold();
 	if (multiForceLimit < FirstMultiXactId)
 		multiForceLimit -= FirstMultiXactId;
 
@@ -1890,6 +1892,7 @@ do_autovacuum(void)
 	BufferAccessStrategy bstrategy;
 	ScanKeyData key;
 	TupleDesc	pg_class_desc;
+	int			effective_multixact_freeze_max_age;
 
 	/*
 	 * StartTransactionCommand and CommitTransactionCommand will automatically
@@ -1920,6 +1923,13 @@ do_autovacuum(void)
 	pgstat_vacuum_stat();
 
 	/*
+	 * Compute the multixact age for which freezing is urgent.  This is
+	 * normally autovacuum_multixact_freeze_max_age, but may be less if we are
+	 * short of multixact member space.
+	 */
+	effective_multixact_freeze_max_age = MultiXactMemberFreezeThreshold();
+
+	/*
 	 * Find the pg_database entry and select the default freeze ages. We use
 	 * zero in template and nonconnectable databases, else the system-wide
 	 * default.
@@ -2010,6 +2020,7 @@ do_autovacuum(void)
 
 		/* Check if it needs vacuum or analyze */
 		relation_needs_vacanalyze(relid, relopts, classForm, tabentry,
+								  effective_multixact_freeze_max_age,
 								  &dovacuum, &doanalyze, &wraparound);
 
 		/*
@@ -2138,6 +2149,7 @@ do_autovacuum(void)
 											 shared, dbentry);
 
 		relation_needs_vacanalyze(relid, relopts, classForm, tabentry,
+								  effective_multixact_freeze_max_age,
 								  &dovacuum, &doanalyze, &wraparound);
 
 		/* ignore analyze for toast tables */
@@ -2254,7 +2266,8 @@ do_autovacuum(void)
 		 * the race condition is not closed but it is very small.
 		 */
 		MemoryContextSwitchTo(AutovacMemCxt);
-		tab = table_recheck_autovac(relid, table_toast_map, pg_class_desc);
+		tab = table_recheck_autovac(relid, table_toast_map, pg_class_desc,
+									effective_multixact_freeze_max_age);
 		if (tab == NULL)
 		{
 			/* someone else vacuumed the table, or it went away */
@@ -2461,7 +2474,8 @@ get_pgstat_tabentry_relid(Oid relid, bool isshared, PgStat_StatDBEntry *shared,
  */
 static autovac_table *
 table_recheck_autovac(Oid relid, HTAB *table_toast_map,
-					  TupleDesc pg_class_desc)
+					  TupleDesc pg_class_desc,
+					  int effective_multixact_freeze_max_age)
 {
 	Form_pg_class classForm;
 	HeapTuple	classTup;
@@ -2507,6 +2521,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 										 shared, dbentry);
 
 	relation_needs_vacanalyze(relid, avopts, classForm, tabentry,
+							  effective_multixact_freeze_max_age,
 							  &dovacuum, &doanalyze, &wraparound);
 
 	/* ignore ANALYZE for toast tables */
@@ -2643,6 +2658,7 @@ relation_needs_vacanalyze(Oid relid,
 						  AutoVacOpts *relopts,
 						  Form_pg_class classForm,
 						  PgStat_StatTabEntry *tabentry,
+						  int effective_multixact_freeze_max_age,
  /* output params below */
 						  bool *dovacuum,
 						  bool *doanalyze,
@@ -2703,8 +2719,8 @@ relation_needs_vacanalyze(Oid relid,
 		: autovacuum_freeze_max_age;
 
 	multixact_freeze_max_age = (relopts && relopts->multixact_freeze_max_age >= 0)
-		? Min(relopts->multixact_freeze_max_age, autovacuum_multixact_freeze_max_age)
-		: autovacuum_multixact_freeze_max_age;
+		? Min(relopts->multixact_freeze_max_age, effective_multixact_freeze_max_age)
+		: effective_multixact_freeze_max_age;
 
 	av_enabled = (relopts ? relopts->enabled : true);
 
@@ -2785,7 +2801,7 @@ relation_needs_vacanalyze(Oid relid,
 static void
 autovacuum_do_vac_analyze(autovac_table *tab, BufferAccessStrategy bstrategy)
 {
-	RangeVar		rangevar;
+	RangeVar	rangevar;
 
 	/* Set up command parameters --- use local variables instead of palloc */
 	MemSet(&rangevar, 0, sizeof(rangevar));
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 99f4b65ea6..f57224c10f 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -130,7 +130,7 @@ BackgroundWorkerShmemInit(void)
 		/*
 		 * Copy contents of worker list into shared memory.  Record the shared
 		 * memory slot assigned to each worker.  This ensures a 1-to-1
-		 * correspondence betwen the postmaster's private list and the array
+		 * correspondence between the postmaster's private list and the array
 		 * in shared memory.
 		 */
 		slist_foreach(siter, &BackgroundWorkerList)
@@ -254,15 +254,15 @@ BackgroundWorkerStateChange(void)
 		}
 
 		/*
-		 * If the worker is marked for termination, we don't need to add it
-		 * to the registered workers list; we can just free the slot.
-		 * However, if bgw_notify_pid is set, the process that registered the
-		 * worker may need to know that we've processed the terminate request,
-		 * so be sure to signal it.
+		 * If the worker is marked for termination, we don't need to add it to
+		 * the registered workers list; we can just free the slot. However, if
+		 * bgw_notify_pid is set, the process that registered the worker may
+		 * need to know that we've processed the terminate request, so be sure
+		 * to signal it.
 		 */
 		if (slot->terminate)
 		{
-			int	notify_pid;
+			int			notify_pid;
 
 			/*
 			 * We need a memory barrier here to make sure that the load of
@@ -426,7 +426,7 @@ BackgroundWorkerStopNotifications(pid_t pid)
 void
 ResetBackgroundWorkerCrashTimes(void)
 {
-	slist_mutable_iter	iter;
+	slist_mutable_iter iter;
 
 	slist_foreach_modify(iter, &BackgroundWorkerList)
 	{
@@ -435,8 +435,8 @@ ResetBackgroundWorkerCrashTimes(void)
 		rw = slist_container(RegisteredBgWorker, rw_lnode, iter.cur);
 
 		/*
-		 * For workers that should not be restarted, we don't want to lose
-		 * the information that they have crashed; otherwise, they would be
+		 * For workers that should not be restarted, we don't want to lose the
+		 * information that they have crashed; otherwise, they would be
 		 * restarted, which is wrong.
 		 */
 		if (rw->rw_worker.bgw_restart_time != BGW_NEVER_RESTART)
@@ -679,7 +679,8 @@ StartBackgroundWorker(void)
 		/*
 		 * Early initialization.  Some of this could be useful even for
 		 * background workers that aren't using shared memory, but they can
-		 * call the individual startup routines for those subsystems if needed.
+		 * call the individual startup routines for those subsystems if
+		 * needed.
 		 */
 		BaseInit();
 
@@ -996,6 +997,56 @@ WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pidp)
 }
 
 /*
+ * Wait for a background worker to stop.
+ *
+ * If the worker hasn't yet started, or is running, we wait for it to stop
+ * and then return BGWH_STOPPED.  However, if the postmaster has died, we give
+ * up and return BGWH_POSTMASTER_DIED, because it's the postmaster that
+ * notifies us when a worker's state changes.
+ */
+BgwHandleStatus
+WaitForBackgroundWorkerShutdown(BackgroundWorkerHandle *handle)
+{
+	BgwHandleStatus status;
+	int			rc;
+	bool		save_set_latch_on_sigusr1;
+
+	save_set_latch_on_sigusr1 = set_latch_on_sigusr1;
+	set_latch_on_sigusr1 = true;
+
+	PG_TRY();
+	{
+		for (;;)
+		{
+			pid_t		pid;
+
+			CHECK_FOR_INTERRUPTS();
+
+			status = GetBackgroundWorkerPid(handle, &pid);
+			if (status == BGWH_STOPPED)
+				return status;
+
+			rc = WaitLatch(&MyProc->procLatch,
+						   WL_LATCH_SET | WL_POSTMASTER_DEATH, 0);
+
+			if (rc & WL_POSTMASTER_DEATH)
+				return BGWH_POSTMASTER_DIED;
+
+			ResetLatch(&MyProc->procLatch);
+		}
+	}
+	PG_CATCH();
+	{
+		set_latch_on_sigusr1 = save_set_latch_on_sigusr1;
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+
+	set_latch_on_sigusr1 = save_set_latch_on_sigusr1;
+	return status;
+}
+
+/*
  * Instruct the postmaster to terminate a background worker.
  *
  * Note that it's safe to do this without regard to whether the worker is
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index b6cf65d495..65465d6a47 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -297,7 +297,7 @@ BackgroundWriterMain(void)
 		 * overall timeout handling but just assume we're going to get called
 		 * often enough even if hibernation mode is active. It's not that
 		 * important that log_snap_interval_ms is met strictly. To make sure
-		 * we're not waking the disk up unneccesarily on an idle system we
+		 * we're not waking the disk up unnecessarily on an idle system we
 		 * check whether there has been any WAL inserted since the last time
 		 * we've logged a running xacts.
 		 *
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 56204bb913..93629f0919 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -2645,7 +2645,7 @@ CreateSharedBackendStatus(void)
 		buffer = (char *) BackendSslStatusBuffer;
 		for (i = 0; i < MaxBackends; i++)
 		{
-			BackendStatusArray[i].st_sslstatus = (PgBackendSSLStatus *)buffer;
+			BackendStatusArray[i].st_sslstatus = (PgBackendSSLStatus *) buffer;
 			buffer += sizeof(PgBackendSSLStatus);
 		}
 	}
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index b377b1d612..0f042c7f24 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -938,9 +938,9 @@ PostmasterMain(int argc, char *argv[])
 		write_stderr("%s: max_wal_senders must be less than max_connections\n", progname);
 		ExitPostmaster(1);
 	}
-	if (XLogArchiveMode && wal_level == WAL_LEVEL_MINIMAL)
+	if (XLogArchiveMode > ARCHIVE_MODE_OFF && wal_level == WAL_LEVEL_MINIMAL)
 		ereport(ERROR,
-				(errmsg("WAL archival (archive_mode=on) requires wal_level \"archive\", \"hot_standby\", or \"logical\"")));
+				(errmsg("WAL archival cannot be enabled when wal_level is \"minimal\"")));
 	if (max_wal_senders > 0 && wal_level == WAL_LEVEL_MINIMAL)
 		ereport(ERROR,
 				(errmsg("WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\"")));
@@ -1779,10 +1779,6 @@ ServerLoop(void)
 				start_autovac_launcher = false; /* signal processed */
 		}
 
-		/* If we have lost the archiver, try to start a new one */
-		if (XLogArchivingActive() && PgArchPID == 0 && pmState == PM_RUN)
-			PgArchPID = pgarch_start();
-
 		/* If we have lost the stats collector, try to start a new one */
 		if (PgStatPID == 0 && pmState == PM_RUN)
 			PgStatPID = pgstat_start();
@@ -1796,6 +1792,22 @@ ServerLoop(void)
 #endif /* XCP */
 			PgPoolerPID = StartPoolManager();
 #endif /* PGXC */
+		/*
+		 * If we have lost the archiver, try to start a new one.
+		 *
+		 * If WAL archiving is enabled always, we try to start a new archiver
+		 * even during recovery.
+		 */
+		if (PgArchPID == 0 && wal_level >= WAL_LEVEL_ARCHIVE)
+		{
+			if ((pmState == PM_RUN && XLogArchiveMode > ARCHIVE_MODE_OFF) ||
+				((pmState == PM_RECOVERY || pmState == PM_HOT_STANDBY) &&
+				 XLogArchiveMode == ARCHIVE_MODE_ALWAYS))
+			{
+				PgArchPID = pgarch_start();
+			}
+		}
+
 		/* If we need to signal the autovacuum launcher, do so now */
 		if (avlauncher_needs_signal)
 		{
@@ -2784,7 +2796,7 @@ reaper(SIGNAL_ARGS)
 			if (EXIT_STATUS_3(exitstatus))
 			{
 				ereport(LOG,
-					(errmsg("shutdown at recovery target")));
+						(errmsg("shutdown at recovery target")));
 				Shutdown = SmartShutdown;
 				TerminateChildren(SIGTERM);
 				pmState = PM_WAIT_BACKENDS;
@@ -3138,9 +3150,9 @@ CleanupBackgroundWorker(int pid,
 		}
 
 		/*
-		 * We must release the postmaster child slot whether this worker
-		 * is connected to shared memory or not, but we only treat it as
-		 * a crash if it is in fact connected.
+		 * We must release the postmaster child slot whether this worker is
+		 * connected to shared memory or not, but we only treat it as a crash
+		 * if it is in fact connected.
 		 */
 		if (!ReleasePostmasterChildSlot(rw->rw_child_slot) &&
 			(rw->rw_worker.bgw_flags & BGWORKER_SHMEM_ACCESS) != 0)
@@ -4213,7 +4225,16 @@ BackendInitialize(Port *port)
 	 * We arrange for a simple exit(1) if we receive SIGTERM or SIGQUIT or
 	 * timeout while trying to collect the startup packet.  Otherwise the
 	 * postmaster cannot shutdown the database FAST or IMMED cleanly if a
-	 * buggy client fails to send the packet promptly.
+	 * buggy client fails to send the packet promptly.  XXX it follows that
+	 * the remainder of this function must tolerate losing control at any
+	 * instant.  Likewise, any pg_on_exit_callback registered before or during
+	 * this function must be prepared to execute at any instant between here
+	 * and the end of this function.  Furthermore, affected callbacks execute
+	 * partially or not at all when a second exit-inducing signal arrives
+	 * after proc_exit_prepare() decrements on_proc_exit_index.  (Thanks to
+	 * that mechanic, callbacks need not anticipate more than one call.)  This
+	 * is fragile; it ought to instead follow the norm of handling interrupts
+	 * at selected, safe opportunities.
 	 */
 	pqsignal(SIGTERM, startup_die);
 	pqsignal(SIGQUIT, startup_die);
@@ -5072,6 +5093,17 @@ sigusr1_handler(SIGNAL_ARGS)
 		Assert(BgWriterPID == 0);
 		BgWriterPID = StartBackgroundWriter();
 
+		/*
+		 * Start the archiver if we're responsible for (re-)archiving received
+		 * files.
+		 */
+		Assert(PgArchPID == 0);
+		if (wal_level >= WAL_LEVEL_ARCHIVE &&
+			XLogArchiveMode == ARCHIVE_MODE_ALWAYS)
+		{
+			PgArchPID = pgarch_start();
+		}
+
 		pmState = PM_RECOVERY;
 	}
 	if (CheckPostmasterSignal(PMSIGNAL_BEGIN_HOT_STANDBY) &&
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index 3563fd997f..1e86e4c57b 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -46,11 +46,12 @@ typedef struct
 	bool		nowait;
 	bool		includewal;
 	uint32		maxrate;
+	bool		sendtblspcmapfile;
 } basebackup_options;
 
 
-static int64 sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces);
-static int64 sendTablespace(char *path, bool sizeonly);
+static int64 sendDir(char *path, int basepathlen, bool sizeonly,
+		List *tablespaces, bool sendtblspclinks);
 static bool sendFile(char *readfilename, char *tarfilename,
 		 struct stat * statbuf, bool missing_ok);
 static void sendFileWithContent(const char *filename, const char *content);
@@ -84,7 +85,7 @@ static char *statrelpath = NULL;
 /* The actual number of bytes, transfer of which may cause sleep. */
 static uint64 throttling_sample;
 
-/* Amount of data already transfered but not yet throttled.  */
+/* Amount of data already transferred but not yet throttled.  */
 static int64 throttling_counter;
 
 /* The minimum time required to transfer throttling_sample bytes. */
@@ -93,15 +94,6 @@ static int64 elapsed_min_unit;
 /* The last check of the transfer rate. */
 static int64 throttled_last;
 
-typedef struct
-{
-	char	   *oid;
-	char	   *path;
-	char	   *rpath;			/* relative path within PGDATA, or NULL */
-	int64		size;
-} tablespaceinfo;
-
-
 /*
  * Called when ERROR or FATAL happens in perform_base_backup() after
  * we have started the backup - make sure we end it!
@@ -126,33 +118,36 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 	XLogRecPtr	endptr;
 	TimeLineID	endtli;
 	char	   *labelfile;
+	char	   *tblspc_map_file = NULL;
 	int			datadirpathlen;
+	List	   *tablespaces = NIL;
 
 	datadirpathlen = strlen(DataDir);
 
 	backup_started_in_recovery = RecoveryInProgress();
 
 	startptr = do_pg_start_backup(opt->label, opt->fastcheckpoint, &starttli,
-								  &labelfile);
+								  &labelfile, tblspcdir, &tablespaces,
+								  &tblspc_map_file,
+								  opt->progress, opt->sendtblspcmapfile);
+
 	/*
 	 * Once do_pg_start_backup has been called, ensure that any failure causes
-	 * us to abort the backup so we don't "leak" a backup counter. For this reason,
-	 * *all* functionality between do_pg_start_backup() and do_pg_stop_backup()
-	 * should be inside the error cleanup block!
+	 * us to abort the backup so we don't "leak" a backup counter. For this
+	 * reason, *all* functionality between do_pg_start_backup() and
+	 * do_pg_stop_backup() should be inside the error cleanup block!
 	 */
 
 	PG_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum) 0);
 	{
-		List	   *tablespaces = NIL;
 		ListCell   *lc;
-		struct dirent *de;
 		tablespaceinfo *ti;
 
 		SendXlogRecPtrResult(startptr, starttli);
 
 		/*
-		 * Calculate the relative path of temporary statistics directory in order
-		 * to skip the files which are located in that directory later.
+		 * Calculate the relative path of temporary statistics directory in
+		 * order to skip the files which are located in that directory later.
 		 */
 		if (is_absolute_path(pgstat_stat_directory) &&
 			strncmp(pgstat_stat_directory, DataDir, datadirpathlen) == 0)
@@ -162,70 +157,9 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 		else
 			statrelpath = pgstat_stat_directory;
 
-		/* Collect information about all tablespaces */
-		while ((de = ReadDir(tblspcdir, "pg_tblspc")) != NULL)
-		{
-			char		fullpath[MAXPGPATH];
-			char		linkpath[MAXPGPATH];
-			char	   *relpath = NULL;
-			int			rllen;
-
-			/* Skip special stuff */
-			if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
-				continue;
-
-			snprintf(fullpath, sizeof(fullpath), "pg_tblspc/%s", de->d_name);
-
-#if defined(HAVE_READLINK) || defined(WIN32)
-			rllen = readlink(fullpath, linkpath, sizeof(linkpath));
-			if (rllen < 0)
-			{
-				ereport(WARNING,
-						(errmsg("could not read symbolic link \"%s\": %m",
-								fullpath)));
-				continue;
-			}
-			else if (rllen >= sizeof(linkpath))
-			{
-				ereport(WARNING,
-						(errmsg("symbolic link \"%s\" target is too long",
-								fullpath)));
-				continue;
-			}
-			linkpath[rllen] = '\0';
-
-			/*
-			 * Relpath holds the relative path of the tablespace directory
-			 * when it's located within PGDATA, or NULL if it's located
-			 * elsewhere.
-			 */
-			if (rllen > datadirpathlen &&
-				strncmp(linkpath, DataDir, datadirpathlen) == 0 &&
-				IS_DIR_SEP(linkpath[datadirpathlen]))
-				relpath = linkpath + datadirpathlen + 1;
-
-			ti = palloc(sizeof(tablespaceinfo));
-			ti->oid = pstrdup(de->d_name);
-			ti->path = pstrdup(linkpath);
-			ti->rpath = relpath ? pstrdup(relpath) : NULL;
-			ti->size = opt->progress ? sendTablespace(fullpath, true) : -1;
-			tablespaces = lappend(tablespaces, ti);
-#else
-
-			/*
-			 * If the platform does not have symbolic links, it should not be
-			 * possible to have tablespaces - clearly somebody else created
-			 * them. Warn about it and ignore.
-			 */
-			ereport(WARNING,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				  errmsg("tablespaces are not supported on this platform")));
-#endif
-		}
-
 		/* Add a node for the base directory at the end */
 		ti = palloc0(sizeof(tablespaceinfo));
-		ti->size = opt->progress ? sendDir(".", 1, true, tablespaces) : -1;
+		ti->size = opt->progress ? sendDir(".", 1, true, tablespaces, true) : -1;
 		tablespaces = lappend(tablespaces, ti);
 
 		/* Send tablespace header */
@@ -239,7 +173,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 
 			/*
 			 * The minimum amount of time for throttling_sample bytes to be
-			 * transfered.
+			 * transferred.
 			 */
 			elapsed_min_unit = USECS_PER_SEC / THROTTLING_FREQUENCY;
 
@@ -274,8 +208,17 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 				/* In the main tar, include the backup_label first... */
 				sendFileWithContent(BACKUP_LABEL_FILE, labelfile);
 
-				/* ... then the bulk of the files ... */
-				sendDir(".", 1, false, tablespaces);
+				/*
+				 * Send tablespace_map file if required and then the bulk of
+				 * the files.
+				 */
+				if (tblspc_map_file && opt->sendtblspcmapfile)
+				{
+					sendFileWithContent(TABLESPACE_MAP, tblspc_map_file);
+					sendDir(".", 1, false, tablespaces, false);
+				}
+				else
+					sendDir(".", 1, false, tablespaces, true);
 
 				/* ... and pg_control after everything else. */
 				if (lstat(XLOG_CONTROL_FILE, &statbuf) != 0)
@@ -350,17 +293,14 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 		while ((de = ReadDir(dir, "pg_xlog")) != NULL)
 		{
 			/* Does it look like a WAL segment, and is it in the range? */
-			if (strlen(de->d_name) == 24 &&
-				strspn(de->d_name, "0123456789ABCDEF") == 24 &&
+			if (IsXLogFileName(de->d_name) &&
 				strcmp(de->d_name + 8, firstoff + 8) >= 0 &&
 				strcmp(de->d_name + 8, lastoff + 8) <= 0)
 			{
 				walFileList = lappend(walFileList, pstrdup(de->d_name));
 			}
 			/* Does it look like a timeline history file? */
-			else if (strlen(de->d_name) == 8 + strlen(".history") &&
-					 strspn(de->d_name, "0123456789ABCDEF") == 8 &&
-					 strcmp(de->d_name + 8, ".history") == 0)
+			else if (IsTLHistoryFileName(de->d_name))
 			{
 				historyFileList = lappend(historyFileList, pstrdup(de->d_name));
 			}
@@ -504,7 +444,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 			/*
 			 * Mark file as archived, otherwise files can get archived again
 			 * after promotion of a new node. This is in line with
-			 * walreceiver.c always doing a XLogArchiveForceDone() after a
+			 * walreceiver.c always doing an XLogArchiveForceDone() after a
 			 * complete segment.
 			 */
 			StatusFilePath(pathbuf, walFiles[i], ".done");
@@ -570,6 +510,7 @@ parse_basebackup_options(List *options, basebackup_options *opt)
 	bool		o_nowait = false;
 	bool		o_wal = false;
 	bool		o_maxrate = false;
+	bool		o_tablespace_map = false;
 
 	MemSet(opt, 0, sizeof(*opt));
 	foreach(lopt, options)
@@ -640,6 +581,15 @@ parse_basebackup_options(List *options, basebackup_options *opt)
 			opt->maxrate = (uint32) maxrate;
 			o_maxrate = true;
 		}
+		else if (strcmp(defel->defname, "tablespace_map") == 0)
+		{
+			if (o_tablespace_map)
+				ereport(ERROR,
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("duplicate option \"%s\"", defel->defname)));
+			opt->sendtblspcmapfile = true;
+			o_tablespace_map = true;
+		}
 		else
 			elog(ERROR, "option \"%s\" not recognized",
 				 defel->defname);
@@ -868,7 +818,7 @@ sendFileWithContent(const char *filename, const char *content)
  *
  * Only used to send auxiliary tablespaces, not PGDATA.
  */
-static int64
+int64
 sendTablespace(char *path, bool sizeonly)
 {
 	int64		size;
@@ -902,7 +852,7 @@ sendTablespace(char *path, bool sizeonly)
 	size = 512;					/* Size of the header just added */
 
 	/* Send all the files in the tablespace version directory */
-	size += sendDir(pathbuf, strlen(path), sizeonly, NIL);
+	size += sendDir(pathbuf, strlen(path), sizeonly, NIL, true);
 
 	return size;
 }
@@ -914,9 +864,14 @@ sendTablespace(char *path, bool sizeonly)
  *
  * Omit any directory in the tablespaces list, to avoid backing up
  * tablespaces twice when they were created inside PGDATA.
+ *
+ * If sendtblspclinks is true, we need to include symlink
+ * information in the tar file. If not, we can skip that
+ * as it will be sent separately in the tablespace_map file.
  */
 static int64
-sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces)
+sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces,
+		bool sendtblspclinks)
 {
 	DIR		   *dir;
 	struct dirent *de;
@@ -944,13 +899,17 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces)
 			continue;
 
 		/*
-		 * If there's a backup_label file, it belongs to a backup started by
-		 * the user with pg_start_backup(). It is *not* correct for this
-		 * backup, our backup_label is injected into the tar separately.
+		 * If there's a backup_label or tablespace_map file, it belongs to a
+		 * backup started by the user with pg_start_backup(). It is *not*
+		 * correct for this backup, our backup_label/tablespace_map is
+		 * injected into the tar separately.
 		 */
 		if (strcmp(de->d_name, BACKUP_LABEL_FILE) == 0)
 			continue;
 
+		if (strcmp(de->d_name, TABLESPACE_MAP) == 0)
+			continue;
+
 		/*
 		 * Check if the postmaster has signaled us to exit, and abort with an
 		 * error in that case. The error handler further up will call
@@ -1069,7 +1028,8 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces)
 								pathbuf)));
 			if (rllen >= sizeof(linkpath))
 				ereport(ERROR,
-						(errmsg("symbolic link \"%s\" target is too long",
+						(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+						 errmsg("symbolic link \"%s\" target is too long",
 								pathbuf)));
 			linkpath[rllen] = '\0';
 
@@ -1123,8 +1083,15 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces)
 					break;
 				}
 			}
+
+			/*
+			 * skip sending directories inside pg_tblspc, if not required.
+			 */
+			if (strcmp(pathbuf, "./pg_tblspc") == 0 && !sendtblspclinks)
+				skip_this_dir = true;
+
 			if (!skip_this_dir)
-				size += sendDir(pathbuf, basepathlen, sizeonly, tablespaces);
+				size += sendDir(pathbuf, basepathlen, sizeonly, tablespaces, sendtblspclinks);
 		}
 		else if (S_ISREG(statbuf.st_mode))
 		{
@@ -1261,8 +1228,8 @@ _tarWriteHeader(const char *filename, const char *linktarget,
 	enum tarError rc;
 
 	rc = tarCreateHeader(h, filename, linktarget, statbuf->st_size,
-					statbuf->st_mode, statbuf->st_uid, statbuf->st_gid,
-					statbuf->st_mtime);
+						 statbuf->st_mode, statbuf->st_uid, statbuf->st_gid,
+						 statbuf->st_mtime);
 
 	switch (rc)
 	{
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 19dc9efedd..b7bbcf6ee7 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -89,15 +89,15 @@ _PG_init(void)
 static void
 libpqrcv_connect(char *conninfo)
 {
-	const char	*keys[5];
-	const char	*vals[5];
+	const char *keys[5];
+	const char *vals[5];
 
 	/*
-	 * We use the expand_dbname parameter to process the connection string
-	 * (or URI), and pass some extra options. The deliberately undocumented
-	 * parameter "replication=true" makes it a replication connection.
-	 * The database name is ignored by the server in replication mode, but
-	 * specify "replication" for .pgpass lookup.
+	 * We use the expand_dbname parameter to process the connection string (or
+	 * URI), and pass some extra options. The deliberately undocumented
+	 * parameter "replication=true" makes it a replication connection. The
+	 * database name is ignored by the server in replication mode, but specify
+	 * "replication" for .pgpass lookup.
 	 */
 	keys[0] = "dbname";
 	vals[0] = conninfo;
diff --git a/src/backend/replication/logical/Makefile b/src/backend/replication/logical/Makefile
index 310a45c5c0..8adea13bf4 100644
--- a/src/backend/replication/logical/Makefile
+++ b/src/backend/replication/logical/Makefile
@@ -14,6 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 
-OBJS = decode.o logical.o logicalfuncs.o reorderbuffer.o snapbuild.o
+OBJS = decode.o logical.o logicalfuncs.o reorderbuffer.o origin.o \
+	snapbuild.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index 87a20522c6..2d63e3857f 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -40,6 +40,7 @@
 #include "replication/decode.h"
 #include "replication/logical.h"
 #include "replication/reorderbuffer.h"
+#include "replication/origin.h"
 #include "replication/snapbuild.h"
 
 #include "storage/standby.h"
@@ -63,10 +64,12 @@ static void DecodeInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
 static void DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
 static void DecodeDelete(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
 static void DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
+static void DecodeSpecConfirm(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
+
 static void DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
-						 xl_xact_parsed_commit *parsed, TransactionId xid);
+			 xl_xact_parsed_commit *parsed, TransactionId xid);
 static void DecodeAbort(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
-						xl_xact_parsed_abort *parsed, TransactionId xid);
+			xl_xact_parsed_abort *parsed, TransactionId xid);
 
 /* common function to decode tuples */
 static void DecodeXLogTuple(char *data, Size len, ReorderBufferTupleBuf *tup);
@@ -134,6 +137,7 @@ LogicalDecodingProcessRecord(LogicalDecodingContext *ctx, XLogReaderState *recor
 #ifdef PGXC 
 		case RM_BARRIER_ID:
 #endif
+		case RM_REPLORIGIN_ID:
 			break;
 		case RM_NEXT_ID:
 			elog(ERROR, "unexpected RM_NEXT_ID rmgr_id: %u", (RmgrIds) XLogRecGetRmid(buf.record));
@@ -415,6 +419,11 @@ DecodeHeapOp(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 			ReorderBufferXidSetCatalogChanges(ctx->reorder, xid, buf->origptr);
 			break;
 
+		case XLOG_HEAP_CONFIRM:
+			if (SnapBuildProcessChange(builder, xid, buf->origptr))
+				DecodeSpecConfirm(ctx, buf);
+			break;
+
 		case XLOG_HEAP_LOCK:
 			/* we don't care about row level locks for now */
 			break;
@@ -425,6 +434,15 @@ DecodeHeapOp(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	}
 }
 
+static inline bool
+FilterByOrigin(LogicalDecodingContext *ctx, RepOriginId origin_id)
+{
+	if (ctx->callbacks.filter_by_origin_cb == NULL)
+		return false;
+
+	return filter_by_origin_cb_wrapper(ctx, origin_id);
+}
+
 /*
  * Consolidated commit record handling between the different form of commit
  * records.
@@ -433,8 +451,17 @@ static void
 DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 			 xl_xact_parsed_commit *parsed, TransactionId xid)
 {
+	XLogRecPtr	origin_lsn = InvalidXLogRecPtr;
+	XLogRecPtr	commit_time = InvalidXLogRecPtr;
+	XLogRecPtr	origin_id = InvalidRepOriginId;
 	int			i;
 
+	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
+	{
+		origin_lsn = parsed->origin_lsn;
+		commit_time = parsed->origin_timestamp;
+	}
+
 	/*
 	 * Process invalidation messages, even if we're not interested in the
 	 * transaction's contents, since the various caches need to always be
@@ -455,12 +482,13 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	 * the reorderbuffer to forget the content of the (sub-)transactions
 	 * if not.
 	 *
-	 * There basically two reasons we might not be interested in this
+	 * There can be several reasons we might not be interested in this
 	 * transaction:
 	 * 1) We might not be interested in decoding transactions up to this
 	 *	  LSN. This can happen because we previously decoded it and now just
 	 *	  are restarting or if we haven't assembled a consistent snapshot yet.
 	 * 2) The transaction happened in another database.
+	 * 3) The output plugin is not interested in the origin.
 	 *
 	 * We can't just use ReorderBufferAbort() here, because we need to execute
 	 * the transaction's invalidations.  This currently won't be needed if
@@ -475,7 +503,8 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	 * ---
 	 */
 	if (SnapBuildXactNeedsSkip(ctx->snapshot_builder, buf->origptr) ||
-		(parsed->dbId != InvalidOid && parsed->dbId != ctx->slot->data.database))
+		(parsed->dbId != InvalidOid && parsed->dbId != ctx->slot->data.database) ||
+		FilterByOrigin(ctx, origin_id))
 	{
 		for (i = 0; i < parsed->nsubxacts; i++)
 		{
@@ -495,7 +524,7 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 
 	/* replay actions of all transaction + subtransactions in order */
 	ReorderBufferCommit(ctx->reorder, xid, buf->origptr, buf->endptr,
-						parsed->xact_time);
+						commit_time, origin_id, origin_lsn);
 }
 
 /*
@@ -540,11 +569,20 @@ DecodeInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	if (target_node.dbNode != ctx->slot->data.database)
 		return;
 
+	/* output plugin doesn't look for this origin, no need to queue */
+	if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
+		return;
+
 	change = ReorderBufferGetChange(ctx->reorder);
-	change->action = REORDER_BUFFER_CHANGE_INSERT;
+	if (!(xlrec->flags & XLH_INSERT_IS_SPECULATIVE))
+		change->action = REORDER_BUFFER_CHANGE_INSERT;
+	else
+		change->action = REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT;
+	change->origin_id = XLogRecGetOrigin(r);
+
 	memcpy(&change->data.tp.relnode, &target_node, sizeof(RelFileNode));
 
-	if (xlrec->flags & XLOG_HEAP_CONTAINS_NEW_TUPLE)
+	if (xlrec->flags & XLH_INSERT_CONTAINS_NEW_TUPLE)
 	{
 		Size		tuplelen;
 		char	   *tupledata = XLogRecGetBlockData(r, 0, &tuplelen);
@@ -582,11 +620,16 @@ DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	if (target_node.dbNode != ctx->slot->data.database)
 		return;
 
+	/* output plugin doesn't look for this origin, no need to queue */
+	if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
+		return;
+
 	change = ReorderBufferGetChange(ctx->reorder);
 	change->action = REORDER_BUFFER_CHANGE_UPDATE;
+	change->origin_id = XLogRecGetOrigin(r);
 	memcpy(&change->data.tp.relnode, &target_node, sizeof(RelFileNode));
 
-	if (xlrec->flags & XLOG_HEAP_CONTAINS_NEW_TUPLE)
+	if (xlrec->flags & XLH_UPDATE_CONTAINS_NEW_TUPLE)
 	{
 		data = XLogRecGetBlockData(r, 0, &datalen);
 
@@ -595,7 +638,7 @@ DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 		DecodeXLogTuple(data, datalen, change->data.tp.newtuple);
 	}
 
-	if (xlrec->flags & XLOG_HEAP_CONTAINS_OLD)
+	if (xlrec->flags & XLH_UPDATE_CONTAINS_OLD)
 	{
 		/* caution, remaining data in record is not aligned */
 		data = XLogRecGetData(r) + SizeOfHeapUpdate;
@@ -631,13 +674,25 @@ DecodeDelete(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	if (target_node.dbNode != ctx->slot->data.database)
 		return;
 
+	/*
+	 * Super deletions are irrelevant for logical decoding, it's driven by the
+	 * confirmation records.
+	 */
+	if (xlrec->flags & XLH_DELETE_IS_SUPER)
+		return;
+
+	/* output plugin doesn't look for this origin, no need to queue */
+	if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
+		return;
+
 	change = ReorderBufferGetChange(ctx->reorder);
 	change->action = REORDER_BUFFER_CHANGE_DELETE;
+	change->origin_id = XLogRecGetOrigin(r);
 
 	memcpy(&change->data.tp.relnode, &target_node, sizeof(RelFileNode));
 
 	/* old primary key stored */
-	if (xlrec->flags & XLOG_HEAP_CONTAINS_OLD)
+	if (xlrec->flags & XLH_DELETE_CONTAINS_OLD)
 	{
 		Assert(XLogRecGetDataLen(r) > (SizeOfHeapDelete + SizeOfHeapHeader));
 
@@ -676,6 +731,10 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	if (rnode.dbNode != ctx->slot->data.database)
 		return;
 
+	/* output plugin doesn't look for this origin, no need to queue */
+	if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
+		return;
+
 	tupledata = XLogRecGetBlockData(r, 0, &tuplelen);
 
 	data = tupledata;
@@ -688,6 +747,8 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 
 		change = ReorderBufferGetChange(ctx->reorder);
 		change->action = REORDER_BUFFER_CHANGE_INSERT;
+		change->origin_id = XLogRecGetOrigin(r);
+
 		memcpy(&change->data.tp.relnode, &rnode, sizeof(RelFileNode));
 
 		/*
@@ -697,7 +758,7 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 		 * We decode the tuple in pretty much the same way as DecodeXLogTuple,
 		 * but since the layout is slightly different, we can't use it here.
 		 */
-		if (xlrec->flags & XLOG_HEAP_CONTAINS_NEW_TUPLE)
+		if (xlrec->flags & XLH_INSERT_CONTAINS_NEW_TUPLE)
 		{
 			change->data.tp.newtuple = ReorderBufferGetTupleBuf(ctx->reorder);
 
@@ -735,7 +796,7 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 		 * xl_multi_insert_tuple record emitted by one heap_multi_insert()
 		 * call.
 		 */
-		if (xlrec->flags & XLOG_HEAP_LAST_MULTI_INSERT &&
+		if (xlrec->flags & XLH_INSERT_LAST_IN_MULTI &&
 			(i + 1) == xlrec->ntuples)
 			change->data.tp.clear_toast_afterwards = true;
 		else
@@ -748,6 +809,40 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 }
 
 /*
+ * Parse XLOG_HEAP_CONFIRM from wal into a confirmation change.
+ *
+ * This is pretty trivial, all the state essentially already setup by the
+ * speculative insertion.
+ */
+static void
+DecodeSpecConfirm(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
+{
+	XLogReaderState *r = buf->record;
+	ReorderBufferChange *change;
+	RelFileNode target_node;
+
+	/* only interested in our database */
+	XLogRecGetBlockTag(r, 0, &target_node, NULL, NULL);
+	if (target_node.dbNode != ctx->slot->data.database)
+		return;
+
+	/* output plugin doesn't look for this origin, no need to queue */
+	if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
+		return;
+
+	change = ReorderBufferGetChange(ctx->reorder);
+	change->action = REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM;
+	change->origin_id = XLogRecGetOrigin(r);
+
+	memcpy(&change->data.tp.relnode, &target_node, sizeof(RelFileNode));
+
+	change->data.tp.clear_toast_afterwards = true;
+
+	ReorderBufferQueueChange(ctx->reorder, XLogRecGetXid(r), buf->origptr, change);
+}
+
+
+/*
  * Read a HeapTuple as WAL logged by heap_insert, heap_update and heap_delete
  * (but not by heap_multi_insert) into a tuplebuf.
  *
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index 774ebbc749..824bc915b1 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -39,6 +39,7 @@
 #include "replication/decode.h"
 #include "replication/logical.h"
 #include "replication/reorderbuffer.h"
+#include "replication/origin.h"
 #include "replication/snapbuild.h"
 
 #include "storage/proc.h"
@@ -148,7 +149,7 @@ StartupDecodingContext(List *output_plugin_options,
 	 * replication slots.
 	 *
 	 * We can only do so if we're outside of a transaction (i.e. the case when
-	 * streaming changes via walsender), otherwise a already setup
+	 * streaming changes via walsender), otherwise an already setup
 	 * snapshot/xid would end up being ignored. That's not a particularly
 	 * bothersome restriction since the SQL interface can't be used for
 	 * streaming anyway.
@@ -224,7 +225,7 @@ CreateInitDecodingContext(char *plugin,
 
 	/* first some sanity checks that are unlikely to be violated */
 	if (slot == NULL)
-		elog(ERROR, "cannot perform logical decoding without a acquired slot");
+		elog(ERROR, "cannot perform logical decoding without an acquired slot");
 
 	if (plugin == NULL)
 		elog(ERROR, "cannot initialize logical decoding without a specified plugin");
@@ -233,7 +234,7 @@ CreateInitDecodingContext(char *plugin,
 	if (slot->data.database == InvalidOid)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("cannot use physical replication slot for logical decoding")));
+		errmsg("cannot use physical replication slot for logical decoding")));
 
 	if (slot->data.database != MyDatabaseId)
 		ereport(ERROR,
@@ -376,7 +377,7 @@ CreateDecodingContext(XLogRecPtr start_lsn,
 
 	/* first some sanity checks that are unlikely to be violated */
 	if (slot == NULL)
-		elog(ERROR, "cannot perform logical decoding without a acquired slot");
+		elog(ERROR, "cannot perform logical decoding without an acquired slot");
 
 	/* make sure the passed slot is suitable, these are user facing errors */
 	if (slot->data.database == InvalidOid)
@@ -435,7 +436,7 @@ CreateDecodingContext(XLogRecPtr start_lsn,
 }
 
 /*
- * Returns true if an consistent initial decoding snapshot has been built.
+ * Returns true if a consistent initial decoding snapshot has been built.
  */
 bool
 DecodingContextReady(LogicalDecodingContext *ctx)
@@ -720,6 +721,34 @@ change_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
 	error_context_stack = errcallback.previous;
 }
 
+bool
+filter_by_origin_cb_wrapper(LogicalDecodingContext *ctx, RepOriginId origin_id)
+{
+	LogicalErrorCallbackState state;
+	ErrorContextCallback errcallback;
+	bool		ret;
+
+	/* Push callback + info on the error context stack */
+	state.ctx = ctx;
+	state.callback_name = "shutdown";
+	state.report_location = InvalidXLogRecPtr;
+	errcallback.callback = output_plugin_error_callback;
+	errcallback.arg = (void *) &state;
+	errcallback.previous = error_context_stack;
+	error_context_stack = &errcallback;
+
+	/* set output state */
+	ctx->accept_writes = false;
+
+	/* do the actual work: call callback */
+	ret = ctx->callbacks.filter_by_origin_cb(ctx, origin_id);
+
+	/* Pop the error context stack */
+	error_context_stack = errcallback.previous;
+
+	return ret;
+}
+
 /*
  * Set the required catalog xmin horizon for historic snapshots in the current
  * replication slot.
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index 3be5263c3f..a354a3f819 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -53,7 +53,7 @@ typedef struct DecodingOutputState
 } DecodingOutputState;
 
 /*
- * Prepare for a output plugin write.
+ * Prepare for an output plugin write.
  */
 static void
 LogicalOutputPrepareWrite(LogicalDecodingContext *ctx, XLogRecPtr lsn, TransactionId xid,
@@ -400,7 +400,7 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin
 		 * what we need.
 		 */
 		if (!binary &&
-			ctx->options.output_type != OUTPUT_PLUGIN_TEXTUAL_OUTPUT)
+			ctx->options.output_type !=OUTPUT_PLUGIN_TEXTUAL_OUTPUT)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("logical decoding output plugin \"%s\" produces binary output, but \"%s\" expects textual data",
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
new file mode 100644
index 0000000000..f4ba86e836
--- /dev/null
+++ b/src/backend/replication/logical/origin.c
@@ -0,0 +1,1487 @@
+/*-------------------------------------------------------------------------
+ *
+ * origin.c
+ *	  Logical replication progress tracking support.
+ *
+ * Copyright (c) 2013-2015, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  src/backend/replication/logical/origin.c
+ *
+ * NOTES
+ *
+ * This file provides the following:
+ * * An infrastructure to name nodes in a replication setup
+ * * A facility to efficiently store and persist replication progress in an
+ *	 efficient and durable manner.
+ *
+ * Replication origin consist out of a descriptive, user defined, external
+ * name and a short, thus space efficient, internal 2 byte one. This split
+ * exists because replication origin have to be stored in WAL and shared
+ * memory and long descriptors would be inefficient.  For now only use 2 bytes
+ * for the internal id of a replication origin as it seems unlikely that there
+ * soon will be more than 65k nodes in one replication setup; and using only
+ * two bytes allow us to be more space efficient.
+ *
+ * Replication progress is tracked in a shared memory table
+ * (ReplicationStates) that's dumped to disk every checkpoint. Entries
+ * ('slots') in this table are identified by the internal id. That's the case
+ * because it allows to increase replication progress during crash
+ * recovery. To allow doing so we store the original LSN (from the originating
+ * system) of a transaction in the commit record. That allows to recover the
+ * precise replayed state after crash recovery; without requiring synchronous
+ * commits. Allowing logical replication to use asynchronous commit is
+ * generally good for performance, but especially important as it allows a
+ * single threaded replay process to keep up with a source that has multiple
+ * backends generating changes concurrently.  For efficiency and simplicity
+ * reasons a backend can setup one replication origin that's from then used as
+ * the source of changes produced by the backend, until reset again.
+ *
+ * This infrastructure is intended to be used in cooperation with logical
+ * decoding. When replaying from a remote system the configured origin is
+ * provided to output plugins, allowing prevention of replication loops and
+ * other filtering.
+ *
+ * There are several levels of locking at work:
+ *
+ * * To create and drop replication origins an exclusive lock on
+ *	 pg_replication_slot is required for the duration. That allows us to
+ *	 safely and conflict free assign new origins using a dirty snapshot.
+ *
+ * * When creating an in-memory replication progress slot the ReplicationOirgin
+ *	 LWLock has to be held exclusively; when iterating over the replication
+ *	 progress a shared lock has to be held, the same when advancing the
+ *	 replication progress of an individual backend that has not setup as the
+ *	 session's replication origin.
+ *
+ * * When manipulating or looking at the remote_lsn and local_lsn fields of a
+ *	 replication progress slot that slot's lwlock has to be held. That's
+ *	 primarily because we do not assume 8 byte writes (the LSN) is atomic on
+ *	 all our platforms, but it also simplifies memory ordering concerns
+ *	 between the remote and local lsn. We use a lwlock instead of a spinlock
+ *	 so it's less harmful to hold the lock over a WAL write
+ *	 (c.f. AdvanceReplicationProgress).
+ *
+ * ---------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "funcapi.h"
+#include "miscadmin.h"
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/htup_details.h"
+#include "access/xact.h"
+
+#include "catalog/indexing.h"
+
+#include "nodes/execnodes.h"
+
+#include "replication/origin.h"
+#include "replication/logical.h"
+
+#include "storage/fd.h"
+#include "storage/ipc.h"
+#include "storage/lmgr.h"
+#include "storage/copydir.h"
+
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/pg_lsn.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
+#include "utils/tqual.h"
+
+/*
+ * Replay progress of a single remote node.
+ */
+typedef struct ReplicationState
+{
+	/*
+	 * Local identifier for the remote node.
+	 */
+	RepOriginId roident;
+
+	/*
+	 * Location of the latest commit from the remote side.
+	 */
+	XLogRecPtr	remote_lsn;
+
+	/*
+	 * Remember the local lsn of the commit record so we can XLogFlush() to it
+	 * during a checkpoint so we know the commit record actually is safe on
+	 * disk.
+	 */
+	XLogRecPtr	local_lsn;
+
+	/*
+	 * Slot is setup in backend?
+	 */
+	pid_t		acquired_by;
+
+	/*
+	 * Lock protecting remote_lsn and local_lsn.
+	 */
+	LWLock		lock;
+} ReplicationState;
+
+/*
+ * On disk version of ReplicationState.
+ */
+typedef struct ReplicationStateOnDisk
+{
+	RepOriginId roident;
+	XLogRecPtr	remote_lsn;
+} ReplicationStateOnDisk;
+
+
+typedef struct ReplicationStateCtl
+{
+	int			tranche_id;
+	LWLockTranche tranche;
+	ReplicationState states[FLEXIBLE_ARRAY_MEMBER];
+} ReplicationStateCtl;
+
+/* external variables */
+RepOriginId replorigin_sesssion_origin = InvalidRepOriginId;	/* assumed identity */
+XLogRecPtr	replorigin_sesssion_origin_lsn = InvalidXLogRecPtr;
+TimestampTz replorigin_sesssion_origin_timestamp = 0;
+
+/*
+ * Base address into a shared memory array of replication states of size
+ * max_replication_slots.
+ *
+ * XXX: Should we use a separate variable to size this rather than
+ * max_replication_slots?
+ */
+static ReplicationState *replication_states;
+static ReplicationStateCtl *replication_states_ctl;
+
+/*
+ * Backend-local, cached element from ReplicationStates for use in a backend
+ * replaying remote commits, so we don't have to search ReplicationStates for
+ * the backends current RepOriginId.
+ */
+static ReplicationState *session_replication_state = NULL;
+
+/* Magic for on disk files. */
+#define REPLICATION_STATE_MAGIC ((uint32) 0x1257DADE)
+
+static void
+replorigin_check_prerequisites(bool check_slots, bool recoveryOK)
+{
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("only superusers can query or manipulate replication origins")));
+
+	if (check_slots && max_replication_slots == 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("cannot query or manipulate replication origin when max_replication_slots = 0")));
+
+	if (!recoveryOK && RecoveryInProgress())
+		ereport(ERROR,
+				(errcode(ERRCODE_READ_ONLY_SQL_TRANSACTION),
+		   errmsg("cannot manipulate replication origins during recovery")));
+
+}
+
+
+/* ---------------------------------------------------------------------------
+ * Functions for working with replication origins themselves.
+ * ---------------------------------------------------------------------------
+ */
+
+/*
+ * Check for a persistent replication origin identified by name.
+ *
+ * Returns InvalidOid if the node isn't known yet and missing_ok is true.
+ */
+RepOriginId
+replorigin_by_name(char *roname, bool missing_ok)
+{
+	Form_pg_replication_origin ident;
+	Oid			roident = InvalidOid;
+	HeapTuple	tuple;
+	Datum		roname_d;
+
+	roname_d = CStringGetTextDatum(roname);
+
+	tuple = SearchSysCache1(REPLORIGNAME, roname_d);
+	if (HeapTupleIsValid(tuple))
+	{
+		ident = (Form_pg_replication_origin) GETSTRUCT(tuple);
+		roident = ident->roident;
+		ReleaseSysCache(tuple);
+	}
+	else if (!missing_ok)
+		elog(ERROR, "cache lookup failed for replication origin '%s'",
+			 roname);
+
+	return roident;
+}
+
+/*
+ * Create a replication origin.
+ *
+ * Needs to be called in a transaction.
+ */
+RepOriginId
+replorigin_create(char *roname)
+{
+	Oid			roident;
+	HeapTuple	tuple = NULL;
+	Relation	rel;
+	Datum		roname_d;
+	SnapshotData SnapshotDirty;
+	SysScanDesc scan;
+	ScanKeyData key;
+
+	roname_d = CStringGetTextDatum(roname);
+
+	Assert(IsTransactionState());
+
+	/*
+	 * We need the numeric replication origin to be 16bit wide, so we cannot
+	 * rely on the normal oid allocation. Instead we simply scan
+	 * pg_replication_origin for the first unused id. That's not particularly
+	 * efficient, but this should be a fairly infrequent operation - we can
+	 * easily spend a bit more code on this when it turns out it needs to be
+	 * faster.
+	 *
+	 * We handle concurrency by taking an exclusive lock (allowing reads!)
+	 * over the table for the duration of the search. Because we use a "dirty
+	 * snapshot" we can read rows that other in-progress sessions have
+	 * written, even though they would be invisible with normal snapshots. Due
+	 * to the exclusive lock there's no danger that new rows can appear while
+	 * we're checking.
+	 */
+	InitDirtySnapshot(SnapshotDirty);
+
+	rel = heap_open(ReplicationOriginRelationId, ExclusiveLock);
+
+	for (roident = InvalidOid + 1; roident < PG_UINT16_MAX; roident++)
+	{
+		bool		nulls[Natts_pg_replication_origin];
+		Datum		values[Natts_pg_replication_origin];
+		bool		collides;
+
+		CHECK_FOR_INTERRUPTS();
+
+		ScanKeyInit(&key,
+					Anum_pg_replication_origin_roident,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(roident));
+
+		scan = systable_beginscan(rel, ReplicationOriginIdentIndex,
+								  true /* indexOK */ ,
+								  &SnapshotDirty,
+								  1, &key);
+
+		collides = HeapTupleIsValid(systable_getnext(scan));
+
+		systable_endscan(scan);
+
+		if (!collides)
+		{
+			/*
+			 * Ok, found an unused roident, insert the new row and do a CCI,
+			 * so our callers can look it up if they want to.
+			 */
+			memset(&nulls, 0, sizeof(nulls));
+
+			values[Anum_pg_replication_origin_roident - 1] = ObjectIdGetDatum(roident);
+			values[Anum_pg_replication_origin_roname - 1] = roname_d;
+
+			tuple = heap_form_tuple(RelationGetDescr(rel), values, nulls);
+			simple_heap_insert(rel, tuple);
+			CatalogUpdateIndexes(rel, tuple);
+			CommandCounterIncrement();
+			break;
+		}
+	}
+
+	/* now release lock again,	*/
+	heap_close(rel, ExclusiveLock);
+
+	if (tuple == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("no free replication oid could be found")));
+
+	heap_freetuple(tuple);
+	return roident;
+}
+
+
+/*
+ * Drop replication origin.
+ *
+ * Needs to be called in a transaction.
+ */
+void
+replorigin_drop(RepOriginId roident)
+{
+	HeapTuple	tuple = NULL;
+	Relation	rel;
+	int			i;
+
+	Assert(IsTransactionState());
+
+	rel = heap_open(ReplicationOriginRelationId, ExclusiveLock);
+
+	/* cleanup the slot state info */
+	LWLockAcquire(ReplicationOriginLock, LW_EXCLUSIVE);
+
+	for (i = 0; i < max_replication_slots; i++)
+	{
+		ReplicationState *state = &replication_states[i];
+
+		/* found our slot */
+		if (state->roident == roident)
+		{
+			if (state->acquired_by != 0)
+			{
+				ereport(ERROR,
+						(errcode(ERRCODE_OBJECT_IN_USE),
+						 errmsg("cannot drop replication origin with oid %d, in use by pid %d",
+								state->roident,
+								state->acquired_by)));
+			}
+
+			/* first WAL log */
+			{
+				xl_replorigin_drop xlrec;
+
+				xlrec.node_id = roident;
+				XLogBeginInsert();
+				XLogRegisterData((char *) (&xlrec), sizeof(xlrec));
+				XLogInsert(RM_REPLORIGIN_ID, XLOG_REPLORIGIN_DROP);
+			}
+
+			/* then reset the in-memory entry */
+			state->roident = InvalidRepOriginId;
+			state->remote_lsn = InvalidXLogRecPtr;
+			state->local_lsn = InvalidXLogRecPtr;
+			break;
+		}
+	}
+	LWLockRelease(ReplicationOriginLock);
+
+	tuple = SearchSysCache1(REPLORIGIDENT, ObjectIdGetDatum(roident));
+	simple_heap_delete(rel, &tuple->t_self);
+	ReleaseSysCache(tuple);
+
+	CommandCounterIncrement();
+
+	/* now release lock again,	*/
+	heap_close(rel, ExclusiveLock);
+}
+
+
+/*
+ * Lookup replication origin via it's oid and return the name.
+ *
+ * The external name is palloc'd in the calling context.
+ *
+ * Returns true if the origin is known, false otherwise.
+ */
+bool
+replorigin_by_oid(RepOriginId roident, bool missing_ok, char **roname)
+{
+	HeapTuple	tuple;
+	Form_pg_replication_origin ric;
+
+	Assert(OidIsValid((Oid) roident));
+	Assert(roident != InvalidRepOriginId);
+	Assert(roident != DoNotReplicateId);
+
+	tuple = SearchSysCache1(REPLORIGIDENT,
+							ObjectIdGetDatum((Oid) roident));
+
+	if (HeapTupleIsValid(tuple))
+	{
+		ric = (Form_pg_replication_origin) GETSTRUCT(tuple);
+		*roname = text_to_cstring(&ric->roname);
+		ReleaseSysCache(tuple);
+
+		return true;
+	}
+	else
+	{
+		*roname = NULL;
+
+		if (!missing_ok)
+			elog(ERROR, "cache lookup failed for replication origin with oid %u",
+				 roident);
+
+		return false;
+	}
+}
+
+
+/* ---------------------------------------------------------------------------
+ * Functions for handling replication progress.
+ * ---------------------------------------------------------------------------
+ */
+
+Size
+ReplicationOriginShmemSize(void)
+{
+	Size		size = 0;
+
+	/*
+	 * XXX: max_replication_slots is arguablethe wrong thing to use here, here
+	 * we keep the replay state of *remote* transactions. But for now it seems
+	 * sufficient to reuse it, lest we introduce a separate guc.
+	 */
+	if (max_replication_slots == 0)
+		return size;
+
+	size = add_size(size, offsetof(ReplicationStateCtl, states));
+
+	size = add_size(size,
+				  mul_size(max_replication_slots, sizeof(ReplicationState)));
+	return size;
+}
+
+void
+ReplicationOriginShmemInit(void)
+{
+	bool		found;
+
+	if (max_replication_slots == 0)
+		return;
+
+	replication_states_ctl = (ReplicationStateCtl *)
+		ShmemInitStruct("ReplicationOriginState",
+						ReplicationOriginShmemSize(),
+						&found);
+	replication_states = replication_states_ctl->states;
+
+	if (!found)
+	{
+		int			i;
+
+		replication_states_ctl->tranche_id = LWLockNewTrancheId();
+		replication_states_ctl->tranche.name = "ReplicationOrigins";
+		replication_states_ctl->tranche.array_base =
+			&replication_states[0].lock;
+		replication_states_ctl->tranche.array_stride =
+			sizeof(ReplicationState);
+
+		MemSet(replication_states, 0, ReplicationOriginShmemSize());
+
+		for (i = 0; i < max_replication_slots; i++)
+			LWLockInitialize(&replication_states[i].lock,
+							 replication_states_ctl->tranche_id);
+	}
+
+	LWLockRegisterTranche(replication_states_ctl->tranche_id,
+						  &replication_states_ctl->tranche);
+}
+
+/* ---------------------------------------------------------------------------
+ * Perform a checkpoint of each replication origin's progress with respect to
+ * the replayed remote_lsn. Make sure that all transactions we refer to in the
+ * checkpoint (local_lsn) are actually on-disk. This might not yet be the case
+ * if the transactions were originally committed asynchronously.
+ *
+ * We store checkpoints in the following format:
+ * +-------+------------------------+------------------+-----+--------+
+ * | MAGIC | ReplicationStateOnDisk | struct Replic... | ... | CRC32C | EOF
+ * +-------+------------------------+------------------+-----+--------+
+ *
+ * So its just the magic, followed by the statically sized
+ * ReplicationStateOnDisk structs. Note that the maximum number of
+ * ReplicationStates is determined by max_replication_slots.
+ * ---------------------------------------------------------------------------
+ */
+void
+CheckPointReplicationOrigin(void)
+{
+	const char *tmppath = "pg_logical/replorigin_checkpoint.tmp";
+	const char *path = "pg_logical/replorigin_checkpoint";
+	int			tmpfd;
+	int			i;
+	uint32		magic = REPLICATION_STATE_MAGIC;
+	pg_crc32c	crc;
+
+	if (max_replication_slots == 0)
+		return;
+
+	INIT_CRC32C(crc);
+
+	/* make sure no old temp file is remaining */
+	if (unlink(tmppath) < 0 && errno != ENOENT)
+		ereport(PANIC,
+				(errcode_for_file_access(),
+				 errmsg("could not remove file \"%s\": %m",
+						path)));
+
+	/*
+	 * no other backend can perform this at the same time, we're protected by
+	 * CheckpointLock.
+	 */
+	tmpfd = OpenTransientFile((char *) tmppath,
+							  O_CREAT | O_EXCL | O_WRONLY | PG_BINARY,
+							  S_IRUSR | S_IWUSR);
+	if (tmpfd < 0)
+		ereport(PANIC,
+				(errcode_for_file_access(),
+				 errmsg("could not create file \"%s\": %m",
+						tmppath)));
+
+	/* write magic */
+	if ((write(tmpfd, &magic, sizeof(magic))) != sizeof(magic))
+	{
+		CloseTransientFile(tmpfd);
+		ereport(PANIC,
+				(errcode_for_file_access(),
+				 errmsg("could not write to file \"%s\": %m",
+						tmppath)));
+	}
+	COMP_CRC32C(crc, &magic, sizeof(magic));
+
+	/* prevent concurrent creations/drops */
+	LWLockAcquire(ReplicationOriginLock, LW_SHARED);
+
+	/* write actual data */
+	for (i = 0; i < max_replication_slots; i++)
+	{
+		ReplicationStateOnDisk disk_state;
+		ReplicationState *curstate = &replication_states[i];
+		XLogRecPtr	local_lsn;
+
+		if (curstate->roident == InvalidRepOriginId)
+			continue;
+
+		LWLockAcquire(&curstate->lock, LW_SHARED);
+
+		disk_state.roident = curstate->roident;
+
+		disk_state.remote_lsn = curstate->remote_lsn;
+		local_lsn = curstate->local_lsn;
+
+		LWLockRelease(&curstate->lock);
+
+		/* make sure we only write out a commit that's persistent */
+		XLogFlush(local_lsn);
+
+		if ((write(tmpfd, &disk_state, sizeof(disk_state))) !=
+			sizeof(disk_state))
+		{
+			CloseTransientFile(tmpfd);
+			ereport(PANIC,
+					(errcode_for_file_access(),
+					 errmsg("could not write to file \"%s\": %m",
+							tmppath)));
+		}
+
+		COMP_CRC32C(crc, &disk_state, sizeof(disk_state));
+	}
+
+	LWLockRelease(ReplicationOriginLock);
+
+	/* write out the CRC */
+	FIN_CRC32C(crc);
+	if ((write(tmpfd, &crc, sizeof(crc))) != sizeof(crc))
+	{
+		CloseTransientFile(tmpfd);
+		ereport(PANIC,
+				(errcode_for_file_access(),
+				 errmsg("could not write to file \"%s\": %m",
+						tmppath)));
+	}
+
+	/* fsync the temporary file */
+	if (pg_fsync(tmpfd) != 0)
+	{
+		CloseTransientFile(tmpfd);
+		ereport(PANIC,
+				(errcode_for_file_access(),
+				 errmsg("could not fsync file \"%s\": %m",
+						tmppath)));
+	}
+
+	CloseTransientFile(tmpfd);
+
+	/* rename to permanent file, fsync file and directory */
+	if (rename(tmppath, path) != 0)
+	{
+		ereport(PANIC,
+				(errcode_for_file_access(),
+				 errmsg("could not rename file \"%s\" to \"%s\": %m",
+						tmppath, path)));
+	}
+
+	fsync_fname((char *) path, false);
+	fsync_fname("pg_logical", true);
+}
+
+/*
+ * Recover replication replay status from checkpoint data saved earlier by
+ * CheckPointReplicationOrigin.
+ *
+ * This only needs to be called at startup and *not* during every checkpoint
+ * read during recovery (e.g. in HS or PITR from a base backup) afterwards. All
+ * state thereafter can be recovered by looking at commit records.
+ */
+void
+StartupReplicationOrigin(void)
+{
+	const char *path = "pg_logical/replorigin_checkpoint";
+	int			fd;
+	int			readBytes;
+	uint32		magic = REPLICATION_STATE_MAGIC;
+	int			last_state = 0;
+	pg_crc32c	file_crc;
+	pg_crc32c	crc;
+
+	/* don't want to overwrite already existing state */
+#ifdef USE_ASSERT_CHECKING
+	static bool already_started = false;
+
+	Assert(!already_started);
+	already_started = true;
+#endif
+
+	if (max_replication_slots == 0)
+		return;
+
+	INIT_CRC32C(crc);
+
+	elog(DEBUG2, "starting up replication origin progress state");
+
+	fd = OpenTransientFile((char *) path, O_RDONLY | PG_BINARY, 0);
+
+	/*
+	 * might have had max_replication_slots == 0 last run, or we just brought
+	 * up a standby.
+	 */
+	if (fd < 0 && errno == ENOENT)
+		return;
+	else if (fd < 0)
+		ereport(PANIC,
+				(errcode_for_file_access(),
+				 errmsg("could not open file \"%s\": %m",
+						path)));
+
+	/* verify magic, thats written even if nothing was active */
+	readBytes = read(fd, &magic, sizeof(magic));
+	if (readBytes != sizeof(magic))
+		ereport(PANIC,
+				(errmsg("could not read file \"%s\": %m",
+						path)));
+	COMP_CRC32C(crc, &magic, sizeof(magic));
+
+	if (magic != REPLICATION_STATE_MAGIC)
+		ereport(PANIC,
+		   (errmsg("replication checkpoint has wrong magic %u instead of %u",
+				   magic, REPLICATION_STATE_MAGIC)));
+
+	/* we can skip locking here, no other access is possible */
+
+	/* recover individual states, until there are no more to be found */
+	while (true)
+	{
+		ReplicationStateOnDisk disk_state;
+
+		readBytes = read(fd, &disk_state, sizeof(disk_state));
+
+		/* no further data */
+		if (readBytes == sizeof(crc))
+		{
+			/* not pretty, but simple ... */
+			file_crc = *(pg_crc32c *) &disk_state;
+			break;
+		}
+
+		if (readBytes < 0)
+		{
+			ereport(PANIC,
+					(errcode_for_file_access(),
+					 errmsg("could not read file \"%s\": %m",
+							path)));
+		}
+
+		if (readBytes != sizeof(disk_state))
+		{
+			ereport(PANIC,
+					(errcode_for_file_access(),
+					 errmsg("could not read file \"%s\": read %d of %zu",
+							path, readBytes, sizeof(disk_state))));
+		}
+
+		COMP_CRC32C(crc, &disk_state, sizeof(disk_state));
+
+		if (last_state == max_replication_slots)
+			ereport(PANIC,
+					(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
+					 errmsg("no free replication state could be found, increase max_replication_slots")));
+
+		/* copy data to shared memory */
+		replication_states[last_state].roident = disk_state.roident;
+		replication_states[last_state].remote_lsn = disk_state.remote_lsn;
+		last_state++;
+
+		elog(LOG, "recovered replication state of node %u to %X/%X",
+			 disk_state.roident,
+			 (uint32) (disk_state.remote_lsn >> 32),
+			 (uint32) disk_state.remote_lsn);
+	}
+
+	/* now check checksum */
+	FIN_CRC32C(crc);
+	if (file_crc != crc)
+		ereport(PANIC,
+				(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
+				 errmsg("replication_slot_checkpoint has wrong checksum %u, expected %u",
+						crc, file_crc)));
+
+	CloseTransientFile(fd);
+}
+
+void
+replorigin_redo(XLogReaderState *record)
+{
+	uint8		info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
+
+	switch (info)
+	{
+		case XLOG_REPLORIGIN_SET:
+			{
+				xl_replorigin_set *xlrec =
+				(xl_replorigin_set *) XLogRecGetData(record);
+
+				replorigin_advance(xlrec->node_id,
+								   xlrec->remote_lsn, record->EndRecPtr,
+								   xlrec->force /* backward */ ,
+								   false /* WAL log */ );
+				break;
+			}
+		case XLOG_REPLORIGIN_DROP:
+			{
+				xl_replorigin_drop *xlrec;
+				int			i;
+
+				xlrec = (xl_replorigin_drop *) XLogRecGetData(record);
+
+				for (i = 0; i < max_replication_slots; i++)
+				{
+					ReplicationState *state = &replication_states[i];
+
+					/* found our slot */
+					if (state->roident == xlrec->node_id)
+					{
+						/* reset entry */
+						state->roident = InvalidRepOriginId;
+						state->remote_lsn = InvalidXLogRecPtr;
+						state->local_lsn = InvalidXLogRecPtr;
+						break;
+					}
+				}
+				break;
+			}
+		default:
+			elog(PANIC, "replorigin_redo: unknown op code %u", info);
+	}
+}
+
+
+/*
+ * Tell the replication origin progress machinery that a commit from 'node'
+ * that originated at the LSN remote_commit on the remote node was replayed
+ * successfully and that we don't need to do so again. In combination with
+ * setting up replorigin_sesssion_origin_lsn and replorigin_sesssion_origin that ensures we
+ * won't loose knowledge about that after a crash if the transaction had a
+ * persistent effect (think of asynchronous commits).
+ *
+ * local_commit needs to be a local LSN of the commit so that we can make sure
+ * uppon a checkpoint that enough WAL has been persisted to disk.
+ *
+ * Needs to be called with a RowExclusiveLock on pg_replication_origin,
+ * unless running in recovery.
+ */
+void
+replorigin_advance(RepOriginId node,
+				   XLogRecPtr remote_commit, XLogRecPtr local_commit,
+				   bool go_backward, bool wal_log)
+{
+	int			i;
+	ReplicationState *replication_state = NULL;
+	ReplicationState *free_state = NULL;
+
+	Assert(node != InvalidRepOriginId);
+
+	/* we don't track DoNotReplicateId */
+	if (node == DoNotReplicateId)
+		return;
+
+	/*
+	 * XXX: For the case where this is called by WAL replay, it'd be more
+	 * efficient to restore into a backend local hashtable and only dump into
+	 * shmem after recovery is finished. Let's wait with implementing that
+	 * till it's shown to be a measurable expense
+	 */
+
+	/* Lock exclusively, as we may have to create a new table entry. */
+	LWLockAcquire(ReplicationOriginLock, LW_EXCLUSIVE);
+
+	/*
+	 * Search for either an existing slot for the origin, or a free one we can
+	 * use.
+	 */
+	for (i = 0; i < max_replication_slots; i++)
+	{
+		ReplicationState *curstate = &replication_states[i];
+
+		/* remember where to insert if necessary */
+		if (curstate->roident == InvalidRepOriginId &&
+			free_state == NULL)
+		{
+			free_state = curstate;
+			continue;
+		}
+
+		/* not our slot */
+		if (curstate->roident != node)
+		{
+			continue;
+		}
+
+		/* ok, found slot */
+		replication_state = curstate;
+
+		LWLockAcquire(&replication_state->lock, LW_EXCLUSIVE);
+
+		/* Make sure it's not used by somebody else */
+		if (replication_state->acquired_by != 0)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_OBJECT_IN_USE),
+					 errmsg("replication origin with oid %d is already active for pid %d",
+							replication_state->roident,
+							replication_state->acquired_by)));
+		}
+
+		break;
+	}
+
+	if (replication_state == NULL && free_state == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
+				 errmsg("no free replication state slot could be found for replication origin with oid %u",
+						node),
+				 errhint("Increase max_replication_slots and try again.")));
+
+	if (replication_state == NULL)
+	{
+		/* initialize new slot */
+		LWLockAcquire(&free_state->lock, LW_EXCLUSIVE);
+		replication_state = free_state;
+		Assert(replication_state->remote_lsn == InvalidXLogRecPtr);
+		Assert(replication_state->local_lsn == InvalidXLogRecPtr);
+		replication_state->roident = node;
+	}
+
+	Assert(replication_state->roident != InvalidRepOriginId);
+
+	/*
+	 * If somebody "forcefully" sets this slot, WAL log it, so it's durable
+	 * and the standby gets the message. Primarily this will be called during
+	 * WAL replay (of commit records) where no WAL logging is necessary.
+	 */
+	if (wal_log)
+	{
+		xl_replorigin_set xlrec;
+
+		xlrec.remote_lsn = remote_commit;
+		xlrec.node_id = node;
+		xlrec.force = go_backward;
+
+		XLogBeginInsert();
+		XLogRegisterData((char *) (&xlrec), sizeof(xlrec));
+
+		XLogInsert(RM_REPLORIGIN_ID, XLOG_REPLORIGIN_SET);
+	}
+
+	/*
+	 * Due to - harmless - race conditions during a checkpoint we could see
+	 * values here that are older than the ones we already have in memory.
+	 * Don't overwrite those.
+	 */
+	if (go_backward || replication_state->remote_lsn < remote_commit)
+		replication_state->remote_lsn = remote_commit;
+	if (local_commit != InvalidXLogRecPtr &&
+		(go_backward || replication_state->local_lsn < local_commit))
+		replication_state->local_lsn = local_commit;
+	LWLockRelease(&replication_state->lock);
+
+	/*
+	 * Release *after* changing the LSNs, slot isn't acquired and thus could
+	 * otherwise be dropped anytime.
+	 */
+	LWLockRelease(ReplicationOriginLock);
+}
+
+
+XLogRecPtr
+replorigin_get_progress(RepOriginId node, bool flush)
+{
+	int			i;
+	XLogRecPtr	local_lsn = InvalidXLogRecPtr;
+	XLogRecPtr	remote_lsn = InvalidXLogRecPtr;
+
+	/* prevent slots from being concurrently dropped */
+	LWLockAcquire(ReplicationOriginLock, LW_SHARED);
+
+	for (i = 0; i < max_replication_slots; i++)
+	{
+		ReplicationState *state;
+
+		state = &replication_states[i];
+
+		if (state->roident == node)
+		{
+			LWLockAcquire(&state->lock, LW_SHARED);
+
+			remote_lsn = state->remote_lsn;
+			local_lsn = state->local_lsn;
+
+			LWLockRelease(&state->lock);
+
+			break;
+		}
+	}
+
+	LWLockRelease(ReplicationOriginLock);
+
+	if (flush && local_lsn != InvalidXLogRecPtr)
+		XLogFlush(local_lsn);
+
+	return remote_lsn;
+}
+
+/*
+ * Tear down a (possibly) configured session replication origin during process
+ * exit.
+ */
+static void
+ReplicationOriginExitCleanup(int code, Datum arg)
+{
+	LWLockAcquire(ReplicationOriginLock, LW_EXCLUSIVE);
+
+	if (session_replication_state != NULL &&
+		session_replication_state->acquired_by == MyProcPid)
+	{
+		session_replication_state->acquired_by = 0;
+		session_replication_state = NULL;
+	}
+
+	LWLockRelease(ReplicationOriginLock);
+}
+
+/*
+ * Setup a replication origin in the shared memory struct if it doesn't
+ * already exists and cache access to the specific ReplicationSlot so the
+ * array doesn't have to be searched when calling
+ * replorigin_session_advance().
+ *
+ * Obviously only one such cached origin can exist per process and the current
+ * cached value can only be set again after the previous value is torn down
+ * with replorigin_session_reset().
+ */
+void
+replorigin_session_setup(RepOriginId node)
+{
+	static bool registered_cleanup;
+	int			i;
+	int			free_slot = -1;
+
+	if (!registered_cleanup)
+	{
+		on_shmem_exit(ReplicationOriginExitCleanup, 0);
+		registered_cleanup = true;
+	}
+
+	Assert(max_replication_slots > 0);
+
+	if (session_replication_state != NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+		errmsg("cannot setup replication origin when one is already setup")));
+
+	/* Lock exclusively, as we may have to create a new table entry. */
+	LWLockAcquire(ReplicationOriginLock, LW_EXCLUSIVE);
+
+	/*
+	 * Search for either an existing slot for the origin, or a free one we can
+	 * use.
+	 */
+	for (i = 0; i < max_replication_slots; i++)
+	{
+		ReplicationState *curstate = &replication_states[i];
+
+		/* remember where to insert if necessary */
+		if (curstate->roident == InvalidRepOriginId &&
+			free_slot == -1)
+		{
+			free_slot = i;
+			continue;
+		}
+
+		/* not our slot */
+		if (curstate->roident != node)
+			continue;
+
+		else if (curstate->acquired_by != 0)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_OBJECT_IN_USE),
+			 errmsg("replication identiefer %d is already active for pid %d",
+					curstate->roident, curstate->acquired_by)));
+		}
+
+		/* ok, found slot */
+		session_replication_state = curstate;
+	}
+
+
+	if (session_replication_state == NULL && free_slot == -1)
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
+				 errmsg("no free replication state slot could be found for replication origin with oid %u",
+						node),
+				 errhint("Increase max_replication_slots and try again.")));
+	else if (session_replication_state == NULL)
+	{
+		/* initialize new slot */
+		session_replication_state = &replication_states[free_slot];
+		Assert(session_replication_state->remote_lsn == InvalidXLogRecPtr);
+		Assert(session_replication_state->local_lsn == InvalidXLogRecPtr);
+		session_replication_state->roident = node;
+	}
+
+
+	Assert(session_replication_state->roident != InvalidRepOriginId);
+
+	session_replication_state->acquired_by = MyProcPid;
+
+	LWLockRelease(ReplicationOriginLock);
+}
+
+/*
+ * Reset replay state previously setup in this session.
+ *
+ * This function may only be called if an origin was setup with
+ * replorigin_session_setup().
+ */
+void
+replorigin_session_reset(void)
+{
+	Assert(max_replication_slots != 0);
+
+	if (session_replication_state == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("no replication origin is configured")));
+
+	LWLockAcquire(ReplicationOriginLock, LW_EXCLUSIVE);
+
+	session_replication_state->acquired_by = 0;
+	session_replication_state = NULL;
+
+	LWLockRelease(ReplicationOriginLock);
+}
+
+/*
+ * Do the same work replorigin_advance() does, just on the session's
+ * configured origin.
+ *
+ * This is noticeably cheaper than using replorigin_advance().
+ */
+void
+replorigin_session_advance(XLogRecPtr remote_commit, XLogRecPtr local_commit)
+{
+	Assert(session_replication_state != NULL);
+	Assert(session_replication_state->roident != InvalidRepOriginId);
+
+	LWLockAcquire(&session_replication_state->lock, LW_EXCLUSIVE);
+	if (session_replication_state->local_lsn < local_commit)
+		session_replication_state->local_lsn = local_commit;
+	if (session_replication_state->remote_lsn < remote_commit)
+		session_replication_state->remote_lsn = remote_commit;
+	LWLockRelease(&session_replication_state->lock);
+}
+
+/*
+ * Ask the machinery about the point up to which we successfully replayed
+ * changes from an already setup replication origin.
+ */
+XLogRecPtr
+replorigin_session_get_progress(bool flush)
+{
+	XLogRecPtr	remote_lsn;
+	XLogRecPtr	local_lsn;
+
+	Assert(session_replication_state != NULL);
+
+	LWLockAcquire(&session_replication_state->lock, LW_SHARED);
+	remote_lsn = session_replication_state->remote_lsn;
+	local_lsn = session_replication_state->local_lsn;
+	LWLockRelease(&session_replication_state->lock);
+
+	if (flush && local_lsn != InvalidXLogRecPtr)
+		XLogFlush(local_lsn);
+
+	return remote_lsn;
+}
+
+
+
+/* ---------------------------------------------------------------------------
+ * SQL functions for working with replication origin.
+ *
+ * These mostly should be fairly short wrappers around more generic functions.
+ * ---------------------------------------------------------------------------
+ */
+
+/*
+ * Create replication origin for the passed in name, and return the assigned
+ * oid.
+ */
+Datum
+pg_replication_origin_create(PG_FUNCTION_ARGS)
+{
+	char	   *name;
+	RepOriginId roident;
+
+	replorigin_check_prerequisites(false, false);
+
+	name = text_to_cstring((text *) DatumGetPointer(PG_GETARG_DATUM(0)));
+	roident = replorigin_create(name);
+
+	pfree(name);
+
+	PG_RETURN_OID(roident);
+}
+
+/*
+ * Drop replication origin.
+ */
+Datum
+pg_replication_origin_drop(PG_FUNCTION_ARGS)
+{
+	char	   *name;
+	RepOriginId roident;
+
+	replorigin_check_prerequisites(false, false);
+
+	name = text_to_cstring((text *) DatumGetPointer(PG_GETARG_DATUM(0)));
+
+	roident = replorigin_by_name(name, false);
+	Assert(OidIsValid(roident));
+
+	replorigin_drop(roident);
+
+	pfree(name);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Return oid of a replication origin.
+ */
+Datum
+pg_replication_origin_oid(PG_FUNCTION_ARGS)
+{
+	char	   *name;
+	RepOriginId roident;
+
+	replorigin_check_prerequisites(false, false);
+
+	name = text_to_cstring((text *) DatumGetPointer(PG_GETARG_DATUM(0)));
+	roident = replorigin_by_name(name, true);
+
+	pfree(name);
+
+	if (OidIsValid(roident))
+		PG_RETURN_OID(roident);
+	PG_RETURN_NULL();
+}
+
+/*
+ * Setup a replication origin for this session.
+ */
+Datum
+pg_replication_origin_session_setup(PG_FUNCTION_ARGS)
+{
+	char	   *name;
+	RepOriginId origin;
+
+	replorigin_check_prerequisites(true, false);
+
+	name = text_to_cstring((text *) DatumGetPointer(PG_GETARG_DATUM(0)));
+	origin = replorigin_by_name(name, false);
+	replorigin_session_setup(origin);
+
+	replorigin_sesssion_origin = origin;
+
+	pfree(name);
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Reset previously setup origin in this session
+ */
+Datum
+pg_replication_origin_session_reset(PG_FUNCTION_ARGS)
+{
+	replorigin_check_prerequisites(true, false);
+
+	replorigin_session_reset();
+
+	/* FIXME */
+	replorigin_sesssion_origin = InvalidRepOriginId;
+	replorigin_sesssion_origin_lsn = InvalidXLogRecPtr;
+	replorigin_sesssion_origin_timestamp = 0;
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * Has a replication origin been setup for this session.
+ */
+Datum
+pg_replication_origin_session_is_setup(PG_FUNCTION_ARGS)
+{
+	replorigin_check_prerequisites(false, false);
+
+	PG_RETURN_BOOL(replorigin_sesssion_origin != InvalidRepOriginId);
+}
+
+
+/*
+ * Return the replication progress for origin setup in the current session.
+ *
+ * If 'flush' is set to true it is ensured that the returned value corresponds
+ * to a local transaction that has been flushed. this is useful if asychronous
+ * commits are used when replaying replicated transactions.
+ */
+Datum
+pg_replication_origin_session_progress(PG_FUNCTION_ARGS)
+{
+	XLogRecPtr	remote_lsn = InvalidXLogRecPtr;
+	bool		flush = PG_GETARG_BOOL(0);
+
+	replorigin_check_prerequisites(true, false);
+
+	if (session_replication_state == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("no replication origin is configured")));
+
+	remote_lsn = replorigin_session_get_progress(flush);
+
+	if (remote_lsn == InvalidXLogRecPtr)
+		PG_RETURN_NULL();
+
+	PG_RETURN_LSN(remote_lsn);
+}
+
+Datum
+pg_replication_origin_xact_setup(PG_FUNCTION_ARGS)
+{
+	XLogRecPtr	location = PG_GETARG_LSN(0);
+
+	replorigin_check_prerequisites(true, false);
+
+	if (session_replication_state == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("no replication origin is configured")));
+
+	replorigin_sesssion_origin_lsn = location;
+	replorigin_sesssion_origin_timestamp = PG_GETARG_TIMESTAMPTZ(1);
+
+	PG_RETURN_VOID();
+}
+
+Datum
+pg_replication_origin_xact_reset(PG_FUNCTION_ARGS)
+{
+	replorigin_check_prerequisites(true, false);
+
+	replorigin_sesssion_origin_lsn = InvalidXLogRecPtr;
+	replorigin_sesssion_origin_timestamp = 0;
+
+	PG_RETURN_VOID();
+}
+
+
+Datum
+pg_replication_origin_advance(PG_FUNCTION_ARGS)
+{
+	text	   *name = PG_GETARG_TEXT_P(0);
+	XLogRecPtr	remote_commit = PG_GETARG_LSN(1);
+	RepOriginId node;
+
+	replorigin_check_prerequisites(true, false);
+
+	/* lock to prevent the replication origin from vanishing */
+	LockRelationOid(ReplicationOriginRelationId, RowExclusiveLock);
+
+	node = replorigin_by_name(text_to_cstring(name), false);
+
+	/*
+	 * Can't sensibly pass a local commit to be flushed at checkpoint - this
+	 * xact hasn't committed yet. This is why this function should be used to
+	 * set up the initial replication state, but not for replay.
+	 */
+	replorigin_advance(node, remote_commit, InvalidXLogRecPtr,
+					   true /* go backward */ , true /* wal log */ );
+
+	UnlockRelationOid(ReplicationOriginRelationId, RowExclusiveLock);
+
+	PG_RETURN_VOID();
+}
+
+
+/*
+ * Return the replication progress for an individual replication origin.
+ *
+ * If 'flush' is set to true it is ensured that the returned value corresponds
+ * to a local transaction that has been flushed. this is useful if asychronous
+ * commits are used when replaying replicated transactions.
+ */
+Datum
+pg_replication_origin_progress(PG_FUNCTION_ARGS)
+{
+	char	   *name;
+	bool		flush;
+	RepOriginId roident;
+	XLogRecPtr	remote_lsn = InvalidXLogRecPtr;
+
+	replorigin_check_prerequisites(true, true);
+
+	name = text_to_cstring((text *) DatumGetPointer(PG_GETARG_DATUM(0)));
+	flush = PG_GETARG_BOOL(1);
+
+	roident = replorigin_by_name(name, false);
+	Assert(OidIsValid(roident));
+
+	remote_lsn = replorigin_get_progress(roident, flush);
+
+	if (remote_lsn == InvalidXLogRecPtr)
+		PG_RETURN_NULL();
+
+	PG_RETURN_LSN(remote_lsn);
+}
+
+
+Datum
+pg_show_replication_origin_status(PG_FUNCTION_ARGS)
+{
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+	TupleDesc	tupdesc;
+	Tuplestorestate *tupstore;
+	MemoryContext per_query_ctx;
+	MemoryContext oldcontext;
+	int			i;
+#define REPLICATION_ORIGIN_PROGRESS_COLS 4
+
+	/* we we want to return 0 rows if slot is set to zero */
+	replorigin_check_prerequisites(false, true);
+
+	if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("set-valued function called in context that cannot accept a set")));
+	if (!(rsinfo->allowedModes & SFRM_Materialize))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("materialize mode required, but it is not allowed in this context")));
+	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
+	if (tupdesc->natts != REPLICATION_ORIGIN_PROGRESS_COLS)
+		elog(ERROR, "wrong function definition");
+
+	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+
+	tupstore = tuplestore_begin_heap(true, false, work_mem);
+	rsinfo->returnMode = SFRM_Materialize;
+	rsinfo->setResult = tupstore;
+	rsinfo->setDesc = tupdesc;
+
+	MemoryContextSwitchTo(oldcontext);
+
+
+	/* prevent slots from being concurrently dropped */
+	LWLockAcquire(ReplicationOriginLock, LW_SHARED);
+
+	/*
+	 * Iterate through all possible replication_states, display if they are
+	 * filled. Note that we do not take any locks, so slightly corrupted/out
+	 * of date values are a possibility.
+	 */
+	for (i = 0; i < max_replication_slots; i++)
+	{
+		ReplicationState *state;
+		Datum		values[REPLICATION_ORIGIN_PROGRESS_COLS];
+		bool		nulls[REPLICATION_ORIGIN_PROGRESS_COLS];
+		char	   *roname;
+
+		state = &replication_states[i];
+
+		/* unused slot, nothing to display */
+		if (state->roident == InvalidRepOriginId)
+			continue;
+
+		memset(values, 0, sizeof(values));
+		memset(nulls, 1, sizeof(nulls));
+
+		values[0] = ObjectIdGetDatum(state->roident);
+		nulls[0] = false;
+
+		/*
+		 * We're not preventing the origin to be dropped concurrently, so
+		 * silently accept that it might be gone.
+		 */
+		if (replorigin_by_oid(state->roident, true,
+							  &roname))
+		{
+			values[1] = CStringGetTextDatum(roname);
+			nulls[1] = false;
+		}
+
+		LWLockAcquire(&state->lock, LW_SHARED);
+
+		values[2] = LSNGetDatum(state->remote_lsn);
+		nulls[2] = false;
+
+		values[3] = LSNGetDatum(state->local_lsn);
+		nulls[3] = false;
+
+		LWLockRelease(&state->lock);
+
+		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+	}
+
+	tuplestore_donestoring(tupstore);
+
+	LWLockRelease(ReplicationOriginLock);
+
+#undef REPLICATION_ORIGIN_PROGRESS_COLS
+
+	return (Datum) 0;
+}
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
index dc855830c4..fa98580302 100644
--- a/src/backend/replication/logical/reorderbuffer.c
+++ b/src/backend/replication/logical/reorderbuffer.c
@@ -143,7 +143,7 @@ typedef struct ReorderBufferDiskChange
  * without hitting disk in OLTP workloads, while starting to spool to disk in
  * other workloads reasonably fast.
  *
- * At some point in the future it probaly makes sense to have a more elaborate
+ * At some point in the future it probably makes sense to have a more elaborate
  * resource management here, but it's not entirely clear what that would look
  * like.
  */
@@ -286,7 +286,7 @@ ReorderBufferFree(ReorderBuffer *rb)
 }
 
 /*
- * Get a unused, possibly preallocated, ReorderBufferTXN.
+ * Get an unused, possibly preallocated, ReorderBufferTXN.
  */
 static ReorderBufferTXN *
 ReorderBufferGetTXN(ReorderBuffer *rb)
@@ -361,7 +361,7 @@ ReorderBufferReturnTXN(ReorderBuffer *rb, ReorderBufferTXN *txn)
 }
 
 /*
- * Get a unused, possibly preallocated, ReorderBufferChange.
+ * Get an unused, possibly preallocated, ReorderBufferChange.
  */
 ReorderBufferChange *
 ReorderBufferGetChange(ReorderBuffer *rb)
@@ -401,6 +401,7 @@ ReorderBufferReturnChange(ReorderBuffer *rb, ReorderBufferChange *change)
 		case REORDER_BUFFER_CHANGE_INSERT:
 		case REORDER_BUFFER_CHANGE_UPDATE:
 		case REORDER_BUFFER_CHANGE_DELETE:
+		case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT:
 			if (change->data.tp.newtuple)
 			{
 				ReorderBufferReturnTupleBuf(rb, change->data.tp.newtuple);
@@ -420,8 +421,9 @@ ReorderBufferReturnChange(ReorderBuffer *rb, ReorderBufferChange *change)
 				change->data.snapshot = NULL;
 			}
 			break;
+			/* no data in addition to the struct itself */
+		case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM:
 		case REORDER_BUFFER_CHANGE_INTERNAL_COMMAND_ID:
-			break;
 		case REORDER_BUFFER_CHANGE_INTERNAL_TUPLECID:
 			break;
 	}
@@ -442,7 +444,7 @@ ReorderBufferReturnChange(ReorderBuffer *rb, ReorderBufferChange *change)
 
 
 /*
- * Get a unused, possibly preallocated, ReorderBufferTupleBuf
+ * Get an unused, possibly preallocated, ReorderBufferTupleBuf
  */
 ReorderBufferTupleBuf *
 ReorderBufferGetTupleBuf(ReorderBuffer *rb)
@@ -1255,7 +1257,8 @@ ReorderBufferFreeSnap(ReorderBuffer *rb, Snapshot snap)
 void
 ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 					XLogRecPtr commit_lsn, XLogRecPtr end_lsn,
-					TimestampTz commit_time)
+					TimestampTz commit_time,
+					RepOriginId origin_id, XLogRecPtr origin_lsn)
 {
 	ReorderBufferTXN *txn;
 	volatile Snapshot snapshot_now;
@@ -1273,6 +1276,8 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 	txn->final_lsn = commit_lsn;
 	txn->end_lsn = end_lsn;
 	txn->commit_time = commit_time;
+	txn->origin_id = origin_id;
+	txn->origin_lsn = origin_lsn;
 
 	/* serialize the last bunch of changes if we need start earlier anyway */
 	if (txn->nentries_mem != txn->nentries)
@@ -1314,6 +1319,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 	PG_TRY();
 	{
 		ReorderBufferChange *change;
+		ReorderBufferChange *specinsert = NULL;
 
 		if (using_subtxn)
 			BeginInternalSubTransaction("replay");
@@ -1330,6 +1336,18 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 
 			switch (change->action)
 			{
+				case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM:
+
+					/*
+					 * Confirmation for speculative insertion arrived. Simply
+					 * use as a normal record. It'll be cleaned up at the end
+					 * of INSERT processing.
+					 */
+					Assert(specinsert->data.tp.oldtuple == NULL);
+					change = specinsert;
+					change->action = REORDER_BUFFER_CHANGE_INSERT;
+
+					/* intentionally fall through */
 				case REORDER_BUFFER_CHANGE_INSERT:
 				case REORDER_BUFFER_CHANGE_UPDATE:
 				case REORDER_BUFFER_CHANGE_DELETE:
@@ -1345,7 +1363,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 					if (reloid == InvalidOid &&
 						change->data.tp.newtuple == NULL &&
 						change->data.tp.oldtuple == NULL)
-						continue;
+						goto change_done;
 					else if (reloid == InvalidOid)
 						elog(ERROR, "could not map filenode \"%s\" to relation OID",
 							 relpathperm(change->data.tp.relnode,
@@ -1359,50 +1377,94 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 							 relpathperm(change->data.tp.relnode,
 										 MAIN_FORKNUM));
 
-					if (RelationIsLogicallyLogged(relation))
+					if (!RelationIsLogicallyLogged(relation))
+						goto change_done;
+
+					/*
+					 * For now ignore sequence changes entirely. Most of the
+					 * time they don't log changes using records we
+					 * understand, so it doesn't make sense to handle the few
+					 * cases we do.
+					 */
+					if (relation->rd_rel->relkind == RELKIND_SEQUENCE)
+						goto change_done;
+
+					/* user-triggered change */
+					if (!IsToastRelation(relation))
 					{
+						ReorderBufferToastReplace(rb, txn, relation, change);
+						rb->apply_change(rb, txn, relation, change);
+
 						/*
-						 * For now ignore sequence changes entirely. Most of
-						 * the time they don't log changes using records we
-						 * understand, so it doesn't make sense to handle the
-						 * few cases we do.
+						 * Only clear reassembled toast chunks if we're sure
+						 * they're not required anymore. The creator of the
+						 * tuple tells us.
 						 */
-						if (relation->rd_rel->relkind == RELKIND_SEQUENCE)
-						{
-						}
-						/* user-triggered change */
-						else if (!IsToastRelation(relation))
-						{
-							ReorderBufferToastReplace(rb, txn, relation, change);
-							rb->apply_change(rb, txn, relation, change);
-
-							/*
-							 * Only clear reassembled toast chunks if we're
-							 * sure they're not required anymore. The creator
-							 * of the tuple tells us.
-							 */
-							if (change->data.tp.clear_toast_afterwards)
-								ReorderBufferToastReset(rb, txn);
-						}
-						/* we're not interested in toast deletions */
-						else if (change->action == REORDER_BUFFER_CHANGE_INSERT)
-						{
-							/*
-							 * Need to reassemble the full toasted Datum in
-							 * memory, to ensure the chunks don't get reused
-							 * till we're done remove it from the list of this
-							 * transaction's changes. Otherwise it will get
-							 * freed/reused while restoring spooled data from
-							 * disk.
-							 */
-							dlist_delete(&change->node);
-							ReorderBufferToastAppendChunk(rb, txn, relation,
-														  change);
-						}
+						if (change->data.tp.clear_toast_afterwards)
+							ReorderBufferToastReset(rb, txn);
+					}
+					/* we're not interested in toast deletions */
+					else if (change->action == REORDER_BUFFER_CHANGE_INSERT)
+					{
+						/*
+						 * Need to reassemble the full toasted Datum in
+						 * memory, to ensure the chunks don't get reused till
+						 * we're done remove it from the list of this
+						 * transaction's changes. Otherwise it will get
+						 * freed/reused while restoring spooled data from
+						 * disk.
+						 */
+						dlist_delete(&change->node);
+						ReorderBufferToastAppendChunk(rb, txn, relation,
+													  change);
+					}
 
+			change_done:
+
+					/*
+					 * Either speculative insertion was confirmed, or it was
+					 * unsuccessful and the record isn't needed anymore.
+					 */
+					if (specinsert != NULL)
+					{
+						ReorderBufferReturnChange(rb, specinsert);
+						specinsert = NULL;
+					}
+
+					if (relation != NULL)
+					{
+						RelationClose(relation);
+						relation = NULL;
+					}
+					break;
+
+				case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT:
+
+					/*
+					 * Speculative insertions are dealt with by delaying the
+					 * processing of the insert until the confirmation record
+					 * arrives. For that we simply unlink the record from the
+					 * chain, so it does not get freed/reused while restoring
+					 * spooled data from disk.
+					 *
+					 * This is safe in the face of concurrent catalog changes
+					 * because the relevant relation can't be changed between
+					 * speculative insertion and confirmation due to
+					 * CheckTableNotInUse() and locking.
+					 */
+
+					/* clear out a pending (and thus failed) speculation */
+					if (specinsert != NULL)
+					{
+						ReorderBufferReturnChange(rb, specinsert);
+						specinsert = NULL;
 					}
-					RelationClose(relation);
+
+					/* and memorize the pending insertion */
+					dlist_delete(&change->node);
+					specinsert = change;
 					break;
+
 				case REORDER_BUFFER_CHANGE_INTERNAL_SNAPSHOT:
 					/* get rid of the old */
 					TeardownHistoricSnapshot(false);
@@ -1471,6 +1533,17 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 			}
 		}
 
+		/*
+		 * There's a speculative insertion remaining, just clean in up, it
+		 * can't have been successful, otherwise we'd gotten a confirmation
+		 * record.
+		 */
+		if (specinsert)
+		{
+			ReorderBufferReturnChange(rb, specinsert);
+			specinsert = NULL;
+		}
+
 		/* clean up the iterator */
 		ReorderBufferIterTXNFinish(rb, iterstate);
 		iterstate = NULL;
@@ -1634,9 +1707,9 @@ ReorderBufferForget(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn)
 	txn->final_lsn = lsn;
 
 	/*
-	 * Proccess cache invalidation messages if there are any. Even if we're
-	 * not interested in the transaction's contents, it could have manipulated
-	 * the catalog and we need to update the caches according to that.
+	 * Process cache invalidation messages if there are any. Even if we're not
+	 * interested in the transaction's contents, it could have manipulated the
+	 * catalog and we need to update the caches according to that.
 	 */
 	if (txn->base_snapshot != NULL && txn->ninvalidations > 0)
 	{
@@ -1998,11 +2071,11 @@ ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
 
 	switch (change->action)
 	{
+			/* fall through these, they're all similar enough */
 		case REORDER_BUFFER_CHANGE_INSERT:
-			/* fall through */
 		case REORDER_BUFFER_CHANGE_UPDATE:
-			/* fall through */
 		case REORDER_BUFFER_CHANGE_DELETE:
+		case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT:
 			{
 				char	   *data;
 				ReorderBufferTupleBuf *oldtup,
@@ -2080,9 +2153,8 @@ ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
 				}
 				break;
 			}
+		case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM:
 		case REORDER_BUFFER_CHANGE_INTERNAL_COMMAND_ID:
-			/* ReorderBufferChange contains everything important */
-			break;
 		case REORDER_BUFFER_CHANGE_INTERNAL_TUPLECID:
 			/* ReorderBufferChange contains everything important */
 			break;
@@ -2253,11 +2325,11 @@ ReorderBufferRestoreChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
 	/* restore individual stuff */
 	switch (change->action)
 	{
+			/* fall through these, they're all similar enough */
 		case REORDER_BUFFER_CHANGE_INSERT:
-			/* fall through */
 		case REORDER_BUFFER_CHANGE_UPDATE:
-			/* fall through */
 		case REORDER_BUFFER_CHANGE_DELETE:
+		case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT:
 			if (change->data.tp.newtuple)
 			{
 				Size		len = offsetof(ReorderBufferTupleBuf, t_data) +
@@ -2306,6 +2378,7 @@ ReorderBufferRestoreChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
 				break;
 			}
 			/* the base struct contains all the data, easy peasy */
+		case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM:
 		case REORDER_BUFFER_CHANGE_INTERNAL_COMMAND_ID:
 		case REORDER_BUFFER_CHANGE_INTERNAL_TUPLECID:
 			break;
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 9b40bc8eca..efab4ca0df 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -79,7 +79,7 @@
  *	  +--->|SNAPBUILD_CONSISTENT	 |<------------+
  *		   +-------------------------+
  *
- * Initially the machinery is in the START stage. When a xl_running_xacts
+ * Initially the machinery is in the START stage. When an xl_running_xacts
  * record is read that is sufficiently new (above the safe xmin horizon),
  * there's a state transition. If there were no running xacts when the
  * runnign_xacts record was generated, we'll directly go into CONSISTENT
@@ -153,15 +153,14 @@ struct SnapBuild
 	TransactionId xmax;
 
 	/*
-	 * Don't replay commits from an LSN < this LSN. This can be set
-	 * externally but it will also be advanced (never retreat) from within
-	 * snapbuild.c.
+	 * Don't replay commits from an LSN < this LSN. This can be set externally
+	 * but it will also be advanced (never retreat) from within snapbuild.c.
 	 */
 	XLogRecPtr	start_decoding_at;
 
 	/*
 	 * Don't start decoding WAL until the "xl_running_xacts" information
-	 * indicates there are no running xids with a xid smaller than this.
+	 * indicates there are no running xids with an xid smaller than this.
 	 */
 	TransactionId initial_xmin_horizon;
 
@@ -244,7 +243,7 @@ struct SnapBuild
  * removes knowledge about the previously used resowner, so we save it here.
  */
 static ResourceOwner SavedResourceOwnerDuringExport = NULL;
-static bool	ExportInProgress = false;
+static bool ExportInProgress = false;
 
 /* transaction state manipulation functions */
 static void SnapBuildEndTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid);
@@ -599,7 +598,7 @@ SnapBuildExportSnapshot(SnapBuild *builder)
 
 	ereport(LOG,
 			(errmsg_plural("exported logical decoding snapshot: \"%s\" with %u transaction ID",
-						   "exported logical decoding snapshot: \"%s\" with %u transaction IDs",
+		"exported logical decoding snapshot: \"%s\" with %u transaction IDs",
 						   snap->xcnt,
 						   snapname, snap->xcnt)));
 	return snapname;
@@ -683,8 +682,9 @@ SnapBuildProcessChange(SnapBuild *builder, TransactionId xid, XLogRecPtr lsn)
 }
 
 /*
- * Do CommandId/ComboCid handling after reading a xl_heap_new_cid record. This
- * implies that a transaction has done some form of write to system catalogs.
+ * Do CommandId/ComboCid handling after reading an xl_heap_new_cid record.
+ * This implies that a transaction has done some form of write to system
+ * catalogs.
  */
 void
 SnapBuildProcessNewCid(SnapBuild *builder, TransactionId xid,
@@ -769,7 +769,7 @@ SnapBuildDistributeNewCatalogSnapshot(SnapBuild *builder, XLogRecPtr lsn)
 	/*
 	 * Iterate through all toplevel transactions. This can include
 	 * subtransactions which we just don't yet know to be that, but that's
-	 * fine, they will just get an unneccesary snapshot queued.
+	 * fine, they will just get an unnecessary snapshot queued.
 	 */
 	dlist_foreach(txn_i, &builder->reorder->toplevel_by_lsn)
 	{
@@ -832,7 +832,7 @@ SnapBuildAddCommittedTxn(SnapBuild *builder, TransactionId xid)
 
 /*
  * Remove knowledge about transactions we treat as committed that are smaller
- * than ->xmin. Those won't ever get checked via the ->commited array but via
+ * than ->xmin. Those won't ever get checked via the ->committed array but via
  * the clog machinery, so we don't need to waste memory on them.
  */
 static void
@@ -903,8 +903,8 @@ SnapBuildEndTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid)
 			ereport(LOG,
 				  (errmsg("logical decoding found consistent point at %X/%X",
 						  (uint32) (lsn >> 32), (uint32) lsn),
-				errdetail("Transaction ID %u finished; no more running transactions.",
-						  xid)));
+				   errdetail("Transaction ID %u finished; no more running transactions.",
+							 xid)));
 			builder->state = SNAPBUILD_CONSISTENT;
 		}
 	}
@@ -1211,7 +1211,7 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
 	 *	  to CONSISTENT.
 	 *	  NB: We need to search running.xip when seeing a transaction's end to
 	 *	  make sure it's a toplevel transaction and it's been one of the
-	 *	  intially running ones.
+	 *	  initially running ones.
 	 *	  Interestingly, in contrast to HS, this allows us not to care about
 	 *	  subtransactions - and by extension suboverflowed xl_running_xacts -
 	 *	  at all.
@@ -1231,8 +1231,8 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
 	{
 		ereport(DEBUG1,
 				(errmsg_internal("skipping snapshot at %X/%X while building logical decoding snapshot, xmin horizon too low",
-						(uint32) (lsn >> 32), (uint32) lsn),
-				 errdetail_internal("initial xmin horizon of %u vs the snapshot's %u",
+								 (uint32) (lsn >> 32), (uint32) lsn),
+		errdetail_internal("initial xmin horizon of %u vs the snapshot's %u",
 				 builder->initial_xmin_horizon, running->oldestRunningXid)));
 		return true;
 	}
@@ -1251,8 +1251,8 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
 			builder->start_decoding_at = lsn + 1;
 
 		/* As no transactions were running xmin/xmax can be trivially set. */
-		builder->xmin = running->nextXid; /* < are finished */
-		builder->xmax = running->nextXid; /* >= are running */
+		builder->xmin = running->nextXid;		/* < are finished */
+		builder->xmax = running->nextXid;		/* >= are running */
 
 		/* so we can safely use the faster comparisons */
 		Assert(TransactionIdIsNormal(builder->xmin));
@@ -1301,8 +1301,8 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
 		 * currently running transactions have finished. We'll update both
 		 * while waiting for the pending transactions to finish.
 		 */
-		builder->xmin = running->nextXid; /* < are finished */
-		builder->xmax = running->nextXid;  /* >= are running */
+		builder->xmin = running->nextXid;		/* < are finished */
+		builder->xmax = running->nextXid;		/* >= are running */
 
 		/* so we can safely use the faster comparisons */
 		Assert(TransactionIdIsNormal(builder->xmin));
@@ -1597,7 +1597,7 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn)
 
 	/*
 	 * We may overwrite the work from some other backend, but that's ok, our
-	 * snapshot is valid as well, we'll just have done some superflous work.
+	 * snapshot is valid as well, we'll just have done some superfluous work.
 	 */
 	if (rename(tmppath, path) != 0)
 	{
@@ -1656,7 +1656,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
 	 * Make sure the snapshot had been stored safely to disk, that's normally
 	 * cheap.
 	 * Note that we do not need PANIC here, nobody will be able to use the
-	 * slot without fsyncing, and saving it won't suceed without an fsync()
+	 * slot without fsyncing, and saving it won't succeed without an fsync()
 	 * either...
 	 * ----
 	 */
@@ -1687,7 +1687,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
 
 	INIT_CRC32C(checksum);
 	COMP_CRC32C(checksum,
-			   ((char *) &ondisk) + SnapBuildOnDiskNotChecksummedSize,
+				((char *) &ondisk) + SnapBuildOnDiskNotChecksummedSize,
 			SnapBuildOnDiskConstantSize - SnapBuildOnDiskNotChecksummedSize);
 
 	/* read SnapBuild */
@@ -1748,7 +1748,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
 
 	/*
 	 * We are only interested in consistent snapshots for now, comparing
-	 * whether one imcomplete snapshot is more "advanced" seems to be
+	 * whether one incomplete snapshot is more "advanced" seems to be
 	 * unnecessarily complex.
 	 */
 	if (ondisk.builder.state < SNAPBUILD_CONSISTENT)
diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y
index 7d6d154f9c..e9177ca0db 100644
--- a/src/backend/replication/repl_gram.y
+++ b/src/backend/replication/repl_gram.y
@@ -71,13 +71,16 @@ Node *replication_parse_result;
 %token K_NOWAIT
 %token K_MAX_RATE
 %token K_WAL
+%token K_TABLESPACE_MAP
 %token K_TIMELINE
 %token K_PHYSICAL
 %token K_LOGICAL
 %token K_SLOT
 
 %type <node>	command
-%type <node>	base_backup start_replication start_logical_replication create_replication_slot drop_replication_slot identify_system timeline_history
+%type <node>	base_backup start_replication start_logical_replication
+				create_replication_slot drop_replication_slot identify_system
+				timeline_history
 %type <list>	base_backup_opt_list
 %type <defelt>	base_backup_opt
 %type <uintval>	opt_timeline
@@ -119,12 +122,14 @@ identify_system:
 			;
 
 /*
- * BASE_BACKUP [LABEL '<label>'] [PROGRESS] [FAST] [WAL] [NOWAIT] [MAX_RATE %d]
+ * BASE_BACKUP [LABEL '<label>'] [PROGRESS] [FAST] [WAL] [NOWAIT]
+ * [MAX_RATE %d] [TABLESPACE_MAP]
  */
 base_backup:
 			K_BASE_BACKUP base_backup_opt_list
 				{
-					BaseBackupCmd *cmd = (BaseBackupCmd *) makeNode(BaseBackupCmd);
+					BaseBackupCmd *cmd =
+						(BaseBackupCmd *) makeNode(BaseBackupCmd);
 					cmd->options = $2;
 					$$ = (Node *) cmd;
 				}
@@ -168,6 +173,11 @@ base_backup_opt:
 				  $$ = makeDefElem("max_rate",
 								   (Node *)makeInteger($2));
 				}
+			| K_TABLESPACE_MAP
+				{
+				  $$ = makeDefElem("tablespace_map",
+								   (Node *)makeInteger(TRUE));
+				}
 			;
 
 create_replication_slot:
diff --git a/src/backend/replication/repl_scanner.l b/src/backend/replication/repl_scanner.l
index f8acb66552..056cc14129 100644
--- a/src/backend/replication/repl_scanner.l
+++ b/src/backend/replication/repl_scanner.l
@@ -88,6 +88,7 @@ NOWAIT			{ return K_NOWAIT; }
 PROGRESS			{ return K_PROGRESS; }
 MAX_RATE		{ return K_MAX_RATE; }
 WAL			{ return K_WAL; }
+TABLESPACE_MAP			{ return K_TABLESPACE_MAP; }
 TIMELINE			{ return K_TIMELINE; }
 START_REPLICATION	{ return K_START_REPLICATION; }
 CREATE_REPLICATION_SLOT		{ return K_CREATE_REPLICATION_SLOT; }
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index 16ea80bc3a..060343f168 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -79,12 +79,12 @@ typedef struct ReplicationSlotOnDisk
 /* size of the part covered by the checksum */
 #define SnapBuildOnDiskChecksummedSize \
 	sizeof(ReplicationSlotOnDisk) - SnapBuildOnDiskNotChecksummedSize
-/* size of the slot data that is version dependant */
+/* size of the slot data that is version dependent */
 #define ReplicationSlotOnDiskV2Size \
 	sizeof(ReplicationSlotOnDisk) - ReplicationSlotOnDiskConstantSize
 
 #define SLOT_MAGIC		0x1051CA1		/* format identifier */
-#define SLOT_VERSION	2				/* version for new files */
+#define SLOT_VERSION	2		/* version for new files */
 
 /* Control array for replication slot management */
 ReplicationSlotCtlData *ReplicationSlotCtl = NULL;
@@ -262,7 +262,7 @@ ReplicationSlotCreate(const char *name, bool db_specific,
 	 * be doing that.  So it's safe to initialize the slot.
 	 */
 	Assert(!slot->in_use);
-	Assert(!slot->active);
+	Assert(slot->active_pid == 0);
 	slot->data.persistency = persistency;
 	slot->data.xmin = InvalidTransactionId;
 	slot->effective_xmin = InvalidTransactionId;
@@ -291,8 +291,8 @@ ReplicationSlotCreate(const char *name, bool db_specific,
 		volatile ReplicationSlot *vslot = slot;
 
 		SpinLockAcquire(&slot->mutex);
-		Assert(!vslot->active);
-		vslot->active = true;
+		Assert(vslot->active_pid == 0);
+		vslot->active_pid = MyProcPid;
 		SpinLockRelease(&slot->mutex);
 		MyReplicationSlot = slot;
 	}
@@ -314,7 +314,7 @@ ReplicationSlotAcquire(const char *name)
 {
 	ReplicationSlot *slot = NULL;
 	int			i;
-	bool		active = false;
+	int			active_pid = 0;
 
 	Assert(MyReplicationSlot == NULL);
 
@@ -331,8 +331,9 @@ ReplicationSlotAcquire(const char *name)
 			volatile ReplicationSlot *vslot = s;
 
 			SpinLockAcquire(&s->mutex);
-			active = vslot->active;
-			vslot->active = true;
+			active_pid = vslot->active_pid;
+			if (active_pid == 0)
+				vslot->active_pid = MyProcPid;
 			SpinLockRelease(&s->mutex);
 			slot = s;
 			break;
@@ -345,10 +346,11 @@ ReplicationSlotAcquire(const char *name)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("replication slot \"%s\" does not exist", name)));
-	if (active)
+	if (active_pid != 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_IN_USE),
-				 errmsg("replication slot \"%s\" is already active", name)));
+			   errmsg("replication slot \"%s\" is already active for pid %d",
+					  name, active_pid)));
 
 	/* We made this slot active, so it's ours now. */
 	MyReplicationSlot = slot;
@@ -363,7 +365,7 @@ ReplicationSlotRelease(void)
 {
 	ReplicationSlot *slot = MyReplicationSlot;
 
-	Assert(slot != NULL && slot->active);
+	Assert(slot != NULL && slot->active_pid != 0);
 
 	if (slot->data.persistency == RS_EPHEMERAL)
 	{
@@ -380,7 +382,7 @@ ReplicationSlotRelease(void)
 		volatile ReplicationSlot *vslot = slot;
 
 		SpinLockAcquire(&slot->mutex);
-		vslot->active = false;
+		vslot->active_pid = 0;
 		SpinLockRelease(&slot->mutex);
 	}
 
@@ -435,7 +437,7 @@ ReplicationSlotDropAcquired(void)
 	/*
 	 * Rename the slot directory on disk, so that we'll no longer recognize
 	 * this as a valid slot.  Note that if this fails, we've got to mark the
-	 * slot inactive before bailing out.  If we're dropping a ephemeral slot,
+	 * slot inactive before bailing out.  If we're dropping an ephemeral slot,
 	 * we better never fail hard as the caller won't expect the slot to
 	 * survive and this might get called during error handling.
 	 */
@@ -460,7 +462,7 @@ ReplicationSlotDropAcquired(void)
 		bool		fail_softly = slot->data.persistency == RS_EPHEMERAL;
 
 		SpinLockAcquire(&slot->mutex);
-		vslot->active = false;
+		vslot->active_pid = 0;
 		SpinLockRelease(&slot->mutex);
 
 		ereport(fail_softly ? WARNING : ERROR,
@@ -477,7 +479,7 @@ ReplicationSlotDropAcquired(void)
 	 * scanning the array.
 	 */
 	LWLockAcquire(ReplicationSlotControlLock, LW_EXCLUSIVE);
-	slot->active = false;
+	slot->active_pid = 0;
 	slot->in_use = false;
 	LWLockRelease(ReplicationSlotControlLock);
 
@@ -544,7 +546,7 @@ ReplicationSlotMarkDirty(void)
 
 /*
  * Convert a slot that's marked as RS_EPHEMERAL to a RS_PERSISTENT slot,
- * guaranteeing it will be there after a eventual crash.
+ * guaranteeing it will be there after an eventual crash.
  */
 void
 ReplicationSlotPersist(void)
@@ -749,7 +751,7 @@ ReplicationSlotsCountDBSlots(Oid dboid, int *nslots, int *nactive)
 		/* count slots with spinlock held */
 		SpinLockAcquire(&s->mutex);
 		(*nslots)++;
-		if (s->active)
+		if (s->active_pid != 0)
 			(*nactive)++;
 		SpinLockRelease(&s->mutex);
 	}
@@ -1090,7 +1092,7 @@ RestoreSlotFromDisk(const char *name)
 
 	elog(DEBUG1, "restoring replication slot from \"%s\"", path);
 
-	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+	fd = OpenTransientFile(path, O_RDWR | PG_BINARY, 0);
 
 	/*
 	 * We do not need to handle this as we are rename()ing the directory into
@@ -1227,7 +1229,7 @@ RestoreSlotFromDisk(const char *name)
 		slot->candidate_restart_valid = InvalidXLogRecPtr;
 
 		slot->in_use = true;
-		slot->active = false;
+		slot->active_pid = 0;
 
 		restored = true;
 		break;
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index f31925d862..9a2793f7ec 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -99,9 +99,9 @@ pg_create_logical_replication_slot(PG_FUNCTION_ARGS)
 	CheckLogicalDecodingRequirements();
 
 	/*
-	 * Acquire a logical decoding slot, this will check for conflicting
-	 * names. Initially create it as ephemeral - that allows us to nicely
-	 * handle errors during initialization because it'll get dropped if this
+	 * Acquire a logical decoding slot, this will check for conflicting names.
+	 * Initially create it as ephemeral - that allows us to nicely handle
+	 * errors during initialization because it'll get dropped if this
 	 * transaction fails. We'll make it persistent at the end.
 	 */
 	ReplicationSlotCreate(NameStr(*name), true, RS_EPHEMERAL);
@@ -158,7 +158,7 @@ pg_drop_replication_slot(PG_FUNCTION_ARGS)
 Datum
 pg_get_replication_slots(PG_FUNCTION_ARGS)
 {
-#define PG_GET_REPLICATION_SLOTS_COLS 8
+#define PG_GET_REPLICATION_SLOTS_COLS 9
 	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
 	TupleDesc	tupdesc;
 	Tuplestorestate *tupstore;
@@ -206,7 +206,7 @@ pg_get_replication_slots(PG_FUNCTION_ARGS)
 		TransactionId xmin;
 		TransactionId catalog_xmin;
 		XLogRecPtr	restart_lsn;
-		bool		active;
+		pid_t		active_pid;
 		Oid			database;
 		NameData	slot_name;
 		NameData	plugin;
@@ -227,7 +227,7 @@ pg_get_replication_slots(PG_FUNCTION_ARGS)
 			namecpy(&slot_name, &slot->data.name);
 			namecpy(&plugin, &slot->data.plugin);
 
-			active = slot->active;
+			active_pid = slot->active_pid;
 		}
 		SpinLockRelease(&slot->mutex);
 
@@ -251,7 +251,12 @@ pg_get_replication_slots(PG_FUNCTION_ARGS)
 		else
 			values[i++] = database;
 
-		values[i++] = BoolGetDatum(active);
+		values[i++] = BoolGetDatum(active_pid != 0);
+
+		if (active_pid != 0)
+			values[i++] = Int32GetDatum(active_pid);
+		else
+			nulls[i++] = true;
 
 		if (xmin != InvalidTransactionId)
 			values[i++] = TransactionIdGetDatum(xmin);
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
index 9c7710f0db..41e57f2439 100644
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@ -540,7 +540,10 @@ WalReceiverMain(void)
 			 * being archived later.
 			 */
 			XLogFileName(xlogfname, recvFileTLI, recvSegNo);
-			XLogArchiveForceDone(xlogfname);
+			if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
+				XLogArchiveForceDone(xlogfname);
+			else
+				XLogArchiveNotify(xlogfname);
 		}
 		recvFile = -1;
 
@@ -897,7 +900,10 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
 				 * from being archived later.
 				 */
 				XLogFileName(xlogfname, recvFileTLI, recvSegNo);
-				XLogArchiveForceDone(xlogfname);
+				if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
+					XLogArchiveForceDone(xlogfname);
+				else
+					XLogArchiveNotify(xlogfname);
 			}
 			recvFile = -1;
 
diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c
index b26f5fcf63..f77a790fd8 100644
--- a/src/backend/replication/walreceiverfuncs.c
+++ b/src/backend/replication/walreceiverfuncs.c
@@ -329,7 +329,7 @@ GetReplicationApplyDelay(void)
 	long		secs;
 	int			usecs;
 
-	TimestampTz	chunckReplayStartTime;
+	TimestampTz chunckReplayStartTime;
 
 	SpinLockAcquire(&walrcv->mutex);
 	receivePtr = walrcv->receivedUpto;
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 4a20569e65..eb1b89b9c3 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -781,6 +781,7 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
 	else
 	{
 		CheckLogicalDecodingRequirements();
+
 		/*
 		 * Initially create the slot as ephemeral - that allows us to nicely
 		 * handle errors during initialization because it'll get dropped if
@@ -1266,9 +1267,9 @@ exec_replication_command(const char *cmd_string)
 	MemoryContext old_context;
 
 	/*
-	 * Log replication command if log_replication_commands is enabled.
-	 * Even when it's disabled, log the command with DEBUG1 level for
-	 * backward compatibility.
+	 * Log replication command if log_replication_commands is enabled. Even
+	 * when it's disabled, log the command with DEBUG1 level for backward
+	 * compatibility.
 	 */
 	ereport(log_replication_commands ? LOG : DEBUG1,
 			(errmsg("received replication command: %s", cmd_string)));
@@ -2663,8 +2664,8 @@ WalSndWakeup(void)
 
 	for (i = 0; i < max_wal_senders; i++)
 	{
-		Latch *latch;
-		WalSnd *walsnd = &WalSndCtl->walsnds[i];
+		Latch	   *latch;
+		WalSnd	   *walsnd = &WalSndCtl->walsnds[i];
 
 		/*
 		 * Get latch pointer with spinlock held, for the unlikely case that
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index f540432ccb..a88d73e15f 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -597,6 +597,7 @@ DefineQueryRewrite(char *rulename,
 		classForm->relhaspkey = false;
 		classForm->relfrozenxid = InvalidTransactionId;
 		classForm->relminmxid = InvalidMultiXactId;
+		classForm->relreplident = REPLICA_IDENTITY_NOTHING;
 
 		simple_heap_update(relationRelation, &classTup->t_self, classTup);
 		CatalogUpdateIndexes(relationRelation, classTup);
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 777654e51c..fa1d07777e 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -64,7 +64,10 @@ static Query *rewriteRuleAction(Query *parsetree,
 				  CmdType event,
 				  bool *returning_flag);
 static List *adjustJoinTreeList(Query *parsetree, bool removert, int rt_index);
-static void rewriteTargetListIU(Query *parsetree, Relation target_relation,
+static List *rewriteTargetListIU(List *targetList,
+					CmdType commandType,
+					Relation target_relation,
+					int result_rti,
 					List **attrno_list);
 static TargetEntry *process_matched_tle(TargetEntry *src_tle,
 					TargetEntry *prior_tle,
@@ -78,7 +81,7 @@ static void markQueryForLocking(Query *qry, Node *jtnode,
 					LockClauseStrength strength, LockWaitPolicy waitPolicy,
 					bool pushedDown);
 static List *matchLocks(CmdType event, RuleLock *rulelocks,
-		   int varno, Query *parsetree);
+		   int varno, Query *parsetree, bool *hasUpdate);
 static Query *fireRIRrules(Query *parsetree, List *activeRIRs,
 			 bool forUpdatePushedDown);
 static bool view_has_instead_trigger(Relation view, CmdType event);
@@ -701,11 +704,13 @@ adjustJoinTreeList(Query *parsetree, bool removert, int rt_index)
  * order of the original tlist's non-junk entries.  This is needed for
  * processing VALUES RTEs.
  */
-static void
-rewriteTargetListIU(Query *parsetree, Relation target_relation,
+static List *
+rewriteTargetListIU(List *targetList,
+					CmdType commandType,
+					Relation target_relation,
+					int result_rti,
 					List **attrno_list)
 {
-	CmdType		commandType = parsetree->commandType;
 	TargetEntry **new_tles;
 	List	   *new_tlist = NIL;
 	List	   *junk_tlist = NIL;
@@ -731,7 +736,7 @@ rewriteTargetListIU(Query *parsetree, Relation target_relation,
 	new_tles = (TargetEntry **) palloc0(numattrs * sizeof(TargetEntry *));
 	next_junk_attrno = numattrs + 1;
 
-	foreach(temp, parsetree->targetList)
+	foreach(temp, targetList)
 	{
 		TargetEntry *old_tle = (TargetEntry *) lfirst(temp);
 
@@ -849,7 +854,7 @@ rewriteTargetListIU(Query *parsetree, Relation target_relation,
 		{
 			Node	   *new_expr;
 
-			new_expr = (Node *) makeVar(parsetree->resultRelation,
+			new_expr = (Node *) makeVar(result_rti,
 										attrno,
 										att_tup->atttypid,
 										att_tup->atttypmod,
@@ -868,7 +873,7 @@ rewriteTargetListIU(Query *parsetree, Relation target_relation,
 
 	pfree(new_tles);
 
-	parsetree->targetList = list_concat(new_tlist, junk_tlist);
+	return list_concat(new_tlist, junk_tlist);
 }
 
 
@@ -1440,7 +1445,8 @@ static List *
 matchLocks(CmdType event,
 		   RuleLock *rulelocks,
 		   int varno,
-		   Query *parsetree)
+		   Query *parsetree,
+		   bool *hasUpdate)
 {
 	List	   *matching_locks = NIL;
 	int			nlocks;
@@ -1461,6 +1467,9 @@ matchLocks(CmdType event,
 	{
 		RewriteRule *oneLock = rulelocks->rules[i];
 
+		if (oneLock->event == CMD_UPDATE)
+			*hasUpdate = true;
+
 		/*
 		 * Suppress ON INSERT/UPDATE/DELETE rules that are disabled or
 		 * configured to not fire during the current sessions replication
@@ -1555,7 +1564,8 @@ ApplyRetrieveRule(Query *parsetree,
 			rte->requiredPerms = 0;
 			rte->checkAsUser = InvalidOid;
 			rte->selectedCols = NULL;
-			rte->modifiedCols = NULL;
+			rte->insertedCols = NULL;
+			rte->updatedCols = NULL;
 
 			/*
 			 * For the most part, Vars referencing the view should remain as
@@ -1618,12 +1628,14 @@ ApplyRetrieveRule(Query *parsetree,
 	subrte->requiredPerms = rte->requiredPerms;
 	subrte->checkAsUser = rte->checkAsUser;
 	subrte->selectedCols = rte->selectedCols;
-	subrte->modifiedCols = rte->modifiedCols;
+	subrte->insertedCols = rte->insertedCols;
+	subrte->updatedCols = rte->updatedCols;
 
 	rte->requiredPerms = 0;		/* no permission check on subquery itself */
 	rte->checkAsUser = InvalidOid;
 	rte->selectedCols = NULL;
-	rte->modifiedCols = NULL;
+	rte->insertedCols = NULL;
+	rte->updatedCols = NULL;
 
 	/*
 	 * If FOR [KEY] UPDATE/SHARE of view, mark all the contained tables as
@@ -1866,51 +1878,6 @@ fireRIRrules(Query *parsetree, List *activeRIRs, bool forUpdatePushedDown)
 				activeRIRs = list_delete_first(activeRIRs);
 			}
 		}
-		/*
-		 * If the RTE has row security quals, apply them and recurse into the
-		 * securityQuals.
-		 */
-		if (prepend_row_security_policies(parsetree, rte, rt_index))
-		{
-			/*
-			 * We applied security quals, check for infinite recursion and
-			 * then expand any nested queries.
-			 */
-			if (list_member_oid(activeRIRs, RelationGetRelid(rel)))
-					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-							 errmsg("infinite recursion detected in policy for relation \"%s\"",
-									RelationGetRelationName(rel))));
-
-			/*
-			 * Make sure we check for recursion in either securityQuals or
-			 * WITH CHECK quals.
-			 */
-			if (rte->securityQuals != NIL)
-			{
-				activeRIRs = lcons_oid(RelationGetRelid(rel), activeRIRs);
-
-				expression_tree_walker( (Node*) rte->securityQuals,
-										fireRIRonSubLink, (void*)activeRIRs );
-
-				activeRIRs = list_delete_first(activeRIRs);
-			}
-
-			if (parsetree->withCheckOptions != NIL)
-			{
-				WithCheckOption    *wco;
-				List			   *quals = NIL;
-
-				wco = (WithCheckOption *) makeNode(WithCheckOption);
-				quals = lcons(wco->qual, quals);
-
-				activeRIRs = lcons_oid(RelationGetRelid(rel), activeRIRs);
-
-				expression_tree_walker( (Node*) quals, fireRIRonSubLink,
-									   (void*)activeRIRs);
-			}
-
-		}
 
 		heap_close(rel, NoLock);
 	}
@@ -1932,6 +1899,88 @@ fireRIRrules(Query *parsetree, List *activeRIRs, bool forUpdatePushedDown)
 		query_tree_walker(parsetree, fireRIRonSubLink, (void *) activeRIRs,
 						  QTW_IGNORE_RC_SUBQUERIES);
 
+	/*
+	 * Apply any row level security policies.  We do this last because it
+	 * requires special recursion detection if the new quals have sublink
+	 * subqueries, and if we did it in the loop above query_tree_walker would
+	 * then recurse into those quals a second time.
+	 */
+	rt_index = 0;
+	foreach(lc, parsetree->rtable)
+	{
+		RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+		Relation	rel;
+		List	   *securityQuals;
+		List	   *withCheckOptions;
+		bool		hasRowSecurity;
+		bool		hasSubLinks;
+
+		++rt_index;
+
+		/* Only normal relations can have RLS policies */
+		if (rte->rtekind != RTE_RELATION ||
+			rte->relkind != RELKIND_RELATION)
+			continue;
+
+		rel = heap_open(rte->relid, NoLock);
+
+		/*
+		 * Fetch any new security quals that must be applied to this RTE.
+		 */
+		get_row_security_policies(parsetree, parsetree->commandType, rte,
+								  rt_index, &securityQuals, &withCheckOptions,
+								  &hasRowSecurity, &hasSubLinks);
+
+		if (securityQuals != NIL || withCheckOptions != NIL)
+		{
+			if (hasSubLinks)
+			{
+				/*
+				 * Recursively process the new quals, checking for infinite
+				 * recursion.
+				 */
+				if (list_member_oid(activeRIRs, RelationGetRelid(rel)))
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+							 errmsg("infinite recursion detected in policy for relation \"%s\"",
+									RelationGetRelationName(rel))));
+
+				activeRIRs = lcons_oid(RelationGetRelid(rel), activeRIRs);
+
+				expression_tree_walker((Node *) securityQuals,
+									   fireRIRonSubLink, (void *) activeRIRs);
+
+				expression_tree_walker((Node *) withCheckOptions,
+									   fireRIRonSubLink, (void *) activeRIRs);
+
+				activeRIRs = list_delete_first(activeRIRs);
+			}
+
+			/*
+			 * Add the new security quals to the start of the RTE's list so
+			 * that they get applied before any existing security quals (which
+			 * might have come from a user-written security barrier view, and
+			 * might contain malicious code).
+			 */
+			rte->securityQuals = list_concat(securityQuals,
+											 rte->securityQuals);
+
+			parsetree->withCheckOptions = list_concat(withCheckOptions,
+												parsetree->withCheckOptions);
+		}
+
+		/*
+		 * Make sure the query is marked correctly if row level security
+		 * applies, or if the new quals had sublinks.
+		 */
+		if (hasRowSecurity)
+			parsetree->hasRowSecurity = true;
+		if (hasSubLinks)
+			parsetree->hasSubLinks = true;
+
+		heap_close(rel, NoLock);
+	}
+
 	return parsetree;
 }
 
@@ -2261,7 +2310,7 @@ view_query_is_auto_updatable(Query *viewquery, bool check_cols)
 	if (viewquery->distinctClause != NIL)
 		return gettext_noop("Views containing DISTINCT are not automatically updatable.");
 
-	if (viewquery->groupClause != NIL)
+	if (viewquery->groupClause != NIL || viewquery->groupingSets)
 		return gettext_noop("Views containing GROUP BY are not automatically updatable.");
 
 	if (viewquery->havingQual != NULL)
@@ -2312,6 +2361,9 @@ view_query_is_auto_updatable(Query *viewquery, bool check_cols)
 		 base_rte->relkind != RELKIND_VIEW))
 		return gettext_noop("Views that do not select from a single table or view are not automatically updatable.");
 
+	if (base_rte->tablesample)
+		return gettext_noop("Views containing TABLESAMPLE are not automatically updatable.");
+
 	/*
 	 * Check that the view has at least one updatable column. This is required
 	 * for INSERT/UPDATE but not for DELETE.
@@ -2736,9 +2788,9 @@ rewriteTargetView(Query *parsetree, Relation view)
 	/*
 	 * For INSERT/UPDATE the modified columns must all be updatable. Note that
 	 * we get the modified columns from the query's targetlist, not from the
-	 * result RTE's modifiedCols set, since rewriteTargetListIU may have added
-	 * additional targetlist entries for view defaults, and these must also be
-	 * updatable.
+	 * result RTE's insertedCols and/or updatedCols set, since
+	 * rewriteTargetListIU may have added additional targetlist entries for
+	 * view defaults, and these must also be updatable.
 	 */
 	if (parsetree->commandType != CMD_DELETE)
 	{
@@ -2754,6 +2806,18 @@ rewriteTargetView(Query *parsetree, Relation view)
 							tle->resno - FirstLowInvalidHeapAttributeNumber);
 		}
 
+		if (parsetree->onConflict)
+		{
+			foreach(lc, parsetree->onConflict->onConflictSet)
+			{
+				TargetEntry *tle = (TargetEntry *) lfirst(lc);
+
+				if (!tle->resjunk)
+					modified_cols = bms_add_member(modified_cols,
+							tle->resno - FirstLowInvalidHeapAttributeNumber);
+			}
+		}
+
 		auto_update_detail = view_cols_are_auto_updatable(viewquery,
 														  modified_cols,
 														  NULL,
@@ -2875,28 +2939,33 @@ rewriteTargetView(Query *parsetree, Relation view)
 	 *
 	 * Initially, new_rte contains selectedCols permission check bits for all
 	 * base-rel columns referenced by the view, but since the view is a SELECT
-	 * query its modifiedCols is empty.  We set modifiedCols to include all
-	 * the columns the outer query is trying to modify, adjusting the column
-	 * numbers as needed.  But we leave selectedCols as-is, so the view owner
-	 * must have read permission for all columns used in the view definition,
-	 * even if some of them are not read by the outer query.  We could try to
-	 * limit selectedCols to only columns used in the transformed query, but
-	 * that does not correspond to what happens in ordinary SELECT usage of a
-	 * view: all referenced columns must have read permission, even if
-	 * optimization finds that some of them can be discarded during query
-	 * transformation.  The flattening we're doing here is an optional
-	 * optimization, too.  (If you are unpersuaded and want to change this,
-	 * note that applying adjust_view_column_set to view_rte->selectedCols is
-	 * clearly *not* the right answer, since that neglects base-rel columns
-	 * used in the view's WHERE quals.)
+	 * query its insertedCols/updatedCols is empty.  We set insertedCols and
+	 * updatedCols to include all the columns the outer query is trying to
+	 * modify, adjusting the column numbers as needed.  But we leave
+	 * selectedCols as-is, so the view owner must have read permission for all
+	 * columns used in the view definition, even if some of them are not read
+	 * by the outer query.  We could try to limit selectedCols to only columns
+	 * used in the transformed query, but that does not correspond to what
+	 * happens in ordinary SELECT usage of a view: all referenced columns must
+	 * have read permission, even if optimization finds that some of them can
+	 * be discarded during query transformation.  The flattening we're doing
+	 * here is an optional optimization, too.  (If you are unpersuaded and
+	 * want to change this, note that applying adjust_view_column_set to
+	 * view_rte->selectedCols is clearly *not* the right answer, since that
+	 * neglects base-rel columns used in the view's WHERE quals.)
 	 *
 	 * This step needs the modified view targetlist, so we have to do things
 	 * in this order.
 	 */
-	Assert(bms_is_empty(new_rte->modifiedCols));
-	new_rte->modifiedCols = adjust_view_column_set(view_rte->modifiedCols,
+	Assert(bms_is_empty(new_rte->insertedCols) &&
+		   bms_is_empty(new_rte->updatedCols));
+
+	new_rte->insertedCols = adjust_view_column_set(view_rte->insertedCols,
 												   view_targetlist);
 
+	new_rte->updatedCols = adjust_view_column_set(view_rte->updatedCols,
+												  view_targetlist);
+
 	/*
 	 * Move any security barrier quals from the view RTE onto the new target
 	 * RTE.  Any such quals should now apply to the new target RTE and will
@@ -3062,7 +3131,8 @@ rewriteTargetView(Query *parsetree, Relation view)
 			WithCheckOption *wco;
 
 			wco = makeNode(WithCheckOption);
-			wco->viewname = pstrdup(RelationGetRelationName(view));
+			wco->kind = WCO_VIEW_CHECK;
+			wco->relname = pstrdup(RelationGetRelationName(view));
 			wco->qual = NULL;
 			wco->cascaded = cascaded;
 
@@ -3105,6 +3175,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 	CmdType		event = parsetree->commandType;
 	bool		instead = false;
 	bool		returning = false;
+	bool		updatableview = false;
 	Query	   *qual_product = NULL;
 	List	   *rewritten = NIL;
 	ListCell   *lc1;
@@ -3193,6 +3264,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 		Relation	rt_entry_relation;
 		List	   *locks;
 		List	   *product_queries;
+		bool		hasUpdate = false;
 
 		result_relation = parsetree->resultRelation;
 		Assert(result_relation != 0);
@@ -3235,19 +3307,41 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 				List	   *attrnos;
 
 				/* Process the main targetlist ... */
-				rewriteTargetListIU(parsetree, rt_entry_relation, &attrnos);
+				parsetree->targetList = rewriteTargetListIU(parsetree->targetList,
+													  parsetree->commandType,
+															rt_entry_relation,
+												   parsetree->resultRelation,
+															&attrnos);
 				/* ... and the VALUES expression lists */
 				rewriteValuesRTE(values_rte, rt_entry_relation, attrnos);
 			}
 			else
 			{
 				/* Process just the main targetlist */
-				rewriteTargetListIU(parsetree, rt_entry_relation, NULL);
+				parsetree->targetList =
+					rewriteTargetListIU(parsetree->targetList,
+										parsetree->commandType,
+										rt_entry_relation,
+										parsetree->resultRelation, NULL);
+			}
+
+			if (parsetree->onConflict &&
+				parsetree->onConflict->action == ONCONFLICT_UPDATE)
+			{
+				parsetree->onConflict->onConflictSet =
+					rewriteTargetListIU(parsetree->onConflict->onConflictSet,
+										CMD_UPDATE,
+										rt_entry_relation,
+										parsetree->resultRelation,
+										NULL);
 			}
 		}
 		else if (event == CMD_UPDATE)
 		{
-			rewriteTargetListIU(parsetree, rt_entry_relation, NULL);
+			parsetree->targetList =
+				rewriteTargetListIU(parsetree->targetList,
+									parsetree->commandType, rt_entry_relation,
+									parsetree->resultRelation, NULL);
 			rewriteTargetListUD(parsetree, rt_entry, rt_entry_relation);
 		}
 		else if (event == CMD_DELETE)
@@ -3265,7 +3359,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 		 * Collect and apply the appropriate rules.
 		 */
 		locks = matchLocks(event, rt_entry_relation->rd_rules,
-						   result_relation, parsetree);
+						   result_relation, parsetree, &hasUpdate);
 
 #ifdef PGXC
 			product_queries = NIL;
@@ -3319,6 +3413,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 			 */
 			instead = true;
 			returning = true;
+			updatableview = true;
 		}
 
 		/*
@@ -3399,6 +3494,17 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 			}
 		}
 
+		/*
+		 * Updatable views are supported by ON CONFLICT, so don't prevent that
+		 * case from proceeding
+		 */
+		if (parsetree->onConflict &&
+			(product_queries != NIL || hasUpdate) &&
+			!updatableview)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules")));
+
 		heap_close(rt_entry_relation, NoLock);
 #ifdef PGXC
 		}
@@ -3414,7 +3520,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 				 * Collect and apply the appropriate rules.
 				 */
 				locks = matchLocks(event, rt_entry_relation->rd_rules,
-							   result_relation, query);
+							   result_relation, query, &hasUpdate);
 
 				if (locks != NIL)
 				{
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index df457080fe..1da90ff894 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -92,6 +92,12 @@ contain_aggs_of_level_walker(Node *node,
 			return true;		/* abort the tree traversal and return true */
 		/* else fall through to examine argument */
 	}
+	if (IsA(node, GroupingFunc))
+	{
+		if (((GroupingFunc *) node)->agglevelsup == context->sublevels_up)
+			return true;
+		/* else fall through to examine argument */
+	}
 	if (IsA(node, Query))
 	{
 		/* Recurse into subselects */
@@ -157,6 +163,15 @@ locate_agg_of_level_walker(Node *node,
 		}
 		/* else fall through to examine argument */
 	}
+	if (IsA(node, GroupingFunc))
+	{
+		if (((GroupingFunc *) node)->agglevelsup == context->sublevels_up &&
+			((GroupingFunc *) node)->location >= 0)
+		{
+			context->agg_location = ((GroupingFunc *) node)->location;
+			return true;		/* abort the tree traversal and return true */
+		}
+	}
 	if (IsA(node, Query))
 	{
 		/* Recurse into subselects */
@@ -426,9 +441,9 @@ OffsetVarNodes(Node *node, int offset, int sublevels_up)
 		/*
 		 * If we are starting at a Query, and sublevels_up is zero, then we
 		 * must also fix rangetable indexes in the Query itself --- namely
-		 * resultRelation and rowMarks entries.  sublevels_up cannot be zero
-		 * when recursing into a subquery, so there's no need to have the same
-		 * logic inside OffsetVarNodes_walker.
+		 * resultRelation, exclRelIndex and rowMarks entries.  sublevels_up
+		 * cannot be zero when recursing into a subquery, so there's no need
+		 * to have the same logic inside OffsetVarNodes_walker.
 		 */
 		if (sublevels_up == 0)
 		{
@@ -436,6 +451,10 @@ OffsetVarNodes(Node *node, int offset, int sublevels_up)
 
 			if (qry->resultRelation)
 				qry->resultRelation += offset;
+
+			if (qry->onConflict && qry->onConflict->exclRelIndex)
+				qry->onConflict->exclRelIndex += offset;
+
 			foreach(l, qry->rowMarks)
 			{
 				RowMarkClause *rc = (RowMarkClause *) lfirst(l);
@@ -617,6 +636,11 @@ ChangeVarNodes(Node *node, int rt_index, int new_index, int sublevels_up)
 
 			if (qry->resultRelation == rt_index)
 				qry->resultRelation = new_index;
+
+			/* this is unlikely to ever be used, but ... */
+			if (qry->onConflict && qry->onConflict->exclRelIndex == rt_index)
+				qry->onConflict->exclRelIndex = new_index;
+
 			foreach(l, qry->rowMarks)
 			{
 				RowMarkClause *rc = (RowMarkClause *) lfirst(l);
@@ -703,6 +727,14 @@ IncrementVarSublevelsUp_walker(Node *node,
 			agg->agglevelsup += context->delta_sublevels_up;
 		/* fall through to recurse into argument */
 	}
+	if (IsA(node, GroupingFunc))
+	{
+		GroupingFunc *grp = (GroupingFunc *) node;
+
+		if (grp->agglevelsup >= context->min_sublevels_up)
+			grp->agglevelsup += context->delta_sublevels_up;
+		/* fall through to recurse into argument */
+	}
 	if (IsA(node, PlaceHolderVar))
 	{
 		PlaceHolderVar *phv = (PlaceHolderVar *) node;
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 7669130e2b..aaf0061164 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -1,6 +1,6 @@
 /*
  * rewrite/rowsecurity.c
- *    Routines to support policies for row level security (aka RLS).
+ *	  Routines to support policies for row level security (aka RLS).
  *
  * Policies in PostgreSQL provide a mechanism to limit what records are
  * returned to a user and what records a user is permitted to add to a table.
@@ -57,47 +57,65 @@
 #include "tcop/utility.h"
 
 static List *pull_row_security_policies(CmdType cmd, Relation relation,
-										Oid user_id);
-static void process_policies(List *policies, int rt_index,
-							 Expr **final_qual,
-							 Expr **final_with_check_qual,
-							 bool *hassublinks);
+						   Oid user_id);
+static void process_policies(Query *root, List *policies, int rt_index,
+				 Expr **final_qual,
+				 Expr **final_with_check_qual,
+				 bool *hassublinks,
+				 BoolExprType boolop);
 static bool check_role_for_policy(ArrayType *policy_roles, Oid user_id);
 
 /*
- * hook to allow extensions to apply their own security policy
+ * hooks to allow extensions to add their own security policies
+ *
+ * row_security_policy_hook_permissive can be used to add policies which
+ * are included in the "OR"d set of policies.
+ *
+ * row_security_policy_hook_restrictive can be used to add policies which
+ * are enforced, regardless of other policies (they are "AND"d).
  *
  * See below where the hook is called in prepend_row_security_policies for
  * insight into how to use this hook.
  */
-row_security_policy_hook_type	row_security_policy_hook = NULL;
+row_security_policy_hook_type row_security_policy_hook_permissive = NULL;
+row_security_policy_hook_type row_security_policy_hook_restrictive = NULL;
 
 /*
- * Check the given RTE to see whether it's already had row security quals
- * expanded and, if not, prepend any row security rules from built-in or
- * plug-in sources to the securityQuals. The security quals are rewritten (for
- * view expansion, etc) before being added to the RTE.
+ * Get any row security quals and check quals that should be applied to the
+ * specified RTE.
  *
- * Returns true if any quals were added. Note that quals may have been found
- * but not added if user rights make the user exempt from row security.
+ * In addition, hasRowSecurity is set to true if row level security is enabled
+ * (even if this RTE doesn't have any row security quals), and hasSubLinks is
+ * set to true if any of the quals returned contain sublinks.
  */
-bool
-prepend_row_security_policies(Query* root, RangeTblEntry* rte, int rt_index)
+void
+get_row_security_policies(Query *root, CmdType commandType, RangeTblEntry *rte,
+						  int rt_index, List **securityQuals,
+						  List **withCheckOptions, bool *hasRowSecurity,
+						  bool *hasSubLinks)
 {
-	Expr			   *rowsec_expr = NULL;
-	Expr			   *rowsec_with_check_expr = NULL;
-	Expr			   *hook_expr = NULL;
-	Expr			   *hook_with_check_expr = NULL;
-
-	List			   *rowsec_policies;
-	List			   *hook_policies = NIL;
-
-	Relation 			rel;
-	Oid					user_id;
-	int					sec_context;
-	int					rls_status;
-	bool				defaultDeny = true;
-	bool				hassublinks = false;
+	Expr	   *rowsec_expr = NULL;
+	Expr	   *rowsec_with_check_expr = NULL;
+	Expr	   *hook_expr_restrictive = NULL;
+	Expr	   *hook_with_check_expr_restrictive = NULL;
+	Expr	   *hook_expr_permissive = NULL;
+	Expr	   *hook_with_check_expr_permissive = NULL;
+
+	List	   *rowsec_policies;
+	List	   *hook_policies_restrictive = NIL;
+	List	   *hook_policies_permissive = NIL;
+
+	Relation	rel;
+	Oid			user_id;
+	int			sec_context;
+	int			rls_status;
+	bool		defaultDeny = false;
+
+	/* Defaults for the return values */
+	*securityQuals = NIL;
+	*withCheckOptions = NIL;
+	*hasRowSecurity = false;
+	*hasSubLinks = false;
 
 	/* This is just to get the security context */
 	GetUserIdAndSecContext(&user_id, &sec_context);
@@ -106,21 +124,21 @@ prepend_row_security_policies(Query* root, RangeTblEntry* rte, int rt_index)
 	user_id = rte->checkAsUser ? rte->checkAsUser : GetUserId();
 
 	/*
-	 * If this is not a normal relation, or we have been told
-	 * to explicitly skip RLS (perhaps because this is an FK check)
-	 * then just return immediately.
+	 * If this is not a normal relation, or we have been told to explicitly
+	 * skip RLS (perhaps because this is an FK check) then just return
+	 * immediately.
 	 */
 	if (rte->relid < FirstNormalObjectId
 		|| rte->relkind != RELKIND_RELATION
 		|| (sec_context & SECURITY_ROW_LEVEL_DISABLED))
-		return false;
+		return;
 
 	/* Determine the state of RLS for this, pass checkAsUser explicitly */
 	rls_status = check_enable_rls(rte->relid, rte->checkAsUser, false);
 
 	/* If there is no RLS on this table at all, nothing to do */
 	if (rls_status == RLS_NONE)
-		return false;
+		return;
 
 	/*
 	 * RLS_NONE_ENV means we are not doing any RLS now, but that may change
@@ -130,57 +148,46 @@ prepend_row_security_policies(Query* root, RangeTblEntry* rte, int rt_index)
 	if (rls_status == RLS_NONE_ENV)
 	{
 		/*
-		 * Indicate that this query may involve RLS and must therefore
-		 * be replanned if the environment changes (GUCs, role), but we
-		 * are not adding anything here.
+		 * Indicate that this query may involve RLS and must therefore be
+		 * replanned if the environment changes (GUCs, role), but we are not
+		 * adding anything here.
 		 */
-		root->hasRowSecurity = true;
+		*hasRowSecurity = true;
 
-		return false;
+		return;
 	}
 
-	/*
-	 * We may end up getting called multiple times for the same RTE, so check
-	 * to make sure we aren't doing double-work.
-	 */
-	if (rte->securityQuals != NIL)
-		return false;
-
 	/* Grab the built-in policies which should be applied to this relation. */
 	rel = heap_open(rte->relid, NoLock);
 
-	rowsec_policies = pull_row_security_policies(root->commandType, rel,
+	rowsec_policies = pull_row_security_policies(commandType, rel,
 												 user_id);
 
 	/*
 	 * Check if this is only the default-deny policy.
 	 *
-	 * Normally, if the table has row security enabled but there are
-	 * no policies, we use a default-deny policy and not allow anything.
-	 * However, when an extension uses the hook to add their own
-	 * policies, we don't want to include the default deny policy or
-	 * there won't be any way for a user to use an extension exclusively
-	 * for the policies to be used.
+	 * Normally, if the table has row security enabled but there are no
+	 * policies, we use a default-deny policy and not allow anything. However,
+	 * when an extension uses the hook to add their own policies, we don't
+	 * want to include the default deny policy or there won't be any way for a
+	 * user to use an extension exclusively for the policies to be used.
 	 */
 	if (((RowSecurityPolicy *) linitial(rowsec_policies))->policy_id
-			== InvalidOid)
+		== InvalidOid)
 		defaultDeny = true;
 
 	/* Now that we have our policies, build the expressions from them. */
-	process_policies(rowsec_policies, rt_index, &rowsec_expr,
-					 &rowsec_with_check_expr, &hassublinks);
+	process_policies(root, rowsec_policies, rt_index, &rowsec_expr,
+					 &rowsec_with_check_expr, hasSubLinks, OR_EXPR);
 
 	/*
 	 * Also, allow extensions to add their own policies.
 	 *
+	 * extensions can add either permissive or restrictive policies.
+	 *
 	 * Note that, as with the internal policies, if multiple policies are
-	 * returned then they will be combined into a single expression with
-	 * all of them OR'd together.  However, to avoid the situation of an
-	 * extension granting more access to a table than the internal policies
-	 * would allow, the extension's policies are AND'd with the internal
-	 * policies.  In other words - extensions can only provide further
-	 * filtering of the result set (or further reduce the set of records
-	 * allowed to be added).
+	 * returned then they will be combined into a single expression with all
+	 * of them OR'd (for permissive) or AND'd (for restrictive) together.
 	 *
 	 * If only a USING policy is returned by the extension then it will be
 	 * used for WITH CHECK as well, similar to how internal policies are
@@ -192,92 +199,221 @@ prepend_row_security_policies(Query* root, RangeTblEntry* rte, int rt_index)
 	 * default-deny policy and use only the policies returned by the
 	 * extension.
 	 */
-	if (row_security_policy_hook)
+	if (row_security_policy_hook_restrictive)
 	{
-		hook_policies = (*row_security_policy_hook)(root->commandType, rel);
+		hook_policies_restrictive = (*row_security_policy_hook_restrictive) (commandType, rel);
 
 		/* Build the expression from any policies returned. */
-		process_policies(hook_policies, rt_index, &hook_expr,
-						 &hook_with_check_expr, &hassublinks);
+		if (hook_policies_restrictive != NIL)
+			process_policies(root, hook_policies_restrictive, rt_index,
+							 &hook_expr_restrictive,
+							 &hook_with_check_expr_restrictive,
+							 hasSubLinks,
+							 AND_EXPR);
+	}
+
+	if (row_security_policy_hook_permissive)
+	{
+		hook_policies_permissive = (*row_security_policy_hook_permissive) (commandType, rel);
+
+		/* Build the expression from any policies returned. */
+		if (hook_policies_permissive != NIL)
+			process_policies(root, hook_policies_permissive, rt_index,
+							 &hook_expr_permissive,
+							 &hook_with_check_expr_permissive, hasSubLinks,
+							 OR_EXPR);
 	}
 
 	/*
-	 * If the only built-in policy is the default-deny one, and hook
-	 * policies exist, then use the hook policies only and do not apply
-	 * the default-deny policy.  Otherwise, apply both sets (AND'd
-	 * together).
+	 * If the only built-in policy is the default-deny one, and hook policies
+	 * exist, then use the hook policies only and do not apply the
+	 * default-deny policy.  Otherwise, we will apply both sets below.
 	 */
-	if (defaultDeny && hook_policies != NIL)
+	if (defaultDeny &&
+		(hook_policies_restrictive != NIL || hook_policies_permissive != NIL))
+	{
 		rowsec_expr = NULL;
+		rowsec_with_check_expr = NULL;
+	}
 
 	/*
-	 * For INSERT or UPDATE, we need to add the WITH CHECK quals to
-	 * Query's withCheckOptions to verify that any new records pass the
-	 * WITH CHECK policy (this will be a copy of the USING policy, if no
-	 * explicit WITH CHECK policy exists).
+	 * For INSERT or UPDATE, we need to add the WITH CHECK quals to Query's
+	 * withCheckOptions to verify that any new records pass the WITH CHECK
+	 * policy (this will be a copy of the USING policy, if no explicit WITH
+	 * CHECK policy exists).
 	 */
-	if (root->commandType == CMD_INSERT || root->commandType == CMD_UPDATE)
+	if (commandType == CMD_INSERT || commandType == CMD_UPDATE)
 	{
 		/*
 		 * WITH CHECK OPTIONS wants a WCO node which wraps each Expr, so
 		 * create them as necessary.
 		 */
-		if (rowsec_with_check_expr)
+
+		/*
+		 * Handle any restrictive policies first.
+		 *
+		 * They can simply be added.
+		 */
+		if (hook_with_check_expr_restrictive)
 		{
-			WithCheckOption	   *wco;
+			WithCheckOption *wco;
 
 			wco = (WithCheckOption *) makeNode(WithCheckOption);
-			wco->viewname = RelationGetRelationName(rel);
-			wco->qual = (Node *) rowsec_with_check_expr;
+			wco->kind = commandType == CMD_INSERT ? WCO_RLS_INSERT_CHECK :
+				WCO_RLS_UPDATE_CHECK;
+			wco->relname = pstrdup(RelationGetRelationName(rel));
+			wco->qual = (Node *) hook_with_check_expr_restrictive;
 			wco->cascaded = false;
-			root->withCheckOptions = lcons(wco, root->withCheckOptions);
+			*withCheckOptions = lappend(*withCheckOptions, wco);
 		}
 
 		/*
-		 * Ditto for the expression, if any, returned from the extension.
+		 * Handle built-in policies, if there are no permissive policies from
+		 * the hook.
 		 */
-		if (hook_with_check_expr)
+		if (rowsec_with_check_expr && !hook_with_check_expr_permissive)
 		{
-			WithCheckOption	   *wco;
+			WithCheckOption *wco;
 
 			wco = (WithCheckOption *) makeNode(WithCheckOption);
-			wco->viewname = RelationGetRelationName(rel);
-			wco->qual = (Node *) hook_with_check_expr;
+			wco->kind = commandType == CMD_INSERT ? WCO_RLS_INSERT_CHECK :
+				WCO_RLS_UPDATE_CHECK;
+			wco->relname = pstrdup(RelationGetRelationName(rel));
+			wco->qual = (Node *) rowsec_with_check_expr;
 			wco->cascaded = false;
-			root->withCheckOptions = lcons(wco, root->withCheckOptions);
+			*withCheckOptions = lappend(*withCheckOptions, wco);
+		}
+		/* Handle the hook policies, if there are no built-in ones. */
+		else if (!rowsec_with_check_expr && hook_with_check_expr_permissive)
+		{
+			WithCheckOption *wco;
+
+			wco = (WithCheckOption *) makeNode(WithCheckOption);
+			wco->kind = commandType == CMD_INSERT ? WCO_RLS_INSERT_CHECK :
+				WCO_RLS_UPDATE_CHECK;
+			wco->relname = pstrdup(RelationGetRelationName(rel));
+			wco->qual = (Node *) hook_with_check_expr_permissive;
+			wco->cascaded = false;
+			*withCheckOptions = lappend(*withCheckOptions, wco);
+		}
+		/* Handle the case where there are both. */
+		else if (rowsec_with_check_expr && hook_with_check_expr_permissive)
+		{
+			WithCheckOption *wco;
+			List	   *combined_quals = NIL;
+			Expr	   *combined_qual_eval;
+
+			combined_quals = lcons(copyObject(rowsec_with_check_expr),
+								   combined_quals);
+
+			combined_quals = lcons(copyObject(hook_with_check_expr_permissive),
+								   combined_quals);
+
+			combined_qual_eval = makeBoolExpr(OR_EXPR, combined_quals, -1);
+
+			wco = (WithCheckOption *) makeNode(WithCheckOption);
+			wco->kind = commandType == CMD_INSERT ? WCO_RLS_INSERT_CHECK :
+				WCO_RLS_UPDATE_CHECK;
+			wco->relname = pstrdup(RelationGetRelationName(rel));
+			wco->qual = (Node *) combined_qual_eval;
+			wco->cascaded = false;
+			*withCheckOptions = lappend(*withCheckOptions, wco);
+		}
+
+		/*
+		 * ON CONFLICT DO UPDATE has an RTE that is subject to both INSERT and
+		 * UPDATE RLS enforcement.  Those are enforced (as a special, distinct
+		 * kind of WCO) on the target tuple.
+		 *
+		 * Make a second, recursive pass over the RTE for this, gathering
+		 * UPDATE-applicable RLS checks/WCOs, and gathering and converting
+		 * UPDATE-applicable security quals into WCO_RLS_CONFLICT_CHECK RLS
+		 * checks/WCOs.  Finally, these distinct kinds of RLS checks/WCOs are
+		 * concatenated with our own INSERT-applicable list.
+		 */
+		if (root->onConflict && root->onConflict->action == ONCONFLICT_UPDATE &&
+			commandType == CMD_INSERT)
+		{
+			List	   *conflictSecurityQuals = NIL;
+			List	   *conflictWCOs = NIL;
+			ListCell   *item;
+			bool		conflictHasRowSecurity = false;
+			bool		conflictHasSublinks = false;
+
+			/* Assume that RTE is target resultRelation */
+			get_row_security_policies(root, CMD_UPDATE, rte, rt_index,
+									  &conflictSecurityQuals, &conflictWCOs,
+									  &conflictHasRowSecurity,
+									  &conflictHasSublinks);
+
+			if (conflictHasRowSecurity)
+				*hasRowSecurity = true;
+			if (conflictHasSublinks)
+				*hasSubLinks = true;
+
+			/*
+			 * Append WITH CHECK OPTIONs/RLS checks, which should not conflict
+			 * between this INSERT and the auxiliary UPDATE
+			 */
+			*withCheckOptions = list_concat(*withCheckOptions,
+											conflictWCOs);
+
+			foreach(item, conflictSecurityQuals)
+			{
+				Expr	   *conflict_rowsec_expr = (Expr *) lfirst(item);
+				WithCheckOption *wco;
+
+				wco = (WithCheckOption *) makeNode(WithCheckOption);
+
+				wco->kind = WCO_RLS_CONFLICT_CHECK;
+				wco->relname = pstrdup(RelationGetRelationName(rel));
+				wco->qual = (Node *) copyObject(conflict_rowsec_expr);
+				wco->cascaded = false;
+				*withCheckOptions = lappend(*withCheckOptions, wco);
+			}
 		}
 	}
 
 	/* For SELECT, UPDATE, and DELETE, set the security quals */
-	if (root->commandType == CMD_SELECT
-		|| root->commandType == CMD_UPDATE
-		|| root->commandType == CMD_DELETE)
+	if (commandType == CMD_SELECT
+		|| commandType == CMD_UPDATE
+		|| commandType == CMD_DELETE)
 	{
-		if (rowsec_expr)
-			rte->securityQuals = lcons(rowsec_expr, rte->securityQuals);
+		/* restrictive policies can simply be added to the list first */
+		if (hook_expr_restrictive)
+			*securityQuals = lappend(*securityQuals, hook_expr_restrictive);
+
+		/* If we only have internal permissive, then just add those */
+		if (rowsec_expr && !hook_expr_permissive)
+			*securityQuals = lappend(*securityQuals, rowsec_expr);
+		/* .. and if we have only permissive policies from the hook */
+		else if (!rowsec_expr && hook_expr_permissive)
+			*securityQuals = lappend(*securityQuals, hook_expr_permissive);
+		/* if we have both, we have to combine them with an OR */
+		else if (rowsec_expr && hook_expr_permissive)
+		{
+			List	   *combined_quals = NIL;
+			Expr	   *combined_qual_eval;
+
+			combined_quals = lcons(copyObject(rowsec_expr), combined_quals);
+			combined_quals = lcons(copyObject(hook_expr_permissive),
+								   combined_quals);
 
-		if (hook_expr)
-			rte->securityQuals = lcons(hook_expr,
-									   rte->securityQuals);
+			combined_qual_eval = makeBoolExpr(OR_EXPR, combined_quals, -1);
+
+			*securityQuals = lappend(*securityQuals, combined_qual_eval);
+		}
 	}
 
 	heap_close(rel, NoLock);
 
 	/*
-	 * Mark this query as having row security, so plancache can invalidate
-	 * it when necessary (eg: role changes)
-	 */
-	root->hasRowSecurity = true;
-
-	/*
-	 * If we have sublinks added because of the policies being added to the
-	 * query, then set hasSubLinks on the Query to force subLinks to be
-	 * properly expanded.
+	 * Mark this query as having row security, so plancache can invalidate it
+	 * when necessary (eg: role changes)
 	 */
-	root->hasSubLinks |= hassublinks;
+	*hasRowSecurity = true;
 
-	/* If we got this far, we must have added quals */
-	return true;
+	return;
 }
 
 /*
@@ -290,27 +426,27 @@ prepend_row_security_policies(Query* root, RangeTblEntry* rte, int rt_index)
 static List *
 pull_row_security_policies(CmdType cmd, Relation relation, Oid user_id)
 {
-	List			   *policies = NIL;
-	ListCell		   *item;
-	RowSecurityPolicy  *policy;
+	List	   *policies = NIL;
+	ListCell   *item;
 
 	/*
 	 * Row security is enabled for the relation and the row security GUC is
-	 * either 'on' or 'force' here, so find the policies to apply to the table.
-	 * There must always be at least one policy defined (may be the simple
-	 * 'default-deny' policy, if none are explicitly defined on the table).
+	 * either 'on' or 'force' here, so find the policies to apply to the
+	 * table. There must always be at least one policy defined (may be the
+	 * simple 'default-deny' policy, if none are explicitly defined on the
+	 * table).
 	 */
 	foreach(item, relation->rd_rsdesc->policies)
 	{
-		policy = (RowSecurityPolicy *) lfirst(item);
+		RowSecurityPolicy *policy = (RowSecurityPolicy *) lfirst(item);
 
 		/* Always add ALL policies, if they exist. */
 		if (policy->polcmd == '*' &&
-				check_role_for_policy(policy->roles, user_id))
+			check_role_for_policy(policy->roles, user_id))
 			policies = lcons(policy, policies);
 
 		/* Add relevant command-specific policies to the list. */
-		switch(cmd)
+		switch (cmd)
 		{
 			case CMD_SELECT:
 				if (policy->polcmd == ACL_SELECT_CHR
@@ -346,8 +482,8 @@ pull_row_security_policies(CmdType cmd, Relation relation, Oid user_id)
 	 */
 	if (policies == NIL)
 	{
-		RowSecurityPolicy  *policy = NULL;
-		Datum               role;
+		RowSecurityPolicy *policy = NULL;
+		Datum		role;
 
 		role = ObjectIdGetDatum(ACL_ID_PUBLIC);
 
@@ -383,16 +519,18 @@ pull_row_security_policies(CmdType cmd, Relation relation, Oid user_id)
  * qual_eval, with_check_eval, and hassublinks are output variables
  */
 static void
-process_policies(List *policies, int rt_index, Expr **qual_eval,
-				 Expr **with_check_eval, bool *hassublinks)
+process_policies(Query *root, List *policies, int rt_index, Expr **qual_eval,
+				 Expr **with_check_eval, bool *hassublinks,
+				 BoolExprType boolop)
 {
-	ListCell		   *item;
-	List			   *quals = NIL;
-	List			   *with_check_quals = NIL;
+	ListCell   *item;
+	List	   *quals = NIL;
+	List	   *with_check_quals = NIL;
 
 	/*
-	 * Extract the USING and WITH CHECK quals from each of the policies
-	 * and add them to our lists.
+	 * Extract the USING and WITH CHECK quals from each of the policies and
+	 * add them to our lists.  We only want WITH CHECK quals if this RTE is
+	 * the query's result relation.
 	 */
 	foreach(item, policies)
 	{
@@ -401,10 +539,22 @@ process_policies(List *policies, int rt_index, Expr **qual_eval,
 		if (policy->qual != NULL)
 			quals = lcons(copyObject(policy->qual), quals);
 
-		if (policy->with_check_qual != NULL)
+		if (policy->with_check_qual != NULL &&
+			rt_index == root->resultRelation)
 			with_check_quals = lcons(copyObject(policy->with_check_qual),
 									 with_check_quals);
 
+		/*
+		 * For each policy, if there is only a USING clause then copy/use it
+		 * for the WITH CHECK policy also, if this RTE is the query's result
+		 * relation.
+		 */
+		if (policy->qual != NULL && policy->with_check_qual == NULL &&
+			rt_index == root->resultRelation)
+			with_check_quals = lcons(copyObject(policy->qual),
+									 with_check_quals);
+
+
 		if (policy->hassublinks)
 			*hassublinks = true;
 	}
@@ -418,47 +568,53 @@ process_policies(List *policies, int rt_index, Expr **qual_eval,
 								BoolGetDatum(false), false, true), quals);
 
 	/*
-	 * If we end up with only USING quals, then use those as
-	 * WITH CHECK quals also.
-	 */
-	if (with_check_quals == NIL)
-		with_check_quals = copyObject(quals);
-
-	/*
-	 * Row security quals always have the target table as varno 1, as no
-	 * joins are permitted in row security expressions. We must walk the
-	 * expression, updating any references to varno 1 to the varno
-	 * the table has in the outer query.
+	 * Row security quals always have the target table as varno 1, as no joins
+	 * are permitted in row security expressions. We must walk the expression,
+	 * updating any references to varno 1 to the varno the table has in the
+	 * outer query.
 	 *
 	 * We rewrite the expression in-place.
+	 *
+	 * We must have some quals at this point; the default-deny policy, if
+	 * nothing else.  Note that we might not have any WITH CHECK quals- that's
+	 * fine, as this might not be the resultRelation.
 	 */
+	Assert(quals != NIL);
+
 	ChangeVarNodes((Node *) quals, 1, rt_index, 0);
-	ChangeVarNodes((Node *) with_check_quals, 1, rt_index, 0);
+
+	if (with_check_quals != NIL)
+		ChangeVarNodes((Node *) with_check_quals, 1, rt_index, 0);
 
 	/*
 	 * If more than one security qual is returned, then they need to be
-	 * OR'ed together.
+	 * combined together.
 	 */
 	if (list_length(quals) > 1)
-		*qual_eval = makeBoolExpr(OR_EXPR, quals, -1);
+		*qual_eval = makeBoolExpr(boolop, quals, -1);
 	else
-		*qual_eval = (Expr*) linitial(quals);
+		*qual_eval = (Expr *) linitial(quals);
 
 	/*
-	 * If more than one WITH CHECK qual is returned, then they need to
-	 * be OR'ed together.
+	 * Similarly, if more than one WITH CHECK qual is returned, then they need
+	 * to be combined together.
+	 *
+	 * with_check_quals is allowed to be NIL here since this might not be the
+	 * resultRelation (see above).
 	 */
 	if (list_length(with_check_quals) > 1)
-		*with_check_eval = makeBoolExpr(OR_EXPR, with_check_quals, -1);
+		*with_check_eval = makeBoolExpr(boolop, with_check_quals, -1);
+	else if (with_check_quals != NIL)
+		*with_check_eval = (Expr *) linitial(with_check_quals);
 	else
-		*with_check_eval = (Expr*) linitial(with_check_quals);
+		*with_check_eval = NULL;
 
 	return;
 }
 
 /*
  * check_role_for_policy -
- *   determines if the policy should be applied for the current role
+ *	 determines if the policy should be applied for the current role
  */
 static bool
 check_role_for_policy(ArrayType *policy_roles, Oid user_id)
diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
index bc31839bdd..63b471ea51 100644
--- a/src/backend/snowball/dict_snowball.c
+++ b/src/backend/snowball/dict_snowball.c
@@ -61,10 +61,8 @@
 PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(dsnowball_init);
-Datum		dsnowball_init(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(dsnowball_lexize);
-Datum		dsnowball_lexize(PG_FUNCTION_ARGS);
 
 /* List of supported modules */
 typedef struct stemmer_module
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 0cd2530be9..3ae2848da0 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -50,7 +50,7 @@ char	   *BufferBlocks;
  * refcount --	Counts the number of processes holding pins on a buffer.
  *		A buffer is pinned during IO and immediately after a BufferAlloc().
  *		Pins must be released before end of transaction.  For efficiency the
- *		shared refcount isn't increased if a individual backend pins a buffer
+ *		shared refcount isn't increased if an individual backend pins a buffer
  *		multiple times. Check the PrivateRefCount infrastructure in bufmgr.c.
  */
 
@@ -69,9 +69,9 @@ InitBufferPool(void)
 
 	/* Align descriptors to a cacheline boundary. */
 	BufferDescriptors = (BufferDescPadded *) CACHELINEALIGN(
-		ShmemInitStruct("Buffer Descriptors",
-						NBuffers * sizeof(BufferDescPadded) + PG_CACHE_LINE_SIZE,
-						&foundDescs));
+										ShmemInitStruct("Buffer Descriptors",
+					NBuffers * sizeof(BufferDescPadded) + PG_CACHE_LINE_SIZE,
+														&foundDescs));
 
 	BufferBlocks = (char *)
 		ShmemInitStruct("Buffer Blocks",
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index d3484723c9..0585d7ed91 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -73,8 +73,8 @@
 
 typedef struct PrivateRefCountEntry
 {
-	Buffer buffer;
-	int32 refcount;
+	Buffer		buffer;
+	int32		refcount;
 } PrivateRefCountEntry;
 
 /* 64 bytes, about the size of a cache line on common systems */
@@ -106,13 +106,13 @@ static volatile BufferDesc *PinCountWaitBuf = NULL;
  * Each buffer also has a private refcount that keeps track of the number of
  * times the buffer is pinned in the current process.  This is so that the
  * shared refcount needs to be modified only once if a buffer is pinned more
- * than once by a individual backend.  It's also used to check that no buffers
+ * than once by an individual backend.  It's also used to check that no buffers
  * are still pinned at the end of transactions and when exiting.
  *
  *
  * To avoid - as we used to - requiring an array with NBuffers entries to keep
  * track of local buffers, we use a small sequentially searched array
- * (PrivateRefCountArray) and a overflow hash table (PrivateRefCountHash) to
+ * (PrivateRefCountArray) and an overflow hash table (PrivateRefCountHash) to
  * keep track of backend local pins.
  *
  * Until no more than REFCOUNT_ARRAY_ENTRIES buffers are pinned at once, all
@@ -137,8 +137,8 @@ static uint32 PrivateRefCountClock = 0;
 static PrivateRefCountEntry *ReservedRefCountEntry = NULL;
 
 static void ReservePrivateRefCountEntry(void);
-static PrivateRefCountEntry* NewPrivateRefCountEntry(Buffer buffer);
-static PrivateRefCountEntry* GetPrivateRefCountEntry(Buffer buffer, bool do_move);
+static PrivateRefCountEntry *NewPrivateRefCountEntry(Buffer buffer);
+static PrivateRefCountEntry *GetPrivateRefCountEntry(Buffer buffer, bool do_move);
 static inline int32 GetPrivateRefCount(Buffer buffer);
 static void ForgetPrivateRefCountEntry(PrivateRefCountEntry *ref);
 
@@ -159,7 +159,7 @@ ReservePrivateRefCountEntry(void)
 	 * majority of cases.
 	 */
 	{
-		int i;
+		int			i;
 
 		for (i = 0; i < REFCOUNT_ARRAY_ENTRIES; i++)
 		{
@@ -185,10 +185,10 @@ ReservePrivateRefCountEntry(void)
 		 * hashtable. Use that slot.
 		 */
 		PrivateRefCountEntry *hashent;
-		bool found;
+		bool		found;
 
 		/* select victim slot */
-		ReservedRefCountEntry  =
+		ReservedRefCountEntry =
 			&PrivateRefCountArray[PrivateRefCountClock++ % REFCOUNT_ARRAY_ENTRIES];
 
 		/* Better be used, otherwise we shouldn't get here. */
@@ -213,7 +213,7 @@ ReservePrivateRefCountEntry(void)
 /*
  * Fill a previously reserved refcount entry.
  */
-static PrivateRefCountEntry*
+static PrivateRefCountEntry *
 NewPrivateRefCountEntry(Buffer buffer)
 {
 	PrivateRefCountEntry *res;
@@ -239,7 +239,7 @@ NewPrivateRefCountEntry(Buffer buffer)
  * do_move is true, and the entry resides in the hashtable the entry is
  * optimized for frequent access by moving it to the array.
  */
-static PrivateRefCountEntry*
+static PrivateRefCountEntry *
 GetPrivateRefCountEntry(Buffer buffer, bool do_move)
 {
 	PrivateRefCountEntry *res;
@@ -285,7 +285,7 @@ GetPrivateRefCountEntry(Buffer buffer, bool do_move)
 	else
 	{
 		/* move buffer from hashtable into the free array slot */
-		bool found;
+		bool		found;
 		PrivateRefCountEntry *free;
 
 		/* Ensure there's a free array slot */
@@ -351,6 +351,7 @@ ForgetPrivateRefCountEntry(PrivateRefCountEntry *ref)
 		ref < &PrivateRefCountArray[REFCOUNT_ARRAY_ENTRIES])
 	{
 		ref->buffer = InvalidBuffer;
+
 		/*
 		 * Mark the just used entry as reserved - in many scenarios that
 		 * allows us to avoid ever having to search the array/hash for free
@@ -360,8 +361,9 @@ ForgetPrivateRefCountEntry(PrivateRefCountEntry *ref)
 	}
 	else
 	{
-		bool found;
-		Buffer buffer = ref->buffer;
+		bool		found;
+		Buffer		buffer = ref->buffer;
+
 		hash_search(PrivateRefCountHash,
 					(void *) &buffer,
 					HASH_REMOVE,
@@ -674,8 +676,8 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 											  found);
 
 			/*
-			 * In RBM_ZERO_AND_LOCK mode the caller expects the page to
-			 * be locked on return.
+			 * In RBM_ZERO_AND_LOCK mode the caller expects the page to be
+			 * locked on return.
 			 */
 			if (!isLocalBuf)
 			{
@@ -814,9 +816,9 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 	 * page before the caller has had a chance to initialize it.
 	 *
 	 * Since no-one else can be looking at the page contents yet, there is no
-	 * difference between an exclusive lock and a cleanup-strength lock.
-	 * (Note that we cannot use LockBuffer() of LockBufferForCleanup() here,
-	 * because they assert that the buffer is already valid.)
+	 * difference between an exclusive lock and a cleanup-strength lock. (Note
+	 * that we cannot use LockBuffer() of LockBufferForCleanup() here, because
+	 * they assert that the buffer is already valid.)
 	 */
 	if ((mode == RBM_ZERO_AND_LOCK || mode == RBM_ZERO_AND_CLEANUP_LOCK) &&
 		!isLocalBuf)
@@ -944,8 +946,8 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 	for (;;)
 	{
 		/*
-		 * Ensure, while the spinlock's not yet held, that there's a free refcount
-		 * entry.
+		 * Ensure, while the spinlock's not yet held, that there's a free
+		 * refcount entry.
 		 */
 		ReservePrivateRefCountEntry();
 
@@ -2170,10 +2172,11 @@ CheckForBufferLeaks(void)
 		}
 	}
 
-	/* if neccessary search the hash */
+	/* if necessary search the hash */
 	if (PrivateRefCountOverflowed)
 	{
 		HASH_SEQ_STATUS hstat;
+
 		hash_seq_init(&hstat, PrivateRefCountHash);
 		while ((res = (PrivateRefCountEntry *) hash_seq_search(&hstat)) != NULL)
 		{
@@ -2979,6 +2982,7 @@ IncrBufferRefCount(Buffer buffer)
 	else
 	{
 		PrivateRefCountEntry *ref;
+
 		ref = GetPrivateRefCountEntry(buffer, true);
 		Assert(ref != NULL);
 		ref->refcount++;
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index f0d23d6858..bc2c773000 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -50,7 +50,7 @@ typedef struct
 	 * Statistics.  These counters should be wide enough that they can't
 	 * overflow during a single bgwriter cycle.
 	 */
-	uint32		 completePasses; /* Complete cycles of the clock sweep */
+	uint32		completePasses; /* Complete cycles of the clock sweep */
 	pg_atomic_uint32 numBufferAllocs;	/* Buffers allocated since last reset */
 
 	/*
@@ -111,7 +111,7 @@ static void AddBufferToRing(BufferAccessStrategy strategy,
 static inline uint32
 ClockSweepTick(void)
 {
-	uint32 victim;
+	uint32		victim;
 
 	/*
 	 * Atomically move hand ahead one buffer - if there's several processes
@@ -123,7 +123,7 @@ ClockSweepTick(void)
 
 	if (victim >= NBuffers)
 	{
-		uint32 originalVictim = victim;
+		uint32		originalVictim = victim;
 
 		/* always wrap what we look up in BufferDescriptors */
 		victim = victim % NBuffers;
@@ -136,9 +136,9 @@ ClockSweepTick(void)
 		 */
 		if (victim == 0)
 		{
-			uint32 expected;
-			uint32 wrapped;
-			bool success = false;
+			uint32		expected;
+			uint32		wrapped;
+			bool		success = false;
 
 			expected = originalVictim + 1;
 
@@ -149,7 +149,7 @@ ClockSweepTick(void)
 				 * allows other readers to read nextVictimBuffer and
 				 * completePasses in a consistent manner which is required for
 				 * StrategySyncStart().  In theory delaying the increment
-				 * could lead to a overflow of nextVictimBuffers, but that's
+				 * could lead to an overflow of nextVictimBuffers, but that's
 				 * highly unlikely and wouldn't be particularly harmful.
 				 */
 				SpinLockAcquire(&StrategyControl->buffer_strategy_lock);
@@ -381,6 +381,7 @@ StrategySyncStart(uint32 *complete_passes, uint32 *num_buf_alloc)
 	if (complete_passes)
 	{
 		*complete_passes = StrategyControl->completePasses;
+
 		/*
 		 * Additionally add the number of wraparounds that happened before
 		 * completePasses could be incremented. C.f. ClockSweepTick().
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 93d5459eda..a66b72be88 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -81,6 +81,14 @@
 #endif
 #include "utils/resowner_private.h"
 
+
+/* Define PG_FLUSH_DATA_WORKS if we have an implementation for pg_flush_data */
+#if defined(HAVE_SYNC_FILE_RANGE)
+#define PG_FLUSH_DATA_WORKS 1
+#elif defined(USE_POSIX_FADVISE) && defined(POSIX_FADV_DONTNEED)
+#define PG_FLUSH_DATA_WORKS 1
+#endif
+
 /*
  * We must leave some file descriptors free for system(), the dynamic loader,
  * and other code that tries to open files without consulting fd.c.  This
@@ -285,6 +293,8 @@ static int	FileAccess(File file);
 static File OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError);
 static bool reserveAllocatedDesc(void);
 static int	FreeDesc(AllocateDesc *desc);
+static struct dirent *ReadDirExtended(DIR *dir, const char *dirname, int elevel);
+
 static void AtProcExit_Files(int code, Datum arg);
 static void CleanupTempFiles(bool isProcExit);
 static void RemovePgTempFilesInDir(const char *tmpdirname);
@@ -292,6 +302,15 @@ static void RemovePgTempRelationFiles(const char *tsdirname);
 static void RemovePgTempRelationFilesInDbspace(const char *dbspacedirname);
 static bool looks_like_temp_rel_name(const char *name);
 
+static void walkdir(const char *path,
+		void (*action) (const char *fname, bool isdir, int elevel),
+		bool process_symlinks,
+		int elevel);
+#ifdef PG_FLUSH_DATA_WORKS
+static void pre_sync_fname(const char *fname, bool isdir, int elevel);
+#endif
+static void fsync_fname_ext(const char *fname, bool isdir, int elevel);
+
 
 /*
  * pg_fsync --- do fsync with or without writethrough
@@ -374,14 +393,18 @@ pg_fdatasync(int fd)
 int
 pg_flush_data(int fd, off_t offset, off_t amount)
 {
+#ifdef PG_FLUSH_DATA_WORKS
 	if (enableFsync)
 	{
 #if defined(HAVE_SYNC_FILE_RANGE)
 		return sync_file_range(fd, offset, amount, SYNC_FILE_RANGE_WRITE);
 #elif defined(USE_POSIX_FADVISE) && defined(POSIX_FADV_DONTNEED)
 		return posix_fadvise(fd, offset, amount, POSIX_FADV_DONTNEED);
+#else
+#error PG_FLUSH_DATA_WORKS should not have been defined
 #endif
 	}
+#endif
 	return 0;
 }
 
@@ -1951,21 +1974,34 @@ TryAgain:
 struct dirent *
 ReadDir(DIR *dir, const char *dirname)
 {
+	return ReadDirExtended(dir, dirname, ERROR);
+}
+
+/*
+ * Alternate version that allows caller to specify the elevel for any
+ * error report.  If elevel < ERROR, returns NULL on any error.
+ */
+static struct dirent *
+ReadDirExtended(DIR *dir, const char *dirname, int elevel)
+{
 	struct dirent *dent;
 
 	/* Give a generic message for AllocateDir failure, if caller didn't */
 	if (dir == NULL)
-		ereport(ERROR,
+	{
+		ereport(elevel,
 				(errcode_for_file_access(),
 				 errmsg("could not open directory \"%s\": %m",
 						dirname)));
+		return NULL;
+	}
 
 	errno = 0;
 	if ((dent = readdir(dir)) != NULL)
 		return dent;
 
 	if (errno)
-		ereport(ERROR,
+		ereport(elevel,
 				(errcode_for_file_access(),
 				 errmsg("could not read directory \"%s\": %m",
 						dirname)));
@@ -2459,3 +2495,248 @@ looks_like_temp_rel_name(const char *name)
 		return false;
 	return true;
 }
+
+
+/*
+ * Issue fsync recursively on PGDATA and all its contents.
+ *
+ * We fsync regular files and directories wherever they are, but we
+ * follow symlinks only for pg_xlog and immediately under pg_tblspc.
+ * Other symlinks are presumed to point at files we're not responsible
+ * for fsyncing, and might not have privileges to write at all.
+ *
+ * Errors are logged but not considered fatal; that's because this is used
+ * only during database startup, to deal with the possibility that there are
+ * issued-but-unsynced writes pending against the data directory.  We want to
+ * ensure that such writes reach disk before anything that's done in the new
+ * run.  However, aborting on error would result in failure to start for
+ * harmless cases such as read-only files in the data directory, and that's
+ * not good either.
+ *
+ * Note we assume we're chdir'd into PGDATA to begin with.
+ */
+void
+SyncDataDirectory(void)
+{
+	bool		xlog_is_symlink;
+
+	/* We can skip this whole thing if fsync is disabled. */
+	if (!enableFsync)
+		return;
+
+	/*
+	 * If pg_xlog is a symlink, we'll need to recurse into it separately,
+	 * because the first walkdir below will ignore it.
+	 */
+	xlog_is_symlink = false;
+
+#ifndef WIN32
+	{
+		struct stat st;
+
+		if (lstat("pg_xlog", &st) < 0)
+			ereport(LOG,
+					(errcode_for_file_access(),
+					 errmsg("could not stat file \"%s\": %m",
+							"pg_xlog")));
+		else if (S_ISLNK(st.st_mode))
+			xlog_is_symlink = true;
+	}
+#else
+	if (pgwin32_is_junction("pg_xlog"))
+		xlog_is_symlink = true;
+#endif
+
+	/*
+	 * If possible, hint to the kernel that we're soon going to fsync the data
+	 * directory and its contents.  Errors in this step are even less
+	 * interesting than normal, so log them only at DEBUG1.
+	 */
+#ifdef PG_FLUSH_DATA_WORKS
+	walkdir(".", pre_sync_fname, false, DEBUG1);
+	if (xlog_is_symlink)
+		walkdir("pg_xlog", pre_sync_fname, false, DEBUG1);
+	walkdir("pg_tblspc", pre_sync_fname, true, DEBUG1);
+#endif
+
+	/*
+	 * Now we do the fsync()s in the same order.
+	 *
+	 * The main call ignores symlinks, so in addition to specially processing
+	 * pg_xlog if it's a symlink, pg_tblspc has to be visited separately with
+	 * process_symlinks = true.  Note that if there are any plain directories
+	 * in pg_tblspc, they'll get fsync'd twice.  That's not an expected case
+	 * so we don't worry about optimizing it.
+	 */
+	walkdir(".", fsync_fname_ext, false, LOG);
+	if (xlog_is_symlink)
+		walkdir("pg_xlog", fsync_fname_ext, false, LOG);
+	walkdir("pg_tblspc", fsync_fname_ext, true, LOG);
+}
+
+/*
+ * walkdir: recursively walk a directory, applying the action to each
+ * regular file and directory (including the named directory itself).
+ *
+ * If process_symlinks is true, the action and recursion are also applied
+ * to regular files and directories that are pointed to by symlinks in the
+ * given directory; otherwise symlinks are ignored.  Symlinks are always
+ * ignored in subdirectories, ie we intentionally don't pass down the
+ * process_symlinks flag to recursive calls.
+ *
+ * Errors are reported at level elevel, which might be ERROR or less.
+ *
+ * See also walkdir in initdb.c, which is a frontend version of this logic.
+ */
+static void
+walkdir(const char *path,
+		void (*action) (const char *fname, bool isdir, int elevel),
+		bool process_symlinks,
+		int elevel)
+{
+	DIR		   *dir;
+	struct dirent *de;
+
+	dir = AllocateDir(path);
+	if (dir == NULL)
+	{
+		ereport(elevel,
+				(errcode_for_file_access(),
+				 errmsg("could not open directory \"%s\": %m", path)));
+		return;
+	}
+
+	while ((de = ReadDirExtended(dir, path, elevel)) != NULL)
+	{
+		char		subpath[MAXPGPATH];
+		struct stat fst;
+		int			sret;
+
+		CHECK_FOR_INTERRUPTS();
+
+		if (strcmp(de->d_name, ".") == 0 ||
+			strcmp(de->d_name, "..") == 0)
+			continue;
+
+		snprintf(subpath, MAXPGPATH, "%s/%s", path, de->d_name);
+
+		if (process_symlinks)
+			sret = stat(subpath, &fst);
+		else
+			sret = lstat(subpath, &fst);
+
+		if (sret < 0)
+		{
+			ereport(elevel,
+					(errcode_for_file_access(),
+					 errmsg("could not stat file \"%s\": %m", subpath)));
+			continue;
+		}
+
+		if (S_ISREG(fst.st_mode))
+			(*action) (subpath, false, elevel);
+		else if (S_ISDIR(fst.st_mode))
+			walkdir(subpath, action, false, elevel);
+	}
+
+	FreeDir(dir);				/* we ignore any error here */
+
+	/*
+	 * It's important to fsync the destination directory itself as individual
+	 * file fsyncs don't guarantee that the directory entry for the file is
+	 * synced.
+	 */
+	(*action) (path, true, elevel);
+}
+
+
+/*
+ * Hint to the OS that it should get ready to fsync() this file.
+ *
+ * Ignores errors trying to open unreadable files, and logs other errors at a
+ * caller-specified level.
+ */
+#ifdef PG_FLUSH_DATA_WORKS
+
+static void
+pre_sync_fname(const char *fname, bool isdir, int elevel)
+{
+	int			fd;
+
+	fd = OpenTransientFile((char *) fname, O_RDONLY | PG_BINARY, 0);
+
+	if (fd < 0)
+	{
+		if (errno == EACCES || (isdir && errno == EISDIR))
+			return;
+		ereport(elevel,
+				(errcode_for_file_access(),
+				 errmsg("could not open file \"%s\": %m", fname)));
+		return;
+	}
+
+	/*
+	 * We ignore errors from pg_flush_data() because this is only a hint.
+	 */
+	(void) pg_flush_data(fd, 0, 0);
+
+	(void) CloseTransientFile(fd);
+}
+
+#endif   /* PG_FLUSH_DATA_WORKS */
+
+/*
+ * fsync_fname_ext -- Try to fsync a file or directory
+ *
+ * Ignores errors trying to open unreadable files, or trying to fsync
+ * directories on systems where that isn't allowed/required, and logs other
+ * errors at a caller-specified level.
+ */
+static void
+fsync_fname_ext(const char *fname, bool isdir, int elevel)
+{
+	int			fd;
+	int			flags;
+	int			returncode;
+
+	/*
+	 * Some OSs require directories to be opened read-only whereas other
+	 * systems don't allow us to fsync files opened read-only; so we need both
+	 * cases here.  Using O_RDWR will cause us to fail to fsync files that are
+	 * not writable by our userid, but we assume that's OK.
+	 */
+	flags = PG_BINARY;
+	if (!isdir)
+		flags |= O_RDWR;
+	else
+		flags |= O_RDONLY;
+
+	/*
+	 * Open the file, silently ignoring errors about unreadable files (or
+	 * unsupported operations, e.g. opening a directory under Windows), and
+	 * logging others.
+	 */
+	fd = OpenTransientFile((char *) fname, flags, 0);
+	if (fd < 0)
+	{
+		if (errno == EACCES || (isdir && errno == EISDIR))
+			return;
+		ereport(elevel,
+				(errcode_for_file_access(),
+				 errmsg("could not open file \"%s\": %m", fname)));
+		return;
+	}
+
+	returncode = pg_fsync(fd);
+
+	/*
+	 * Some OSes don't allow us to fsync directories at all, so we can ignore
+	 * those errors. Anything else needs to be logged.
+	 */
+	if (returncode != 0 && !(isdir && errno == EBADF))
+		ereport(elevel,
+				(errcode_for_file_access(),
+				 errmsg("could not fsync file \"%s\": %m", fname)));
+
+	(void) CloseTransientFile(fd);
+}
diff --git a/src/backend/storage/file/reinit.c b/src/backend/storage/file/reinit.c
index 803537021c..6dfd09ade6 100644
--- a/src/backend/storage/file/reinit.c
+++ b/src/backend/storage/file/reinit.c
@@ -350,11 +350,11 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 		FreeDir(dbspace_dir);
 
 		/*
-		 * copy_file() above has already called pg_flush_data() on the
-		 * files it created. Now we need to fsync those files, because
-		 * a checkpoint won't do it for us while we're in recovery. We
-		 * do this in a separate pass to allow the kernel to perform
-		 * all the flushes (especially the metadata ones) at once.
+		 * copy_file() above has already called pg_flush_data() on the files
+		 * it created. Now we need to fsync those files, because a checkpoint
+		 * won't do it for us while we're in recovery. We do this in a
+		 * separate pass to allow the kernel to perform all the flushes
+		 * (especially the metadata ones) at once.
 		 */
 		dbspace_dir = AllocateDir(dbspacedirname);
 		if (dbspace_dir == NULL)
diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c
index 29e46c28b4..b82ae05e15 100644
--- a/src/backend/storage/ipc/dsm.c
+++ b/src/backend/storage/ipc/dsm.c
@@ -225,7 +225,7 @@ dsm_cleanup_using_control_segment(dsm_handle old_control_handle)
 	/*
 	 * Try to attach the segment.  If this fails, it probably just means that
 	 * the operating system has been rebooted and the segment no longer
-	 * exists, or an unrelated proces has used the same shm ID.  So just fall
+	 * exists, or an unrelated process has used the same shm ID.  So just fall
 	 * out quietly.
 	 */
 	if (!dsm_impl_op(DSM_OP_ATTACH, old_control_handle, 0, &impl_private,
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 0859fbfc93..0b10dac729 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -332,8 +332,8 @@ dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
 
 		ereport(elevel,
 				(errcode_for_dynamic_shared_memory(),
-		 errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
-				name, request_size)));
+				 errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
+						name, request_size)));
 		return false;
 	}
 
@@ -875,8 +875,8 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size,
 
 		ereport(elevel,
 				(errcode_for_dynamic_shared_memory(),
-		 errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
-				name, request_size)));
+				 errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
+						name, request_size)));
 		return false;
 	}
 	else if (*mapped_size < request_size)
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 38f8b7be6f..db5f4f605c 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -39,6 +39,7 @@
 #include "replication/slot.h"
 #include "replication/walreceiver.h"
 #include "replication/walsender.h"
+#include "replication/origin.h"
 #include "storage/bufmgr.h"
 #include "storage/dsm.h"
 #include "storage/ipc.h"
@@ -144,6 +145,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
 		size = add_size(size, CheckpointerShmemSize());
 		size = add_size(size, AutoVacuumShmemSize());
 		size = add_size(size, ReplicationSlotsShmemSize());
+		size = add_size(size, ReplicationOriginShmemSize());
 		size = add_size(size, WalSndShmemSize());
 		size = add_size(size, WalRcvShmemSize());
 #ifdef XCP
@@ -260,6 +262,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
 	CheckpointerShmemInit();
 	AutoVacuumShmemInit();
 	ReplicationSlotsShmemInit();
+	ReplicationOriginShmemInit();
 	WalSndShmemInit();
 	WalRcvShmemInit();
 
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index bb95bbbfea..7692f160f6 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -337,7 +337,7 @@ ProcArrayAdd(PGPROC *proc)
 	/*
 	 * Keep the procs array sorted by (PGPROC *) so that we can utilize
 	 * locality of references much better. This is useful while traversing the
-	 * ProcArray because there is a increased likelihood of finding the next
+	 * ProcArray because there is an increased likelihood of finding the next
 	 * PGPROC structure in the cache.
 	 *
 	 * Since the occurrence of adding/removing a proc is much lower than the
@@ -1784,6 +1784,50 @@ ProcArrayInstallImportedXmin(TransactionId xmin, TransactionId sourcexid)
 }
 
 /*
+ * ProcArrayInstallRestoredXmin -- install restored xmin into MyPgXact->xmin
+ *
+ * This is like ProcArrayInstallImportedXmin, but we have a pointer to the
+ * PGPROC of the transaction from which we imported the snapshot, rather than
+ * an XID.
+ *
+ * Returns TRUE if successful, FALSE if source xact is no longer running.
+ */
+bool
+ProcArrayInstallRestoredXmin(TransactionId xmin, PGPROC *proc)
+{
+	bool		result = false;
+	TransactionId xid;
+	volatile PGXACT *pgxact;
+
+	Assert(TransactionIdIsNormal(xmin));
+	Assert(proc != NULL);
+
+	/* Get lock so source xact can't end while we're doing this */
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
+
+	pgxact = &allPgXact[proc->pgprocno];
+
+	/*
+	 * Be certain that the referenced PGPROC has an advertised xmin which is
+	 * no later than the one we're installing, so that the system-wide xmin
+	 * can't go backwards.  Also, make sure it's running in the same database,
+	 * so that the per-database xmin cannot go backwards.
+	 */
+	xid = pgxact->xmin;			/* fetch just once */
+	if (proc->databaseId == MyDatabaseId &&
+		TransactionIdIsNormal(xid) &&
+		TransactionIdPrecedesOrEquals(xid, xmin))
+	{
+		MyPgXact->xmin = TransactionXmin = xmin;
+		result = true;
+	}
+
+	LWLockRelease(ProcArrayLock);
+
+	return result;
+}
+
+/*
  * GetRunningTransactionData -- returns information about running transactions.
  *
  * Similar to GetSnapshotData but returns more information. We include
@@ -2058,7 +2102,7 @@ GetOldestSafeDecodingTransactionId(void)
 	/*
 	 * If there's already a slot pegging the xmin horizon, we can start with
 	 * that value, it's guaranteed to be safe since it's computed by this
-	 * routine initally and has been enforced since.
+	 * routine initially and has been enforced since.
 	 */
 	if (TransactionIdIsValid(procArray->replication_slot_catalog_xmin) &&
 		TransactionIdPrecedes(procArray->replication_slot_catalog_xmin,
@@ -2118,7 +2162,7 @@ GetOldestSafeDecodingTransactionId(void)
  * the result is somewhat indeterminate, but we don't really care.  Even in
  * a multiprocessor with delayed writes to shared memory, it should be certain
  * that setting of delayChkpt will propagate to shared memory when the backend
- * takes a lock, so we cannot fail to see an virtual xact as delayChkpt if
+ * takes a lock, so we cannot fail to see a virtual xact as delayChkpt if
  * it's already inserted its commit record.  Whether it takes a little while
  * for clearing of delayChkpt to propagate is unimportant for correctness.
  */
@@ -3876,7 +3920,7 @@ KnownAssignedXidsRemovePreceding(TransactionId removeXid)
 
 	/*
 	 * Mark entries invalid starting at the tail.  Since array is sorted, we
-	 * can stop as soon as we reach a entry >= removeXid.
+	 * can stop as soon as we reach an entry >= removeXid.
 	 */
 	tail = pArray->tailKnownAssignedXids;
 	head = pArray->headKnownAssignedXids;
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index b022084e17..e0feeb57c0 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -22,6 +22,7 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include "access/parallel.h"
 #include "commands/async.h"
 #include "miscadmin.h"
 #include "storage/latch.h"
@@ -285,6 +286,8 @@ procsignal_sigusr1_handler(SIGNAL_ARGS)
 	if (CheckProcSignal(PROCSIG_PGXCPOOL_RELOAD))
 		HandlePoolerReload();
 #endif
+	if (CheckProcSignal(PROCSIG_PARALLEL_MESSAGE))
+		HandleParallelMessageInterrupt();
 
 	if (CheckProcSignal(PROCSIG_RECOVERY_CONFLICT_DATABASE))
 		RecoveryConflictInterrupt(PROCSIG_RECOVERY_CONFLICT_DATABASE);
diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c
index d42a8d1ae4..126cb0751b 100644
--- a/src/backend/storage/ipc/shm_mq.c
+++ b/src/backend/storage/ipc/shm_mq.c
@@ -317,7 +317,7 @@ shm_mq_set_handle(shm_mq_handle *mqh, BackgroundWorkerHandle *handle)
 shm_mq_result
 shm_mq_send(shm_mq_handle *mqh, Size nbytes, const void *data, bool nowait)
 {
-	shm_mq_iovec	iov;
+	shm_mq_iovec iov;
 
 	iov.data = data;
 	iov.len = nbytes;
@@ -385,7 +385,7 @@ shm_mq_sendv(shm_mq_handle *mqh, shm_mq_iovec *iov, int iovcnt, bool nowait)
 	offset = mqh->mqh_partial_bytes;
 	do
 	{
-		Size	chunksize;
+		Size		chunksize;
 
 		/* Figure out which bytes need to be sent next. */
 		if (offset >= iov[which_iov].len)
@@ -399,18 +399,18 @@ shm_mq_sendv(shm_mq_handle *mqh, shm_mq_iovec *iov, int iovcnt, bool nowait)
 
 		/*
 		 * We want to avoid copying the data if at all possible, but every
-		 * chunk of bytes we write into the queue has to be MAXALIGN'd,
-		 * except the last.  Thus, if a chunk other than the last one ends
-		 * on a non-MAXALIGN'd boundary, we have to combine the tail end of
-		 * its data with data from one or more following chunks until we
-		 * either reach the last chunk or accumulate a number of bytes which
-		 * is MAXALIGN'd.
+		 * chunk of bytes we write into the queue has to be MAXALIGN'd, except
+		 * the last.  Thus, if a chunk other than the last one ends on a
+		 * non-MAXALIGN'd boundary, we have to combine the tail end of its
+		 * data with data from one or more following chunks until we either
+		 * reach the last chunk or accumulate a number of bytes which is
+		 * MAXALIGN'd.
 		 */
 		if (which_iov + 1 < iovcnt &&
 			offset + MAXIMUM_ALIGNOF > iov[which_iov].len)
 		{
-			char	tmpbuf[MAXIMUM_ALIGNOF];
-			int		j = 0;
+			char		tmpbuf[MAXIMUM_ALIGNOF];
+			int			j = 0;
 
 			for (;;)
 			{
@@ -1047,7 +1047,7 @@ shm_mq_inc_bytes_read(volatile shm_mq *mq, Size n)
 
 /*
  * Get the number of bytes written.  The sender need not use this to access
- * the count of bytes written, but the reciever must.
+ * the count of bytes written, but the receiver must.
  */
 static uint64
 shm_mq_get_bytes_written(volatile shm_mq *mq, bool *detached)
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index 67ec5152a8..dc9207164e 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -33,7 +33,7 @@ uint64		SharedInvalidMessageCounter;
  * through a cache reset exercise.  This is done by sending
  * PROCSIG_CATCHUP_INTERRUPT to any backend that gets too far behind.
  *
- * The signal handler will set a interrupt pending flag and will set the
+ * The signal handler will set an interrupt pending flag and will set the
  * processes latch. Whenever starting to read from the client, or when
  * interrupted while doing so, ProcessClientReadInterrupt() will call
  * ProcessCatchupEvent().
@@ -188,8 +188,8 @@ ProcessCatchupInterrupt(void)
 		 *
 		 * It is awfully tempting to just call AcceptInvalidationMessages()
 		 * without the rest of the xact start/stop overhead, and I think that
-		 * would actually work in the normal case; but I am not sure that things
-		 * would clean up nicely if we got an error partway through.
+		 * would actually work in the normal case; but I am not sure that
+		 * things would clean up nicely if we got an error partway through.
 		 */
 		if (IsTransactionOrTransactionBlock())
 		{
diff --git a/src/backend/storage/lmgr/README b/src/backend/storage/lmgr/README
index 6bc7efcdef..8898e25227 100644
--- a/src/backend/storage/lmgr/README
+++ b/src/backend/storage/lmgr/README
@@ -56,9 +56,9 @@ two lock methods: DEFAULT and USER.
 Lock modes describe the type of the lock (read/write or shared/exclusive).
 In principle, each lock method can have its own set of lock modes with
 different conflict rules, but currently DEFAULT and USER methods use
-identical lock mode sets.  See src/tools/backend/index.html and
-src/include/storage/lock.h for more details.  (Lock modes are also called
-lock types in some places in the code and documentation.)
+identical lock mode sets. See src/include/storage/lock.h for more details.
+(Lock modes are also called lock types in some places in the code and
+documentation.)
 
 There are two main methods for recording locks in shared memory.  The primary
 mechanism uses two main structures: the per-lockable-object LOCK struct, and
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index d13a167334..c052949749 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -26,6 +26,24 @@
 
 
 /*
+ * Per-backend counter for generating speculative insertion tokens.
+ *
+ * This may wrap around, but that's OK as it's only used for the short
+ * duration between inserting a tuple and checking that there are no (unique)
+ * constraint violations.  It's theoretically possible that a backend sees a
+ * tuple that was speculatively inserted by another backend, but before it has
+ * started waiting on the token, the other backend completes its insertion,
+ * and then then performs 2^32 unrelated insertions.  And after all that, the
+ * first backend finally calls SpeculativeInsertionLockAcquire(), with the
+ * intention of waiting for the first insertion to complete, but ends up
+ * waiting for the latest unrelated insertion instead.  Even then, nothing
+ * particularly bad happens: in the worst case they deadlock, causing one of
+ * the transactions to abort.
+ */
+static uint32 speculativeInsertionToken = 0;
+
+
+/*
  * Struct to hold context info for transaction lock waits.
  *
  * 'oper' is the operation that needs to wait for the other transaction; 'rel'
@@ -576,6 +594,73 @@ ConditionalXactLockTableWait(TransactionId xid)
 }
 
 /*
+ *		SpeculativeInsertionLockAcquire
+ *
+ * Insert a lock showing that the given transaction ID is inserting a tuple,
+ * but hasn't yet decided whether it's going to keep it.  The lock can then be
+ * used to wait for the decision to go ahead with the insertion, or aborting
+ * it.
+ *
+ * The token is used to distinguish multiple insertions by the same
+ * transaction.  It is returned to caller.
+ */
+uint32
+SpeculativeInsertionLockAcquire(TransactionId xid)
+{
+	LOCKTAG		tag;
+
+	speculativeInsertionToken++;
+
+	/*
+	 * Check for wrap-around. Zero means no token is held, so don't use that.
+	 */
+	if (speculativeInsertionToken == 0)
+		speculativeInsertionToken = 1;
+
+	SET_LOCKTAG_SPECULATIVE_INSERTION(tag, xid, speculativeInsertionToken);
+
+	(void) LockAcquire(&tag, ExclusiveLock, false, false);
+
+	return speculativeInsertionToken;
+}
+
+/*
+ *		SpeculativeInsertionLockRelease
+ *
+ * Delete the lock showing that the given transaction is speculatively
+ * inserting a tuple.
+ */
+void
+SpeculativeInsertionLockRelease(TransactionId xid)
+{
+	LOCKTAG		tag;
+
+	SET_LOCKTAG_SPECULATIVE_INSERTION(tag, xid, speculativeInsertionToken);
+
+	LockRelease(&tag, ExclusiveLock, false);
+}
+
+/*
+ *		SpeculativeInsertionWait
+ *
+ * Wait for the specified transaction to finish or abort the insertion of a
+ * tuple.
+ */
+void
+SpeculativeInsertionWait(TransactionId xid, uint32 token)
+{
+	LOCKTAG		tag;
+
+	SET_LOCKTAG_SPECULATIVE_INSERTION(tag, xid, token);
+
+	Assert(TransactionIdIsValid(xid));
+	Assert(token != 0);
+
+	(void) LockAcquire(&tag, ShareLock, false, false);
+	LockRelease(&tag, ShareLock, false);
+}
+
+/*
  * XactLockTableWaitErrorContextCb
  *		Error context callback for transaction lock waits.
  */
@@ -873,6 +958,12 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *tag)
 							 tag->locktag_field1,
 							 tag->locktag_field2);
 			break;
+		case LOCKTAG_SPECULATIVE_TOKEN:
+			appendStringInfo(buf,
+							 _("speculative token %u of transaction %u"),
+							 tag->locktag_field2,
+							 tag->locktag_field1);
+			break;
 		case LOCKTAG_OBJECT:
 			appendStringInfo(buf,
 							 _("object %u of class %u of database %u"),
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index 05bbfabe1e..c918f090da 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -67,14 +67,14 @@
  * work. That's problematic because we're now stuck waiting inside the OS.
 
  * To mitigate those races we use a two phased attempt at locking:
- *   Phase 1: Try to do it atomically, if we succeed, nice
- *   Phase 2: Add ourselves to the waitqueue of the lock
- *   Phase 3: Try to grab the lock again, if we succeed, remove ourselves from
- *            the queue
- *   Phase 4: Sleep till wake-up, goto Phase 1
+ *	 Phase 1: Try to do it atomically, if we succeed, nice
+ *	 Phase 2: Add ourselves to the waitqueue of the lock
+ *	 Phase 3: Try to grab the lock again, if we succeed, remove ourselves from
+ *			  the queue
+ *	 Phase 4: Sleep till wake-up, goto Phase 1
  *
  * This protects us against the problem from above as nobody can release too
- *    quick, before we're queued, since after Phase 2 we're already queued.
+ *	  quick, before we're queued, since after Phase 2 we're already queued.
  * -------------------------------------------------------------------------
  */
 #include "postgres.h"
@@ -148,7 +148,7 @@ static LWLockTranche MainLWLockTranche;
 /* struct representing the LWLocks we're holding */
 typedef struct LWLockHandle
 {
-	LWLock *lock;
+	LWLock	   *lock;
 	LWLockMode	mode;
 } LWLockHandle;
 
@@ -191,7 +191,8 @@ PRINT_LWDEBUG(const char *where, LWLock *lock, LWLockMode mode)
 	/* hide statement & context here, otherwise the log is just too verbose */
 	if (Trace_lwlocks)
 	{
-		uint32 state = pg_atomic_read_u32(&lock->state);
+		uint32		state = pg_atomic_read_u32(&lock->state);
+
 		ereport(LOG,
 				(errhidestmt(true),
 				 errhidecontext(true),
@@ -593,17 +594,17 @@ LWLockInitialize(LWLock *lock, int tranche_id)
  * Returns true if the lock isn't free and we need to wait.
  */
 static bool
-LWLockAttemptLock(LWLock* lock, LWLockMode mode)
+LWLockAttemptLock(LWLock *lock, LWLockMode mode)
 {
 	AssertArg(mode == LW_EXCLUSIVE || mode == LW_SHARED);
 
 	/* loop until we've determined whether we could acquire the lock or not */
 	while (true)
 	{
-		uint32 old_state;
-		uint32 expected_state;
-		uint32 desired_state;
-		bool lock_free;
+		uint32		old_state;
+		uint32		expected_state;
+		uint32		desired_state;
+		bool		lock_free;
 
 		old_state = pg_atomic_read_u32(&lock->state);
 		expected_state = old_state;
@@ -645,7 +646,7 @@ LWLockAttemptLock(LWLock* lock, LWLockMode mode)
 				return false;
 			}
 			else
-				return true; /* someobdy else has the lock */
+				return true;	/* someobdy else has the lock */
 		}
 	}
 	pg_unreachable();
@@ -680,7 +681,7 @@ LWLockWakeup(LWLock *lock)
 
 	dlist_foreach_modify(iter, &lock->waiters)
 	{
-		PGPROC *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
+		PGPROC	   *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
 
 		if (wokeup_somebody && waiter->lwWaitMode == LW_EXCLUSIVE)
 			continue;
@@ -696,6 +697,7 @@ LWLockWakeup(LWLock *lock)
 			 * automatically.
 			 */
 			new_release_ok = false;
+
 			/*
 			 * Don't wakeup (further) exclusive locks.
 			 */
@@ -706,7 +708,7 @@ LWLockWakeup(LWLock *lock)
 		 * Once we've woken up an exclusive lock, there's no point in waking
 		 * up anybody else.
 		 */
-		if(waiter->lwWaitMode == LW_EXCLUSIVE)
+		if (waiter->lwWaitMode == LW_EXCLUSIVE)
 			break;
 	}
 
@@ -729,10 +731,11 @@ LWLockWakeup(LWLock *lock)
 	/* Awaken any waiters I removed from the queue. */
 	dlist_foreach_modify(iter, &wakeup)
 	{
-		PGPROC *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
+		PGPROC	   *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
 
 		LOG_LWDEBUG("LWLockRelease", lock, "release waiter");
 		dlist_delete(&waiter->lwWaitLink);
+
 		/*
 		 * Guarantee that lwWaiting being unset only becomes visible once the
 		 * unlink from the link has completed. Otherwise the target backend
@@ -812,7 +815,7 @@ LWLockQueueSelf(LWLock *lock, LWLockMode mode)
 static void
 LWLockDequeueSelf(LWLock *lock)
 {
-	bool	found = false;
+	bool		found = false;
 	dlist_mutable_iter iter;
 
 #ifdef LWLOCK_STATS
@@ -835,7 +838,8 @@ LWLockDequeueSelf(LWLock *lock)
 	 */
 	dlist_foreach_modify(iter, &lock->waiters)
 	{
-		PGPROC *proc = dlist_container(PGPROC, lwWaitLink, iter.cur);
+		PGPROC	   *proc = dlist_container(PGPROC, lwWaitLink, iter.cur);
+
 		if (proc == MyProc)
 		{
 			found = true;
@@ -857,11 +861,11 @@ LWLockDequeueSelf(LWLock *lock)
 		MyProc->lwWaiting = false;
 	else
 	{
-		int		extraWaits = 0;
+		int			extraWaits = 0;
 
 		/*
 		 * Somebody else dequeued us and has or will wake us up. Deal with the
-		 * superflous absorption of a wakeup.
+		 * superfluous absorption of a wakeup.
 		 */
 
 		/*
@@ -894,6 +898,7 @@ LWLockDequeueSelf(LWLock *lock)
 	{
 		/* not waiting anymore */
 		uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+
 		Assert(nwaiters < MAX_BACKENDS);
 	}
 #endif
@@ -1060,6 +1065,7 @@ LWLockAcquireCommon(LWLock *lock, LWLockMode mode, uint64 *valptr, uint64 val)
 		{
 			/* not waiting anymore */
 			uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+
 			Assert(nwaiters < MAX_BACKENDS);
 		}
 #endif
@@ -1195,8 +1201,9 @@ LWLockAcquireOrWait(LWLock *lock, LWLockMode mode)
 		if (mustwait)
 		{
 			/*
-			 * Wait until awakened.  Like in LWLockAcquire, be prepared for bogus
-			 * wakups, because we share the semaphore with ProcWaitForSignal.
+			 * Wait until awakened.  Like in LWLockAcquire, be prepared for
+			 * bogus wakeups, because we share the semaphore with
+			 * ProcWaitForSignal.
 			 */
 			LOG_LWDEBUG("LWLockAcquireOrWait", lock, "waiting");
 
@@ -1217,6 +1224,7 @@ LWLockAcquireOrWait(LWLock *lock, LWLockMode mode)
 			{
 				/* not waiting anymore */
 				uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+
 				Assert(nwaiters < MAX_BACKENDS);
 			}
 #endif
@@ -1229,11 +1237,11 @@ LWLockAcquireOrWait(LWLock *lock, LWLockMode mode)
 			LOG_LWDEBUG("LWLockAcquireOrWait", lock, "acquired, undoing queue");
 
 			/*
-			  * Got lock in the second attempt, undo queueing. We need to
-			  * treat this as having successfully acquired the lock, otherwise
-			  * we'd not necessarily wake up people we've prevented from
-			  * acquiring the lock.
-			  */
+			 * Got lock in the second attempt, undo queueing. We need to treat
+			 * this as having successfully acquired the lock, otherwise we'd
+			 * not necessarily wake up people we've prevented from acquiring
+			 * the lock.
+			 */
 			LWLockDequeueSelf(lock);
 		}
 	}
@@ -1358,9 +1366,9 @@ LWLockWaitForVar(LWLock *lock, uint64 *valptr, uint64 oldval, uint64 *newval)
 
 		/*
 		 * Add myself to wait queue. Note that this is racy, somebody else
-		 * could wakeup before we're finished queuing.
-		 * NB: We're using nearly the same twice-in-a-row lock acquisition
-		 * protocol as LWLockAcquire(). Check its comments for details.
+		 * could wakeup before we're finished queuing. NB: We're using nearly
+		 * the same twice-in-a-row lock acquisition protocol as
+		 * LWLockAcquire(). Check its comments for details.
 		 */
 		LWLockQueueSelf(lock, LW_WAIT_UNTIL_FREE);
 
@@ -1418,6 +1426,7 @@ LWLockWaitForVar(LWLock *lock, uint64 *valptr, uint64 oldval, uint64 *newval)
 		{
 			/* not waiting anymore */
 			uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+
 			Assert(nwaiters < MAX_BACKENDS);
 		}
 #endif
@@ -1490,7 +1499,7 @@ LWLockUpdateVar(LWLock *lock, uint64 *valptr, uint64 val)
 	 */
 	dlist_foreach_modify(iter, &lock->waiters)
 	{
-		PGPROC *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
+		PGPROC	   *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
 
 		if (waiter->lwWaitMode != LW_WAIT_UNTIL_FREE)
 			break;
@@ -1507,7 +1516,8 @@ LWLockUpdateVar(LWLock *lock, uint64 *valptr, uint64 val)
 	 */
 	dlist_foreach_modify(iter, &wakeup)
 	{
-		PGPROC *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
+		PGPROC	   *waiter = dlist_container(PGPROC, lwWaitLink, iter.cur);
+
 		dlist_delete(&waiter->lwWaitLink);
 		/* check comment in LWLockWakeup() about this barrier */
 		pg_write_barrier();
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index b81ebeb260..bad5618341 100644
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -62,7 +62,7 @@
  *		an existing SIREAD lock for the same transaction, the SIREAD lock
  *		can be deleted.
  *
- * (7)	A write from a serializable transaction must ensure that a xact
+ * (7)	A write from a serializable transaction must ensure that an xact
  *		record exists for the transaction, with the same lifespan (until
  *		all concurrent transaction complete or the transaction is rolled
  *		back) so that rw-dependencies to that transaction can be
@@ -1653,6 +1653,14 @@ GetSerializableTransactionSnapshotInt(Snapshot snapshot,
 
 	Assert(!RecoveryInProgress());
 
+	/*
+	 * Since all parts of a serializable transaction must use the same
+	 * snapshot, it is too late to establish one after a parallel operation
+	 * has begun.
+	 */
+	if (IsInParallelMode())
+		elog(ERROR, "cannot establish serializable snapshot during a parallel operation");
+
 	proc = MyProc;
 	Assert(proc != NULL);
 	GET_VXID_FROM_PGPROC(vxid, *proc);
@@ -4737,7 +4745,7 @@ AtPrepare_PredicateLocks(void)
 	if (MySerializableXact == InvalidSerializableXact)
 		return;
 
-	/* Generate a xact record for our SERIALIZABLEXACT */
+	/* Generate an xact record for our SERIALIZABLEXACT */
 	record.type = TWOPHASEPREDICATERECORD_XACT;
 	xactRecord->xmin = MySerializableXact->xmin;
 	xactRecord->flags = MySerializableXact->flags;
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 72e78a6c98..bf92ab06f0 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -1623,6 +1623,7 @@ CheckDeadLockAlert(void)
 	int			save_errno = errno;
 
 	got_deadlock_timeout = true;
+
 	/*
 	 * Have to set the latch again, even if handle_sig_alarm already did. Back
 	 * then got_deadlock_timeout wasn't yet set... It's unlikely that this
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 61e7437f8f..df77bb2f5c 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -806,7 +806,7 @@ PageIndexMultiDelete(Page page, OffsetNumber *itemnos, int nitems)
 	int			nextitm;
 	OffsetNumber offnum;
 
-	Assert(nitems < MaxIndexTuplesPerPage);
+	Assert(nitems <= MaxIndexTuplesPerPage);
 
 	/*
 	 * If there aren't very many items to delete, then retail
@@ -962,8 +962,8 @@ PageIndexDeleteNoCompact(Page page, OffsetNumber *itemnos, int nitems)
 				offset != MAXALIGN(offset))
 				ereport(ERROR,
 						(errcode(ERRCODE_DATA_CORRUPTED),
-						 errmsg("corrupted item pointer: offset = %u, length = %u",
-								offset, (unsigned int) itemlen)));
+				   errmsg("corrupted item pointer: offset = %u, length = %u",
+						  offset, (unsigned int) itemlen)));
 
 			if (nextitm < nitems && offnum == itemnos[nextitm])
 			{
@@ -1039,8 +1039,8 @@ PageIndexDeleteNoCompact(Page page, OffsetNumber *itemnos, int nitems)
 		if (totallen > (Size) (pd_special - pd_lower))
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("corrupted item lengths: total %u, available space %u",
-							(unsigned int) totallen, pd_special - pd_lower)));
+			   errmsg("corrupted item lengths: total %u, available space %u",
+					  (unsigned int) totallen, pd_special - pd_lower)));
 
 		/*
 		 * Defragment the data areas of each tuple, being careful to preserve
diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c
index c991828969..244d8fba2f 100644
--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -28,6 +28,13 @@
 bool
 ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2)
 {
+	/*
+	 * We really want ItemPointerData to be exactly 6 bytes.  This is rather a
+	 * random place to check, but there is no better place.
+	 */
+	StaticAssertStmt(sizeof(ItemPointerData) == 3 * sizeof(uint16),
+					 "ItemPointerData struct is improperly padded");
+
 	if (ItemPointerGetBlockNumber(pointer1) ==
 		ItemPointerGetBlockNumber(pointer2) &&
 		ItemPointerGetOffsetNumber(pointer1) ==
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index b754d3bd19..42a43bb07b 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -213,8 +213,8 @@ mdinit(void)
 		/*
 		 * XXX: The checkpointer needs to add entries to the pending ops table
 		 * when absorbing fsync requests.  That is done within a critical
-		 * section, which isn't usually allowed, but we make an exception.
-		 * It means that there's a theoretical possibility that you run out of
+		 * section, which isn't usually allowed, but we make an exception. It
+		 * means that there's a theoretical possibility that you run out of
 		 * memory while absorbing fsync requests, which leads to a PANIC.
 		 * Fortunately the hash table is small so that's unlikely to happen in
 		 * practice.
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 66174c02a4..f85916adb0 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -42,6 +42,7 @@
 #include "rusagestub.h"
 #endif
 
+#include "access/parallel.h"
 #include "access/printtup.h"
 #include "access/xact.h"
 #include "catalog/pg_type.h"
@@ -728,10 +729,10 @@ ProcessClientWriteInterrupt(bool blocked)
 
 	/*
 	 * We only want to process the interrupt here if socket writes are
-	 * blocking to increase the chance to get an error message to the
-	 * client. If we're not blocked there'll soon be a
-	 * CHECK_FOR_INTERRUPTS(). But if we're blocked we'll never get out of
-	 * that situation if the client has died.
+	 * blocking to increase the chance to get an error message to the client.
+	 * If we're not blocked there'll soon be a CHECK_FOR_INTERRUPTS(). But if
+	 * we're blocked we'll never get out of that situation if the client has
+	 * died.
 	 */
 	if (ProcDiePending && blocked)
 	{
@@ -3072,9 +3073,9 @@ die(SIGNAL_ARGS)
 
 	/*
 	 * If we're in single user mode, we want to quit immediately - we can't
-	 * rely on latches as they wouldn't work when stdin/stdout is a
-	 * file. Rather ugly, but it's unlikely to be worthwhile to invest much
-	 * more effort just for the benefit of single user mode.
+	 * rely on latches as they wouldn't work when stdin/stdout is a file.
+	 * Rather ugly, but it's unlikely to be worthwhile to invest much more
+	 * effort just for the benefit of single user mode.
 	 */
 	if (DoingCommandRead && whereToSendOutput != DestRemote)
 		ProcessInterrupts();
@@ -3326,13 +3327,13 @@ ProcessInterrupts(void)
 	 */
 	if (RecoveryConflictPending && DoingCommandRead)
 	{
-		QueryCancelPending = false;			/* this trumps QueryCancel */
+		QueryCancelPending = false;		/* this trumps QueryCancel */
 		RecoveryConflictPending = false;
 		LockErrorCleanup();
 		pgstat_report_recovery_conflict(RecoveryConflictReason);
 		ereport(FATAL,
 				(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-				 errmsg("terminating connection due to conflict with recovery"),
+			  errmsg("terminating connection due to conflict with recovery"),
 				 errdetail_recovery_conflict(),
 				 errhint("In a moment you should be able to reconnect to the"
 						 " database and repeat your command.")));
@@ -3409,7 +3410,8 @@ ProcessInterrupts(void)
 		}
 	}
 
-	/* If we get here, do nothing (probably, QueryCancelPending was reset) */
+	if (ParallelMessagePending)
+		HandleParallelMessages();
 }
 
 
@@ -4454,7 +4456,7 @@ PostgresMain(int argc, char *argv[],
 		if (pq_is_reading_msg())
 			ereport(FATAL,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
-					 errmsg("terminating connection because protocol sync was lost")));
+			errmsg("terminating connection because protocol sync was lost")));
 
 		/* Now we can allow interrupts again */
 		RESUME_INTERRUPTS();
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 1434be2bbd..22be1b11f4 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -179,14 +179,15 @@ CommandIsReadOnly(Node *parsetree)
 static void
 check_xact_readonly(Node *parsetree)
 {
-	if (!XactReadOnly)
+	/* Only perform the check if we have a reason to do so. */
+	if (!XactReadOnly && !IsInParallelMode())
 		return;
 
 	/*
 	 * Note: Commands that need to do more complicated checking are handled
 	 * elsewhere, in particular COPY and plannable statements do their own
-	 * checking.  However they should all call PreventCommandIfReadOnly to
-	 * actually throw the error.
+	 * checking.  However they should all call PreventCommandIfReadOnly or
+	 * PreventCommandIfParallelMode to actually throw the error.
 	 */
 
 	switch (nodeTag(parsetree))
@@ -225,6 +226,7 @@ check_xact_readonly(Node *parsetree)
 		case T_CreateTableAsStmt:
 		case T_RefreshMatViewStmt:
 		case T_CreateTableSpaceStmt:
+		case T_CreateTransformStmt:
 		case T_CreateTrigStmt:
 		case T_CompositeTypeStmt:
 		case T_CreateEnumStmt:
@@ -258,6 +260,7 @@ check_xact_readonly(Node *parsetree)
 		case T_ImportForeignSchemaStmt:
 		case T_SecLabelStmt:
 			PreventCommandIfReadOnly(CreateCommandTag(parsetree));
+			PreventCommandIfParallelMode(CreateCommandTag(parsetree));
 			break;
 		default:
 			/* do nothing */
@@ -283,6 +286,24 @@ PreventCommandIfReadOnly(const char *cmdname)
 }
 
 /*
+ * PreventCommandIfParallelMode: throw error if current (sub)transaction is
+ * in parallel mode.
+ *
+ * This is useful mainly to ensure consistency of the error message wording;
+ * most callers have checked IsInParallelMode() for themselves.
+ */
+void
+PreventCommandIfParallelMode(const char *cmdname)
+{
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+		/* translator: %s is name of a SQL command, eg CREATE */
+				 errmsg("cannot execute %s during a parallel operation",
+						cmdname)));
+}
+
+/*
  * PreventCommandDuringRecovery: throw error if RecoveryInProgress
  *
  * The majority of operations that are unsafe in a Hot Standby slave
@@ -868,6 +889,7 @@ standard_ProcessUtility(Node *parsetree,
 			if (IS_PGXC_LOCAL_COORDINATOR)
 				ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, true, EXEC_ON_DATANODES, false);
 #endif
+			/* forbidden in parallel mode due to CommandIsReadOnly */
 			cluster((ClusterStmt *) parsetree, isTopLevel);
 			break;
 
@@ -886,6 +908,7 @@ standard_ProcessUtility(Node *parsetree,
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, true, EXEC_ON_DATANODES, false);
 #endif
+				/* forbidden in parallel mode due to CommandIsReadOnly */
 				ExecVacuum(stmt, isTopLevel);
 			}
 			break;
@@ -1022,6 +1045,7 @@ standard_ProcessUtility(Node *parsetree,
 			 * outside a transaction block is presumed to be user error.
 			 */
 			RequireTransactionChain(isTopLevel, "LOCK TABLE");
+			/* forbidden in parallel mode due to CommandIsReadOnly */
 			LockTableCommand((LockStmt *) parsetree);
 #ifdef PGXC
 			if (IS_PGXC_LOCAL_COORDINATOR)
@@ -1125,13 +1149,14 @@ standard_ProcessUtility(Node *parsetree,
 
 				/* we choose to allow this during "read only" transactions */
 				PreventCommandDuringRecovery("REINDEX");
+				/* forbidden in parallel mode due to CommandIsReadOnly */
 				switch (stmt->kind)
 				{
 					case REINDEX_OBJECT_INDEX:
-						ReindexIndex(stmt->relation);
+						ReindexIndex(stmt->relation, stmt->options);
 						break;
 					case REINDEX_OBJECT_TABLE:
-						ReindexTable(stmt->relation);
+						ReindexTable(stmt->relation, stmt->options);
 						break;
 					case REINDEX_OBJECT_SCHEMA:
 					case REINDEX_OBJECT_SYSTEM:
@@ -1147,7 +1172,7 @@ standard_ProcessUtility(Node *parsetree,
 												(stmt->kind == REINDEX_OBJECT_SCHEMA) ? "REINDEX SCHEMA" :
 												(stmt->kind == REINDEX_OBJECT_SYSTEM) ? "REINDEX SYSTEM" :
 												"REINDEX DATABASE");
-						ReindexMultipleTables(stmt->name, stmt->kind);
+						ReindexMultipleTables(stmt->name, stmt->kind, stmt->options);
 						break;
 					default:
 						elog(ERROR, "unrecognized object type: %d",
@@ -1157,7 +1182,7 @@ standard_ProcessUtility(Node *parsetree,
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote,
-							stmt->kind == OBJECT_DATABASE, EXEC_ON_ALL_NODES, false);
+							stmt->kind == REINDEX_OBJECT_DATABASE, EXEC_ON_ALL_NODES, false);
 #endif
 			}
 			break;
@@ -1501,7 +1526,9 @@ ProcessUtilitySlow(Node *parsetree,
 	bool		isTopLevel = (context == PROCESS_UTILITY_TOPLEVEL);
 	bool		isCompleteQuery = (context <= PROCESS_UTILITY_QUERY);
 	bool		needCleanup;
+	bool		commandCollected = false;
 	ObjectAddress address;
+	ObjectAddress secondaryObject = InvalidObjectAddress;
 
 	/* All event trigger calls are done only when isCompleteQuery is true */
 	needCleanup = isCompleteQuery && EventTriggerBeginCompleteQuery();
@@ -1525,6 +1552,12 @@ ProcessUtilitySlow(Node *parsetree,
 				CreateSchemaCommand((CreateSchemaStmt *) parsetree,
 									queryString);
 #endif				
+
+				/*
+				 * EventTriggerCollectSimpleCommand called by
+				 * CreateSchemaCommand
+				 */
+				commandCollected = true;
 				break;
 
 			case T_CreateStmt:
@@ -1641,6 +1674,9 @@ ProcessUtilitySlow(Node *parsetree,
 							address = DefineRelation((CreateStmt *) stmt,
 													 RELKIND_RELATION,
 													 InvalidOid, NULL);
+							EventTriggerCollectSimpleCommand(address,
+															 secondaryObject,
+															 stmt);
 
 							/*
 							 * Let NewRelationCreateToastTable decide if this
@@ -1673,10 +1709,17 @@ ProcessUtilitySlow(Node *parsetree,
 													 InvalidOid, NULL);
 							CreateForeignTable((CreateForeignTableStmt *) stmt,
 											   address.objectId);
+							EventTriggerCollectSimpleCommand(address,
+															 secondaryObject,
+															 stmt);
 						}
 						else
 						{
-							/* Recurse for anything else */
+							/*
+							 * Recurse for anything else.  Note the recursive
+							 * call will stash the objects so created into our
+							 * event trigger context.
+							 */
 							ProcessUtility(stmt,
 										   queryString,
 										   PROCESS_UTILITY_SUBCOMMAND,
@@ -1692,6 +1735,12 @@ ProcessUtilitySlow(Node *parsetree,
 						if (lnext(l) != NULL)
 							CommandCounterIncrement();
 					}
+
+					/*
+					 * The multiple commands generated here are stashed
+					 * individually, so disable collection below.
+					 */
+					commandCollected = true;
 				}
 				break;
 
@@ -1745,6 +1794,10 @@ ProcessUtilitySlow(Node *parsetree,
 #endif
 
 
+						/* ... ensure we have an event trigger context ... */
+						EventTriggerAlterTableStart(parsetree);
+						EventTriggerAlterTableRelid(relid);
+
 						/* ... and do it */
 						foreach(l, stmts)
 						{
@@ -1758,7 +1811,15 @@ ProcessUtilitySlow(Node *parsetree,
 							}
 							else
 							{
-								/* Recurse for anything else */
+								/*
+								 * Recurse for anything else.  If we need to
+								 * do so, "close" the current complex-command
+								 * set, and start a new one at the bottom;
+								 * this is needed to ensure the ordering of
+								 * queued commands is consistent with the way
+								 * they are executed here.
+								 */
+								EventTriggerAlterTableEnd();
 								ProcessUtility(stmt,
 											   queryString,
 											   PROCESS_UTILITY_SUBCOMMAND,
@@ -1768,18 +1829,26 @@ ProcessUtilitySlow(Node *parsetree,
 											   true,
 #endif /* PGXC */
 											   NULL);
+								EventTriggerAlterTableStart(parsetree);
+								EventTriggerAlterTableRelid(relid);
 							}
 
 							/* Need CCI between commands */
 							if (lnext(l) != NULL)
 								CommandCounterIncrement();
 						}
+
+						/* done */
+						EventTriggerAlterTableEnd();
 					}
 					else
 						ereport(NOTICE,
 						  (errmsg("relation \"%s\" does not exist, skipping",
 								  atstmt->relation->relname)));
 				}
+
+				/* ALTER TABLE stashes commands internally */
+				commandCollected = true;
 				break;
 
 			case T_AlterDomainStmt:
@@ -1798,31 +1867,37 @@ ProcessUtilitySlow(Node *parsetree,
 							 * Recursively alter column default for table and,
 							 * if requested, for descendants
 							 */
-							AlterDomainDefault(stmt->typeName,
-											   stmt->def);
+							address =
+								AlterDomainDefault(stmt->typeName,
+												   stmt->def);
 							break;
 						case 'N':		/* ALTER DOMAIN DROP NOT NULL */
-							AlterDomainNotNull(stmt->typeName,
-											   false);
+							address =
+								AlterDomainNotNull(stmt->typeName,
+												   false);
 							break;
 						case 'O':		/* ALTER DOMAIN SET NOT NULL */
-							AlterDomainNotNull(stmt->typeName,
-											   true);
+							address =
+								AlterDomainNotNull(stmt->typeName,
+												   true);
 							break;
 						case 'C':		/* ADD CONSTRAINT */
-							AlterDomainAddConstraint(stmt->typeName,
-													 stmt->def,
-													 NULL);
+							address =
+								AlterDomainAddConstraint(stmt->typeName,
+														 stmt->def,
+														 &secondaryObject);
 							break;
 						case 'X':		/* DROP CONSTRAINT */
-							AlterDomainDropConstraint(stmt->typeName,
-													  stmt->name,
-													  stmt->behavior,
-													  stmt->missing_ok);
+							address =
+								AlterDomainDropConstraint(stmt->typeName,
+														  stmt->name,
+														  stmt->behavior,
+														  stmt->missing_ok);
 							break;
 						case 'V':		/* VALIDATE CONSTRAINT */
-							AlterDomainValidateConstraint(stmt->typeName,
-														  stmt->name);
+							address =
+								AlterDomainValidateConstraint(stmt->typeName,
+															  stmt->name);
 							break;
 						default:		/* oops */
 							elog(ERROR, "unrecognized alter domain type: %d",
@@ -1846,41 +1921,46 @@ ProcessUtilitySlow(Node *parsetree,
 					switch (stmt->kind)
 					{
 						case OBJECT_AGGREGATE:
-							DefineAggregate(stmt->defnames, stmt->args,
-											stmt->oldstyle, stmt->definition,
-											queryString);
+							address =
+								DefineAggregate(stmt->defnames, stmt->args,
+												stmt->oldstyle,
+											  stmt->definition, queryString);
 							break;
 						case OBJECT_OPERATOR:
 							Assert(stmt->args == NIL);
-							DefineOperator(stmt->defnames, stmt->definition);
+							address = DefineOperator(stmt->defnames,
+													 stmt->definition);
 							break;
 						case OBJECT_TYPE:
 							Assert(stmt->args == NIL);
-							DefineType(stmt->defnames, stmt->definition);
+							address = DefineType(stmt->defnames,
+												 stmt->definition);
 							break;
 						case OBJECT_TSPARSER:
 							Assert(stmt->args == NIL);
-							DefineTSParser(stmt->defnames, stmt->definition);
+							address = DefineTSParser(stmt->defnames,
+													 stmt->definition);
 							break;
 						case OBJECT_TSDICTIONARY:
 							Assert(stmt->args == NIL);
-							DefineTSDictionary(stmt->defnames,
-											   stmt->definition);
+							address = DefineTSDictionary(stmt->defnames,
+														 stmt->definition);
 							break;
 						case OBJECT_TSTEMPLATE:
 							Assert(stmt->args == NIL);
-							DefineTSTemplate(stmt->defnames,
-											 stmt->definition);
+							address = DefineTSTemplate(stmt->defnames,
+													   stmt->definition);
 							break;
 						case OBJECT_TSCONFIGURATION:
 							Assert(stmt->args == NIL);
-							DefineTSConfiguration(stmt->defnames,
-												  stmt->definition,
-												  NULL);
+							address = DefineTSConfiguration(stmt->defnames,
+															stmt->definition,
+															&secondaryObject);
 							break;
 						case OBJECT_COLLATION:
 							Assert(stmt->args == NIL);
-							DefineCollation(stmt->defnames, stmt->definition);
+							address = DefineCollation(stmt->defnames,
+													  stmt->definition);
 							break;
 						default:
 							elog(ERROR, "unrecognized define stmt type: %d",
@@ -1946,23 +2026,36 @@ ProcessUtilitySlow(Node *parsetree,
 					stmt = transformIndexStmt(relid, stmt, queryString);
 
 					/* ... and do it */
-					DefineIndex(relid,	/* OID of heap relation */
-								stmt,
-								InvalidOid,		/* no predefined OID */
-								false,	/* is_alter_table */
-								true,	/* check_rights */
-								false,	/* skip_build */
-								false); /* quiet */
+					EventTriggerAlterTableStart(parsetree);
+					address =
+						DefineIndex(relid,		/* OID of heap relation */
+									stmt,
+									InvalidOid, /* no predefined OID */
+									false,		/* is_alter_table */
+									true,		/* check_rights */
+									false,		/* skip_build */
+									false);		/* quiet */
+
 #ifdef PGXC
 					if (IS_PGXC_COORDINATOR && !stmt->isconstraint && !IsConnFromCoord())
 						ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote,
 								stmt->concurrent, exec_type, is_temp);
 #endif
+
+					/*
+					 * Add the CREATE INDEX node itself to stash right away;
+					 * if there were any commands stashed in the ALTER TABLE
+					 * code, we need them to appear after this one.
+					 */
+					EventTriggerCollectSimpleCommand(address, secondaryObject,
+													 parsetree);
+					commandCollected = true;
+					EventTriggerAlterTableEnd();
 				}
 				break;
 
 			case T_CreateExtensionStmt:
-				CreateExtension((CreateExtensionStmt *) parsetree);
+				address = CreateExtension((CreateExtensionStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -1970,7 +2063,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_AlterExtensionStmt:
-				ExecAlterExtensionStmt((AlterExtensionStmt *) parsetree);
+				address = ExecAlterExtensionStmt((AlterExtensionStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -1978,8 +2071,8 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_AlterExtensionContentsStmt:
-				ExecAlterExtensionContentsStmt((AlterExtensionContentsStmt *) parsetree,
-											   NULL);
+				address = ExecAlterExtensionContentsStmt((AlterExtensionContentsStmt *) parsetree,
+														 &secondaryObject);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -1997,11 +2090,11 @@ ProcessUtilitySlow(Node *parsetree,
 #endif
 						 errdetail("The feature is not currently supported")));
 #endif
-				CreateForeignDataWrapper((CreateFdwStmt *) parsetree);
+				address = CreateForeignDataWrapper((CreateFdwStmt *) parsetree);
 				break;
 
 			case T_AlterFdwStmt:
-				AlterForeignDataWrapper((AlterFdwStmt *) parsetree);
+				address = AlterForeignDataWrapper((AlterFdwStmt *) parsetree);
 				break;
 
 			case T_CreateForeignServerStmt:
@@ -2015,11 +2108,11 @@ ProcessUtilitySlow(Node *parsetree,
 #endif
 						 errdetail("The feature is not currently supported")));
 #endif
-				CreateForeignServer((CreateForeignServerStmt *) parsetree);
+				address = CreateForeignServer((CreateForeignServerStmt *) parsetree);
 				break;
 
 			case T_AlterForeignServerStmt:
-				AlterForeignServer((AlterForeignServerStmt *) parsetree);
+				address = AlterForeignServer((AlterForeignServerStmt *) parsetree);
 				break;
 
 			case T_CreateUserMappingStmt:
@@ -2033,26 +2126,31 @@ ProcessUtilitySlow(Node *parsetree,
 #endif
 						 errdetail("The feature is not currently supported")));
 #endif
-				CreateUserMapping((CreateUserMappingStmt *) parsetree);
+				address = CreateUserMapping((CreateUserMappingStmt *) parsetree);
 				break;
 
 			case T_AlterUserMappingStmt:
-				AlterUserMapping((AlterUserMappingStmt *) parsetree);
+				address = AlterUserMapping((AlterUserMappingStmt *) parsetree);
 				break;
 
 			case T_DropUserMappingStmt:
 				RemoveUserMapping((DropUserMappingStmt *) parsetree);
+				/* no commands stashed for DROP */
+				commandCollected = true;
 				break;
 
 			case T_ImportForeignSchemaStmt:
 				ImportForeignSchema((ImportForeignSchemaStmt *) parsetree);
+				/* commands are stashed inside ImportForeignSchema */
+				commandCollected = true;
 				break;
 
 			case T_CompositeTypeStmt:	/* CREATE TYPE (composite) */
 				{
 					CompositeTypeStmt *stmt = (CompositeTypeStmt *) parsetree;
 
-					DefineCompositeType(stmt->typevar, stmt->coldeflist);
+					address = DefineCompositeType(stmt->typevar,
+												  stmt->coldeflist);
 				}
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
@@ -2061,7 +2159,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_CreateEnumStmt:		/* CREATE TYPE AS ENUM */
-				DefineEnum((CreateEnumStmt *) parsetree);
+				address = DefineEnum((CreateEnumStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2069,7 +2167,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_CreateRangeStmt:		/* CREATE TYPE AS RANGE */
-				DefineRange((CreateRangeStmt *) parsetree);
+				address = DefineRange((CreateRangeStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2077,7 +2175,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_AlterEnumStmt:		/* ALTER TYPE (enum) */
-				AlterEnum((AlterEnumStmt *) parsetree, isTopLevel);
+				address = AlterEnum((AlterEnumStmt *) parsetree, isTopLevel);
 #ifdef PGXC
 				/*
 				 * In this case force autocommit, this transaction cannot be launched
@@ -2090,7 +2188,8 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_ViewStmt:	/* CREATE VIEW */
-				DefineView((ViewStmt *) parsetree, queryString);
+				EventTriggerAlterTableStart(parsetree);
+				address = DefineView((ViewStmt *) parsetree, queryString);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 				{
@@ -2104,10 +2203,15 @@ ProcessUtilitySlow(Node *parsetree,
 							ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_COORDS, false);
 				}
 #endif
+				EventTriggerCollectSimpleCommand(address, secondaryObject,
+												 parsetree);
+				/* stashed internally */
+				commandCollected = true;
+				EventTriggerAlterTableEnd();
 				break;
 
 			case T_CreateFunctionStmt:	/* CREATE FUNCTION */
-				CreateFunction((CreateFunctionStmt *) parsetree, queryString);
+				address = CreateFunction((CreateFunctionStmt *) parsetree, queryString);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2115,7 +2219,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_AlterFunctionStmt:	/* ALTER FUNCTION */
-				AlterFunction((AlterFunctionStmt *) parsetree);
+				address = AlterFunction((AlterFunctionStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2123,7 +2227,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_RuleStmt:	/* CREATE RULE */
-				DefineRule((RuleStmt *) parsetree, queryString);
+				address = DefineRule((RuleStmt *) parsetree, queryString);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 				{
@@ -2137,7 +2241,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_CreateSeqStmt:
-				DefineSequence((CreateSeqStmt *) parsetree);
+				address = DefineSequence((CreateSeqStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 				{
@@ -2161,7 +2265,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_AlterSeqStmt:
-				AlterSequence((AlterSeqStmt *) parsetree);
+				address = AlterSequence((AlterSeqStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 				{
@@ -2188,8 +2292,8 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_CreateTableAsStmt:
-				ExecCreateTableAs((CreateTableAsStmt *) parsetree,
-								  queryString, params, completionTag);
+				address = ExecCreateTableAs((CreateTableAsStmt *) parsetree,
+										 queryString, params, completionTag);
 #ifdef PGXC
 				if ((IS_PGXC_COORDINATOR) && !IsConnFromCoord())
 				{
@@ -2208,23 +2312,38 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_RefreshMatViewStmt:
-				ExecRefreshMatView((RefreshMatViewStmt *) parsetree,
-								   queryString, params, completionTag);
-#ifdef PGXC
-				if ((IS_PGXC_COORDINATOR) && !IsConnFromCoord())
+
+				/*
+				 * REFRSH CONCURRENTLY executes some DDL commands internally.
+				 * Inhibit DDL command collection here to avoid those commands
+				 * from showing up in the deparsed command queue.  The refresh
+				 * command itself is queued, which is enough.
+				 */
+				EventTriggerInhibitCommandCollection();
+				PG_TRY();
 				{
-					RefreshMatViewStmt *stmt = (RefreshMatViewStmt *) parsetree;
-					if (stmt->relation->relpersistence != RELPERSISTENCE_TEMP)
+					address = ExecRefreshMatView((RefreshMatViewStmt *) parsetree,
+										 queryString, params, completionTag);
+#ifdef PGXC
+					if ((IS_PGXC_COORDINATOR) && !IsConnFromCoord())
+					{
+						RefreshMatViewStmt *stmt = (RefreshMatViewStmt *) parsetree;
+						if (stmt->relation->relpersistence != RELPERSISTENCE_TEMP)
 							ExecUtilityStmtOnNodes(queryString, NULL,
 									sentToRemote, false, EXEC_ON_COORDS, false);
-				}
+					}
 #endif
+				}
+				PG_CATCH();
+				{
+					EventTriggerUndoInhibitCommandCollection();
+					PG_RE_THROW();
+				}
+				PG_END_TRY();
+				EventTriggerUndoInhibitCommandCollection();
 				break;
 
 			case T_CreateTrigStmt:
-				(void) CreateTrigger((CreateTrigStmt *) parsetree, queryString,
-									 InvalidOid, InvalidOid, InvalidOid,
-									 InvalidOid, false);
 #ifdef PGXC
 				/* Postgres-XC does not support yet triggers */
 				ereport(ERROR,
@@ -2239,10 +2358,13 @@ ProcessUtilitySlow(Node *parsetree,
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
 #endif
+				address = CreateTrigger((CreateTrigStmt *) parsetree,
+										queryString, InvalidOid, InvalidOid,
+										InvalidOid, InvalidOid, false);
 				break;
 
 			case T_CreatePLangStmt:
-				CreateProceduralLanguage((CreatePLangStmt *) parsetree);
+				address = CreateProceduralLanguage((CreatePLangStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2250,7 +2372,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_CreateDomainStmt:
-				DefineDomain((CreateDomainStmt *) parsetree);
+				address = DefineDomain((CreateDomainStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2258,7 +2380,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_CreateConversionStmt:
-				CreateConversionCommand((CreateConversionStmt *) parsetree);
+				address = CreateConversionCommand((CreateConversionStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2266,7 +2388,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_CreateCastStmt:
-				CreateCast((CreateCastStmt *) parsetree);
+				address = CreateCast((CreateCastStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2279,26 +2401,34 @@ ProcessUtilitySlow(Node *parsetree,
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
 #endif
+				/* command is stashed in DefineOpClass */
+				commandCollected = true;
 				break;
 
 			case T_CreateOpFamilyStmt:
-				DefineOpFamily((CreateOpFamilyStmt *) parsetree);
+				address = DefineOpFamily((CreateOpFamilyStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
 #endif
 				break;
 
+			case T_CreateTransformStmt:
+				CreateTransform((CreateTransformStmt *) parsetree);
+				break;
+
 			case T_AlterOpFamilyStmt:
 				AlterOpFamily((AlterOpFamilyStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
 #endif
+				/* commands are stashed in AlterOpFamily */
+				commandCollected = true;
 				break;
 
 			case T_AlterTSDictionaryStmt:
-				AlterTSDictionary((AlterTSDictionaryStmt *) parsetree);
+				address = AlterTSDictionary((AlterTSDictionaryStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2306,7 +2436,7 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 
 			case T_AlterTSConfigurationStmt:
-				AlterTSConfiguration((AlterTSConfigurationStmt *) parsetree);
+				address = AlterTSConfiguration((AlterTSConfigurationStmt *) parsetree);
 #ifdef PGXC
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
@@ -2315,6 +2445,8 @@ ProcessUtilitySlow(Node *parsetree,
 
 			case T_AlterTableMoveAllStmt:
 				AlterTableMoveAll((AlterTableMoveAllStmt *) parsetree);
+				/* commands are stashed in AlterTableMoveAll */
+				commandCollected = true;
 				break;
 
 			case T_DropStmt:
@@ -2323,27 +2455,32 @@ ProcessUtilitySlow(Node *parsetree,
 #else
 				ExecDropStmt((DropStmt *) parsetree, isTopLevel);
 #endif
+				/* no commands stashed for DROP */
+				commandCollected = true;
 				break;
 
 			case T_RenameStmt:
-				ExecRenameStmt((RenameStmt *) parsetree);
+				address = ExecRenameStmt((RenameStmt *) parsetree);
 				break;
 
 			case T_AlterObjectSchemaStmt:
-				ExecAlterObjectSchemaStmt((AlterObjectSchemaStmt *) parsetree,
-										  NULL);
+				address =
+					ExecAlterObjectSchemaStmt((AlterObjectSchemaStmt *) parsetree,
+											  &secondaryObject);
 				break;
 
 			case T_AlterOwnerStmt:
-				ExecAlterOwnerStmt((AlterOwnerStmt *) parsetree);
+				address = ExecAlterOwnerStmt((AlterOwnerStmt *) parsetree);
 				break;
 
 			case T_CommentStmt:
-				CommentObject((CommentStmt *) parsetree);
+				address = CommentObject((CommentStmt *) parsetree);
 				break;
 
 			case T_GrantStmt:
 				ExecuteGrantStmt((GrantStmt *) parsetree);
+				/* commands are stashed in ExecGrantStmt_oids */
+				commandCollected = true;
 				break;
 
 			case T_DropOwnedStmt:
@@ -2352,6 +2489,8 @@ ProcessUtilitySlow(Node *parsetree,
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
 #endif
+				/* no commands stashed for DROP */
+				commandCollected = true;
 				break;
 
 			case T_AlterDefaultPrivilegesStmt:
@@ -2361,18 +2500,20 @@ ProcessUtilitySlow(Node *parsetree,
 				if (IS_PGXC_LOCAL_COORDINATOR)
 					ExecUtilityStmtOnNodes(queryString, NULL, sentToRemote, false, EXEC_ON_ALL_NODES, false);
 #endif
+				EventTriggerCollectAlterDefPrivs((AlterDefaultPrivilegesStmt *) parsetree);
+				commandCollected = true;
 				break;
 
 			case T_CreatePolicyStmt:	/* CREATE POLICY */
-				CreatePolicy((CreatePolicyStmt *) parsetree);
+				address = CreatePolicy((CreatePolicyStmt *) parsetree);
 				break;
 
 			case T_AlterPolicyStmt:		/* ALTER POLICY */
-				AlterPolicy((AlterPolicyStmt *) parsetree);
+				address = AlterPolicy((AlterPolicyStmt *) parsetree);
 				break;
 
 			case T_SecLabelStmt:
-				ExecSecLabelStmt((SecLabelStmt *) parsetree);
+				address = ExecSecLabelStmt((SecLabelStmt *) parsetree);
 				break;
 
 			default:
@@ -2381,6 +2522,14 @@ ProcessUtilitySlow(Node *parsetree,
 				break;
 		}
 
+		/*
+		 * Remember the object so that ddl_command_end event triggers have
+		 * access to it.
+		 */
+		if (!commandCollected)
+			EventTriggerCollectSimpleCommand(address, secondaryObject,
+											 parsetree);
+
 		if (isCompleteQuery)
 		{
 			EventTriggerSQLDrop(parsetree);
@@ -3042,6 +3191,9 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_POLICY:
 					tag = "DROP POLICY";
 					break;
+				case OBJECT_TRANSFORM:
+					tag = "DROP TRANSFORM";
+					break;
 				default:
 					tag = "???";
 			}
@@ -3301,6 +3453,10 @@ CreateCommandTag(Node *parsetree)
 			}
 			break;
 
+		case T_CreateTransformStmt:
+			tag = "CREATE TRANSFORM";
+			break;
+
 		case T_CreateTrigStmt:
 			tag = "CREATE TRIGGER";
 			break;
@@ -3965,6 +4121,10 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_DDL;
 			break;
 
+		case T_CreateTransformStmt:
+			lev = LOGSTMT_DDL;
+			break;
+
 		case T_AlterOpFamilyStmt:
 			lev = LOGSTMT_DDL;
 			break;
@@ -4254,7 +4414,7 @@ ExecUtilityFindNodesRelkind(Oid relid, bool *is_temp)
 #endif
 		case RELKIND_RELATION:
 #ifdef XCP
-				if (*is_temp = IsTempTable(relid))
+				if ((*is_temp = IsTempTable(relid)))
 				{
 					if (IsLocalTempTable(relid))
 						exec_type = EXEC_ON_NONE;
diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c
index 26725a86b2..ee7e6cdbbb 100644
--- a/src/backend/tsearch/dict_synonym.c
+++ b/src/backend/tsearch/dict_synonym.c
@@ -37,7 +37,7 @@ typedef struct
  * Returns a pointer to the first character of the word, and a pointer
  * to the next byte after the last character in the word (in *end).
  * Character '*' at the end of word will not be threated as word
- * charater if flags is not null.
+ * character if flags is not null.
  */
 static char *
 findwrd(char *in, char **end, uint16 *flags)
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
index 1c036d5d38..3af1904821 100644
--- a/src/backend/tsearch/spell.c
+++ b/src/backend/tsearch/spell.c
@@ -1335,8 +1335,8 @@ CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *neww
 	else
 	{
 		/*
-		 * if prefix is a all non-chaged part's length then all word contains
-		 * only prefix and suffix, so out
+		 * if prefix is an all non-changed part's length then all word
+		 * contains only prefix and suffix, so out
 		 */
 		if (baselen && *baselen + strlen(Affix->find) <= Affix->replen)
 			return NULL;
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 1f1bee7fb5..3ed0b4409e 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -16,10 +16,11 @@ endif
 endif
 
 # keep this list arranged alphabetically or it gets to be a mess
-OBJS = acl.o arrayfuncs.o array_selfuncs.o array_typanalyze.o \
-	array_userfuncs.o arrayutils.o ascii.o bool.o \
-	cash.o char.o date.o datetime.o datum.o dbsize.o domains.o \
-	encode.o enum.o float.o format_type.o formatting.o genfile.o \
+OBJS = acl.o arrayfuncs.o array_expanded.o array_selfuncs.o \
+	array_typanalyze.o array_userfuncs.o arrayutils.o ascii.o \
+	bool.o cash.o char.o date.o datetime.o datum.o dbsize.o domains.o \
+	encode.o enum.o expandeddatum.o \
+	float.o format_type.o formatting.o genfile.o \
 	geo_ops.o geo_selfuncs.o inet_cidr_ntop.o inet_net_pton.o int.o \
 	int8.o json.o jsonb.o jsonb_gin.o jsonb_op.o jsonb_util.o \
 	jsonfuncs.o like.o lockfuncs.o mac.o misc.o nabstime.o name.o \
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 7701fc5ac0..3ca168b473 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -4878,7 +4878,7 @@ check_is_member_of_role(Oid member, Oid role)
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("must be member of role \"%s\"",
-						GetUserNameFromId(role))));
+						GetUserNameFromId(role, false))));
 }
 
 /*
@@ -5202,7 +5202,7 @@ get_rolespec_tuple(const Node *node)
 			if (!HeapTupleIsValid(tuple))
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_OBJECT),
-						 errmsg("role \"%s\" does not exist", role->rolename)));
+					  errmsg("role \"%s\" does not exist", role->rolename)));
 			break;
 
 		case ROLESPEC_CURRENT_USER:
@@ -5221,7 +5221,7 @@ get_rolespec_tuple(const Node *node)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
 					 errmsg("role \"%s\" does not exist", "public")));
-			tuple = NULL;	/* make compiler happy */
+			tuple = NULL;		/* make compiler happy */
 
 		default:
 			elog(ERROR, "unexpected role type %d", role->roletype);
diff --git a/src/backend/utils/adt/array_expanded.c b/src/backend/utils/adt/array_expanded.c
new file mode 100644
index 0000000000..97fd4440c8
--- /dev/null
+++ b/src/backend/utils/adt/array_expanded.c
@@ -0,0 +1,455 @@
+/*-------------------------------------------------------------------------
+ *
+ * array_expanded.c
+ *	  Basic functions for manipulating expanded arrays.
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/adt/array_expanded.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/tupmacs.h"
+#include "utils/array.h"
+#include "utils/lsyscache.h"
+#include "utils/memutils.h"
+
+
+/* "Methods" required for an expanded object */
+static Size EA_get_flat_size(ExpandedObjectHeader *eohptr);
+static void EA_flatten_into(ExpandedObjectHeader *eohptr,
+				void *result, Size allocated_size);
+
+static const ExpandedObjectMethods EA_methods =
+{
+	EA_get_flat_size,
+	EA_flatten_into
+};
+
+/* Other local functions */
+static void copy_byval_expanded_array(ExpandedArrayHeader *eah,
+						  ExpandedArrayHeader *oldeah);
+
+
+/*
+ * expand_array: convert an array Datum into an expanded array
+ *
+ * The expanded object will be a child of parentcontext.
+ *
+ * Some callers can provide cache space to avoid repeated lookups of element
+ * type data across calls; if so, pass a metacache pointer, making sure that
+ * metacache->element_type is initialized to InvalidOid before first call.
+ * If no cross-call caching is required, pass NULL for metacache.
+ */
+Datum
+expand_array(Datum arraydatum, MemoryContext parentcontext,
+			 ArrayMetaState *metacache)
+{
+	ArrayType  *array;
+	ExpandedArrayHeader *eah;
+	MemoryContext objcxt;
+	MemoryContext oldcxt;
+	ArrayMetaState fakecache;
+
+	/*
+	 * Allocate private context for expanded object.  We start by assuming
+	 * that the array won't be very large; but if it does grow a lot, don't
+	 * constrain aset.c's large-context behavior.
+	 */
+	objcxt = AllocSetContextCreate(parentcontext,
+								   "expanded array",
+								   ALLOCSET_SMALL_MINSIZE,
+								   ALLOCSET_SMALL_INITSIZE,
+								   ALLOCSET_DEFAULT_MAXSIZE);
+
+	/* Set up expanded array header */
+	eah = (ExpandedArrayHeader *)
+		MemoryContextAlloc(objcxt, sizeof(ExpandedArrayHeader));
+
+	EOH_init_header(&eah->hdr, &EA_methods, objcxt);
+	eah->ea_magic = EA_MAGIC;
+
+	/* If the source is an expanded array, we may be able to optimize */
+	if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(arraydatum)))
+	{
+		ExpandedArrayHeader *oldeah = (ExpandedArrayHeader *) DatumGetEOHP(arraydatum);
+
+		Assert(oldeah->ea_magic == EA_MAGIC);
+
+		/*
+		 * Update caller's cache if provided; we don't need it this time, but
+		 * next call might be for a non-expanded source array.  Furthermore,
+		 * if the caller didn't provide a cache area, use some local storage
+		 * to cache anyway, thereby avoiding a catalog lookup in the case
+		 * where we fall through to the flat-copy code path.
+		 */
+		if (metacache == NULL)
+			metacache = &fakecache;
+		metacache->element_type = oldeah->element_type;
+		metacache->typlen = oldeah->typlen;
+		metacache->typbyval = oldeah->typbyval;
+		metacache->typalign = oldeah->typalign;
+
+		/*
+		 * If element type is pass-by-value and we have a Datum-array
+		 * representation, just copy the source's metadata and Datum/isnull
+		 * arrays.  The original flat array, if present at all, adds no
+		 * additional information so we need not copy it.
+		 */
+		if (oldeah->typbyval && oldeah->dvalues != NULL)
+		{
+			copy_byval_expanded_array(eah, oldeah);
+			/* return a R/W pointer to the expanded array */
+			return EOHPGetRWDatum(&eah->hdr);
+		}
+
+		/*
+		 * Otherwise, either we have only a flat representation or the
+		 * elements are pass-by-reference.  In either case, the best thing
+		 * seems to be to copy the source as a flat representation and then
+		 * deconstruct that later if necessary.  For the pass-by-ref case, we
+		 * could perhaps save some cycles with custom code that generates the
+		 * deconstructed representation in parallel with copying the values,
+		 * but it would be a lot of extra code for fairly marginal gain.  So,
+		 * fall through into the flat-source code path.
+		 */
+	}
+
+	/*
+	 * Detoast and copy source array into private context, as a flat array.
+	 *
+	 * Note that this coding risks leaking some memory in the private context
+	 * if we have to fetch data from a TOAST table; however, experimentation
+	 * says that the leak is minimal.  Doing it this way saves a copy step,
+	 * which seems worthwhile, especially if the array is large enough to need
+	 * external storage.
+	 */
+	oldcxt = MemoryContextSwitchTo(objcxt);
+	array = DatumGetArrayTypePCopy(arraydatum);
+	MemoryContextSwitchTo(oldcxt);
+
+	eah->ndims = ARR_NDIM(array);
+	/* note these pointers point into the fvalue header! */
+	eah->dims = ARR_DIMS(array);
+	eah->lbound = ARR_LBOUND(array);
+
+	/* Save array's element-type data for possible use later */
+	eah->element_type = ARR_ELEMTYPE(array);
+	if (metacache && metacache->element_type == eah->element_type)
+	{
+		/* We have a valid cache of representational data */
+		eah->typlen = metacache->typlen;
+		eah->typbyval = metacache->typbyval;
+		eah->typalign = metacache->typalign;
+	}
+	else
+	{
+		/* No, so look it up */
+		get_typlenbyvalalign(eah->element_type,
+							 &eah->typlen,
+							 &eah->typbyval,
+							 &eah->typalign);
+		/* Update cache if provided */
+		if (metacache)
+		{
+			metacache->element_type = eah->element_type;
+			metacache->typlen = eah->typlen;
+			metacache->typbyval = eah->typbyval;
+			metacache->typalign = eah->typalign;
+		}
+	}
+
+	/* we don't make a deconstructed representation now */
+	eah->dvalues = NULL;
+	eah->dnulls = NULL;
+	eah->dvalueslen = 0;
+	eah->nelems = 0;
+	eah->flat_size = 0;
+
+	/* remember we have a flat representation */
+	eah->fvalue = array;
+	eah->fstartptr = ARR_DATA_PTR(array);
+	eah->fendptr = ((char *) array) + ARR_SIZE(array);
+
+	/* return a R/W pointer to the expanded array */
+	return EOHPGetRWDatum(&eah->hdr);
+}
+
+/*
+ * helper for expand_array(): copy pass-by-value Datum-array representation
+ */
+static void
+copy_byval_expanded_array(ExpandedArrayHeader *eah,
+						  ExpandedArrayHeader *oldeah)
+{
+	MemoryContext objcxt = eah->hdr.eoh_context;
+	int			ndims = oldeah->ndims;
+	int			dvalueslen = oldeah->dvalueslen;
+
+	/* Copy array dimensionality information */
+	eah->ndims = ndims;
+	/* We can alloc both dimensionality arrays with one palloc */
+	eah->dims = (int *) MemoryContextAlloc(objcxt, ndims * 2 * sizeof(int));
+	eah->lbound = eah->dims + ndims;
+	/* .. but don't assume the source's arrays are contiguous */
+	memcpy(eah->dims, oldeah->dims, ndims * sizeof(int));
+	memcpy(eah->lbound, oldeah->lbound, ndims * sizeof(int));
+
+	/* Copy element-type data */
+	eah->element_type = oldeah->element_type;
+	eah->typlen = oldeah->typlen;
+	eah->typbyval = oldeah->typbyval;
+	eah->typalign = oldeah->typalign;
+
+	/* Copy the deconstructed representation */
+	eah->dvalues = (Datum *) MemoryContextAlloc(objcxt,
+												dvalueslen * sizeof(Datum));
+	memcpy(eah->dvalues, oldeah->dvalues, dvalueslen * sizeof(Datum));
+	if (oldeah->dnulls)
+	{
+		eah->dnulls = (bool *) MemoryContextAlloc(objcxt,
+												  dvalueslen * sizeof(bool));
+		memcpy(eah->dnulls, oldeah->dnulls, dvalueslen * sizeof(bool));
+	}
+	else
+		eah->dnulls = NULL;
+	eah->dvalueslen = dvalueslen;
+	eah->nelems = oldeah->nelems;
+	eah->flat_size = oldeah->flat_size;
+
+	/* we don't make a flat representation */
+	eah->fvalue = NULL;
+	eah->fstartptr = NULL;
+	eah->fendptr = NULL;
+}
+
+/*
+ * get_flat_size method for expanded arrays
+ */
+static Size
+EA_get_flat_size(ExpandedObjectHeader *eohptr)
+{
+	ExpandedArrayHeader *eah = (ExpandedArrayHeader *) eohptr;
+	int			nelems;
+	int			ndims;
+	Datum	   *dvalues;
+	bool	   *dnulls;
+	Size		nbytes;
+	int			i;
+
+	Assert(eah->ea_magic == EA_MAGIC);
+
+	/* Easy if we have a valid flattened value */
+	if (eah->fvalue)
+		return ARR_SIZE(eah->fvalue);
+
+	/* If we have a cached size value, believe that */
+	if (eah->flat_size)
+		return eah->flat_size;
+
+	/*
+	 * Compute space needed by examining dvalues/dnulls.  Note that the result
+	 * array will have a nulls bitmap if dnulls isn't NULL, even if the array
+	 * doesn't actually contain any nulls now.
+	 */
+	nelems = eah->nelems;
+	ndims = eah->ndims;
+	Assert(nelems == ArrayGetNItems(ndims, eah->dims));
+	dvalues = eah->dvalues;
+	dnulls = eah->dnulls;
+	nbytes = 0;
+	for (i = 0; i < nelems; i++)
+	{
+		if (dnulls && dnulls[i])
+			continue;
+		nbytes = att_addlength_datum(nbytes, eah->typlen, dvalues[i]);
+		nbytes = att_align_nominal(nbytes, eah->typalign);
+		/* check for overflow of total request */
+		if (!AllocSizeIsValid(nbytes))
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("array size exceeds the maximum allowed (%d)",
+							(int) MaxAllocSize)));
+	}
+
+	if (dnulls)
+		nbytes += ARR_OVERHEAD_WITHNULLS(ndims, nelems);
+	else
+		nbytes += ARR_OVERHEAD_NONULLS(ndims);
+
+	/* cache for next time */
+	eah->flat_size = nbytes;
+
+	return nbytes;
+}
+
+/*
+ * flatten_into method for expanded arrays
+ */
+static void
+EA_flatten_into(ExpandedObjectHeader *eohptr,
+				void *result, Size allocated_size)
+{
+	ExpandedArrayHeader *eah = (ExpandedArrayHeader *) eohptr;
+	ArrayType  *aresult = (ArrayType *) result;
+	int			nelems;
+	int			ndims;
+	int32		dataoffset;
+
+	Assert(eah->ea_magic == EA_MAGIC);
+
+	/* Easy if we have a valid flattened value */
+	if (eah->fvalue)
+	{
+		Assert(allocated_size == ARR_SIZE(eah->fvalue));
+		memcpy(result, eah->fvalue, allocated_size);
+		return;
+	}
+
+	/* Else allocation should match previous get_flat_size result */
+	Assert(allocated_size == eah->flat_size);
+
+	/* Fill result array from dvalues/dnulls */
+	nelems = eah->nelems;
+	ndims = eah->ndims;
+
+	if (eah->dnulls)
+		dataoffset = ARR_OVERHEAD_WITHNULLS(ndims, nelems);
+	else
+		dataoffset = 0;			/* marker for no null bitmap */
+
+	/* We must ensure that any pad space is zero-filled */
+	memset(aresult, 0, allocated_size);
+
+	SET_VARSIZE(aresult, allocated_size);
+	aresult->ndim = ndims;
+	aresult->dataoffset = dataoffset;
+	aresult->elemtype = eah->element_type;
+	memcpy(ARR_DIMS(aresult), eah->dims, ndims * sizeof(int));
+	memcpy(ARR_LBOUND(aresult), eah->lbound, ndims * sizeof(int));
+
+	CopyArrayEls(aresult,
+				 eah->dvalues, eah->dnulls, nelems,
+				 eah->typlen, eah->typbyval, eah->typalign,
+				 false);
+}
+
+/*
+ * Argument fetching support code
+ */
+
+/*
+ * DatumGetExpandedArray: get a writable expanded array from an input argument
+ *
+ * Caution: if the input is a read/write pointer, this returns the input
+ * argument; so callers must be sure that their changes are "safe", that is
+ * they cannot leave the array in a corrupt state.
+ */
+ExpandedArrayHeader *
+DatumGetExpandedArray(Datum d)
+{
+	/* If it's a writable expanded array already, just return it */
+	if (VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(d)))
+	{
+		ExpandedArrayHeader *eah = (ExpandedArrayHeader *) DatumGetEOHP(d);
+
+		Assert(eah->ea_magic == EA_MAGIC);
+		return eah;
+	}
+
+	/* Else expand the hard way */
+	d = expand_array(d, CurrentMemoryContext, NULL);
+	return (ExpandedArrayHeader *) DatumGetEOHP(d);
+}
+
+/*
+ * As above, when caller has the ability to cache element type info
+ */
+ExpandedArrayHeader *
+DatumGetExpandedArrayX(Datum d, ArrayMetaState *metacache)
+{
+	/* If it's a writable expanded array already, just return it */
+	if (VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(d)))
+	{
+		ExpandedArrayHeader *eah = (ExpandedArrayHeader *) DatumGetEOHP(d);
+
+		Assert(eah->ea_magic == EA_MAGIC);
+		/* Update cache if provided */
+		if (metacache)
+		{
+			metacache->element_type = eah->element_type;
+			metacache->typlen = eah->typlen;
+			metacache->typbyval = eah->typbyval;
+			metacache->typalign = eah->typalign;
+		}
+		return eah;
+	}
+
+	/* Else expand using caller's cache if any */
+	d = expand_array(d, CurrentMemoryContext, metacache);
+	return (ExpandedArrayHeader *) DatumGetEOHP(d);
+}
+
+/*
+ * DatumGetAnyArray: return either an expanded array or a detoasted varlena
+ * array.  The result must not be modified in-place.
+ */
+AnyArrayType *
+DatumGetAnyArray(Datum d)
+{
+	ExpandedArrayHeader *eah;
+
+	/*
+	 * If it's an expanded array (RW or RO), return the header pointer.
+	 */
+	if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(d)))
+	{
+		eah = (ExpandedArrayHeader *) DatumGetEOHP(d);
+		Assert(eah->ea_magic == EA_MAGIC);
+		return (AnyArrayType *) eah;
+	}
+
+	/* Else do regular detoasting as needed */
+	return (AnyArrayType *) PG_DETOAST_DATUM(d);
+}
+
+/*
+ * Create the Datum/isnull representation of an expanded array object
+ * if we didn't do so previously
+ */
+void
+deconstruct_expanded_array(ExpandedArrayHeader *eah)
+{
+	if (eah->dvalues == NULL)
+	{
+		MemoryContext oldcxt = MemoryContextSwitchTo(eah->hdr.eoh_context);
+		Datum	   *dvalues;
+		bool	   *dnulls;
+		int			nelems;
+
+		dnulls = NULL;
+		deconstruct_array(eah->fvalue,
+						  eah->element_type,
+						  eah->typlen, eah->typbyval, eah->typalign,
+						  &dvalues,
+						  ARR_HASNULL(eah->fvalue) ? &dnulls : NULL,
+						  &nelems);
+
+		/*
+		 * Update header only after successful completion of this step.  If
+		 * deconstruct_array fails partway through, worst consequence is some
+		 * leaked memory in the object's context.  If the caller fails at a
+		 * later point, that's fine, since the deconstructed representation is
+		 * valid anyhow.
+		 */
+		eah->dvalues = dvalues;
+		eah->dnulls = dnulls;
+		eah->dvalueslen = eah->nelems = nelems;
+		MemoryContextSwitchTo(oldcxt);
+	}
+}
diff --git a/src/backend/utils/adt/array_selfuncs.c b/src/backend/utils/adt/array_selfuncs.c
index 6cd28c8c53..9d023c2621 100644
--- a/src/backend/utils/adt/array_selfuncs.c
+++ b/src/backend/utils/adt/array_selfuncs.c
@@ -300,7 +300,7 @@ arraycontsel(PG_FUNCTION_ARGS)
 
 	/*
 	 * OK, there's a Var and a Const we're dealing with here.  We need the
-	 * Const to be a array with same element type as column, else we can't do
+	 * Const to be an array with same element type as column, else we can't do
 	 * anything useful.  (Such cases will likely fail at runtime, but here
 	 * we'd rather just return a default estimate.)
 	 */
@@ -358,7 +358,7 @@ calc_arraycontsel(VariableStatData *vardata, Datum constval,
 	cmpfunc = &typentry->cmp_proc_finfo;
 
 	/*
-	 * The caller made sure the const is a array with same element type, so
+	 * The caller made sure the const is an array with same element type, so
 	 * get it now
 	 */
 	array = DatumGetArrayTypeP(constval);
diff --git a/src/backend/utils/adt/array_typanalyze.c b/src/backend/utils/adt/array_typanalyze.c
index 742f94d92a..ffe8035eb4 100644
--- a/src/backend/utils/adt/array_typanalyze.c
+++ b/src/backend/utils/adt/array_typanalyze.c
@@ -157,7 +157,7 @@ array_typanalyze(PG_FUNCTION_ARGS)
 }
 
 /*
- * compute_array_stats() -- compute statistics for a array column
+ * compute_array_stats() -- compute statistics for an array column
  *
  * This function computes statistics useful for determining selectivity of
  * the array operators <@, &&, and @>.  It is invoked by ANALYZE via the
diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c
index 4177d2da17..c14ea23dfb 100644
--- a/src/backend/utils/adt/array_userfuncs.c
+++ b/src/backend/utils/adt/array_userfuncs.c
@@ -25,22 +25,36 @@ static Datum array_position_common(FunctionCallInfo fcinfo);
 /*
  * fetch_array_arg_replace_nulls
  *
- * Fetch an array-valued argument; if it's null, construct an empty array
- * value of the proper data type.  Also cache basic element type information
- * in fn_extra.
+ * Fetch an array-valued argument in expanded form; if it's null, construct an
+ * empty array value of the proper data type.  Also cache basic element type
+ * information in fn_extra.
+ *
+ * Caution: if the input is a read/write pointer, this returns the input
+ * argument; so callers must be sure that their changes are "safe", that is
+ * they cannot leave the array in a corrupt state.
  */
-static ArrayType *
+static ExpandedArrayHeader *
 fetch_array_arg_replace_nulls(FunctionCallInfo fcinfo, int argno)
 {
-	ArrayType  *v;
+	ExpandedArrayHeader *eah;
 	Oid			element_type;
 	ArrayMetaState *my_extra;
 
-	/* First collect the array value */
+	/* If first time through, create datatype cache struct */
+	my_extra = (ArrayMetaState *) fcinfo->flinfo->fn_extra;
+	if (my_extra == NULL)
+	{
+		my_extra = (ArrayMetaState *)
+			MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
+							   sizeof(ArrayMetaState));
+		my_extra->element_type = InvalidOid;
+		fcinfo->flinfo->fn_extra = my_extra;
+	}
+
+	/* Now collect the array value */
 	if (!PG_ARGISNULL(argno))
 	{
-		v = PG_GETARG_ARRAYTYPE_P(argno);
-		element_type = ARR_ELEMTYPE(v);
+		eah = PG_GETARG_EXPANDED_ARRAYX(argno, my_extra);
 	}
 	else
 	{
@@ -57,30 +71,12 @@ fetch_array_arg_replace_nulls(FunctionCallInfo fcinfo, int argno)
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("input data type is not an array")));
 
-		v = construct_empty_array(element_type);
-	}
-
-	/* Now cache required info, which might change from call to call */
-	my_extra = (ArrayMetaState *) fcinfo->flinfo->fn_extra;
-	if (my_extra == NULL)
-	{
-		my_extra = (ArrayMetaState *)
-			MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
-							   sizeof(ArrayMetaState));
-		my_extra->element_type = InvalidOid;
-		fcinfo->flinfo->fn_extra = my_extra;
-	}
-
-	if (my_extra->element_type != element_type)
-	{
-		get_typlenbyvalalign(element_type,
-							 &my_extra->typlen,
-							 &my_extra->typbyval,
-							 &my_extra->typalign);
-		my_extra->element_type = element_type;
+		eah = construct_empty_expanded_array(element_type,
+											 CurrentMemoryContext,
+											 my_extra);
 	}
 
-	return v;
+	return eah;
 }
 
 /*-----------------------------------------------------------------------------
@@ -91,29 +87,29 @@ fetch_array_arg_replace_nulls(FunctionCallInfo fcinfo, int argno)
 Datum
 array_append(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v;
+	ExpandedArrayHeader *eah;
 	Datum		newelem;
 	bool		isNull;
-	ArrayType  *result;
+	Datum		result;
 	int		   *dimv,
 			   *lb;
 	int			indx;
 	ArrayMetaState *my_extra;
 
-	v = fetch_array_arg_replace_nulls(fcinfo, 0);
+	eah = fetch_array_arg_replace_nulls(fcinfo, 0);
 	isNull = PG_ARGISNULL(1);
 	if (isNull)
 		newelem = (Datum) 0;
 	else
 		newelem = PG_GETARG_DATUM(1);
 
-	if (ARR_NDIM(v) == 1)
+	if (eah->ndims == 1)
 	{
 		/* append newelem */
 		int			ub;
 
-		lb = ARR_LBOUND(v);
-		dimv = ARR_DIMS(v);
+		lb = eah->lbound;
+		dimv = eah->dims;
 		ub = dimv[0] + lb[0] - 1;
 		indx = ub + 1;
 
@@ -123,7 +119,7 @@ array_append(PG_FUNCTION_ARGS)
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("integer out of range")));
 	}
-	else if (ARR_NDIM(v) == 0)
+	else if (eah->ndims == 0)
 		indx = 1;
 	else
 		ereport(ERROR,
@@ -133,10 +129,11 @@ array_append(PG_FUNCTION_ARGS)
 	/* Perform element insertion */
 	my_extra = (ArrayMetaState *) fcinfo->flinfo->fn_extra;
 
-	result = array_set(v, 1, &indx, newelem, isNull,
+	result = array_set_element(EOHPGetRWDatum(&eah->hdr),
+							   1, &indx, newelem, isNull,
 			   -1, my_extra->typlen, my_extra->typbyval, my_extra->typalign);
 
-	PG_RETURN_ARRAYTYPE_P(result);
+	PG_RETURN_DATUM(result);
 }
 
 /*-----------------------------------------------------------------------------
@@ -147,12 +144,13 @@ array_append(PG_FUNCTION_ARGS)
 Datum
 array_prepend(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v;
+	ExpandedArrayHeader *eah;
 	Datum		newelem;
 	bool		isNull;
-	ArrayType  *result;
+	Datum		result;
 	int		   *lb;
 	int			indx;
+	int			lb0;
 	ArrayMetaState *my_extra;
 
 	isNull = PG_ARGISNULL(0);
@@ -160,13 +158,14 @@ array_prepend(PG_FUNCTION_ARGS)
 		newelem = (Datum) 0;
 	else
 		newelem = PG_GETARG_DATUM(0);
-	v = fetch_array_arg_replace_nulls(fcinfo, 1);
+	eah = fetch_array_arg_replace_nulls(fcinfo, 1);
 
-	if (ARR_NDIM(v) == 1)
+	if (eah->ndims == 1)
 	{
 		/* prepend newelem */
-		lb = ARR_LBOUND(v);
+		lb = eah->lbound;
 		indx = lb[0] - 1;
+		lb0 = lb[0];
 
 		/* overflow? */
 		if (indx > lb[0])
@@ -174,8 +173,11 @@ array_prepend(PG_FUNCTION_ARGS)
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("integer out of range")));
 	}
-	else if (ARR_NDIM(v) == 0)
+	else if (eah->ndims == 0)
+	{
 		indx = 1;
+		lb0 = 1;
+	}
 	else
 		ereport(ERROR,
 				(errcode(ERRCODE_DATA_EXCEPTION),
@@ -184,14 +186,19 @@ array_prepend(PG_FUNCTION_ARGS)
 	/* Perform element insertion */
 	my_extra = (ArrayMetaState *) fcinfo->flinfo->fn_extra;
 
-	result = array_set(v, 1, &indx, newelem, isNull,
+	result = array_set_element(EOHPGetRWDatum(&eah->hdr),
+							   1, &indx, newelem, isNull,
 			   -1, my_extra->typlen, my_extra->typbyval, my_extra->typalign);
 
 	/* Readjust result's LB to match the input's, as expected for prepend */
-	if (ARR_NDIM(v) == 1)
-		ARR_LBOUND(result)[0] = ARR_LBOUND(v)[0];
+	Assert(result == EOHPGetRWDatum(&eah->hdr));
+	if (eah->ndims == 1)
+	{
+		/* This is ok whether we've deconstructed or not */
+		eah->lbound[0] = lb0;
+	}
 
-	PG_RETURN_ARRAYTYPE_P(result);
+	PG_RETURN_DATUM(result);
 }
 
 /*-----------------------------------------------------------------------------
@@ -680,7 +687,7 @@ array_position_start(PG_FUNCTION_ARGS)
 
 /*
  * array_position_common
- * 		Common code for array_position and array_position_start
+ *		Common code for array_position and array_position_start
  *
  * These are separate wrappers for the sake of opr_sanity regression test.
  * They are not strict so we have to test for null inputs explicitly.
@@ -748,7 +755,8 @@ array_position_common(FunctionCallInfo fcinfo)
 
 	/*
 	 * We arrange to look up type info for array_create_iterator only once per
-	 * series of calls, assuming the element type doesn't change underneath us.
+	 * series of calls, assuming the element type doesn't change underneath
+	 * us.
 	 */
 	my_extra = (ArrayMetaState *) fcinfo->flinfo->fn_extra;
 	if (my_extra == NULL)
@@ -771,8 +779,8 @@ array_position_common(FunctionCallInfo fcinfo)
 		if (!OidIsValid(typentry->eq_opr_finfo.fn_oid))
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_FUNCTION),
-					 errmsg("could not identify an equality operator for type %s",
-							format_type_be(element_type))));
+				errmsg("could not identify an equality operator for type %s",
+					   format_type_be(element_type))));
 
 		my_extra->element_type = element_type;
 		fmgr_info(typentry->eq_opr_finfo.fn_oid, &my_extra->proc);
@@ -885,7 +893,8 @@ array_positions(PG_FUNCTION_ARGS)
 
 	/*
 	 * We arrange to look up type info for array_create_iterator only once per
-	 * series of calls, assuming the element type doesn't change underneath us.
+	 * series of calls, assuming the element type doesn't change underneath
+	 * us.
 	 */
 	my_extra = (ArrayMetaState *) fcinfo->flinfo->fn_extra;
 	if (my_extra == NULL)
@@ -908,15 +917,16 @@ array_positions(PG_FUNCTION_ARGS)
 		if (!OidIsValid(typentry->eq_opr_finfo.fn_oid))
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_FUNCTION),
-					 errmsg("could not identify an equality operator for type %s",
-							format_type_be(element_type))));
+				errmsg("could not identify an equality operator for type %s",
+					   format_type_be(element_type))));
 
 		my_extra->element_type = element_type;
 		fmgr_info(typentry->eq_opr_finfo.fn_oid, &my_extra->proc);
 	}
 
 	/*
-	 * Accumulate each array position iff the element matches the given element.
+	 * Accumulate each array position iff the element matches the given
+	 * element.
 	 */
 	array_iterator = array_create_iterator(array, 0, my_extra);
 	while (array_iterate(array_iterator, &value, &isnull))
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 036b3eefd5..b49ff0ab18 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -25,11 +25,15 @@
 #endif
 #include <math.h>
 
+/* See arrayaccess.h */
+#define ARRAYACCESS_INCLUDE_DEFINITIONS
+
 #include "access/htup_details.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "utils/array.h"
+#include "utils/arrayaccess.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
@@ -47,6 +51,12 @@ bool		Array_nulls = true;
  */
 #define ASSGN	 "="
 
+#define AARR_FREE_IF_COPY(array,n) \
+	do { \
+		if (!VARATT_IS_EXPANDED_HEADER(array)) \
+			PG_FREE_IF_COPY(array, n); \
+	} while (0)
+
 typedef enum
 {
 	ARRAY_NO_LEVEL,
@@ -98,10 +108,16 @@ static void ReadArrayBinary(StringInfo buf, int nitems,
 				int typlen, bool typbyval, char typalign,
 				Datum *values, bool *nulls,
 				bool *hasnulls, int32 *nbytes);
-static void CopyArrayEls(ArrayType *array,
-			 Datum *values, bool *nulls, int nitems,
-			 int typlen, bool typbyval, char typalign,
-			 bool freedata);
+static Datum array_get_element_expanded(Datum arraydatum,
+						   int nSubscripts, int *indx,
+						   int arraytyplen,
+						   int elmlen, bool elmbyval, char elmalign,
+						   bool *isNull);
+static Datum array_set_element_expanded(Datum arraydatum,
+						   int nSubscripts, int *indx,
+						   Datum dataValue, bool isNull,
+						   int arraytyplen,
+						   int elmlen, bool elmbyval, char elmalign);
 static bool array_get_isnull(const bits8 *nullbitmap, int offset);
 static void array_set_isnull(bits8 *nullbitmap, int offset, bool isNull);
 static Datum ArrayCast(char *value, bool byval, int len);
@@ -980,7 +996,7 @@ ReadArrayStr(char *arrayStr,
  * the values are not toasted.  (Doing it here doesn't work since the
  * caller has already allocated space for the array...)
  */
-static void
+void
 CopyArrayEls(ArrayType *array,
 			 Datum *values,
 			 bool *nulls,
@@ -1038,8 +1054,8 @@ CopyArrayEls(ArrayType *array,
 Datum
 array_out(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
-	Oid			element_type = ARR_ELEMTYPE(v);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	Oid			element_type = AARR_ELEMTYPE(v);
 	int			typlen;
 	bool		typbyval;
 	char		typalign;
@@ -1055,8 +1071,6 @@ array_out(PG_FUNCTION_ARGS)
 	 *
 	 * +2 allows for assignment operator + trailing null
 	 */
-	bits8	   *bitmap;
-	int			bitmask;
 	bool	   *needquotes,
 				needdims = false;
 	int			nitems,
@@ -1068,6 +1082,7 @@ array_out(PG_FUNCTION_ARGS)
 	int			ndim,
 			   *dims,
 			   *lb;
+	array_iter	iter;
 	ArrayMetaState *my_extra;
 
 	/*
@@ -1102,9 +1117,9 @@ array_out(PG_FUNCTION_ARGS)
 	typalign = my_extra->typalign;
 	typdelim = my_extra->typdelim;
 
-	ndim = ARR_NDIM(v);
-	dims = ARR_DIMS(v);
-	lb = ARR_LBOUND(v);
+	ndim = AARR_NDIM(v);
+	dims = AARR_DIMS(v);
+	lb = AARR_LBOUND(v);
 	nitems = ArrayGetNItems(ndim, dims);
 
 	if (nitems == 0)
@@ -1135,16 +1150,19 @@ array_out(PG_FUNCTION_ARGS)
 	needquotes = (bool *) palloc(nitems * sizeof(bool));
 	overall_length = 1;			/* don't forget to count \0 at end. */
 
-	p = ARR_DATA_PTR(v);
-	bitmap = ARR_NULLBITMAP(v);
-	bitmask = 1;
+	array_iter_setup(&iter, v);
 
 	for (i = 0; i < nitems; i++)
 	{
+		Datum		itemvalue;
+		bool		isnull;
 		bool		needquote;
 
 		/* Get source element, checking for NULL */
-		if (bitmap && (*bitmap & bitmask) == 0)
+		itemvalue = array_iter_next(&iter, &isnull, i,
+									typlen, typbyval, typalign);
+
+		if (isnull)
 		{
 			values[i] = pstrdup("NULL");
 			overall_length += 4;
@@ -1152,12 +1170,7 @@ array_out(PG_FUNCTION_ARGS)
 		}
 		else
 		{
-			Datum		itemvalue;
-
-			itemvalue = fetch_att(p, typbyval, typlen);
 			values[i] = OutputFunctionCall(&my_extra->proc, itemvalue);
-			p = att_addlength_pointer(p, typlen, p);
-			p = (char *) att_align_nominal(p, typalign);
 
 			/* count data plus backslashes; detect chars needing quotes */
 			if (values[i][0] == '\0')
@@ -1190,17 +1203,6 @@ array_out(PG_FUNCTION_ARGS)
 			overall_length += 2;
 		/* and the comma */
 		overall_length += 1;
-
-		/* advance bitmap pointer if any */
-		if (bitmap)
-		{
-			bitmask <<= 1;
-			if (bitmask == 0x100)
-			{
-				bitmap++;
-				bitmask = 1;
-			}
-		}
 	}
 
 	/*
@@ -1575,19 +1577,18 @@ ReadArrayBinary(StringInfo buf,
 Datum
 array_send(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
-	Oid			element_type = ARR_ELEMTYPE(v);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	Oid			element_type = AARR_ELEMTYPE(v);
 	int			typlen;
 	bool		typbyval;
 	char		typalign;
-	char	   *p;
-	bits8	   *bitmap;
-	int			bitmask;
 	int			nitems,
 				i;
 	int			ndim,
-			   *dim;
+			   *dim,
+			   *lb;
 	StringInfoData buf;
+	array_iter	iter;
 	ArrayMetaState *my_extra;
 
 	/*
@@ -1624,60 +1625,49 @@ array_send(PG_FUNCTION_ARGS)
 	typbyval = my_extra->typbyval;
 	typalign = my_extra->typalign;
 
-	ndim = ARR_NDIM(v);
-	dim = ARR_DIMS(v);
+	ndim = AARR_NDIM(v);
+	dim = AARR_DIMS(v);
+	lb = AARR_LBOUND(v);
 	nitems = ArrayGetNItems(ndim, dim);
 
 	pq_begintypsend(&buf);
 
 	/* Send the array header information */
 	pq_sendint(&buf, ndim, 4);
-	pq_sendint(&buf, ARR_HASNULL(v) ? 1 : 0, 4);
+	pq_sendint(&buf, AARR_HASNULL(v) ? 1 : 0, 4);
 	pq_sendint(&buf, element_type, sizeof(Oid));
 	for (i = 0; i < ndim; i++)
 	{
-		pq_sendint(&buf, ARR_DIMS(v)[i], 4);
-		pq_sendint(&buf, ARR_LBOUND(v)[i], 4);
+		pq_sendint(&buf, dim[i], 4);
+		pq_sendint(&buf, lb[i], 4);
 	}
 
 	/* Send the array elements using the element's own sendproc */
-	p = ARR_DATA_PTR(v);
-	bitmap = ARR_NULLBITMAP(v);
-	bitmask = 1;
+	array_iter_setup(&iter, v);
 
 	for (i = 0; i < nitems; i++)
 	{
+		Datum		itemvalue;
+		bool		isnull;
+
 		/* Get source element, checking for NULL */
-		if (bitmap && (*bitmap & bitmask) == 0)
+		itemvalue = array_iter_next(&iter, &isnull, i,
+									typlen, typbyval, typalign);
+
+		if (isnull)
 		{
 			/* -1 length means a NULL */
 			pq_sendint(&buf, -1, 4);
 		}
 		else
 		{
-			Datum		itemvalue;
 			bytea	   *outputbytes;
 
-			itemvalue = fetch_att(p, typbyval, typlen);
 			outputbytes = SendFunctionCall(&my_extra->proc, itemvalue);
 			pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
 			pq_sendbytes(&buf, VARDATA(outputbytes),
 						 VARSIZE(outputbytes) - VARHDRSZ);
 			pfree(outputbytes);
-
-			p = att_addlength_pointer(p, typlen, p);
-			p = (char *) att_align_nominal(p, typalign);
-		}
-
-		/* advance bitmap pointer if any */
-		if (bitmap)
-		{
-			bitmask <<= 1;
-			if (bitmask == 0x100)
-			{
-				bitmap++;
-				bitmask = 1;
-			}
 		}
 	}
 
@@ -1691,13 +1681,13 @@ array_send(PG_FUNCTION_ARGS)
 Datum
 array_ndims(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
 
 	/* Sanity check: does it look like an array at all? */
-	if (ARR_NDIM(v) <= 0 || ARR_NDIM(v) > MAXDIM)
+	if (AARR_NDIM(v) <= 0 || AARR_NDIM(v) > MAXDIM)
 		PG_RETURN_NULL();
 
-	PG_RETURN_INT32(ARR_NDIM(v));
+	PG_RETURN_INT32(AARR_NDIM(v));
 }
 
 /*
@@ -1707,7 +1697,7 @@ array_ndims(PG_FUNCTION_ARGS)
 Datum
 array_dims(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
 	char	   *p;
 	int			i;
 	int		   *dimv,
@@ -1721,14 +1711,14 @@ array_dims(PG_FUNCTION_ARGS)
 	char		buf[MAXDIM * 33 + 1];
 
 	/* Sanity check: does it look like an array at all? */
-	if (ARR_NDIM(v) <= 0 || ARR_NDIM(v) > MAXDIM)
+	if (AARR_NDIM(v) <= 0 || AARR_NDIM(v) > MAXDIM)
 		PG_RETURN_NULL();
 
-	dimv = ARR_DIMS(v);
-	lb = ARR_LBOUND(v);
+	dimv = AARR_DIMS(v);
+	lb = AARR_LBOUND(v);
 
 	p = buf;
-	for (i = 0; i < ARR_NDIM(v); i++)
+	for (i = 0; i < AARR_NDIM(v); i++)
 	{
 		sprintf(p, "[%d:%d]", lb[i], dimv[i] + lb[i] - 1);
 		p += strlen(p);
@@ -1745,20 +1735,20 @@ array_dims(PG_FUNCTION_ARGS)
 Datum
 array_lower(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
 	int			reqdim = PG_GETARG_INT32(1);
 	int		   *lb;
 	int			result;
 
 	/* Sanity check: does it look like an array at all? */
-	if (ARR_NDIM(v) <= 0 || ARR_NDIM(v) > MAXDIM)
+	if (AARR_NDIM(v) <= 0 || AARR_NDIM(v) > MAXDIM)
 		PG_RETURN_NULL();
 
 	/* Sanity check: was the requested dim valid */
-	if (reqdim <= 0 || reqdim > ARR_NDIM(v))
+	if (reqdim <= 0 || reqdim > AARR_NDIM(v))
 		PG_RETURN_NULL();
 
-	lb = ARR_LBOUND(v);
+	lb = AARR_LBOUND(v);
 	result = lb[reqdim - 1];
 
 	PG_RETURN_INT32(result);
@@ -1772,22 +1762,22 @@ array_lower(PG_FUNCTION_ARGS)
 Datum
 array_upper(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
 	int			reqdim = PG_GETARG_INT32(1);
 	int		   *dimv,
 			   *lb;
 	int			result;
 
 	/* Sanity check: does it look like an array at all? */
-	if (ARR_NDIM(v) <= 0 || ARR_NDIM(v) > MAXDIM)
+	if (AARR_NDIM(v) <= 0 || AARR_NDIM(v) > MAXDIM)
 		PG_RETURN_NULL();
 
 	/* Sanity check: was the requested dim valid */
-	if (reqdim <= 0 || reqdim > ARR_NDIM(v))
+	if (reqdim <= 0 || reqdim > AARR_NDIM(v))
 		PG_RETURN_NULL();
 
-	lb = ARR_LBOUND(v);
-	dimv = ARR_DIMS(v);
+	lb = AARR_LBOUND(v);
+	dimv = AARR_DIMS(v);
 
 	result = dimv[reqdim - 1] + lb[reqdim - 1] - 1;
 
@@ -1802,20 +1792,20 @@ array_upper(PG_FUNCTION_ARGS)
 Datum
 array_length(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
 	int			reqdim = PG_GETARG_INT32(1);
 	int		   *dimv;
 	int			result;
 
 	/* Sanity check: does it look like an array at all? */
-	if (ARR_NDIM(v) <= 0 || ARR_NDIM(v) > MAXDIM)
+	if (AARR_NDIM(v) <= 0 || AARR_NDIM(v) > MAXDIM)
 		PG_RETURN_NULL();
 
 	/* Sanity check: was the requested dim valid */
-	if (reqdim <= 0 || reqdim > ARR_NDIM(v))
+	if (reqdim <= 0 || reqdim > AARR_NDIM(v))
 		PG_RETURN_NULL();
 
-	dimv = ARR_DIMS(v);
+	dimv = AARR_DIMS(v);
 
 	result = dimv[reqdim - 1];
 
@@ -1829,9 +1819,9 @@ array_length(PG_FUNCTION_ARGS)
 Datum
 array_cardinality(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
 
-	PG_RETURN_INT32(ArrayGetNItems(ARR_NDIM(v), ARR_DIMS(v)));
+	PG_RETURN_INT32(ArrayGetNItems(AARR_NDIM(v), AARR_DIMS(v)));
 }
 
 
@@ -1866,7 +1856,6 @@ array_get_element(Datum arraydatum,
 				  char elmalign,
 				  bool *isNull)
 {
-	ArrayType  *array;
 	int			i,
 				ndim,
 			   *dim,
@@ -1891,10 +1880,22 @@ array_get_element(Datum arraydatum,
 		arraydataptr = (char *) DatumGetPointer(arraydatum);
 		arraynullsptr = NULL;
 	}
+	else if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(arraydatum)))
+	{
+		/* expanded array: let's do this in a separate function */
+		return array_get_element_expanded(arraydatum,
+										  nSubscripts,
+										  indx,
+										  arraytyplen,
+										  elmlen,
+										  elmbyval,
+										  elmalign,
+										  isNull);
+	}
 	else
 	{
-		/* detoast input array if necessary */
-		array = DatumGetArrayTypeP(arraydatum);
+		/* detoast array if necessary, producing normal varlena input */
+		ArrayType  *array = DatumGetArrayTypeP(arraydatum);
 
 		ndim = ARR_NDIM(array);
 		dim = ARR_DIMS(array);
@@ -1944,6 +1945,88 @@ array_get_element(Datum arraydatum,
 }
 
 /*
+ * Implementation of array_get_element() for an expanded array
+ */
+static Datum
+array_get_element_expanded(Datum arraydatum,
+						   int nSubscripts, int *indx,
+						   int arraytyplen,
+						   int elmlen, bool elmbyval, char elmalign,
+						   bool *isNull)
+{
+	ExpandedArrayHeader *eah;
+	int			i,
+				ndim,
+			   *dim,
+			   *lb,
+				offset;
+	Datum	   *dvalues;
+	bool	   *dnulls;
+
+	eah = (ExpandedArrayHeader *) DatumGetEOHP(arraydatum);
+	Assert(eah->ea_magic == EA_MAGIC);
+
+	/* sanity-check caller's info against object */
+	Assert(arraytyplen == -1);
+	Assert(elmlen == eah->typlen);
+	Assert(elmbyval == eah->typbyval);
+	Assert(elmalign == eah->typalign);
+
+	ndim = eah->ndims;
+	dim = eah->dims;
+	lb = eah->lbound;
+
+	/*
+	 * Return NULL for invalid subscript
+	 */
+	if (ndim != nSubscripts || ndim <= 0 || ndim > MAXDIM)
+	{
+		*isNull = true;
+		return (Datum) 0;
+	}
+	for (i = 0; i < ndim; i++)
+	{
+		if (indx[i] < lb[i] || indx[i] >= (dim[i] + lb[i]))
+		{
+			*isNull = true;
+			return (Datum) 0;
+		}
+	}
+
+	/*
+	 * Calculate the element number
+	 */
+	offset = ArrayGetOffset(nSubscripts, dim, lb, indx);
+
+	/*
+	 * Deconstruct array if we didn't already.  Note that we apply this even
+	 * if the input is nominally read-only: it should be safe enough.
+	 */
+	deconstruct_expanded_array(eah);
+
+	dvalues = eah->dvalues;
+	dnulls = eah->dnulls;
+
+	/*
+	 * Check for NULL array element
+	 */
+	if (dnulls && dnulls[offset])
+	{
+		*isNull = true;
+		return (Datum) 0;
+	}
+
+	/*
+	 * OK, get the element.  It's OK to return a pass-by-ref value as a
+	 * pointer into the expanded array, for the same reason that regular
+	 * array_get_element can return a pointer into flat arrays: the value is
+	 * assumed not to change for as long as the Datum reference can exist.
+	 */
+	*isNull = false;
+	return dvalues[offset];
+}
+
+/*
  * array_get_slice :
  *		   This routine takes an array and a range of indices (upperIndex and
  *		   lowerIndx), creates a new array structure for the referred elements
@@ -2124,7 +2207,9 @@ array_get_slice(Datum arraydatum,
  *
  * Result:
  *		  A new array is returned, just like the old except for the one
- *		  modified entry.  The original array object is not changed.
+ *		  modified entry.  The original array object is not changed,
+ *		  unless what is passed is a read-write reference to an expanded
+ *		  array object; in that case the expanded array is updated in-place.
  *
  * For one-dimensional arrays only, we allow the array to be extended
  * by assigning to a position outside the existing subscript range; any
@@ -2207,6 +2292,20 @@ array_set_element(Datum arraydatum,
 	if (elmlen == -1 && !isNull)
 		dataValue = PointerGetDatum(PG_DETOAST_DATUM(dataValue));
 
+	if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(arraydatum)))
+	{
+		/* expanded array: let's do this in a separate function */
+		return array_set_element_expanded(arraydatum,
+										  nSubscripts,
+										  indx,
+										  dataValue,
+										  isNull,
+										  arraytyplen,
+										  elmlen,
+										  elmbyval,
+										  elmalign);
+	}
+
 	/* detoast input array if necessary */
 	array = DatumGetArrayTypeP(arraydatum);
 
@@ -2396,6 +2495,251 @@ array_set_element(Datum arraydatum,
 }
 
 /*
+ * Implementation of array_set_element() for an expanded array
+ *
+ * Note: as with any operation on a read/write expanded object, we must
+ * take pains not to leave the object in a corrupt state if we fail partway
+ * through.
+ */
+static Datum
+array_set_element_expanded(Datum arraydatum,
+						   int nSubscripts, int *indx,
+						   Datum dataValue, bool isNull,
+						   int arraytyplen,
+						   int elmlen, bool elmbyval, char elmalign)
+{
+	ExpandedArrayHeader *eah;
+	Datum	   *dvalues;
+	bool	   *dnulls;
+	int			i,
+				ndim,
+				dim[MAXDIM],
+				lb[MAXDIM],
+				offset;
+	bool		dimschanged,
+				newhasnulls;
+	int			addedbefore,
+				addedafter;
+	char	   *oldValue;
+
+	/* Convert to R/W object if not so already */
+	eah = DatumGetExpandedArray(arraydatum);
+
+	/* Sanity-check caller's info against object; we don't use it otherwise */
+	Assert(arraytyplen == -1);
+	Assert(elmlen == eah->typlen);
+	Assert(elmbyval == eah->typbyval);
+	Assert(elmalign == eah->typalign);
+
+	/*
+	 * Copy dimension info into local storage.  This allows us to modify the
+	 * dimensions if needed, while not messing up the expanded value if we
+	 * fail partway through.
+	 */
+	ndim = eah->ndims;
+	Assert(ndim >= 0 && ndim <= MAXDIM);
+	memcpy(dim, eah->dims, ndim * sizeof(int));
+	memcpy(lb, eah->lbound, ndim * sizeof(int));
+	dimschanged = false;
+
+	/*
+	 * if number of dims is zero, i.e. an empty array, create an array with
+	 * nSubscripts dimensions, and set the lower bounds to the supplied
+	 * subscripts.
+	 */
+	if (ndim == 0)
+	{
+		/*
+		 * Allocate adequate space for new dimension info.  This is harmless
+		 * if we fail later.
+		 */
+		Assert(nSubscripts > 0 && nSubscripts <= MAXDIM);
+		eah->dims = (int *) MemoryContextAllocZero(eah->hdr.eoh_context,
+												   nSubscripts * sizeof(int));
+		eah->lbound = (int *) MemoryContextAllocZero(eah->hdr.eoh_context,
+												  nSubscripts * sizeof(int));
+
+		/* Update local copies of dimension info */
+		ndim = nSubscripts;
+		for (i = 0; i < nSubscripts; i++)
+		{
+			dim[i] = 0;
+			lb[i] = indx[i];
+		}
+		dimschanged = true;
+	}
+	else if (ndim != nSubscripts)
+		ereport(ERROR,
+				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+				 errmsg("wrong number of array subscripts")));
+
+	/*
+	 * Deconstruct array if we didn't already.  (Someday maybe add a special
+	 * case path for fixed-length, no-nulls cases, where we can overwrite an
+	 * element in place without ever deconstructing.  But today is not that
+	 * day.)
+	 */
+	deconstruct_expanded_array(eah);
+
+	/*
+	 * Copy new element into array's context, if needed (we assume it's
+	 * already detoasted, so no junk should be created).  If we fail further
+	 * down, this memory is leaked, but that's reasonably harmless.
+	 */
+	if (!eah->typbyval && !isNull)
+	{
+		MemoryContext oldcxt = MemoryContextSwitchTo(eah->hdr.eoh_context);
+
+		dataValue = datumCopy(dataValue, false, eah->typlen);
+		MemoryContextSwitchTo(oldcxt);
+	}
+
+	dvalues = eah->dvalues;
+	dnulls = eah->dnulls;
+
+	newhasnulls = ((dnulls != NULL) || isNull);
+	addedbefore = addedafter = 0;
+
+	/*
+	 * Check subscripts (this logic matches original array_set_element)
+	 */
+	if (ndim == 1)
+	{
+		if (indx[0] < lb[0])
+		{
+			addedbefore = lb[0] - indx[0];
+			dim[0] += addedbefore;
+			lb[0] = indx[0];
+			dimschanged = true;
+			if (addedbefore > 1)
+				newhasnulls = true;		/* will insert nulls */
+		}
+		if (indx[0] >= (dim[0] + lb[0]))
+		{
+			addedafter = indx[0] - (dim[0] + lb[0]) + 1;
+			dim[0] += addedafter;
+			dimschanged = true;
+			if (addedafter > 1)
+				newhasnulls = true;		/* will insert nulls */
+		}
+	}
+	else
+	{
+		/*
+		 * XXX currently we do not support extending multi-dimensional arrays
+		 * during assignment
+		 */
+		for (i = 0; i < ndim; i++)
+		{
+			if (indx[i] < lb[i] ||
+				indx[i] >= (dim[i] + lb[i]))
+				ereport(ERROR,
+						(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+						 errmsg("array subscript out of range")));
+		}
+	}
+
+	/* Now we can calculate linear offset of target item in array */
+	offset = ArrayGetOffset(nSubscripts, dim, lb, indx);
+
+	/* Physically enlarge existing dvalues/dnulls arrays if needed */
+	if (dim[0] > eah->dvalueslen)
+	{
+		/* We want some extra space if we're enlarging */
+		int			newlen = dim[0] + dim[0] / 8;
+
+		newlen = Max(newlen, dim[0]);	/* integer overflow guard */
+		eah->dvalues = dvalues = (Datum *)
+			repalloc(dvalues, newlen * sizeof(Datum));
+		if (dnulls)
+			eah->dnulls = dnulls = (bool *)
+				repalloc(dnulls, newlen * sizeof(bool));
+		eah->dvalueslen = newlen;
+	}
+
+	/*
+	 * If we need a nulls bitmap and don't already have one, create it, being
+	 * sure to mark all existing entries as not null.
+	 */
+	if (newhasnulls && dnulls == NULL)
+		eah->dnulls = dnulls = (bool *)
+			MemoryContextAllocZero(eah->hdr.eoh_context,
+								   eah->dvalueslen * sizeof(bool));
+
+	/*
+	 * We now have all the needed space allocated, so we're ready to make
+	 * irreversible changes.  Be very wary of allowing failure below here.
+	 */
+
+	/* Flattened value will no longer represent array accurately */
+	eah->fvalue = NULL;
+	/* And we don't know the flattened size either */
+	eah->flat_size = 0;
+
+	/* Update dimensionality info if needed */
+	if (dimschanged)
+	{
+		eah->ndims = ndim;
+		memcpy(eah->dims, dim, ndim * sizeof(int));
+		memcpy(eah->lbound, lb, ndim * sizeof(int));
+	}
+
+	/* Reposition items if needed, and fill addedbefore items with nulls */
+	if (addedbefore > 0)
+	{
+		memmove(dvalues + addedbefore, dvalues, eah->nelems * sizeof(Datum));
+		for (i = 0; i < addedbefore; i++)
+			dvalues[i] = (Datum) 0;
+		if (dnulls)
+		{
+			memmove(dnulls + addedbefore, dnulls, eah->nelems * sizeof(bool));
+			for (i = 0; i < addedbefore; i++)
+				dnulls[i] = true;
+		}
+		eah->nelems += addedbefore;
+	}
+
+	/* fill addedafter items with nulls */
+	if (addedafter > 0)
+	{
+		for (i = 0; i < addedafter; i++)
+			dvalues[eah->nelems + i] = (Datum) 0;
+		if (dnulls)
+		{
+			for (i = 0; i < addedafter; i++)
+				dnulls[eah->nelems + i] = true;
+		}
+		eah->nelems += addedafter;
+	}
+
+	/* Grab old element value for pfree'ing, if needed. */
+	if (!eah->typbyval && (dnulls == NULL || !dnulls[offset]))
+		oldValue = (char *) DatumGetPointer(dvalues[offset]);
+	else
+		oldValue = NULL;
+
+	/* And finally we can insert the new element. */
+	dvalues[offset] = dataValue;
+	if (dnulls)
+		dnulls[offset] = isNull;
+
+	/*
+	 * Free old element if needed; this keeps repeated element replacements
+	 * from bloating the array's storage.  If the pfree somehow fails, it
+	 * won't corrupt the array.
+	 */
+	if (oldValue)
+	{
+		/* Don't try to pfree a part of the original flat array */
+		if (oldValue < eah->fstartptr || oldValue >= eah->fendptr)
+			pfree(oldValue);
+	}
+
+	/* Done, return standard TOAST pointer for object */
+	return EOHPGetRWDatum(&eah->hdr);
+}
+
+/*
  * array_set_slice :
  *		  This routine sets the value of a range of array locations (specified
  *		  by upper and lower subscript values) to new values passed as
@@ -2775,8 +3119,6 @@ array_set(ArrayType *array, int nSubscripts, int *indx,
  *	 the function fn(), and if nargs > 1 then argument positions after the
  *	 first must be preset to the additional values to be passed.  The
  *	 first argument position initially holds the input array value.
- * * inpType: OID of element type of input array.  This must be the same as,
- *	 or binary-compatible with, the first argument type of fn().
  * * retType: OID of element type of output array.  This must be the same as,
  *	 or binary-compatible with, the result type of fn().
  * * amstate: workspace for array_map.  Must be zeroed by caller before
@@ -2790,14 +3132,12 @@ array_set(ArrayType *array, int nSubscripts, int *indx,
  * the array are OK however.
  */
 Datum
-array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
-		  ArrayMapState *amstate)
+array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
 {
-	ArrayType  *v;
+	AnyArrayType *v;
 	ArrayType  *result;
 	Datum	   *values;
 	bool	   *nulls;
-	Datum		elt;
 	int		   *dim;
 	int			ndim;
 	int			nitems;
@@ -2805,15 +3145,14 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 	int32		nbytes = 0;
 	int32		dataoffset;
 	bool		hasnulls;
+	Oid			inpType;
 	int			inp_typlen;
 	bool		inp_typbyval;
 	char		inp_typalign;
 	int			typlen;
 	bool		typbyval;
 	char		typalign;
-	char	   *s;
-	bits8	   *bitmap;
-	int			bitmask;
+	array_iter	iter;
 	ArrayMetaState *inp_extra;
 	ArrayMetaState *ret_extra;
 
@@ -2822,12 +3161,11 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 		elog(ERROR, "invalid nargs: %d", fcinfo->nargs);
 	if (PG_ARGISNULL(0))
 		elog(ERROR, "null input array");
-	v = PG_GETARG_ARRAYTYPE_P(0);
-
-	Assert(ARR_ELEMTYPE(v) == inpType);
+	v = PG_GETARG_ANY_ARRAY(0);
 
-	ndim = ARR_NDIM(v);
-	dim = ARR_DIMS(v);
+	inpType = AARR_ELEMTYPE(v);
+	ndim = AARR_NDIM(v);
+	dim = AARR_DIMS(v);
 	nitems = ArrayGetNItems(ndim, dim);
 
 	/* Check for empty array */
@@ -2874,9 +3212,7 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 	nulls = (bool *) palloc(nitems * sizeof(bool));
 
 	/* Loop over source data */
-	s = ARR_DATA_PTR(v);
-	bitmap = ARR_NULLBITMAP(v);
-	bitmask = 1;
+	array_iter_setup(&iter, v);
 	hasnulls = false;
 
 	for (i = 0; i < nitems; i++)
@@ -2884,18 +3220,8 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 		bool		callit = true;
 
 		/* Get source element, checking for NULL */
-		if (bitmap && (*bitmap & bitmask) == 0)
-		{
-			fcinfo->argnull[0] = true;
-		}
-		else
-		{
-			elt = fetch_att(s, inp_typbyval, inp_typlen);
-			s = att_addlength_datum(s, inp_typlen, elt);
-			s = (char *) att_align_nominal(s, inp_typalign);
-			fcinfo->arg[0] = elt;
-			fcinfo->argnull[0] = false;
-		}
+		fcinfo->arg[0] = array_iter_next(&iter, &fcinfo->argnull[0], i,
+									 inp_typlen, inp_typbyval, inp_typalign);
 
 		/*
 		 * Apply the given function to source elt and extra args.
@@ -2940,17 +3266,6 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 						 errmsg("array size exceeds the maximum allowed (%d)",
 								(int) MaxAllocSize)));
 		}
-
-		/* advance bitmap pointer if any */
-		if (bitmap)
-		{
-			bitmask <<= 1;
-			if (bitmask == 0x100)
-			{
-				bitmap++;
-				bitmask = 1;
-			}
-		}
 	}
 
 	/* Allocate and initialize the result array */
@@ -2969,7 +3284,8 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 	result->ndim = ndim;
 	result->dataoffset = dataoffset;
 	result->elemtype = retType;
-	memcpy(ARR_DIMS(result), ARR_DIMS(v), 2 * ndim * sizeof(int));
+	memcpy(ARR_DIMS(result), AARR_DIMS(v), ndim * sizeof(int));
+	memcpy(ARR_LBOUND(result), AARR_LBOUND(v), ndim * sizeof(int));
 
 	/*
 	 * Note: do not risk trying to pfree the results of the called function
@@ -3133,6 +3449,23 @@ construct_empty_array(Oid elmtype)
 }
 
 /*
+ * construct_empty_expanded_array: make an empty expanded array
+ * given only type information.  (metacache can be NULL if not needed.)
+ */
+ExpandedArrayHeader *
+construct_empty_expanded_array(Oid element_type,
+							   MemoryContext parentcontext,
+							   ArrayMetaState *metacache)
+{
+	ArrayType  *array = construct_empty_array(element_type);
+	Datum		d;
+
+	d = expand_array(PointerGetDatum(array), parentcontext, metacache);
+	pfree(array);
+	return (ExpandedArrayHeader *) DatumGetEOHP(d);
+}
+
+/*
  * deconstruct_array  --- simple method for extracting data from an array
  *
  * array: array object to examine (must not be NULL)
@@ -3270,36 +3603,36 @@ array_contains_nulls(ArrayType *array)
 Datum
 array_eq(PG_FUNCTION_ARGS)
 {
-	ArrayType  *array1 = PG_GETARG_ARRAYTYPE_P(0);
-	ArrayType  *array2 = PG_GETARG_ARRAYTYPE_P(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
 	Oid			collation = PG_GET_COLLATION();
-	int			ndims1 = ARR_NDIM(array1);
-	int			ndims2 = ARR_NDIM(array2);
-	int		   *dims1 = ARR_DIMS(array1);
-	int		   *dims2 = ARR_DIMS(array2);
-	Oid			element_type = ARR_ELEMTYPE(array1);
+	int			ndims1 = AARR_NDIM(array1);
+	int			ndims2 = AARR_NDIM(array2);
+	int		   *dims1 = AARR_DIMS(array1);
+	int		   *dims2 = AARR_DIMS(array2);
+	int		   *lbs1 = AARR_LBOUND(array1);
+	int		   *lbs2 = AARR_LBOUND(array2);
+	Oid			element_type = AARR_ELEMTYPE(array1);
 	bool		result = true;
 	int			nitems;
 	TypeCacheEntry *typentry;
 	int			typlen;
 	bool		typbyval;
 	char		typalign;
-	char	   *ptr1;
-	char	   *ptr2;
-	bits8	   *bitmap1;
-	bits8	   *bitmap2;
-	int			bitmask;
+	array_iter	it1;
+	array_iter	it2;
 	int			i;
 	FunctionCallInfoData locfcinfo;
 
-	if (element_type != ARR_ELEMTYPE(array2))
+	if (element_type != AARR_ELEMTYPE(array2))
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("cannot compare arrays of different element types")));
 
 	/* fast path if the arrays do not have the same dimensionality */
 	if (ndims1 != ndims2 ||
-		memcmp(dims1, dims2, 2 * ndims1 * sizeof(int)) != 0)
+		memcmp(dims1, dims2, ndims1 * sizeof(int)) != 0 ||
+		memcmp(lbs1, lbs2, ndims1 * sizeof(int)) != 0)
 		result = false;
 	else
 	{
@@ -3334,11 +3667,8 @@ array_eq(PG_FUNCTION_ARGS)
 
 		/* Loop over source data */
 		nitems = ArrayGetNItems(ndims1, dims1);
-		ptr1 = ARR_DATA_PTR(array1);
-		ptr2 = ARR_DATA_PTR(array2);
-		bitmap1 = ARR_NULLBITMAP(array1);
-		bitmap2 = ARR_NULLBITMAP(array2);
-		bitmask = 1;			/* use same bitmask for both arrays */
+		array_iter_setup(&it1, array1);
+		array_iter_setup(&it2, array2);
 
 		for (i = 0; i < nitems; i++)
 		{
@@ -3349,42 +3679,10 @@ array_eq(PG_FUNCTION_ARGS)
 			bool		oprresult;
 
 			/* Get elements, checking for NULL */
-			if (bitmap1 && (*bitmap1 & bitmask) == 0)
-			{
-				isnull1 = true;
-				elt1 = (Datum) 0;
-			}
-			else
-			{
-				isnull1 = false;
-				elt1 = fetch_att(ptr1, typbyval, typlen);
-				ptr1 = att_addlength_pointer(ptr1, typlen, ptr1);
-				ptr1 = (char *) att_align_nominal(ptr1, typalign);
-			}
-
-			if (bitmap2 && (*bitmap2 & bitmask) == 0)
-			{
-				isnull2 = true;
-				elt2 = (Datum) 0;
-			}
-			else
-			{
-				isnull2 = false;
-				elt2 = fetch_att(ptr2, typbyval, typlen);
-				ptr2 = att_addlength_pointer(ptr2, typlen, ptr2);
-				ptr2 = (char *) att_align_nominal(ptr2, typalign);
-			}
-
-			/* advance bitmap pointers if any */
-			bitmask <<= 1;
-			if (bitmask == 0x100)
-			{
-				if (bitmap1)
-					bitmap1++;
-				if (bitmap2)
-					bitmap2++;
-				bitmask = 1;
-			}
+			elt1 = array_iter_next(&it1, &isnull1, i,
+								   typlen, typbyval, typalign);
+			elt2 = array_iter_next(&it2, &isnull2, i,
+								   typlen, typbyval, typalign);
 
 			/*
 			 * We consider two NULLs equal; NULL and not-NULL are unequal.
@@ -3415,8 +3713,8 @@ array_eq(PG_FUNCTION_ARGS)
 	}
 
 	/* Avoid leaking memory when handed toasted input. */
-	PG_FREE_IF_COPY(array1, 0);
-	PG_FREE_IF_COPY(array2, 1);
+	AARR_FREE_IF_COPY(array1, 0);
+	AARR_FREE_IF_COPY(array2, 1);
 
 	PG_RETURN_BOOL(result);
 }
@@ -3476,31 +3774,28 @@ btarraycmp(PG_FUNCTION_ARGS)
 static int
 array_cmp(FunctionCallInfo fcinfo)
 {
-	ArrayType  *array1 = PG_GETARG_ARRAYTYPE_P(0);
-	ArrayType  *array2 = PG_GETARG_ARRAYTYPE_P(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
 	Oid			collation = PG_GET_COLLATION();
-	int			ndims1 = ARR_NDIM(array1);
-	int			ndims2 = ARR_NDIM(array2);
-	int		   *dims1 = ARR_DIMS(array1);
-	int		   *dims2 = ARR_DIMS(array2);
+	int			ndims1 = AARR_NDIM(array1);
+	int			ndims2 = AARR_NDIM(array2);
+	int		   *dims1 = AARR_DIMS(array1);
+	int		   *dims2 = AARR_DIMS(array2);
 	int			nitems1 = ArrayGetNItems(ndims1, dims1);
 	int			nitems2 = ArrayGetNItems(ndims2, dims2);
-	Oid			element_type = ARR_ELEMTYPE(array1);
+	Oid			element_type = AARR_ELEMTYPE(array1);
 	int			result = 0;
 	TypeCacheEntry *typentry;
 	int			typlen;
 	bool		typbyval;
 	char		typalign;
 	int			min_nitems;
-	char	   *ptr1;
-	char	   *ptr2;
-	bits8	   *bitmap1;
-	bits8	   *bitmap2;
-	int			bitmask;
+	array_iter	it1;
+	array_iter	it2;
 	int			i;
 	FunctionCallInfoData locfcinfo;
 
-	if (element_type != ARR_ELEMTYPE(array2))
+	if (element_type != AARR_ELEMTYPE(array2))
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("cannot compare arrays of different element types")));
@@ -3536,11 +3831,8 @@ array_cmp(FunctionCallInfo fcinfo)
 
 	/* Loop over source data */
 	min_nitems = Min(nitems1, nitems2);
-	ptr1 = ARR_DATA_PTR(array1);
-	ptr2 = ARR_DATA_PTR(array2);
-	bitmap1 = ARR_NULLBITMAP(array1);
-	bitmap2 = ARR_NULLBITMAP(array2);
-	bitmask = 1;				/* use same bitmask for both arrays */
+	array_iter_setup(&it1, array1);
+	array_iter_setup(&it2, array2);
 
 	for (i = 0; i < min_nitems; i++)
 	{
@@ -3551,42 +3843,8 @@ array_cmp(FunctionCallInfo fcinfo)
 		int32		cmpresult;
 
 		/* Get elements, checking for NULL */
-		if (bitmap1 && (*bitmap1 & bitmask) == 0)
-		{
-			isnull1 = true;
-			elt1 = (Datum) 0;
-		}
-		else
-		{
-			isnull1 = false;
-			elt1 = fetch_att(ptr1, typbyval, typlen);
-			ptr1 = att_addlength_pointer(ptr1, typlen, ptr1);
-			ptr1 = (char *) att_align_nominal(ptr1, typalign);
-		}
-
-		if (bitmap2 && (*bitmap2 & bitmask) == 0)
-		{
-			isnull2 = true;
-			elt2 = (Datum) 0;
-		}
-		else
-		{
-			isnull2 = false;
-			elt2 = fetch_att(ptr2, typbyval, typlen);
-			ptr2 = att_addlength_pointer(ptr2, typlen, ptr2);
-			ptr2 = (char *) att_align_nominal(ptr2, typalign);
-		}
-
-		/* advance bitmap pointers if any */
-		bitmask <<= 1;
-		if (bitmask == 0x100)
-		{
-			if (bitmap1)
-				bitmap1++;
-			if (bitmap2)
-				bitmap2++;
-			bitmask = 1;
-		}
+		elt1 = array_iter_next(&it1, &isnull1, i, typlen, typbyval, typalign);
+		elt2 = array_iter_next(&it2, &isnull2, i, typlen, typbyval, typalign);
 
 		/*
 		 * We consider two NULLs equal; NULL > not-NULL.
@@ -3645,8 +3903,7 @@ array_cmp(FunctionCallInfo fcinfo)
 			result = (ndims1 < ndims2) ? -1 : 1;
 		else
 		{
-			/* this relies on LB array immediately following DIMS array */
-			for (i = 0; i < ndims1 * 2; i++)
+			for (i = 0; i < ndims1; i++)
 			{
 				if (dims1[i] != dims2[i])
 				{
@@ -3654,12 +3911,26 @@ array_cmp(FunctionCallInfo fcinfo)
 					break;
 				}
 			}
+			if (result == 0)
+			{
+				int		   *lbound1 = AARR_LBOUND(array1);
+				int		   *lbound2 = AARR_LBOUND(array2);
+
+				for (i = 0; i < ndims1; i++)
+				{
+					if (lbound1[i] != lbound2[i])
+					{
+						result = (lbound1[i] < lbound2[i]) ? -1 : 1;
+						break;
+					}
+				}
+			}
 		}
 	}
 
 	/* Avoid leaking memory when handed toasted input. */
-	PG_FREE_IF_COPY(array1, 0);
-	PG_FREE_IF_COPY(array2, 1);
+	AARR_FREE_IF_COPY(array1, 0);
+	AARR_FREE_IF_COPY(array2, 1);
 
 	return result;
 }
@@ -3674,20 +3945,18 @@ array_cmp(FunctionCallInfo fcinfo)
 Datum
 hash_array(PG_FUNCTION_ARGS)
 {
-	ArrayType  *array = PG_GETARG_ARRAYTYPE_P(0);
-	int			ndims = ARR_NDIM(array);
-	int		   *dims = ARR_DIMS(array);
-	Oid			element_type = ARR_ELEMTYPE(array);
+	AnyArrayType *array = PG_GETARG_ANY_ARRAY(0);
+	int			ndims = AARR_NDIM(array);
+	int		   *dims = AARR_DIMS(array);
+	Oid			element_type = AARR_ELEMTYPE(array);
 	uint32		result = 1;
 	int			nitems;
 	TypeCacheEntry *typentry;
 	int			typlen;
 	bool		typbyval;
 	char		typalign;
-	char	   *ptr;
-	bits8	   *bitmap;
-	int			bitmask;
 	int			i;
+	array_iter	iter;
 	FunctionCallInfoData locfcinfo;
 
 	/*
@@ -3721,28 +3990,24 @@ hash_array(PG_FUNCTION_ARGS)
 
 	/* Loop over source data */
 	nitems = ArrayGetNItems(ndims, dims);
-	ptr = ARR_DATA_PTR(array);
-	bitmap = ARR_NULLBITMAP(array);
-	bitmask = 1;
+	array_iter_setup(&iter, array);
 
 	for (i = 0; i < nitems; i++)
 	{
+		Datum		elt;
+		bool		isnull;
 		uint32		elthash;
 
 		/* Get element, checking for NULL */
-		if (bitmap && (*bitmap & bitmask) == 0)
+		elt = array_iter_next(&iter, &isnull, i, typlen, typbyval, typalign);
+
+		if (isnull)
 		{
 			/* Treat nulls as having hashvalue 0 */
 			elthash = 0;
 		}
 		else
 		{
-			Datum		elt;
-
-			elt = fetch_att(ptr, typbyval, typlen);
-			ptr = att_addlength_pointer(ptr, typlen, ptr);
-			ptr = (char *) att_align_nominal(ptr, typalign);
-
 			/* Apply the hash function */
 			locfcinfo.arg[0] = elt;
 			locfcinfo.argnull[0] = false;
@@ -3750,17 +4015,6 @@ hash_array(PG_FUNCTION_ARGS)
 			elthash = DatumGetUInt32(FunctionCallInvoke(&locfcinfo));
 		}
 
-		/* advance bitmap pointer if any */
-		if (bitmap)
-		{
-			bitmask <<= 1;
-			if (bitmask == 0x100)
-			{
-				bitmap++;
-				bitmask = 1;
-			}
-		}
-
 		/*
 		 * Combine hash values of successive elements by multiplying the
 		 * current value by 31 and adding on the new element's hash value.
@@ -3776,7 +4030,7 @@ hash_array(PG_FUNCTION_ARGS)
 	}
 
 	/* Avoid leaking memory when handed toasted input. */
-	PG_FREE_IF_COPY(array, 0);
+	AARR_FREE_IF_COPY(array, 0);
 
 	PG_RETURN_UINT32(result);
 }
@@ -3797,11 +4051,11 @@ hash_array(PG_FUNCTION_ARGS)
  * When matchall is false, return true if any members of array1 are in array2.
  */
 static bool
-array_contain_compare(ArrayType *array1, ArrayType *array2, Oid collation,
+array_contain_compare(AnyArrayType *array1, AnyArrayType *array2, Oid collation,
 					  bool matchall, void **fn_extra)
 {
 	bool		result = matchall;
-	Oid			element_type = ARR_ELEMTYPE(array1);
+	Oid			element_type = AARR_ELEMTYPE(array1);
 	TypeCacheEntry *typentry;
 	int			nelems1;
 	Datum	   *values2;
@@ -3810,14 +4064,12 @@ array_contain_compare(ArrayType *array1, ArrayType *array2, Oid collation,
 	int			typlen;
 	bool		typbyval;
 	char		typalign;
-	char	   *ptr1;
-	bits8	   *bitmap1;
-	int			bitmask;
 	int			i;
 	int			j;
+	array_iter	it1;
 	FunctionCallInfoData locfcinfo;
 
-	if (element_type != ARR_ELEMTYPE(array2))
+	if (element_type != AARR_ELEMTYPE(array2))
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("cannot compare arrays of different element types")));
@@ -3850,8 +4102,18 @@ array_contain_compare(ArrayType *array1, ArrayType *array2, Oid collation,
 	 * worthwhile to use deconstruct_array on it.  We scan array1 the hard way
 	 * however, since we very likely won't need to look at all of it.
 	 */
-	deconstruct_array(array2, element_type, typlen, typbyval, typalign,
-					  &values2, &nulls2, &nelems2);
+	if (VARATT_IS_EXPANDED_HEADER(array2))
+	{
+		/* This should be safe even if input is read-only */
+		deconstruct_expanded_array(&(array2->xpn));
+		values2 = array2->xpn.dvalues;
+		nulls2 = array2->xpn.dnulls;
+		nelems2 = array2->xpn.nelems;
+	}
+	else
+		deconstruct_array(&(array2->flt),
+						  element_type, typlen, typbyval, typalign,
+						  &values2, &nulls2, &nelems2);
 
 	/*
 	 * Apply the comparison operator to each pair of array elements.
@@ -3860,10 +4122,8 @@ array_contain_compare(ArrayType *array1, ArrayType *array2, Oid collation,
 							 collation, NULL, NULL);
 
 	/* Loop over source data */
-	nelems1 = ArrayGetNItems(ARR_NDIM(array1), ARR_DIMS(array1));
-	ptr1 = ARR_DATA_PTR(array1);
-	bitmap1 = ARR_NULLBITMAP(array1);
-	bitmask = 1;
+	nelems1 = ArrayGetNItems(AARR_NDIM(array1), AARR_DIMS(array1));
+	array_iter_setup(&it1, array1);
 
 	for (i = 0; i < nelems1; i++)
 	{
@@ -3871,27 +4131,7 @@ array_contain_compare(ArrayType *array1, ArrayType *array2, Oid collation,
 		bool		isnull1;
 
 		/* Get element, checking for NULL */
-		if (bitmap1 && (*bitmap1 & bitmask) == 0)
-		{
-			isnull1 = true;
-			elt1 = (Datum) 0;
-		}
-		else
-		{
-			isnull1 = false;
-			elt1 = fetch_att(ptr1, typbyval, typlen);
-			ptr1 = att_addlength_pointer(ptr1, typlen, ptr1);
-			ptr1 = (char *) att_align_nominal(ptr1, typalign);
-		}
-
-		/* advance bitmap pointer if any */
-		bitmask <<= 1;
-		if (bitmask == 0x100)
-		{
-			if (bitmap1)
-				bitmap1++;
-			bitmask = 1;
-		}
+		elt1 = array_iter_next(&it1, &isnull1, i, typlen, typbyval, typalign);
 
 		/*
 		 * We assume that the comparison operator is strict, so a NULL can't
@@ -3911,7 +4151,7 @@ array_contain_compare(ArrayType *array1, ArrayType *array2, Oid collation,
 		for (j = 0; j < nelems2; j++)
 		{
 			Datum		elt2 = values2[j];
-			bool		isnull2 = nulls2[j];
+			bool		isnull2 = nulls2 ? nulls2[j] : false;
 			bool		oprresult;
 
 			if (isnull2)
@@ -3950,17 +4190,14 @@ array_contain_compare(ArrayType *array1, ArrayType *array2, Oid collation,
 		}
 	}
 
-	pfree(values2);
-	pfree(nulls2);
-
 	return result;
 }
 
 Datum
 arrayoverlap(PG_FUNCTION_ARGS)
 {
-	ArrayType  *array1 = PG_GETARG_ARRAYTYPE_P(0);
-	ArrayType  *array2 = PG_GETARG_ARRAYTYPE_P(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
 	Oid			collation = PG_GET_COLLATION();
 	bool		result;
 
@@ -3968,8 +4205,8 @@ arrayoverlap(PG_FUNCTION_ARGS)
 								   &fcinfo->flinfo->fn_extra);
 
 	/* Avoid leaking memory when handed toasted input. */
-	PG_FREE_IF_COPY(array1, 0);
-	PG_FREE_IF_COPY(array2, 1);
+	AARR_FREE_IF_COPY(array1, 0);
+	AARR_FREE_IF_COPY(array2, 1);
 
 	PG_RETURN_BOOL(result);
 }
@@ -3977,8 +4214,8 @@ arrayoverlap(PG_FUNCTION_ARGS)
 Datum
 arraycontains(PG_FUNCTION_ARGS)
 {
-	ArrayType  *array1 = PG_GETARG_ARRAYTYPE_P(0);
-	ArrayType  *array2 = PG_GETARG_ARRAYTYPE_P(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
 	Oid			collation = PG_GET_COLLATION();
 	bool		result;
 
@@ -3986,8 +4223,8 @@ arraycontains(PG_FUNCTION_ARGS)
 								   &fcinfo->flinfo->fn_extra);
 
 	/* Avoid leaking memory when handed toasted input. */
-	PG_FREE_IF_COPY(array1, 0);
-	PG_FREE_IF_COPY(array2, 1);
+	AARR_FREE_IF_COPY(array1, 0);
+	AARR_FREE_IF_COPY(array2, 1);
 
 	PG_RETURN_BOOL(result);
 }
@@ -3995,8 +4232,8 @@ arraycontains(PG_FUNCTION_ARGS)
 Datum
 arraycontained(PG_FUNCTION_ARGS)
 {
-	ArrayType  *array1 = PG_GETARG_ARRAYTYPE_P(0);
-	ArrayType  *array2 = PG_GETARG_ARRAYTYPE_P(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
 	Oid			collation = PG_GET_COLLATION();
 	bool		result;
 
@@ -4004,8 +4241,8 @@ arraycontained(PG_FUNCTION_ARGS)
 								   &fcinfo->flinfo->fn_extra);
 
 	/* Avoid leaking memory when handed toasted input. */
-	PG_FREE_IF_COPY(array1, 0);
-	PG_FREE_IF_COPY(array2, 1);
+	AARR_FREE_IF_COPY(array1, 0);
+	AARR_FREE_IF_COPY(array2, 1);
 
 	PG_RETURN_BOOL(result);
 }
@@ -4743,7 +4980,8 @@ initArrayResult(Oid element_type, MemoryContext rcontext, bool subcontext)
 		MemoryContextAlloc(arr_context, sizeof(ArrayBuildState));
 	astate->mcontext = arr_context;
 	astate->private_cxt = subcontext;
-	astate->alen = (subcontext ? 64 : 8);	/* arbitrary starting array size */
+	astate->alen = (subcontext ? 64 : 8);		/* arbitrary starting array
+												 * size */
 	astate->dvalues = (Datum *)
 		MemoryContextAlloc(arr_context, astate->alen * sizeof(Datum));
 	astate->dnulls = (bool *)
@@ -4919,10 +5157,11 @@ initArrayResultArr(Oid array_type, Oid element_type, MemoryContext rcontext,
 				   bool subcontext)
 {
 	ArrayBuildStateArr *astate;
-	MemoryContext arr_context = rcontext;   /* by default use the parent ctx */
+	MemoryContext arr_context = rcontext;		/* by default use the parent
+												 * ctx */
 
 	/* Lookup element type, unless element_type already provided */
-	if (! OidIsValid(element_type))
+	if (!OidIsValid(element_type))
 	{
 		element_type = get_element_type(array_type);
 
@@ -5300,31 +5539,19 @@ makeArrayResultAny(ArrayBuildStateAny *astate,
 Datum
 array_larger(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v1,
-			   *v2,
-			   *result;
-
-	v1 = PG_GETARG_ARRAYTYPE_P(0);
-	v2 = PG_GETARG_ARRAYTYPE_P(1);
-
-	result = ((array_cmp(fcinfo) > 0) ? v1 : v2);
-
-	PG_RETURN_ARRAYTYPE_P(result);
+	if (array_cmp(fcinfo) > 0)
+		PG_RETURN_DATUM(PG_GETARG_DATUM(0));
+	else
+		PG_RETURN_DATUM(PG_GETARG_DATUM(1));
 }
 
 Datum
 array_smaller(PG_FUNCTION_ARGS)
 {
-	ArrayType  *v1,
-			   *v2,
-			   *result;
-
-	v1 = PG_GETARG_ARRAYTYPE_P(0);
-	v2 = PG_GETARG_ARRAYTYPE_P(1);
-
-	result = ((array_cmp(fcinfo) < 0) ? v1 : v2);
-
-	PG_RETURN_ARRAYTYPE_P(result);
+	if (array_cmp(fcinfo) < 0)
+		PG_RETURN_DATUM(PG_GETARG_DATUM(0));
+	else
+		PG_RETURN_DATUM(PG_GETARG_DATUM(1));
 }
 
 
@@ -5349,7 +5576,7 @@ generate_subscripts(PG_FUNCTION_ARGS)
 	/* stuff done only on the first call of the function */
 	if (SRF_IS_FIRSTCALL())
 	{
-		ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
+		AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
 		int			reqdim = PG_GETARG_INT32(1);
 		int		   *lb,
 				   *dimv;
@@ -5358,11 +5585,11 @@ generate_subscripts(PG_FUNCTION_ARGS)
 		funcctx = SRF_FIRSTCALL_INIT();
 
 		/* Sanity check: does it look like an array at all? */
-		if (ARR_NDIM(v) <= 0 || ARR_NDIM(v) > MAXDIM)
+		if (AARR_NDIM(v) <= 0 || AARR_NDIM(v) > MAXDIM)
 			SRF_RETURN_DONE(funcctx);
 
 		/* Sanity check: was the requested dim valid */
-		if (reqdim <= 0 || reqdim > ARR_NDIM(v))
+		if (reqdim <= 0 || reqdim > AARR_NDIM(v))
 			SRF_RETURN_DONE(funcctx);
 
 		/*
@@ -5371,8 +5598,8 @@ generate_subscripts(PG_FUNCTION_ARGS)
 		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 		fctx = (generate_subscripts_fctx *) palloc(sizeof(generate_subscripts_fctx));
 
-		lb = ARR_LBOUND(v);
-		dimv = ARR_DIMS(v);
+		lb = AARR_LBOUND(v);
+		dimv = AARR_DIMS(v);
 
 		fctx->lower = lb[reqdim - 1];
 		fctx->upper = dimv[reqdim - 1] + lb[reqdim - 1] - 1;
@@ -5691,11 +5918,9 @@ array_unnest(PG_FUNCTION_ARGS)
 {
 	typedef struct
 	{
-		ArrayType  *arr;
+		array_iter	iter;
 		int			nextelem;
 		int			numelems;
-		char	   *elemdataptr;	/* this moves with nextelem */
-		bits8	   *arraynullsptr;		/* this does not */
 		int16		elmlen;
 		bool		elmbyval;
 		char		elmalign;
@@ -5708,7 +5933,7 @@ array_unnest(PG_FUNCTION_ARGS)
 	/* stuff done only on the first call of the function */
 	if (SRF_IS_FIRSTCALL())
 	{
-		ArrayType  *arr;
+		AnyArrayType *arr;
 
 		/* create a function context for cross-call persistence */
 		funcctx = SRF_FIRSTCALL_INIT();
@@ -5725,23 +5950,28 @@ array_unnest(PG_FUNCTION_ARGS)
 		 * and not before.  (If no detoast happens, we assume the originally
 		 * passed array will stick around till then.)
 		 */
-		arr = PG_GETARG_ARRAYTYPE_P(0);
+		arr = PG_GETARG_ANY_ARRAY(0);
 
 		/* allocate memory for user context */
 		fctx = (array_unnest_fctx *) palloc(sizeof(array_unnest_fctx));
 
 		/* initialize state */
-		fctx->arr = arr;
+		array_iter_setup(&fctx->iter, arr);
 		fctx->nextelem = 0;
-		fctx->numelems = ArrayGetNItems(ARR_NDIM(arr), ARR_DIMS(arr));
-
-		fctx->elemdataptr = ARR_DATA_PTR(arr);
-		fctx->arraynullsptr = ARR_NULLBITMAP(arr);
+		fctx->numelems = ArrayGetNItems(AARR_NDIM(arr), AARR_DIMS(arr));
 
-		get_typlenbyvalalign(ARR_ELEMTYPE(arr),
-							 &fctx->elmlen,
-							 &fctx->elmbyval,
-							 &fctx->elmalign);
+		if (VARATT_IS_EXPANDED_HEADER(arr))
+		{
+			/* we can just grab the type data from expanded array */
+			fctx->elmlen = arr->xpn.typlen;
+			fctx->elmbyval = arr->xpn.typbyval;
+			fctx->elmalign = arr->xpn.typalign;
+		}
+		else
+			get_typlenbyvalalign(AARR_ELEMTYPE(arr),
+								 &fctx->elmlen,
+								 &fctx->elmbyval,
+								 &fctx->elmalign);
 
 		funcctx->user_fctx = fctx;
 		MemoryContextSwitchTo(oldcontext);
@@ -5756,32 +5986,8 @@ array_unnest(PG_FUNCTION_ARGS)
 		int			offset = fctx->nextelem++;
 		Datum		elem;
 
-		/*
-		 * Check for NULL array element
-		 */
-		if (array_get_isnull(fctx->arraynullsptr, offset))
-		{
-			fcinfo->isnull = true;
-			elem = (Datum) 0;
-			/* elemdataptr does not move */
-		}
-		else
-		{
-			/*
-			 * OK, get the element
-			 */
-			char	   *ptr = fctx->elemdataptr;
-
-			fcinfo->isnull = false;
-			elem = ArrayCast(ptr, fctx->elmbyval, fctx->elmlen);
-
-			/*
-			 * Advance elemdataptr over it
-			 */
-			ptr = att_addlength_pointer(ptr, fctx->elmlen, ptr);
-			ptr = (char *) att_align_nominal(ptr, fctx->elmalign);
-			fctx->elemdataptr = ptr;
-		}
+		elem = array_iter_next(&fctx->iter, &fcinfo->isnull, offset,
+							   fctx->elmlen, fctx->elmbyval, fctx->elmalign);
 
 		SRF_RETURN_NEXT(funcctx, elem);
 	}
@@ -6033,7 +6239,8 @@ array_replace_internal(ArrayType *array,
 	result->ndim = ndim;
 	result->dataoffset = dataoffset;
 	result->elemtype = element_type;
-	memcpy(ARR_DIMS(result), ARR_DIMS(array), 2 * ndim * sizeof(int));
+	memcpy(ARR_DIMS(result), ARR_DIMS(array), ndim * sizeof(int));
+	memcpy(ARR_LBOUND(result), ARR_LBOUND(array), ndim * sizeof(int));
 
 	if (remove)
 	{
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index 6aba20de85..b336185df7 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -893,7 +893,7 @@ cashsmaller(PG_FUNCTION_ARGS)
 }
 
 /* cash_words()
- * This converts a int4 as well but to a representation using words
+ * This converts an int4 as well but to a representation using words
  * Obviously way North American centric - sorry
  */
 Datum
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index 014eca5185..4b4974b5ca 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -12,8 +12,9 @@
  *
  *-------------------------------------------------------------------------
  */
+
 /*
- * In the implementation of the next routines we assume the following:
+ * In the implementation of these routines we assume the following:
  *
  * A) if a type is "byVal" then all the information is stored in the
  * Datum itself (i.e. no pointers involved!). In this case the
@@ -34,11 +35,15 @@
  *
  * Note that we do not treat "toasted" datums specially; therefore what
  * will be copied or compared is the compressed data or toast reference.
+ * An exception is made for datumCopy() of an expanded object, however,
+ * because most callers expect to get a simple contiguous (and pfree'able)
+ * result from datumCopy().  See also datumTransfer().
  */
 
 #include "postgres.h"
 
 #include "utils/datum.h"
+#include "utils/expandeddatum.h"
 
 
 /*-------------------------------------------------------------------------
@@ -46,6 +51,7 @@
  *
  * Find the "real" size of a datum, given the datum value,
  * whether it is a "by value", and the declared type length.
+ * (For TOAST pointer datums, this is the size of the pointer datum.)
  *
  * This is essentially an out-of-line version of the att_addlength_datum()
  * macro in access/tupmacs.h.  We do a tad more error checking though.
@@ -106,9 +112,16 @@ datumGetSize(Datum value, bool typByVal, int typLen)
 /*-------------------------------------------------------------------------
  * datumCopy
  *
- * make a copy of a datum
+ * Make a copy of a non-NULL datum.
  *
  * If the datatype is pass-by-reference, memory is obtained with palloc().
+ *
+ * If the value is a reference to an expanded object, we flatten into memory
+ * obtained with palloc().  We need to copy because one of the main uses of
+ * this function is to copy a datum out of a transient memory context that's
+ * about to be destroyed, and the expanded object is probably in a child
+ * context that will also go away.  Moreover, many callers assume that the
+ * result is a single pfree-able chunk.
  *-------------------------------------------------------------------------
  */
 Datum
@@ -118,44 +131,74 @@ datumCopy(Datum value, bool typByVal, int typLen)
 
 	if (typByVal)
 		res = value;
-	else
+	else if (typLen == -1)
 	{
-		Size		realSize;
-		char	   *s;
+		/* It is a varlena datatype */
+		struct varlena *vl = (struct varlena *) DatumGetPointer(value);
 
-		if (DatumGetPointer(value) == NULL)
+		if (!vl)
 			return PointerGetDatum(NULL);
 
+		if (VARATT_IS_EXTERNAL_EXPANDED(vl))
+		{
+			/* Flatten into the caller's memory context */
+			ExpandedObjectHeader *eoh = DatumGetEOHP(value);
+			Size		resultsize;
+			char	   *resultptr;
+
+			resultsize = EOH_get_flat_size(eoh);
+			resultptr = (char *) palloc(resultsize);
+			EOH_flatten_into(eoh, (void *) resultptr, resultsize);
+			res = PointerGetDatum(resultptr);
+		}
+		else
+		{
+			/* Otherwise, just copy the varlena datum verbatim */
+			Size		realSize;
+			char	   *resultptr;
+
+			realSize = (Size) VARSIZE_ANY(vl);
+			resultptr = (char *) palloc(realSize);
+			memcpy(resultptr, vl, realSize);
+			res = PointerGetDatum(resultptr);
+		}
+	}
+	else
+	{
+		/* Pass by reference, but not varlena, so not toasted */
+		Size		realSize;
+		char	   *resultptr;
+
 		realSize = datumGetSize(value, typByVal, typLen);
 
-		s = (char *) palloc(realSize);
-		memcpy(s, DatumGetPointer(value), realSize);
-		res = PointerGetDatum(s);
+		resultptr = (char *) palloc(realSize);
+		memcpy(resultptr, DatumGetPointer(value), realSize);
+		res = PointerGetDatum(resultptr);
 	}
 	return res;
 }
 
 /*-------------------------------------------------------------------------
- * datumFree
+ * datumTransfer
  *
- * Free the space occupied by a datum CREATED BY "datumCopy"
+ * Transfer a non-NULL datum into the current memory context.
  *
- * NOTE: DO NOT USE THIS ROUTINE with datums returned by heap_getattr() etc.
- * ONLY datums created by "datumCopy" can be freed!
+ * This is equivalent to datumCopy() except when the datum is a read-write
+ * pointer to an expanded object.  In that case we merely reparent the object
+ * into the current context, and return its standard R/W pointer (in case the
+ * given one is a transient pointer of shorter lifespan).
  *-------------------------------------------------------------------------
  */
-#ifdef NOT_USED
-void
-datumFree(Datum value, bool typByVal, int typLen)
+Datum
+datumTransfer(Datum value, bool typByVal, int typLen)
 {
-	if (!typByVal)
-	{
-		Pointer		s = DatumGetPointer(value);
-
-		pfree(s);
-	}
+	if (!typByVal && typLen == -1 &&
+		VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(value)))
+		value = TransferExpandedObject(value, CurrentMemoryContext);
+	else
+		value = datumCopy(value, typByVal, typLen);
+	return value;
 }
-#endif
 
 /*-------------------------------------------------------------------------
  * datumIsEqual
diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c
index 3446da3104..d5818a9751 100644
--- a/src/backend/utils/adt/enum.c
+++ b/src/backend/utils/adt/enum.c
@@ -312,8 +312,8 @@ enum_endpoint(Oid enumtypoid, ScanDirection direction)
 
 	/*
 	 * Find the first/last enum member using pg_enum_typid_sortorder_index.
-	 * Note we must not use the syscache, and must use an MVCC snapshot here.
-	 * See comments for RenumberEnumType in catalog/pg_enum.c for more info.
+	 * Note we must not use the syscache.  See comments for RenumberEnumType
+	 * in catalog/pg_enum.c for more info.
 	 */
 	ScanKeyInit(&skey,
 				Anum_pg_enum_enumtypid,
@@ -322,8 +322,7 @@ enum_endpoint(Oid enumtypoid, ScanDirection direction)
 
 	enum_rel = heap_open(EnumRelationId, AccessShareLock);
 	enum_idx = index_open(EnumTypIdSortOrderIndexId, AccessShareLock);
-	enum_scan = systable_beginscan_ordered(enum_rel, enum_idx,
-										   GetTransactionSnapshot(),
+	enum_scan = systable_beginscan_ordered(enum_rel, enum_idx, NULL,
 										   1, &skey);
 
 	enum_tuple = systable_getnext_ordered(enum_scan, direction);
@@ -465,8 +464,8 @@ enum_range_internal(Oid enumtypoid, Oid lower, Oid upper)
 
 	/*
 	 * Scan the enum members in order using pg_enum_typid_sortorder_index.
-	 * Note we must not use the syscache, and must use an MVCC snapshot here.
-	 * See comments for RenumberEnumType in catalog/pg_enum.c for more info.
+	 * Note we must not use the syscache.  See comments for RenumberEnumType
+	 * in catalog/pg_enum.c for more info.
 	 */
 	ScanKeyInit(&skey,
 				Anum_pg_enum_enumtypid,
@@ -475,9 +474,7 @@ enum_range_internal(Oid enumtypoid, Oid lower, Oid upper)
 
 	enum_rel = heap_open(EnumRelationId, AccessShareLock);
 	enum_idx = index_open(EnumTypIdSortOrderIndexId, AccessShareLock);
-	enum_scan = systable_beginscan_ordered(enum_rel, enum_idx,
-										   GetTransactionSnapshot(),
-										   1, &skey);
+	enum_scan = systable_beginscan_ordered(enum_rel, enum_idx, NULL, 1, &skey);
 
 	max = 64;
 	elems = (Datum *) palloc(max * sizeof(Datum));
diff --git a/src/backend/utils/adt/expandeddatum.c b/src/backend/utils/adt/expandeddatum.c
new file mode 100644
index 0000000000..039671bc7d
--- /dev/null
+++ b/src/backend/utils/adt/expandeddatum.c
@@ -0,0 +1,163 @@
+/*-------------------------------------------------------------------------
+ *
+ * expandeddatum.c
+ *	  Support functions for "expanded" value representations.
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/adt/expandeddatum.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "utils/expandeddatum.h"
+#include "utils/memutils.h"
+
+/*
+ * DatumGetEOHP
+ *
+ * Given a Datum that is an expanded-object reference, extract the pointer.
+ *
+ * This is a bit tedious since the pointer may not be properly aligned;
+ * compare VARATT_EXTERNAL_GET_POINTER().
+ */
+ExpandedObjectHeader *
+DatumGetEOHP(Datum d)
+{
+	varattrib_1b_e *datum = (varattrib_1b_e *) DatumGetPointer(d);
+	varatt_expanded ptr;
+
+	Assert(VARATT_IS_EXTERNAL_EXPANDED(datum));
+	memcpy(&ptr, VARDATA_EXTERNAL(datum), sizeof(ptr));
+	Assert(VARATT_IS_EXPANDED_HEADER(ptr.eohptr));
+	return ptr.eohptr;
+}
+
+/*
+ * EOH_init_header
+ *
+ * Initialize the common header of an expanded object.
+ *
+ * The main thing this encapsulates is initializing the TOAST pointers.
+ */
+void
+EOH_init_header(ExpandedObjectHeader *eohptr,
+				const ExpandedObjectMethods *methods,
+				MemoryContext obj_context)
+{
+	varatt_expanded ptr;
+
+	eohptr->vl_len_ = EOH_HEADER_MAGIC;
+	eohptr->eoh_methods = methods;
+	eohptr->eoh_context = obj_context;
+
+	ptr.eohptr = eohptr;
+
+	SET_VARTAG_EXTERNAL(eohptr->eoh_rw_ptr, VARTAG_EXPANDED_RW);
+	memcpy(VARDATA_EXTERNAL(eohptr->eoh_rw_ptr), &ptr, sizeof(ptr));
+
+	SET_VARTAG_EXTERNAL(eohptr->eoh_ro_ptr, VARTAG_EXPANDED_RO);
+	memcpy(VARDATA_EXTERNAL(eohptr->eoh_ro_ptr), &ptr, sizeof(ptr));
+}
+
+/*
+ * EOH_get_flat_size
+ * EOH_flatten_into
+ *
+ * Convenience functions for invoking the "methods" of an expanded object.
+ */
+
+Size
+EOH_get_flat_size(ExpandedObjectHeader *eohptr)
+{
+	return (*eohptr->eoh_methods->get_flat_size) (eohptr);
+}
+
+void
+EOH_flatten_into(ExpandedObjectHeader *eohptr,
+				 void *result, Size allocated_size)
+{
+	(*eohptr->eoh_methods->flatten_into) (eohptr, result, allocated_size);
+}
+
+/*
+ * Does the Datum represent a writable expanded object?
+ */
+bool
+DatumIsReadWriteExpandedObject(Datum d, bool isnull, int16 typlen)
+{
+	/* Reject if it's NULL or not a varlena type */
+	if (isnull || typlen != -1)
+		return false;
+
+	/* Reject if not a read-write expanded-object pointer */
+	if (!VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(d)))
+		return false;
+
+	return true;
+}
+
+/*
+ * If the Datum represents a R/W expanded object, change it to R/O.
+ * Otherwise return the original Datum.
+ */
+Datum
+MakeExpandedObjectReadOnly(Datum d, bool isnull, int16 typlen)
+{
+	ExpandedObjectHeader *eohptr;
+
+	/* Nothing to do if it's NULL or not a varlena type */
+	if (isnull || typlen != -1)
+		return d;
+
+	/* Nothing to do if not a read-write expanded-object pointer */
+	if (!VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(d)))
+		return d;
+
+	/* Now safe to extract the object pointer */
+	eohptr = DatumGetEOHP(d);
+
+	/* Return the built-in read-only pointer instead of given pointer */
+	return EOHPGetRODatum(eohptr);
+}
+
+/*
+ * Transfer ownership of an expanded object to a new parent memory context.
+ * The object must be referenced by a R/W pointer, and what we return is
+ * always its "standard" R/W pointer, which is certain to have the same
+ * lifespan as the object itself.  (The passed-in pointer might not, and
+ * in any case wouldn't provide a unique identifier if it's not that one.)
+ */
+Datum
+TransferExpandedObject(Datum d, MemoryContext new_parent)
+{
+	ExpandedObjectHeader *eohptr = DatumGetEOHP(d);
+
+	/* Assert caller gave a R/W pointer */
+	Assert(VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(d)));
+
+	/* Transfer ownership */
+	MemoryContextSetParent(eohptr->eoh_context, new_parent);
+
+	/* Return the object's standard read-write pointer */
+	return EOHPGetRWDatum(eohptr);
+}
+
+/*
+ * Delete an expanded object (must be referenced by a R/W pointer).
+ */
+void
+DeleteExpandedObject(Datum d)
+{
+	ExpandedObjectHeader *eohptr = DatumGetEOHP(d);
+
+	/* Assert caller gave a R/W pointer */
+	Assert(VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(d)));
+
+	/* Kill it */
+	MemoryContextDelete(eohptr->eoh_context);
+}
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 2f0f0a1d89..a8519835cc 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -96,6 +96,9 @@ format_type_be(Oid type_oid)
 	return format_type_internal(type_oid, -1, false, false, false);
 }
 
+/*
+ * This version returns a name which is always qualified.
+ */
 char *
 format_type_be_qualified(Oid type_oid)
 {
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 40a353f513..5391ea0bf0 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -920,7 +920,7 @@ typedef struct NUMProc
 				num_count,		/* number of write digits	*/
 				num_in,			/* is inside number		*/
 				num_curr,		/* current position in number	*/
-				out_pre_spaces,	/* spaces before first digit	*/
+				out_pre_spaces, /* spaces before first digit	*/
 
 				read_dec,		/* to_number - was read dec. point	*/
 				read_post,		/* to_number - number of dec. digit */
@@ -981,7 +981,7 @@ static char *get_last_relevant_decnum(char *num);
 static void NUM_numpart_from_char(NUMProc *Np, int id, int input_len);
 static void NUM_numpart_to_char(NUMProc *Np, int id);
 static char *NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
-			  char *number, int from_char_input_len, int to_char_out_pre_spaces,
+		   char *number, int from_char_input_len, int to_char_out_pre_spaces,
 			  int sign, bool is_to_char, Oid collid);
 static DCHCacheEntry *DCH_cache_search(char *str);
 static DCHCacheEntry *DCH_cache_getnew(char *str);
@@ -2503,11 +2503,11 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				break;
 			case DCH_OF:
 				INVALID_FOR_INTERVAL;
-				sprintf(s, "%+0*ld", S_FM(n->suffix) ? 0 : 3, tm->tm_gmtoff / SECS_PER_HOUR);
+				sprintf(s, "%+0*d", S_FM(n->suffix) ? 0 : 3, (int) tm->tm_gmtoff / SECS_PER_HOUR);
 				s += strlen(s);
-				if (tm->tm_gmtoff % SECS_PER_HOUR != 0)
+				if ((int) tm->tm_gmtoff % SECS_PER_HOUR != 0)
 				{
-					sprintf(s, ":%02ld", (tm->tm_gmtoff % SECS_PER_HOUR) / SECS_PER_MINUTE);
+					sprintf(s, ":%02d", abs((int) tm->tm_gmtoff % SECS_PER_HOUR) / SECS_PER_MINUTE);
 					s += strlen(s);
 				}
 				break;
@@ -2541,14 +2541,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 					break;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_toupper_z(localized_full_months[tm->tm_mon - 1], collid);
+					char	   *str = str_toupper_z(localized_full_months[tm->tm_mon - 1], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
@@ -2561,14 +2561,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 					break;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_initcap_z(localized_full_months[tm->tm_mon - 1], collid);
+					char	   *str = str_initcap_z(localized_full_months[tm->tm_mon - 1], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
@@ -2581,14 +2581,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 					break;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_tolower_z(localized_full_months[tm->tm_mon - 1], collid);
+					char	   *str = str_tolower_z(localized_full_months[tm->tm_mon - 1], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
@@ -2601,14 +2601,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 					break;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_toupper_z(localized_abbrev_months[tm->tm_mon - 1], collid);
+					char	   *str = str_toupper_z(localized_abbrev_months[tm->tm_mon - 1], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					strcpy(s, asc_toupper_z(months[tm->tm_mon - 1]));
@@ -2620,14 +2620,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 					break;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_initcap_z(localized_abbrev_months[tm->tm_mon - 1], collid);
+					char	   *str = str_initcap_z(localized_abbrev_months[tm->tm_mon - 1], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					strcpy(s, months[tm->tm_mon - 1]);
@@ -2639,14 +2639,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 					break;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_tolower_z(localized_abbrev_months[tm->tm_mon - 1], collid);
+					char	   *str = str_tolower_z(localized_abbrev_months[tm->tm_mon - 1], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					strcpy(s, asc_tolower_z(months[tm->tm_mon - 1]));
@@ -2662,14 +2662,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				INVALID_FOR_INTERVAL;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_toupper_z(localized_full_days[tm->tm_wday], collid);
+					char	   *str = str_toupper_z(localized_full_days[tm->tm_wday], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
@@ -2680,14 +2680,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				INVALID_FOR_INTERVAL;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_initcap_z(localized_full_days[tm->tm_wday], collid);
+					char	   *str = str_initcap_z(localized_full_days[tm->tm_wday], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
@@ -2698,14 +2698,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				INVALID_FOR_INTERVAL;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_tolower_z(localized_full_days[tm->tm_wday], collid);
+					char	   *str = str_tolower_z(localized_full_days[tm->tm_wday], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
@@ -2716,14 +2716,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				INVALID_FOR_INTERVAL;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_toupper_z(localized_abbrev_days[tm->tm_wday], collid);
+					char	   *str = str_toupper_z(localized_abbrev_days[tm->tm_wday], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					strcpy(s, asc_toupper_z(days_short[tm->tm_wday]));
@@ -2733,14 +2733,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				INVALID_FOR_INTERVAL;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_initcap_z(localized_abbrev_days[tm->tm_wday], collid);
+					char	   *str = str_initcap_z(localized_abbrev_days[tm->tm_wday], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					strcpy(s, days_short[tm->tm_wday]);
@@ -2750,14 +2750,14 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				INVALID_FOR_INTERVAL;
 				if (S_TM(n->suffix))
 				{
-					char *str = str_tolower_z(localized_abbrev_days[tm->tm_wday], collid);
+					char	   *str = str_tolower_z(localized_abbrev_days[tm->tm_wday], collid);
 
 					if (strlen(str) <= (n->key->len + TM_SUFFIX_LEN) * DCH_MAX_ITEM_SIZ)
 						strcpy(s, str);
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("localized string format value too long")));
+						  errmsg("localized string format value too long")));
 				}
 				else
 					strcpy(s, asc_tolower_z(days_short[tm->tm_wday]));
@@ -4572,7 +4572,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 
 static char *
 NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
-			  char *number, int from_char_input_len, int to_char_out_pre_spaces,
+		   char *number, int from_char_input_len, int to_char_out_pre_spaces,
 			  int sign, bool is_to_char, Oid collid)
 {
 	FormatNode *n;
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 6cb6be5c5f..a3af08ad6b 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -2657,6 +2657,18 @@ dist_ppoly(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(result);
 }
 
+Datum
+dist_polyp(PG_FUNCTION_ARGS)
+{
+	POLYGON    *poly = PG_GETARG_POLYGON_P(0);
+	Point	   *point = PG_GETARG_POINT_P(1);
+	float8		result;
+
+	result = dist_ppoly_internal(point, poly);
+
+	PG_RETURN_FLOAT8(result);
+}
+
 static double
 dist_ppoly_internal(Point *pt, POLYGON *poly)
 {
@@ -4227,6 +4239,45 @@ box_div(PG_FUNCTION_ARGS)
 	PG_RETURN_BOX_P(result);
 }
 
+/*
+ * Convert point to empty box
+ */
+Datum
+point_box(PG_FUNCTION_ARGS)
+{
+	Point	   *pt = PG_GETARG_POINT_P(0);
+	BOX		   *box;
+
+	box = (BOX *) palloc(sizeof(BOX));
+
+	box->high.x = pt->x;
+	box->low.x = pt->x;
+	box->high.y = pt->y;
+	box->low.y = pt->y;
+
+	PG_RETURN_BOX_P(box);
+}
+
+/*
+ * Smallest bounding box that includes both of the given boxes
+ */
+Datum
+boxes_bound_box(PG_FUNCTION_ARGS)
+{
+	BOX		   *box1 = PG_GETARG_BOX_P(0),
+			   *box2 = PG_GETARG_BOX_P(1),
+			   *container;
+
+	container = (BOX *) palloc(sizeof(BOX));
+
+	container->high.x = Max(box1->high.x, box2->high.x);
+	container->low.x = Min(box1->low.x, box2->low.x);
+	container->high.y = Max(box1->high.y, box2->high.y);
+	container->low.y = Min(box1->low.y, box2->low.y);
+
+	PG_RETURN_BOX_P(container);
+}
+
 
 /***********************************************************************
  **
@@ -5073,6 +5124,21 @@ dist_pc(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(result);
 }
 
+/*
+ * Distance from a circle to a point
+ */
+Datum
+dist_cpoint(PG_FUNCTION_ARGS)
+{
+	CIRCLE	   *circle = PG_GETARG_CIRCLE_P(0);
+	Point	   *point = PG_GETARG_POINT_P(1);
+	float8		result;
+
+	result = point_dt(point, &circle->center) - circle->radius;
+	if (result < 0)
+		result = 0;
+	PG_RETURN_FLOAT8(result);
+}
 
 /*		circle_center	-		returns the center point of the circle.
  */
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index f08e288c21..26d3843369 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -1442,7 +1442,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 				if (DATE_NOT_FINITE(date))
 				{
 					/* we have to format infinity ourselves */
-					appendStringInfoString(result,DT_INFINITY);
+					appendStringInfoString(result, DT_INFINITY);
 				}
 				else
 				{
@@ -1465,7 +1465,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 				if (TIMESTAMP_NOT_FINITE(timestamp))
 				{
 					/* we have to format infinity ourselves */
-					appendStringInfoString(result,DT_INFINITY);
+					appendStringInfoString(result, DT_INFINITY);
 				}
 				else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0)
 				{
@@ -1492,7 +1492,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 				if (TIMESTAMP_NOT_FINITE(timestamp))
 				{
 					/* we have to format infinity ourselves */
-					appendStringInfoString(result,DT_INFINITY);
+					appendStringInfoString(result, DT_INFINITY);
 				}
 				else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0)
 				{
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 7e2c359b21..e68972221a 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -57,7 +57,7 @@ typedef enum					/* type categories for datum_to_jsonb */
 	JSONBTYPE_COMPOSITE,		/* composite */
 	JSONBTYPE_JSONCAST,			/* something with an explicit cast to JSON */
 	JSONBTYPE_OTHER				/* all else */
-}	JsonbTypeCategory;
+} JsonbTypeCategory;
 
 static inline Datum jsonb_from_cstring(char *json, int len);
 static size_t checkStringLen(size_t len);
@@ -69,7 +69,7 @@ static void jsonb_in_object_field_start(void *pstate, char *fname, bool isnull);
 static void jsonb_put_escaped_value(StringInfo out, JsonbValue *scalarVal);
 static void jsonb_in_scalar(void *pstate, char *token, JsonTokenType tokentype);
 static void jsonb_categorize_type(Oid typoid,
-					  JsonbTypeCategory * tcategory,
+					  JsonbTypeCategory *tcategory,
 					  Oid *outfuncoid);
 static void composite_to_jsonb(Datum composite, JsonbInState *result);
 static void array_dim_to_jsonb(JsonbInState *result, int dim, int ndims, int *dims,
@@ -77,14 +77,16 @@ static void array_dim_to_jsonb(JsonbInState *result, int dim, int ndims, int *di
 				   JsonbTypeCategory tcategory, Oid outfuncoid);
 static void array_to_jsonb_internal(Datum array, JsonbInState *result);
 static void jsonb_categorize_type(Oid typoid,
-					  JsonbTypeCategory * tcategory,
+					  JsonbTypeCategory *tcategory,
 					  Oid *outfuncoid);
 static void datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 			   JsonbTypeCategory tcategory, Oid outfuncoid,
 			   bool key_scalar);
 static void add_jsonb(Datum val, bool is_null, JsonbInState *result,
 		  Oid val_type, bool key_scalar);
-static JsonbParseState * clone_parse_state(JsonbParseState * state);
+static JsonbParseState *clone_parse_state(JsonbParseState *state);
+static char *JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool indent);
+static void add_indent(StringInfo out, bool indent, int level);
 
 /*
  * jsonb type input function
@@ -363,10 +365,12 @@ jsonb_in_scalar(void *pstate, char *token, JsonTokenType tokentype)
 		case JSON_TOKEN_TRUE:
 			v.type = jbvBool;
 			v.val.boolean = true;
+
 			break;
 		case JSON_TOKEN_FALSE:
 			v.type = jbvBool;
 			v.val.boolean = false;
+
 			break;
 		case JSON_TOKEN_NULL:
 			v.type = jbvNull;
@@ -422,6 +426,24 @@ jsonb_in_scalar(void *pstate, char *token, JsonTokenType tokentype)
 char *
 JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
 {
+	return JsonbToCStringWorker(out, in, estimated_len, false);
+}
+
+/*
+ * same thing but with indentation turned on
+ */
+char *
+JsonbToCStringIndent(StringInfo out, JsonbContainer *in, int estimated_len)
+{
+	return JsonbToCStringWorker(out, in, estimated_len, true);
+}
+
+/*
+ * common worker for above two functions
+ */
+static char *
+JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool indent)
+{
 	bool		first = true;
 	JsonbIterator *it;
 	JsonbIteratorToken type = WJB_DONE;
@@ -429,6 +451,17 @@ JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
 	int			level = 0;
 	bool		redo_switch = false;
 
+	/* If we are indenting, don't add a space after a comma */
+	int			ispaces = indent ? 1 : 2;
+
+	/*
+	 * Don't indent the very first item. This gets set to the indent flag at
+	 * the bottom of the loop.
+	 */
+	bool		use_indent = false;
+	bool		raw_scalar = false;
+	bool		last_was_key = false;
+
 	if (out == NULL)
 		out = makeStringInfo();
 
@@ -444,26 +477,36 @@ JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
 		{
 			case WJB_BEGIN_ARRAY:
 				if (!first)
-					appendBinaryStringInfo(out, ", ", 2);
-				first = true;
+					appendBinaryStringInfo(out, ", ", ispaces);
 
 				if (!v.val.array.rawScalar)
-					appendStringInfoChar(out, '[');
+				{
+					add_indent(out, use_indent && !last_was_key, level);
+					appendStringInfoCharMacro(out, '[');
+				}
+				else
+					raw_scalar = true;
+
+				first = true;
 				level++;
 				break;
 			case WJB_BEGIN_OBJECT:
 				if (!first)
-					appendBinaryStringInfo(out, ", ", 2);
-				first = true;
+					appendBinaryStringInfo(out, ", ", ispaces);
+
+				add_indent(out, use_indent && !last_was_key, level);
 				appendStringInfoCharMacro(out, '{');
 
+				first = true;
 				level++;
 				break;
 			case WJB_KEY:
 				if (!first)
-					appendBinaryStringInfo(out, ", ", 2);
+					appendBinaryStringInfo(out, ", ", ispaces);
 				first = true;
 
+				add_indent(out, use_indent, level);
+
 				/* json rules guarantee this is a string */
 				jsonb_put_escaped_value(out, &v);
 				appendBinaryStringInfo(out, ": ", 2);
@@ -488,26 +531,33 @@ JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
 				break;
 			case WJB_ELEM:
 				if (!first)
-					appendBinaryStringInfo(out, ", ", 2);
-				else
-					first = false;
+					appendBinaryStringInfo(out, ", ", ispaces);
+				first = false;
 
+				if (!raw_scalar)
+					add_indent(out, use_indent, level);
 				jsonb_put_escaped_value(out, &v);
 				break;
 			case WJB_END_ARRAY:
 				level--;
-				if (!v.val.array.rawScalar)
-					appendStringInfoChar(out, ']');
+				if (!raw_scalar)
+				{
+					add_indent(out, use_indent, level);
+					appendStringInfoCharMacro(out, ']');
+				}
 				first = false;
 				break;
 			case WJB_END_OBJECT:
 				level--;
+				add_indent(out, use_indent, level);
 				appendStringInfoCharMacro(out, '}');
 				first = false;
 				break;
 			default:
 				elog(ERROR, "unknown jsonb iterator token type");
 		}
+		use_indent = indent;
+		last_was_key = redo_switch;
 	}
 
 	Assert(level == 0);
@@ -515,17 +565,30 @@ JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
 	return out->data;
 }
 
+static void
+add_indent(StringInfo out, bool indent, int level)
+{
+	if (indent)
+	{
+		int			i;
+
+		appendStringInfoCharMacro(out, '\n');
+		for (i = 0; i < level; i++)
+			appendBinaryStringInfo(out, "    ", 4);
+	}
+}
+
 
 /*
  * Determine how we want to render values of a given type in datum_to_jsonb.
  *
  * Given the datatype OID, return its JsonbTypeCategory, as well as the type's
  * output function OID.  If the returned category is JSONBTYPE_JSONCAST,
- *  we return the OID of the relevant cast function instead.
+ * we return the OID of the relevant cast function instead.
  */
 static void
 jsonb_categorize_type(Oid typoid,
-					  JsonbTypeCategory * tcategory,
+					  JsonbTypeCategory *tcategory,
 					  Oid *outfuncoid)
 {
 	bool		typisvarlena;
@@ -590,16 +653,16 @@ jsonb_categorize_type(Oid typoid,
 				*tcategory = JSONBTYPE_OTHER;
 
 				/*
-				 * but first let's look for a cast to json (note: not to jsonb)
-				 * if it's not built-in.
+				 * but first let's look for a cast to json (note: not to
+				 * jsonb) if it's not built-in.
 				 */
 				if (typoid >= FirstNormalObjectId)
 				{
-					Oid castfunc;
+					Oid			castfunc;
 					CoercionPathType ctype;
 
 					ctype = find_coercion_pathway(JSONOID, typoid,
-												  COERCION_EXPLICIT, &castfunc);
+											   COERCION_EXPLICIT, &castfunc);
 					if (ctype == COERCION_PATH_FUNC && OidIsValid(castfunc))
 					{
 						*tcategory = JSONBTYPE_JSONCAST;
@@ -715,30 +778,30 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 					}
 				}
 				break;
-		case JSONBTYPE_DATE:
-			{
-				DateADT		date;
-				struct pg_tm tm;
-				char		buf[MAXDATELEN + 1];
+			case JSONBTYPE_DATE:
+				{
+					DateADT		date;
+					struct pg_tm tm;
+					char		buf[MAXDATELEN + 1];
 
-				date = DatumGetDateADT(val);
-				jb.type = jbvString;
+					date = DatumGetDateADT(val);
+					jb.type = jbvString;
 
-				if (DATE_NOT_FINITE(date))
-				{
-					jb.val.string.len = strlen(DT_INFINITY);
-					jb.val.string.val = pstrdup(DT_INFINITY);
-				}
-				else
-				{
-					j2date(date + POSTGRES_EPOCH_JDATE,
-						   &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
-					EncodeDateOnly(&tm, USE_XSD_DATES, buf);
-					jb.val.string.len = strlen(buf);
-					jb.val.string.val = pstrdup(buf);
+					if (DATE_NOT_FINITE(date))
+					{
+						jb.val.string.len = strlen(DT_INFINITY);
+						jb.val.string.val = pstrdup(DT_INFINITY);
+					}
+					else
+					{
+						j2date(date + POSTGRES_EPOCH_JDATE,
+							   &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
+						EncodeDateOnly(&tm, USE_XSD_DATES, buf);
+						jb.val.string.len = strlen(buf);
+						jb.val.string.val = pstrdup(buf);
+					}
 				}
-			}
-			break;
+				break;
 			case JSONBTYPE_TIMESTAMP:
 				{
 					Timestamp	timestamp;
@@ -1475,9 +1538,11 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS)
  * change them.
  */
 static JsonbParseState *
-clone_parse_state(JsonbParseState * state)
+clone_parse_state(JsonbParseState *state)
 {
-	JsonbParseState *result, *icursor, *ocursor;
+	JsonbParseState *result,
+			   *icursor,
+			   *ocursor;
 
 	if (state == NULL)
 		return NULL;
@@ -1485,14 +1550,14 @@ clone_parse_state(JsonbParseState * state)
 	result = palloc(sizeof(JsonbParseState));
 	icursor = state;
 	ocursor = result;
-	for(;;)
+	for (;;)
 	{
 		ocursor->contVal = icursor->contVal;
 		ocursor->size = icursor->size;
 		icursor = icursor->next;
 		if (icursor == NULL)
 			break;
-		ocursor->next= palloc(sizeof(JsonbParseState));
+		ocursor->next = palloc(sizeof(JsonbParseState));
 		ocursor = ocursor->next;
 	}
 	ocursor->next = NULL;
@@ -1593,15 +1658,16 @@ jsonb_agg_transfn(PG_FUNCTION_ARGS)
 				{
 					/* copy string values in the aggregate context */
 					char	   *buf = palloc(v.val.string.len + 1);
+
 					snprintf(buf, v.val.string.len + 1, "%s", v.val.string.val);
 					v.val.string.val = buf;
 				}
 				else if (v.type == jbvNumeric)
 				{
 					/* same for numeric */
-				  v.val.numeric =
+					v.val.numeric =
 					DatumGetNumeric(DirectFunctionCall1(numeric_uplus,
-														NumericGetDatum(v.val.numeric)));
+											NumericGetDatum(v.val.numeric)));
 
 				}
 				result->res = pushJsonbValue(&result->parseState,
@@ -1634,15 +1700,15 @@ jsonb_agg_finalfn(PG_FUNCTION_ARGS)
 
 	/*
 	 * We need to do a shallow clone of the argument in case the final
-	 * function is called more than once, so we avoid changing the argument.
-	 * A shallow clone is sufficient as we aren't going to change any of the
+	 * function is called more than once, so we avoid changing the argument. A
+	 * shallow clone is sufficient as we aren't going to change any of the
 	 * values, just add the final array end marker.
 	 */
 
 	result.parseState = clone_parse_state(arg->parseState);
 
 	result.res = pushJsonbValue(&result.parseState,
-								 WJB_END_ARRAY, NULL);
+								WJB_END_ARRAY, NULL);
 
 
 	out = JsonbValueToJsonb(result.res);
@@ -1754,6 +1820,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
 				{
 					/* copy string values in the aggregate context */
 					char	   *buf = palloc(v.val.string.len + 1);
+
 					snprintf(buf, v.val.string.len + 1, "%s", v.val.string.val);
 					v.val.string.val = buf;
 				}
@@ -1812,6 +1879,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
 				{
 					/* copy string values in the aggregate context */
 					char	   *buf = palloc(v.val.string.len + 1);
+
 					snprintf(buf, v.val.string.len + 1, "%s", v.val.string.val);
 					v.val.string.val = buf;
 				}
@@ -1819,8 +1887,8 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
 				{
 					/* same for numeric */
 					v.val.numeric =
-					  DatumGetNumeric(DirectFunctionCall1(numeric_uplus,
-														  NumericGetDatum(v.val.numeric)));
+					DatumGetNumeric(DirectFunctionCall1(numeric_uplus,
+											NumericGetDatum(v.val.numeric)));
 
 				}
 				result->res = pushJsonbValue(&result->parseState,
@@ -1841,7 +1909,7 @@ Datum
 jsonb_object_agg_finalfn(PG_FUNCTION_ARGS)
 {
 	JsonbInState *arg;
-	JsonbInState  result;
+	JsonbInState result;
 	Jsonb	   *out;
 
 	/* cannot be called directly because of internal-type argument */
@@ -1854,15 +1922,15 @@ jsonb_object_agg_finalfn(PG_FUNCTION_ARGS)
 
 	/*
 	 * We need to do a shallow clone of the argument in case the final
-	 * function is called more than once, so we avoid changing the argument.
-	 * A shallow clone is sufficient as we aren't going to change any of the
+	 * function is called more than once, so we avoid changing the argument. A
+	 * shallow clone is sufficient as we aren't going to change any of the
 	 * values, just add the final object end marker.
 	 */
 
 	result.parseState = clone_parse_state(arg->parseState);
 
 	result.res = pushJsonbValue(&result.parseState,
-								 WJB_END_OBJECT, NULL);
+								WJB_END_OBJECT, NULL);
 
 
 	out = JsonbValueToJsonb(result.res);
diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c
index bc521ed831..2591c81f3d 100644
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@ -15,7 +15,7 @@
 
 #include "access/gin.h"
 #include "access/hash.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index 5cd9140896..4d733159d0 100644
--- a/src/backend/utils/adt/jsonb_util.c
+++ b/src/backend/utils/adt/jsonb_util.c
@@ -57,6 +57,9 @@ static void appendElement(JsonbParseState *pstate, JsonbValue *scalarVal);
 static int	lengthCompareJsonbStringValue(const void *a, const void *b);
 static int	lengthCompareJsonbPair(const void *a, const void *b, void *arg);
 static void uniqueifyJsonbObject(JsonbValue *object);
+static JsonbValue *pushJsonbValueScalar(JsonbParseState **pstate,
+					 JsonbIteratorToken seq,
+					 JsonbValue *scalarVal);
 
 /*
  * Turn an in-memory JsonbValue into a Jsonb for on-disk storage.
@@ -503,11 +506,44 @@ fillJsonbValue(JsonbContainer *container, int index,
  *
  * Only sequential tokens pertaining to non-container types should pass a
  * JsonbValue.  There is one exception -- WJB_BEGIN_ARRAY callers may pass a
- * "raw scalar" pseudo array to append that.
+ * "raw scalar" pseudo array to append it - the actual scalar should be passed
+ * next and it will be added as the only member of the array.
+ *
+ * Values of type jvbBinary, which are rolled up arrays and objects,
+ * are unpacked before being added to the result.
  */
 JsonbValue *
 pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq,
-			   JsonbValue *scalarVal)
+			   JsonbValue *jbval)
+{
+	JsonbIterator *it;
+	JsonbValue *res = NULL;
+	JsonbValue	v;
+	JsonbIteratorToken tok;
+
+	if (!jbval || (seq != WJB_ELEM && seq != WJB_VALUE) ||
+		jbval->type != jbvBinary)
+	{
+		/* drop through */
+		return pushJsonbValueScalar(pstate, seq, jbval);
+	}
+
+	/* unpack the binary and add each piece to the pstate */
+	it = JsonbIteratorInit(jbval->val.binary.data);
+	while ((tok = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
+		res = pushJsonbValueScalar(pstate, tok,
+								   tok < WJB_BEGIN_ARRAY ? &v : NULL);
+
+	return res;
+}
+
+/*
+ * Do the actual pushing, with only scalar or pseudo-scalar-array values
+ * accepted.
+ */
+static JsonbValue *
+pushJsonbValueScalar(JsonbParseState **pstate, JsonbIteratorToken seq,
+					 JsonbValue *scalarVal)
 {
 	JsonbValue *result = NULL;
 
@@ -549,13 +585,11 @@ pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq,
 			appendKey(*pstate, scalarVal);
 			break;
 		case WJB_VALUE:
-			Assert(IsAJsonbScalar(scalarVal) ||
-				   scalarVal->type == jbvBinary);
+			Assert(IsAJsonbScalar(scalarVal));
 			appendValue(*pstate, scalarVal);
 			break;
 		case WJB_ELEM:
-			Assert(IsAJsonbScalar(scalarVal) ||
-				   scalarVal->type == jbvBinary);
+			Assert(IsAJsonbScalar(scalarVal));
 			appendElement(*pstate, scalarVal);
 			break;
 		case WJB_END_OBJECT:
@@ -1197,6 +1231,7 @@ JsonbHashScalarValue(const JsonbValue *scalarVal, uint32 *hash)
 			break;
 		case jbvBool:
 			tmp = scalarVal->val.boolean ? 0x02 : 0x04;
+
 			break;
 		default:
 			elog(ERROR, "invalid jsonb scalar type");
@@ -1270,7 +1305,7 @@ compareJsonbScalarValue(JsonbValue *aScalar, JsonbValue *bScalar)
 			case jbvBool:
 				if (aScalar->val.boolean == bScalar->val.boolean)
 					return 0;
-				else if (aScalar->val.boolean > bScalar->val.boolean)
+				else if (aScalar->val.boolean >bScalar->val.boolean)
 					return 1;
 				else
 					return -1;
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 274f64c95f..f87ba77e3e 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -110,8 +110,8 @@ static void sn_object_start(void *state);
 static void sn_object_end(void *state);
 static void sn_array_start(void *state);
 static void sn_array_end(void *state);
-static void sn_object_field_start (void *state, char *fname, bool isnull);
-static void sn_array_element_start (void *state, bool isnull);
+static void sn_object_field_start(void *state, char *fname, bool isnull);
+static void sn_array_element_start(void *state, bool isnull);
 static void sn_scalar(void *state, char *token, JsonTokenType tokentype);
 
 /* worker function for populate_recordset and to_recordset */
@@ -124,6 +124,22 @@ static JsonbValue *findJsonbValueFromContainerLen(JsonbContainer *container,
 							   char *key,
 							   uint32 keylen);
 
+/* functions supporting jsonb_delete, jsonb_set and jsonb_concat */
+static JsonbValue *IteratorConcat(JsonbIterator **it1, JsonbIterator **it2,
+			   JsonbParseState **state);
+static JsonbValue *setPath(JsonbIterator **it, Datum *path_elems,
+		bool *path_nulls, int path_len,
+		JsonbParseState **st, int level, Jsonb *newval,
+		bool create);
+static void setPathObject(JsonbIterator **it, Datum *path_elems,
+			  bool *path_nulls, int path_len, JsonbParseState **st,
+			  int level,
+			  Jsonb *newval, uint32 npairs, bool create);
+static void setPathArray(JsonbIterator **it, Datum *path_elems,
+			 bool *path_nulls, int path_len, JsonbParseState **st,
+			 int level, Jsonb *newval, uint32 nelems, bool create);
+static void addJsonbToParseState(JsonbParseState **jbps, Jsonb *jb);
+
 /* state for json_object_keys */
 typedef struct OkeysState
 {
@@ -235,10 +251,11 @@ typedef struct PopulateRecordsetState
 } PopulateRecordsetState;
 
 /* state for json_strip_nulls */
-typedef struct StripnullState{
+typedef struct StripnullState
+{
 	JsonLexContext *lex;
-	StringInfo  strval;
-	bool skip_next_null;
+	StringInfo	strval;
+	bool		skip_next_null;
 } StripnullState;
 
 /* Turn a jsonb object into a record */
@@ -2115,6 +2132,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 		if (hash_get_num_entries(json_hash) == 0 && rec)
 		{
 			hash_destroy(json_hash);
+			ReleaseTupleDesc(tupdesc);
 			PG_RETURN_POINTER(rec);
 		}
 	}
@@ -2123,8 +2141,11 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 		jb = PG_GETARG_JSONB(json_arg_num);
 
 		/* same logic as for json */
-		if (!have_record_arg && rec)
+		if (JB_ROOT_COUNT(jb) == 0 && rec)
+		{
+			ReleaseTupleDesc(tupdesc);
 			PG_RETURN_POINTER(rec);
+		}
 	}
 
 	ncolumns = tupdesc->natts;
@@ -3026,6 +3047,7 @@ static void
 sn_object_start(void *state)
 {
 	StripnullState *_state = (StripnullState *) state;
+
 	appendStringInfoCharMacro(_state->strval, '{');
 }
 
@@ -3033,6 +3055,7 @@ static void
 sn_object_end(void *state)
 {
 	StripnullState *_state = (StripnullState *) state;
+
 	appendStringInfoCharMacro(_state->strval, '}');
 }
 
@@ -3040,6 +3063,7 @@ static void
 sn_array_start(void *state)
 {
 	StripnullState *_state = (StripnullState *) state;
+
 	appendStringInfoCharMacro(_state->strval, '[');
 }
 
@@ -3047,21 +3071,21 @@ static void
 sn_array_end(void *state)
 {
 	StripnullState *_state = (StripnullState *) state;
+
 	appendStringInfoCharMacro(_state->strval, ']');
 }
 
 static void
-sn_object_field_start (void *state, char *fname, bool isnull)
+sn_object_field_start(void *state, char *fname, bool isnull)
 {
 	StripnullState *_state = (StripnullState *) state;
 
 	if (isnull)
 	{
 		/*
-		 * The next thing must be a scalar or isnull couldn't be true,
-		 * so there is no danger of this state being carried down
-		 * into a nested  object or array. The flag will be reset in the
-		 * scalar action.
+		 * The next thing must be a scalar or isnull couldn't be true, so
+		 * there is no danger of this state being carried down into a nested
+		 * object or array. The flag will be reset in the scalar action.
 		 */
 		_state->skip_next_null = true;
 		return;
@@ -3071,16 +3095,16 @@ sn_object_field_start (void *state, char *fname, bool isnull)
 		appendStringInfoCharMacro(_state->strval, ',');
 
 	/*
-	 * Unfortunately we don't have the quoted and escaped string any more,
-	 * so we have to re-escape it.
+	 * Unfortunately we don't have the quoted and escaped string any more, so
+	 * we have to re-escape it.
 	 */
-	escape_json(_state->strval,fname);
+	escape_json(_state->strval, fname);
 
 	appendStringInfoCharMacro(_state->strval, ':');
 }
 
 static void
-sn_array_element_start (void *state, bool isnull)
+sn_array_element_start(void *state, bool isnull)
 {
 	StripnullState *_state = (StripnullState *) state;
 
@@ -3095,7 +3119,7 @@ sn_scalar(void *state, char *token, JsonTokenType tokentype)
 
 	if (_state->skip_next_null)
 	{
-		Assert (tokentype == JSON_TOKEN_NULL);
+		Assert(tokentype == JSON_TOKEN_NULL);
 		_state->skip_next_null = false;
 		return;
 	}
@@ -3113,7 +3137,7 @@ Datum
 json_strip_nulls(PG_FUNCTION_ARGS)
 {
 	text	   *json = PG_GETARG_TEXT_P(0);
-	StripnullState  *state;
+	StripnullState *state;
 	JsonLexContext *lex;
 	JsonSemAction *sem;
 
@@ -3147,13 +3171,14 @@ json_strip_nulls(PG_FUNCTION_ARGS)
 Datum
 jsonb_strip_nulls(PG_FUNCTION_ARGS)
 {
-	Jsonb * jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB(0);
 	JsonbIterator *it;
 	JsonbParseState *parseState = NULL;
 	JsonbValue *res = NULL;
-	int type;
-	JsonbValue v,k;
-	bool last_was_key = false;
+	int			type;
+	JsonbValue	v,
+				k;
+	bool		last_was_key = false;
 
 	if (JB_ROOT_IS_SCALAR(jb))
 		PG_RETURN_POINTER(jb);
@@ -3162,7 +3187,7 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)
 
 	while ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
 	{
-		Assert( ! (type == WJB_KEY && last_was_key));
+		Assert(!(type == WJB_KEY && last_was_key));
 
 		if (type == WJB_KEY)
 		{
@@ -3195,3 +3220,675 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)
 
 	PG_RETURN_POINTER(JsonbValueToJsonb(res));
 }
+
+/*
+ * Add values from the jsonb to the parse state.
+ *
+ * If the parse state container is an object, the jsonb is pushed as
+ * a value, not a key.
+ *
+ * This needs to be done using an iterator because pushJsonbValue doesn't
+ * like getting jbvBinary values, so we can't just push jb as a whole.
+ */
+static void
+addJsonbToParseState(JsonbParseState **jbps, Jsonb *jb)
+{
+	JsonbIterator *it;
+	JsonbValue *o = &(*jbps)->contVal;
+	int			type;
+	JsonbValue	v;
+
+	it = JsonbIteratorInit(&jb->root);
+
+	Assert(o->type == jbvArray || o->type == jbvObject);
+
+	if (JB_ROOT_IS_SCALAR(jb))
+	{
+		(void) JsonbIteratorNext(&it, &v, false);		/* skip array header */
+		(void) JsonbIteratorNext(&it, &v, false);		/* fetch scalar value */
+
+		switch (o->type)
+		{
+			case jbvArray:
+				(void) pushJsonbValue(jbps, WJB_ELEM, &v);
+				break;
+			case jbvObject:
+				(void) pushJsonbValue(jbps, WJB_VALUE, &v);
+				break;
+			default:
+				elog(ERROR, "unexpected parent of nested structure");
+		}
+	}
+	else
+	{
+		while ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
+		{
+			if (type == WJB_KEY || type == WJB_VALUE || type == WJB_ELEM)
+				(void) pushJsonbValue(jbps, type, &v);
+			else
+				(void) pushJsonbValue(jbps, type, NULL);
+		}
+	}
+
+}
+
+/*
+ * SQL function jsonb_pretty (jsonb)
+ *
+ * Pretty-printed text for the jsonb
+ */
+Datum
+jsonb_pretty(PG_FUNCTION_ARGS)
+{
+	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	StringInfo	str = makeStringInfo();
+
+	JsonbToCStringIndent(str, &jb->root, VARSIZE(jb));
+
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(str->data, str->len));
+}
+
+/*
+ * SQL function jsonb_concat (jsonb, jsonb)
+ *
+ * function for || operator
+ */
+Datum
+jsonb_concat(PG_FUNCTION_ARGS)
+{
+	Jsonb	   *jb1 = PG_GETARG_JSONB(0);
+	Jsonb	   *jb2 = PG_GETARG_JSONB(1);
+	JsonbParseState *state = NULL;
+	JsonbValue *res;
+	JsonbIterator *it1,
+			   *it2;
+
+	/*
+	 * If one of the jsonb is empty, just return other.
+	 */
+	if (JB_ROOT_COUNT(jb1) == 0)
+		PG_RETURN_JSONB(jb2);
+	else if (JB_ROOT_COUNT(jb2) == 0)
+		PG_RETURN_JSONB(jb1);
+
+	it1 = JsonbIteratorInit(&jb1->root);
+	it2 = JsonbIteratorInit(&jb2->root);
+
+	res = IteratorConcat(&it1, &it2, &state);
+
+	Assert(res != NULL);
+
+	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+}
+
+
+/*
+ * SQL function jsonb_delete (jsonb, text)
+ *
+ * return a copy of the jsonb with the indicated item
+ * removed.
+ */
+Datum
+jsonb_delete(PG_FUNCTION_ARGS)
+{
+	Jsonb	   *in = PG_GETARG_JSONB(0);
+	text	   *key = PG_GETARG_TEXT_PP(1);
+	char	   *keyptr = VARDATA_ANY(key);
+	int			keylen = VARSIZE_ANY_EXHDR(key);
+	JsonbParseState *state = NULL;
+	JsonbIterator *it;
+	uint32		r;
+	JsonbValue	v,
+			   *res = NULL;
+	bool		skipNested = false;
+
+	if (JB_ROOT_IS_SCALAR(in))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot delete from scalar")));
+
+	if (JB_ROOT_COUNT(in) == 0)
+		PG_RETURN_JSONB(in);
+
+	it = JsonbIteratorInit(&in->root);
+
+	while ((r = JsonbIteratorNext(&it, &v, skipNested)) != 0)
+	{
+		skipNested = true;
+
+		if ((r == WJB_ELEM || r == WJB_KEY) &&
+			(v.type == jbvString && keylen == v.val.string.len &&
+			 memcmp(keyptr, v.val.string.val, keylen) == 0))
+		{
+			/* skip corresponding value as well */
+			if (r == WJB_KEY)
+				JsonbIteratorNext(&it, &v, true);
+
+			continue;
+		}
+
+		res = pushJsonbValue(&state, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
+	}
+
+	Assert(res != NULL);
+
+	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+}
+
+/*
+ * SQL function jsonb_delete (jsonb, int)
+ *
+ * return a copy of the jsonb with the indicated item
+ * removed. Negative int means count back from the
+ * end of the items.
+ */
+Datum
+jsonb_delete_idx(PG_FUNCTION_ARGS)
+{
+	Jsonb	   *in = PG_GETARG_JSONB(0);
+	int			idx = PG_GETARG_INT32(1);
+	JsonbParseState *state = NULL;
+	JsonbIterator *it;
+	uint32		r,
+				i = 0,
+				n;
+	JsonbValue	v,
+			   *res = NULL;
+
+	if (JB_ROOT_IS_SCALAR(in))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot delete from scalar")));
+
+	if (JB_ROOT_COUNT(in) == 0)
+		PG_RETURN_JSONB(in);
+
+	it = JsonbIteratorInit(&in->root);
+
+	r = JsonbIteratorNext(&it, &v, false);
+	if (r == WJB_BEGIN_ARRAY)
+		n = v.val.array.nElems;
+	else
+		n = v.val.object.nPairs;
+
+	if (idx < 0)
+	{
+		if (-idx > n)
+			idx = n;
+		else
+			idx = n + idx;
+	}
+
+	if (idx >= n)
+		PG_RETURN_JSONB(in);
+
+	pushJsonbValue(&state, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
+
+	while ((r = JsonbIteratorNext(&it, &v, true)) != 0)
+	{
+		if (r == WJB_ELEM || r == WJB_KEY)
+		{
+			if (i++ == idx)
+			{
+				if (r == WJB_KEY)
+					JsonbIteratorNext(&it, &v, true);	/* skip value */
+				continue;
+			}
+		}
+
+		res = pushJsonbValue(&state, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
+	}
+
+	Assert(res != NULL);
+
+	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+}
+
+/*
+ * SQL function jsonb_set(jsonb, text[], jsonb, boolean)
+ *
+ */
+Datum
+jsonb_set(PG_FUNCTION_ARGS)
+{
+	Jsonb	   *in = PG_GETARG_JSONB(0);
+	ArrayType  *path = PG_GETARG_ARRAYTYPE_P(1);
+	Jsonb	   *newval = PG_GETARG_JSONB(2);
+	bool		create = PG_GETARG_BOOL(3);
+	JsonbValue *res = NULL;
+	Datum	   *path_elems;
+	bool	   *path_nulls;
+	int			path_len;
+	JsonbIterator *it;
+	JsonbParseState *st = NULL;
+
+	if (ARR_NDIM(path) > 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+				 errmsg("wrong number of array subscripts")));
+
+	if (JB_ROOT_IS_SCALAR(in))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot set path in scalar")));
+
+	if (JB_ROOT_COUNT(in) == 0 && !create)
+		PG_RETURN_JSONB(in);
+
+	deconstruct_array(path, TEXTOID, -1, false, 'i',
+					  &path_elems, &path_nulls, &path_len);
+
+	if (path_len == 0)
+		PG_RETURN_JSONB(in);
+
+	it = JsonbIteratorInit(&in->root);
+
+	res = setPath(&it, path_elems, path_nulls, path_len, &st,
+				  0, newval, create);
+
+	Assert(res != NULL);
+
+	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+}
+
+
+/*
+ * SQL function jsonb_delete(jsonb, text[])
+ */
+Datum
+jsonb_delete_path(PG_FUNCTION_ARGS)
+{
+	Jsonb	   *in = PG_GETARG_JSONB(0);
+	ArrayType  *path = PG_GETARG_ARRAYTYPE_P(1);
+	JsonbValue *res = NULL;
+	Datum	   *path_elems;
+	bool	   *path_nulls;
+	int			path_len;
+	JsonbIterator *it;
+	JsonbParseState *st = NULL;
+
+	if (ARR_NDIM(path) > 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+				 errmsg("wrong number of array subscripts")));
+
+	if (JB_ROOT_IS_SCALAR(in))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot delete path in scalar")));
+
+	if (JB_ROOT_COUNT(in) == 0)
+		PG_RETURN_JSONB(in);
+
+	deconstruct_array(path, TEXTOID, -1, false, 'i',
+					  &path_elems, &path_nulls, &path_len);
+
+	if (path_len == 0)
+		PG_RETURN_JSONB(in);
+
+	it = JsonbIteratorInit(&in->root);
+
+	res = setPath(&it, path_elems, path_nulls, path_len, &st, 0, NULL, false);
+
+	Assert(res != NULL);
+
+	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+}
+
+/*
+ * Iterate over all jsonb objects and merge them into one.
+ * The logic of this function copied from the same hstore function,
+ * except the case, when it1 & it2 represents jbvObject.
+ * In that case we just append the content of it2 to it1 without any
+ * verifications.
+ */
+static JsonbValue *
+IteratorConcat(JsonbIterator **it1, JsonbIterator **it2,
+			   JsonbParseState **state)
+{
+	uint32		r1,
+				r2,
+				rk1,
+				rk2;
+	JsonbValue	v1,
+				v2,
+			   *res = NULL;
+
+	r1 = rk1 = JsonbIteratorNext(it1, &v1, false);
+	r2 = rk2 = JsonbIteratorNext(it2, &v2, false);
+
+	/*
+	 * Both elements are objects.
+	 */
+	if (rk1 == WJB_BEGIN_OBJECT && rk2 == WJB_BEGIN_OBJECT)
+	{
+		/*
+		 * Append the all tokens from v1 to res, except last WJB_END_OBJECT
+		 * (because res will not be finished yet).
+		 */
+		pushJsonbValue(state, r1, NULL);
+		while ((r1 = JsonbIteratorNext(it1, &v1, true)) != WJB_END_OBJECT)
+			pushJsonbValue(state, r1, &v1);
+
+		/*
+		 * Append the all tokens from v2 to res, include last WJB_END_OBJECT
+		 * (the concatenation will be completed).
+		 */
+		while ((r2 = JsonbIteratorNext(it2, &v2, true)) != 0)
+			res = pushJsonbValue(state, r2, r2 != WJB_END_OBJECT ? &v2 : NULL);
+	}
+
+	/*
+	 * Both elements are arrays (either can be scalar).
+	 */
+	else if (rk1 == WJB_BEGIN_ARRAY && rk2 == WJB_BEGIN_ARRAY)
+	{
+		pushJsonbValue(state, r1, NULL);
+
+		while ((r1 = JsonbIteratorNext(it1, &v1, true)) != WJB_END_ARRAY)
+		{
+			Assert(r1 == WJB_ELEM);
+			pushJsonbValue(state, r1, &v1);
+		}
+
+		while ((r2 = JsonbIteratorNext(it2, &v2, true)) != WJB_END_ARRAY)
+		{
+			Assert(r2 == WJB_ELEM);
+			pushJsonbValue(state, WJB_ELEM, &v2);
+		}
+
+		res = pushJsonbValue(state, WJB_END_ARRAY, NULL /* signal to sort */ );
+	}
+	/* have we got array || object or object || array? */
+	else if (((rk1 == WJB_BEGIN_ARRAY && !(*it1)->isScalar) && rk2 == WJB_BEGIN_OBJECT) ||
+			 (rk1 == WJB_BEGIN_OBJECT && (rk2 == WJB_BEGIN_ARRAY && !(*it2)->isScalar)))
+	{
+
+		JsonbIterator **it_array = rk1 == WJB_BEGIN_ARRAY ? it1 : it2;
+		JsonbIterator **it_object = rk1 == WJB_BEGIN_OBJECT ? it1 : it2;
+
+		bool		prepend = (rk1 == WJB_BEGIN_OBJECT);
+
+		pushJsonbValue(state, WJB_BEGIN_ARRAY, NULL);
+
+		if (prepend)
+		{
+			pushJsonbValue(state, WJB_BEGIN_OBJECT, NULL);
+			while ((r1 = JsonbIteratorNext(it_object, &v1, true)) != 0)
+				pushJsonbValue(state, r1, r1 != WJB_END_OBJECT ? &v1 : NULL);
+
+			while ((r2 = JsonbIteratorNext(it_array, &v2, true)) != 0)
+				res = pushJsonbValue(state, r2, r2 != WJB_END_ARRAY ? &v2 : NULL);
+		}
+		else
+		{
+			while ((r1 = JsonbIteratorNext(it_array, &v1, true)) != WJB_END_ARRAY)
+				pushJsonbValue(state, r1, &v1);
+
+			pushJsonbValue(state, WJB_BEGIN_OBJECT, NULL);
+			while ((r2 = JsonbIteratorNext(it_object, &v2, true)) != 0)
+				pushJsonbValue(state, r2, r2 != WJB_END_OBJECT ? &v2 : NULL);
+
+			res = pushJsonbValue(state, WJB_END_ARRAY, NULL);
+		}
+	}
+	else
+	{
+		/*
+		 * This must be scalar || object or object || scalar, as that's all
+		 * that's left. Both of these make no sense, so error out.
+		 */
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("invalid concatenation of jsonb objects")));
+	}
+
+	return res;
+}
+
+/*
+ * Do most of the heavy work for jsonb_set
+ *
+ * If newval is null, the element is to be removed.
+ *
+ * If create is true, we create the new value if the key or array index
+ * does not exist. All path elemnts before the last must already exist
+ * whether or not create is true, or nothing is done.
+ */
+static JsonbValue *
+setPath(JsonbIterator **it, Datum *path_elems,
+		bool *path_nulls, int path_len,
+		JsonbParseState **st, int level, Jsonb *newval, bool create)
+{
+	JsonbValue	v;
+	JsonbValue *res = NULL;
+	int			r;
+
+	r = JsonbIteratorNext(it, &v, false);
+
+	switch (r)
+	{
+		case WJB_BEGIN_ARRAY:
+			(void) pushJsonbValue(st, r, NULL);
+			setPathArray(it, path_elems, path_nulls, path_len, st, level,
+						 newval, v.val.array.nElems, create);
+			r = JsonbIteratorNext(it, &v, false);
+			Assert(r == WJB_END_ARRAY);
+			res = pushJsonbValue(st, r, NULL);
+
+			break;
+		case WJB_BEGIN_OBJECT:
+			(void) pushJsonbValue(st, r, NULL);
+			setPathObject(it, path_elems, path_nulls, path_len, st, level,
+						  newval, v.val.object.nPairs, create);
+			r = JsonbIteratorNext(it, &v, true);
+			Assert(r == WJB_END_OBJECT);
+			res = pushJsonbValue(st, r, NULL);
+
+			break;
+		case WJB_ELEM:
+		case WJB_VALUE:
+			res = pushJsonbValue(st, r, &v);
+			break;
+		default:
+			elog(ERROR, "impossible state");
+	}
+
+	return res;
+}
+
+/*
+ * Object walker for setPath
+ */
+static void
+setPathObject(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
+			  int path_len, JsonbParseState **st, int level,
+			  Jsonb *newval, uint32 npairs, bool create)
+{
+	JsonbValue	v;
+	int			i;
+	JsonbValue	k;
+	bool		done = false;
+
+	if (level >= path_len || path_nulls[level])
+		done = true;
+
+	/* empty object is a special case for create */
+	if ((npairs == 0) && create && (level == path_len - 1))
+	{
+		JsonbValue	newkey;
+
+		newkey.type = jbvString;
+		newkey.val.string.len = VARSIZE_ANY_EXHDR(path_elems[level]);
+		newkey.val.string.val = VARDATA_ANY(path_elems[level]);
+
+		(void) pushJsonbValue(st, WJB_KEY, &newkey);
+		addJsonbToParseState(st, newval);
+	}
+
+	for (i = 0; i < npairs; i++)
+	{
+		int			r = JsonbIteratorNext(it, &k, true);
+
+		Assert(r == WJB_KEY);
+
+		if (!done &&
+			k.val.string.len == VARSIZE_ANY_EXHDR(path_elems[level]) &&
+			memcmp(k.val.string.val, VARDATA_ANY(path_elems[level]),
+				   k.val.string.len) == 0)
+		{
+			if (level == path_len - 1)
+			{
+				r = JsonbIteratorNext(it, &v, true);	/* skip */
+				if (newval != NULL)
+				{
+					(void) pushJsonbValue(st, WJB_KEY, &k);
+					addJsonbToParseState(st, newval);
+				}
+				done = true;
+			}
+			else
+			{
+				(void) pushJsonbValue(st, r, &k);
+				setPath(it, path_elems, path_nulls, path_len,
+						st, level + 1, newval, create);
+			}
+		}
+		else
+		{
+			if (create && !done && level == path_len - 1 && i == npairs - 1)
+			{
+				JsonbValue	newkey;
+
+				newkey.type = jbvString;
+				newkey.val.string.len = VARSIZE_ANY_EXHDR(path_elems[level]);
+				newkey.val.string.val = VARDATA_ANY(path_elems[level]);
+
+				(void) pushJsonbValue(st, WJB_KEY, &newkey);
+				addJsonbToParseState(st, newval);
+			}
+
+			(void) pushJsonbValue(st, r, &k);
+			r = JsonbIteratorNext(it, &v, false);
+			(void) pushJsonbValue(st, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
+			if (r == WJB_BEGIN_ARRAY || r == WJB_BEGIN_OBJECT)
+			{
+				int			walking_level = 1;
+
+				while (walking_level != 0)
+				{
+					r = JsonbIteratorNext(it, &v, false);
+
+					if (r == WJB_BEGIN_ARRAY || r == WJB_BEGIN_OBJECT)
+						++walking_level;
+					if (r == WJB_END_ARRAY || r == WJB_END_OBJECT)
+						--walking_level;
+
+					(void) pushJsonbValue(st, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
+				}
+			}
+		}
+	}
+}
+
+/*
+ * Array walker for setPath
+ */
+static void
+setPathArray(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
+			 int path_len, JsonbParseState **st, int level,
+			 Jsonb *newval, uint32 nelems, bool create)
+{
+	JsonbValue	v;
+	int			idx,
+				i;
+	char	   *badp;
+	bool		done = false;
+
+	/* pick correct index */
+	if (level < path_len && !path_nulls[level])
+	{
+		char	   *c = VARDATA_ANY(path_elems[level]);
+
+		errno = 0;
+		idx = (int) strtol(c, &badp, 10);
+		if (errno != 0 || badp == c)
+			idx = nelems;
+	}
+	else
+		idx = nelems;
+
+	if (idx < 0)
+	{
+		if (-idx > nelems)
+			idx = -1;
+		else
+			idx = nelems + idx;
+	}
+
+	if (idx > 0 && idx > nelems)
+		idx = nelems;
+
+	/*
+	 * if we're creating, and idx == -1, we prepend the new value to the array
+	 * also if the array is empty - in which case we don't really care what
+	 * the idx value is
+	 */
+
+	if ((idx == -1 || nelems == 0) && create && (level == path_len - 1))
+	{
+		Assert(newval != NULL);
+		addJsonbToParseState(st, newval);
+		done = true;
+	}
+
+	/* iterate over the array elements */
+	for (i = 0; i < nelems; i++)
+	{
+		int			r;
+
+		if (i == idx && level < path_len)
+		{
+			if (level == path_len - 1)
+			{
+				r = JsonbIteratorNext(it, &v, true);	/* skip */
+				if (newval != NULL)
+					addJsonbToParseState(st, newval);
+
+				done = true;
+			}
+			else
+				(void) setPath(it, path_elems, path_nulls, path_len,
+							   st, level + 1, newval, create);
+		}
+		else
+		{
+			r = JsonbIteratorNext(it, &v, false);
+
+			(void) pushJsonbValue(st, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
+
+			if (r == WJB_BEGIN_ARRAY || r == WJB_BEGIN_OBJECT)
+			{
+				int			walking_level = 1;
+
+				while (walking_level != 0)
+				{
+					r = JsonbIteratorNext(it, &v, false);
+
+					if (r == WJB_BEGIN_ARRAY || r == WJB_BEGIN_OBJECT)
+						++walking_level;
+					if (r == WJB_END_ARRAY || r == WJB_END_OBJECT)
+						--walking_level;
+
+					(void) pushJsonbValue(st, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
+				}
+			}
+
+			if (create && !done && level == path_len - 1 && i == nelems - 1)
+			{
+				addJsonbToParseState(st, newval);
+			}
+
+		}
+	}
+}
diff --git a/src/backend/utils/adt/levenshtein.c b/src/backend/utils/adt/levenshtein.c
index f6e2ca6452..2c30b6c8e9 100644
--- a/src/backend/utils/adt/levenshtein.c
+++ b/src/backend/utils/adt/levenshtein.c
@@ -96,8 +96,8 @@ varstr_levenshtein(const char *source, int slen, const char *target, int tlen,
 #endif
 
 	/*
-	 * A common use for Levenshtein distance is to match attributes when building
-	 * diagnostic, user-visible messages.  Restrict the size of
+	 * A common use for Levenshtein distance is to match attributes when
+	 * building diagnostic, user-visible messages.  Restrict the size of
 	 * MAX_LEVENSHTEIN_STRLEN at compile time so that this is guaranteed to
 	 * work.
 	 */
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c
index 9cbc76f1d8..b4c9f46a12 100644
--- a/src/backend/utils/adt/lockfuncs.c
+++ b/src/backend/utils/adt/lockfuncs.c
@@ -13,6 +13,7 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
+#include "access/xact.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "miscadmin.h"
@@ -35,6 +36,7 @@ static const char *const LockTagTypeNames[] = {
 	"tuple",
 	"transactionid",
 	"virtualxid",
+	"speculative token",
 	"object",
 	"userlock",
 	"advisory"
@@ -576,6 +578,15 @@ pgxc_advisory_lock(int64 key64, int32 key1, int32 key2, bool iskeybig,
 
 #endif /* PGXC */
 
+static void
+PreventAdvisoryLocksInParallelMode(void)
+{
+	if (IsInParallelMode())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+		   errmsg("cannot use advisory locks during a parallel operation")));
+}
+
 /*
  * pg_advisory_lock(int8) - acquire exclusive lock on an int8 key
  */
@@ -585,6 +596,8 @@ pg_advisory_lock_int8(PG_FUNCTION_ARGS)
 	int64		key = PG_GETARG_INT64(0);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -610,6 +623,8 @@ pg_advisory_xact_lock_int8(PG_FUNCTION_ARGS)
 	int64		key = PG_GETARG_INT64(0);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -634,6 +649,8 @@ pg_advisory_lock_shared_int8(PG_FUNCTION_ARGS)
 	int64		key = PG_GETARG_INT64(0);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -659,6 +676,8 @@ pg_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS)
 	int64		key = PG_GETARG_INT64(0);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -666,7 +685,6 @@ pg_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS)
 		PG_RETURN_VOID();
 	}
 #endif
-
 	SET_LOCKTAG_INT64(tag, key);
 
 	(void) LockAcquire(&tag, ShareLock, false, false);
@@ -686,11 +704,12 @@ pg_try_advisory_lock_int8(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(key, 0, 0, true, ExclusiveLock, SESSION_LOCK, DONT_WAIT));
 #endif
-
 	SET_LOCKTAG_INT64(tag, key);
 
 	res = LockAcquire(&tag, ExclusiveLock, true, true);
@@ -711,11 +730,12 @@ pg_try_advisory_xact_lock_int8(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(key, 0, 0, true, ExclusiveLock, TRANSACTION_LOCK, DONT_WAIT));
 #endif
-
 	SET_LOCKTAG_INT64(tag, key);
 
 	res = LockAcquire(&tag, ExclusiveLock, false, true);
@@ -735,6 +755,8 @@ pg_try_advisory_lock_shared_int8(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(key, 0, 0, true, ShareLock, SESSION_LOCK, DONT_WAIT));
@@ -760,11 +782,12 @@ pg_try_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(key, 0, 0, true, ShareLock, TRANSACTION_LOCK, DONT_WAIT));
 #endif
-
 	SET_LOCKTAG_INT64(tag, key);
 
 	res = LockAcquire(&tag, ShareLock, false, true);
@@ -784,6 +807,7 @@ pg_advisory_unlock_int8(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	bool		res;
 
+	PreventAdvisoryLocksInParallelMode();
 	SET_LOCKTAG_INT64(tag, key);
 
 	res = LockRelease(&tag, ExclusiveLock, true);
@@ -803,6 +827,7 @@ pg_advisory_unlock_shared_int8(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	bool		res;
 
+	PreventAdvisoryLocksInParallelMode();
 	SET_LOCKTAG_INT64(tag, key);
 
 	res = LockRelease(&tag, ShareLock, true);
@@ -820,6 +845,8 @@ pg_advisory_lock_int4(PG_FUNCTION_ARGS)
 	int32		key2 = PG_GETARG_INT32(1);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -827,7 +854,6 @@ pg_advisory_lock_int4(PG_FUNCTION_ARGS)
 		PG_RETURN_VOID();
 	}
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	(void) LockAcquire(&tag, ExclusiveLock, true, false);
@@ -846,6 +872,8 @@ pg_advisory_xact_lock_int4(PG_FUNCTION_ARGS)
 	int32		key2 = PG_GETARG_INT32(1);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -853,7 +881,6 @@ pg_advisory_xact_lock_int4(PG_FUNCTION_ARGS)
 		PG_RETURN_VOID();
 	}
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	(void) LockAcquire(&tag, ExclusiveLock, false, false);
@@ -871,6 +898,8 @@ pg_advisory_lock_shared_int4(PG_FUNCTION_ARGS)
 	int32		key2 = PG_GETARG_INT32(1);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -878,7 +907,6 @@ pg_advisory_lock_shared_int4(PG_FUNCTION_ARGS)
 		PG_RETURN_VOID();
 	}
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	(void) LockAcquire(&tag, ShareLock, true, false);
@@ -897,6 +925,8 @@ pg_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS)
 	int32		key2 = PG_GETARG_INT32(1);
 	LOCKTAG		tag;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 	{
@@ -904,7 +934,6 @@ pg_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS)
 		PG_RETURN_VOID();
 	}
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	(void) LockAcquire(&tag, ShareLock, false, false);
@@ -925,11 +954,12 @@ pg_try_advisory_lock_int4(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(0, key1, key2, false, ExclusiveLock, SESSION_LOCK, DONT_WAIT));
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	res = LockAcquire(&tag, ExclusiveLock, true, true);
@@ -951,11 +981,12 @@ pg_try_advisory_xact_lock_int4(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(0, key1, key2, false, ExclusiveLock, TRANSACTION_LOCK, DONT_WAIT));
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	res = LockAcquire(&tag, ExclusiveLock, false, true);
@@ -976,11 +1007,12 @@ pg_try_advisory_lock_shared_int4(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(0, key1, key2, false, ShareLock, SESSION_LOCK, DONT_WAIT));
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	res = LockAcquire(&tag, ShareLock, true, true);
@@ -1002,11 +1034,12 @@ pg_try_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	LockAcquireResult res;
 
+	PreventAdvisoryLocksInParallelMode();
+
 #ifdef PGXC
 	if (IS_PGXC_LOCAL_COORDINATOR)
 		PG_RETURN_BOOL(pgxc_advisory_lock(0, key1, key2, false, ShareLock, TRANSACTION_LOCK, DONT_WAIT));
 #endif
-
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	res = LockAcquire(&tag, ShareLock, false, true);
@@ -1027,6 +1060,7 @@ pg_advisory_unlock_int4(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	bool		res;
 
+	PreventAdvisoryLocksInParallelMode();
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	res = LockRelease(&tag, ExclusiveLock, true);
@@ -1047,6 +1081,7 @@ pg_advisory_unlock_shared_int4(PG_FUNCTION_ARGS)
 	LOCKTAG		tag;
 	bool		res;
 
+	PreventAdvisoryLocksInParallelMode();
 	SET_LOCKTAG_INT32(tag, key1, key2);
 
 	res = LockRelease(&tag, ShareLock, true);
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 36d8e0bdf0..6912a049cf 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -190,7 +190,7 @@ pg_terminate_backend(PG_FUNCTION_ARGS)
 	if (r == SIGNAL_BACKEND_NOSUPERUSER)
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 (errmsg("must be a superuser to terminate superuser process"))));
+			(errmsg("must be a superuser to terminate superuser process"))));
 
 	if (r == SIGNAL_BACKEND_NOPERMISSION)
 		ereport(ERROR,
@@ -386,11 +386,13 @@ pg_tablespace_location(PG_FUNCTION_ARGS)
 	rllen = readlink(sourcepath, targetpath, sizeof(targetpath));
 	if (rllen < 0)
 		ereport(ERROR,
-				(errmsg("could not read symbolic link \"%s\": %m",
+				(errcode_for_file_access(),
+				 errmsg("could not read symbolic link \"%s\": %m",
 						sourcepath)));
-	else if (rllen >= sizeof(targetpath))
+	if (rllen >= sizeof(targetpath))
 		ereport(ERROR,
-				(errmsg("symbolic link \"%s\" target is too long",
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("symbolic link \"%s\" target is too long",
 						sourcepath)));
 	targetpath[rllen] = '\0';
 
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index b6c6e39335..5826127561 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -263,13 +263,13 @@ namestrcmp(Name name, const char *str)
 Datum
 current_user(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_DATUM(DirectFunctionCall1(namein, CStringGetDatum(GetUserNameFromId(GetUserId()))));
+	PG_RETURN_DATUM(DirectFunctionCall1(namein, CStringGetDatum(GetUserNameFromId(GetUserId(), false))));
 }
 
 Datum
 session_user(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_DATUM(DirectFunctionCall1(namein, CStringGetDatum(GetUserNameFromId(GetSessionUserId()))));
+	PG_RETURN_DATUM(DirectFunctionCall1(namein, CStringGetDatum(GetUserNameFromId(GetSessionUserId(), false))));
 }
 
 
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 3a705da619..1f8469a2cb 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -888,6 +888,58 @@ network_hostmask(PG_FUNCTION_ARGS)
 }
 
 /*
+ * Returns true if the addresses are from the same family, or false.  Used to
+ * check that we can create a network which contains both of the networks.
+ */
+Datum
+inet_same_family(PG_FUNCTION_ARGS)
+{
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
+
+	PG_RETURN_BOOL(ip_family(a1) == ip_family(a2));
+}
+
+/*
+ * Returns the smallest CIDR which contains both of the inputs.
+ */
+Datum
+inet_merge(PG_FUNCTION_ARGS)
+{
+	inet	   *a1 = PG_GETARG_INET_PP(0),
+			   *a2 = PG_GETARG_INET_PP(1),
+			   *result;
+	int			commonbits;
+
+	if (ip_family(a1) != ip_family(a2))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot merge addresses from different families")));
+
+	commonbits = bitncommon(ip_addr(a1), ip_addr(a2),
+							Min(ip_bits(a1), ip_bits(a2)));
+
+	/* Make sure any unused bits are zeroed. */
+	result = (inet *) palloc0(sizeof(inet));
+
+	ip_family(result) = ip_family(a1);
+	ip_bits(result) = commonbits;
+
+	/* Clone appropriate bytes of the address. */
+	if (commonbits > 0)
+		memcpy(ip_addr(result), ip_addr(a1), (commonbits + 7) / 8);
+
+	/* Clean any unwanted bits in the last partial byte. */
+	if (commonbits % 8 != 0)
+		ip_addr(result)[commonbits / 8] &= ~(0xFF >> (commonbits % 8));
+
+	/* Set varlena header correctly. */
+	SET_INET_VARSIZE(result);
+
+	PG_RETURN_INET_P(result);
+}
+
+/*
  * Convert a value of a network datatype to an approximate scalar value.
  * This is used for estimating selectivities of inequality operators
  * involving network types.
diff --git a/src/backend/utils/adt/network_gist.c b/src/backend/utils/adt/network_gist.c
index cd2b8b19a7..756237e751 100644
--- a/src/backend/utils/adt/network_gist.c
+++ b/src/backend/utils/adt/network_gist.c
@@ -48,23 +48,23 @@
 #include <sys/socket.h>
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "utils/inet.h"
 
 /*
  * Operator strategy numbers used in the GiST inet_ops opclass
  */
-#define INETSTRAT_OVERLAPS		3
-#define INETSTRAT_EQ			18
-#define INETSTRAT_NE			19
-#define INETSTRAT_LT			20
-#define INETSTRAT_LE			21
-#define INETSTRAT_GT			22
-#define INETSTRAT_GE			23
-#define INETSTRAT_SUB			24
-#define INETSTRAT_SUBEQ			25
-#define INETSTRAT_SUP			26
-#define INETSTRAT_SUPEQ			27
+#define INETSTRAT_OVERLAPS		RTOverlapStrategyNumber
+#define INETSTRAT_EQ			RTEqualStrategyNumber
+#define INETSTRAT_NE			RTNotEqualStrategyNumber
+#define INETSTRAT_LT			RTLessStrategyNumber
+#define INETSTRAT_LE			RTLessEqualStrategyNumber
+#define INETSTRAT_GT			RTGreaterStrategyNumber
+#define INETSTRAT_GE			RTGreaterEqualStrategyNumber
+#define INETSTRAT_SUB			RTSubStrategyNumber
+#define INETSTRAT_SUBEQ			RTSubEqualStrategyNumber
+#define INETSTRAT_SUP			RTSuperStrategyNumber
+#define INETSTRAT_SUPEQ			RTSuperEqualStrategyNumber
 
 
 /*
@@ -595,10 +595,10 @@ inet_gist_decompress(PG_FUNCTION_ARGS)
 Datum
 inet_gist_fetch(PG_FUNCTION_ARGS)
 {
-	GISTENTRY	*entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GistInetKey	*key = DatumGetInetKeyP(entry->key);
-	GISTENTRY	*retval;
-	inet		*dst;
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	GistInetKey *key = DatumGetInetKeyP(entry->key);
+	GISTENTRY  *retval;
+	inet	   *dst;
 
 	dst = (inet *) palloc0(sizeof(inet));
 
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 3e52c073cc..21aa365162 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -1731,7 +1731,7 @@ numeric_abbrev_abort(int memtupcount, SortSupport ssup)
 		if (trace_sort)
 			elog(LOG,
 				 "numeric_abbrev: aborting abbreviation at cardinality %f"
-				 " below threshold %f after " INT64_FORMAT " values (%d rows)",
+			   " below threshold %f after " INT64_FORMAT " values (%d rows)",
 				 abbr_card, nss->input_count / 10000.0 + 0.5,
 				 nss->input_count, memtupcount);
 #endif
@@ -3625,10 +3625,10 @@ numeric_accum_inv(PG_FUNCTION_ARGS)
 #ifdef HAVE_INT128
 typedef struct Int128AggState
 {
-	bool	calcSumX2;	/* if true, calculate sumX2 */
-	int64	N;			/* count of processed numbers */
-	int128	sumX;		/* sum of processed numbers */
-	int128	sumX2;		/* sum of squares of processed numbers */
+	bool		calcSumX2;		/* if true, calculate sumX2 */
+	int64		N;				/* count of processed numbers */
+	int128		sumX;			/* sum of processed numbers */
+	int128		sumX2;			/* sum of squares of processed numbers */
 } Int128AggState;
 
 /*
@@ -3920,9 +3920,9 @@ Datum
 numeric_poly_sum(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	*state;
-	Numeric			res;
-	NumericVar		result;
+	PolyNumAggState *state;
+	Numeric		res;
+	NumericVar	result;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -3948,9 +3948,10 @@ Datum
 numeric_poly_avg(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	NumericVar			result;
-	Datum				countd, sumd;
+	PolyNumAggState *state;
+	NumericVar	result;
+	Datum		countd,
+				sumd;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4179,8 +4180,8 @@ numeric_stddev_pop(PG_FUNCTION_ARGS)
 #ifdef HAVE_INT128
 static Numeric
 numeric_poly_stddev_internal(Int128AggState *state,
-						bool variance, bool sample,
-						bool *is_null)
+							 bool variance, bool sample,
+							 bool *is_null)
 {
 	NumericAggState numstate;
 	Numeric		res;
@@ -4214,9 +4215,9 @@ Datum
 numeric_poly_var_samp(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4235,9 +4236,9 @@ Datum
 numeric_poly_stddev_samp(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4256,9 +4257,9 @@ Datum
 numeric_poly_var_pop(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4277,9 +4278,9 @@ Datum
 numeric_poly_stddev_pop(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -5555,10 +5556,10 @@ int64_to_numericvar(int64 val, NumericVar *var)
 static void
 int128_to_numericvar(int128 val, NumericVar *var)
 {
-	uint128			uval,
-					newuval;
-	NumericDigit   *ptr;
-	int				ndigits;
+	uint128		uval,
+				newuval;
+	NumericDigit *ptr;
+	int			ndigits;
 
 	/* int128 can require at most 39 decimal digits; add one for safety */
 	alloc_var(var, 40 / DEC_DIGITS);
diff --git a/src/backend/utils/adt/orderedsetaggs.c b/src/backend/utils/adt/orderedsetaggs.c
index f9a5f7f93f..39ed85b793 100644
--- a/src/backend/utils/adt/orderedsetaggs.c
+++ b/src/backend/utils/adt/orderedsetaggs.c
@@ -268,10 +268,6 @@ ordered_set_startup(FunctionCallInfo fcinfo, bool use_tuples)
 
 	/*
 	 * Initialize tuplesort object.
-	 *
-	 * In the future, we should consider forcing the tuplesort_begin_heap()
-	 * case when the abbreviated key optimization can thereby be used, even
-	 * when !use_tuples.
 	 */
 	if (use_tuples)
 		osastate->sortstate = tuplesort_begin_heap(qstate->tupdesc,
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 3acf9c8e2f..4be735e918 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -575,22 +575,32 @@ PGLC_localeconv(void)
  * pg_strftime(), which isn't locale-aware and does not need to be replaced.
  */
 static size_t
-strftime_win32(char *dst, size_t dstlen, const wchar_t *format, const struct tm * tm)
+strftime_win32(char *dst, size_t dstlen,
+			   const char *format, const struct tm * tm)
 {
 	size_t		len;
+	wchar_t		wformat[8];		/* formats used below need 3 bytes */
 	wchar_t		wbuf[MAX_L10N_DATA];
 
-	len = wcsftime(wbuf, MAX_L10N_DATA, format, tm);
+	/* get a wchar_t version of the format string */
+	len = MultiByteToWideChar(CP_UTF8, 0, format, -1,
+							  wformat, lengthof(wformat));
+	if (len == 0)
+		elog(ERROR, "could not convert format string from UTF-8: error code %lu",
+			 GetLastError());
+
+	len = wcsftime(wbuf, MAX_L10N_DATA, wformat, tm);
 	if (len == 0)
 	{
 		/*
-		 * strftime call failed - return 0 with the contents of dst
-		 * unspecified
+		 * strftime failed, possibly because the result would not fit in
+		 * MAX_L10N_DATA.  Return 0 with the contents of dst unspecified.
 		 */
 		return 0;
 	}
 
-	len = WideCharToMultiByte(CP_UTF8, 0, wbuf, len, dst, dstlen, NULL, NULL);
+	len = WideCharToMultiByte(CP_UTF8, 0, wbuf, len, dst, dstlen - 1,
+							  NULL, NULL);
 	if (len == 0)
 		elog(ERROR, "could not convert string to UTF-8: error code %lu",
 			 GetLastError());
@@ -612,9 +622,33 @@ strftime_win32(char *dst, size_t dstlen, const wchar_t *format, const struct tm
 }
 
 /* redefine strftime() */
-#define strftime(a,b,c,d) strftime_win32(a,b,L##c,d)
+#define strftime(a,b,c,d) strftime_win32(a,b,c,d)
 #endif   /* WIN32 */
 
+/* Subroutine for cache_locale_time(). */
+static void
+cache_single_time(char **dst, const char *format, const struct tm * tm)
+{
+	char		buf[MAX_L10N_DATA];
+	char	   *ptr;
+
+	/*
+	 * MAX_L10N_DATA is sufficient buffer space for every known locale, and
+	 * POSIX defines no strftime() errors.  (Buffer space exhaustion is not an
+	 * error.)	An implementation might report errors (e.g. ENOMEM) by
+	 * returning 0 (or, less plausibly, a negative value) and setting errno.
+	 * Report errno just in case the implementation did that, but clear it in
+	 * advance of the call so we don't emit a stale, unrelated errno.
+	 */
+	errno = 0;
+	if (strftime(buf, MAX_L10N_DATA, format, tm) <= 0)
+		elog(ERROR, "strftime(%s) failed: %m", format);
+
+	ptr = MemoryContextStrdup(TopMemoryContext, buf);
+	if (*dst)
+		pfree(*dst);
+	*dst = ptr;
+}
 
 /*
  * Update the lc_time localization cache variables if needed.
@@ -625,8 +659,6 @@ cache_locale_time(void)
 	char	   *save_lc_time;
 	time_t		timenow;
 	struct tm  *timeinfo;
-	char		buf[MAX_L10N_DATA];
-	char	   *ptr;
 	int			i;
 
 #ifdef WIN32
@@ -673,17 +705,8 @@ cache_locale_time(void)
 	for (i = 0; i < 7; i++)
 	{
 		timeinfo->tm_wday = i;
-		strftime(buf, MAX_L10N_DATA, "%a", timeinfo);
-		ptr = MemoryContextStrdup(TopMemoryContext, buf);
-		if (localized_abbrev_days[i])
-			pfree(localized_abbrev_days[i]);
-		localized_abbrev_days[i] = ptr;
-
-		strftime(buf, MAX_L10N_DATA, "%A", timeinfo);
-		ptr = MemoryContextStrdup(TopMemoryContext, buf);
-		if (localized_full_days[i])
-			pfree(localized_full_days[i]);
-		localized_full_days[i] = ptr;
+		cache_single_time(&localized_abbrev_days[i], "%a", timeinfo);
+		cache_single_time(&localized_full_days[i], "%A", timeinfo);
 	}
 
 	/* localized months */
@@ -691,17 +714,8 @@ cache_locale_time(void)
 	{
 		timeinfo->tm_mon = i;
 		timeinfo->tm_mday = 1;	/* make sure we don't have invalid date */
-		strftime(buf, MAX_L10N_DATA, "%b", timeinfo);
-		ptr = MemoryContextStrdup(TopMemoryContext, buf);
-		if (localized_abbrev_months[i])
-			pfree(localized_abbrev_months[i]);
-		localized_abbrev_months[i] = ptr;
-
-		strftime(buf, MAX_L10N_DATA, "%B", timeinfo);
-		ptr = MemoryContextStrdup(TopMemoryContext, buf);
-		if (localized_full_months[i])
-			pfree(localized_full_months[i]);
-		localized_full_months[i] = ptr;
+		cache_single_time(&localized_abbrev_months[i], "%b", timeinfo);
+		cache_single_time(&localized_full_months[i], "%B", timeinfo);
 	}
 
 	/* try to restore internal settings */
diff --git a/src/backend/utils/adt/pg_upgrade_support.c b/src/backend/utils/adt/pg_upgrade_support.c
index d69fa53567..883378e524 100644
--- a/src/backend/utils/adt/pg_upgrade_support.c
+++ b/src/backend/utils/adt/pg_upgrade_support.c
@@ -20,19 +20,19 @@
 #include "utils/builtins.h"
 
 
-Datum binary_upgrade_set_next_pg_type_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_set_next_array_pg_type_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_set_next_toast_pg_type_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_set_next_heap_pg_class_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_set_next_index_pg_class_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_set_next_toast_pg_class_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_set_next_pg_enum_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_set_next_pg_authid_oid(PG_FUNCTION_ARGS);
-Datum binary_upgrade_create_empty_extension(PG_FUNCTION_ARGS);
-
-
-#define CHECK_IS_BINARY_UPGRADE 								\
-do { 															\
+Datum		binary_upgrade_set_next_pg_type_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_set_next_array_pg_type_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_set_next_toast_pg_type_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_set_next_heap_pg_class_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_set_next_index_pg_class_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_set_next_toast_pg_class_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_set_next_pg_enum_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_set_next_pg_authid_oid(PG_FUNCTION_ARGS);
+Datum		binary_upgrade_create_empty_extension(PG_FUNCTION_ARGS);
+
+
+#define CHECK_IS_BINARY_UPGRADE									\
+do {															\
 	if (!IsBinaryUpgrade)										\
 		ereport(ERROR,											\
 				(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),	\
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index bbe94c34a1..f7c9bf6333 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -524,137 +524,75 @@ pg_stat_get_backend_idset(PG_FUNCTION_ARGS)
 	}
 }
 
+/*
+ * Returns activity of PG backends.
+ */
 Datum
 pg_stat_get_activity(PG_FUNCTION_ARGS)
 {
-	FuncCallContext *funcctx;
-
-	if (SRF_IS_FIRSTCALL())
-	{
-		MemoryContext oldcontext;
-		TupleDesc	tupdesc;
-
-		funcctx = SRF_FIRSTCALL_INIT();
-
-		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-		tupdesc = CreateTemplateTupleDesc(22, false);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "datid",
-						   OIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 2, "pid",
-						   INT4OID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 3, "usesysid",
-						   OIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 4, "application_name",
-						   TEXTOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 5, "state",
-						   TEXTOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 6, "query",
-						   TEXTOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 7, "waiting",
-						   BOOLOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 8, "act_start",
-						   TIMESTAMPTZOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 9, "query_start",
-						   TIMESTAMPTZOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 10, "backend_start",
-						   TIMESTAMPTZOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 11, "state_change",
-						   TIMESTAMPTZOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 12, "client_addr",
-						   INETOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 13, "client_hostname",
-						   TEXTOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 14, "client_port",
-						   INT4OID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 15, "backend_xid",
-						   XIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 16, "backend_xmin",
-						   XIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 17, "ssl",
-						   BOOLOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 18, "sslversion",
-						   TEXTOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 19, "sslcipher",
-						   TEXTOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 20, "sslbits",
-						   INT4OID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 21, "sslcompression",
-						   BOOLOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 22, "sslclientdn",
-						   TEXTOID, -1, 0);
-
-		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
-
-		funcctx->user_fctx = palloc0(sizeof(int));
-		if (PG_ARGISNULL(0))
-		{
-			/* Get all backends */
-			funcctx->max_calls = pgstat_fetch_stat_numbackends();
-		}
-		else
-		{
-			/*
-			 * Get one backend - locate by pid.
-			 *
-			 * We lookup the backend early, so we can return zero rows if it
-			 * doesn't exist, instead of returning a single row full of NULLs.
-			 */
-			int			pid = PG_GETARG_INT32(0);
-			int			i;
-			int			n = pgstat_fetch_stat_numbackends();
-
-			for (i = 1; i <= n; i++)
-			{
-				PgBackendStatus *be = pgstat_fetch_stat_beentry(i);
-
-				if (be)
-				{
-					if (be->st_procpid == pid)
-					{
-						*(int *) (funcctx->user_fctx) = i;
-						break;
-					}
-				}
-			}
-
-			if (*(int *) (funcctx->user_fctx) == 0)
-				/* Pid not found, return zero rows */
-				funcctx->max_calls = 0;
-			else
-				funcctx->max_calls = 1;
-		}
-
-		MemoryContextSwitchTo(oldcontext);
-	}
-
-	/* stuff done on every call of the function */
-	funcctx = SRF_PERCALL_SETUP();
-
-	if (funcctx->call_cntr < funcctx->max_calls)
+#define PG_STAT_GET_ACTIVITY_COLS	22
+	int			num_backends = pgstat_fetch_stat_numbackends();
+	int			curr_backend;
+	int			pid = PG_ARGISNULL(0) ? -1 : PG_GETARG_INT32(0);
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+	TupleDesc	tupdesc;
+	Tuplestorestate *tupstore;
+	MemoryContext per_query_ctx;
+	MemoryContext oldcontext;
+
+	/* check to see if caller supports us returning a tuplestore */
+	if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("set-valued function called in context that cannot accept a set")));
+	if (!(rsinfo->allowedModes & SFRM_Materialize))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("materialize mode required, but it is not " \
+						"allowed in this context")));
+
+	/* Build a tuple descriptor for our result type */
+	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
+	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+
+	tupstore = tuplestore_begin_heap(true, false, work_mem);
+	rsinfo->returnMode = SFRM_Materialize;
+	rsinfo->setResult = tupstore;
+	rsinfo->setDesc = tupdesc;
+
+	MemoryContextSwitchTo(oldcontext);
+
+	/* 1-based index */
+	for (curr_backend = 1; curr_backend <= num_backends; curr_backend++)
 	{
 		/* for each row */
-		Datum		values[22];
-		bool		nulls[22];
-		HeapTuple	tuple;
+		Datum		values[PG_STAT_GET_ACTIVITY_COLS];
+		bool		nulls[PG_STAT_GET_ACTIVITY_COLS];
 		LocalPgBackendStatus *local_beentry;
 		PgBackendStatus *beentry;
 
 		MemSet(values, 0, sizeof(values));
 		MemSet(nulls, 0, sizeof(nulls));
 
-		if (*(int *) (funcctx->user_fctx) > 0)
-		{
-			/* Get specific pid slot */
-			local_beentry = pgstat_fetch_stat_local_beentry(*(int *) (funcctx->user_fctx));
-			beentry = &local_beentry->backendStatus;
-		}
-		else
+		if (pid != -1)
 		{
-			/* Get the next one in the list */
-			local_beentry = pgstat_fetch_stat_local_beentry(funcctx->call_cntr + 1);	/* 1-based index */
-			beentry = &local_beentry->backendStatus;
+			/* Skip any which are not the one we're looking for. */
+			PgBackendStatus *be = pgstat_fetch_stat_beentry(curr_backend);
+
+			if (!be || be->st_procpid != pid)
+				continue;
+
 		}
+
+		/* Get the next one in the list */
+		local_beentry = pgstat_fetch_stat_local_beentry(curr_backend);
+		if (!local_beentry)
+			continue;
+
+		beentry = &local_beentry->backendStatus;
 		if (!beentry)
 		{
 			int			i;
@@ -665,8 +603,8 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 			nulls[5] = false;
 			values[5] = CStringGetTextDatum("<backend information not available>");
 
-			tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls);
-			SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple));
+			tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+			continue;
 		}
 
 		/* Values available to all callers */
@@ -690,7 +628,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 
 		if (beentry->st_ssl)
 		{
-			values[16] = BoolGetDatum(true); /* ssl */
+			values[16] = BoolGetDatum(true);	/* ssl */
 			values[17] = CStringGetTextDatum(beentry->st_sslstatus->ssl_version);
 			values[18] = CStringGetTextDatum(beentry->st_sslstatus->ssl_cipher);
 			values[19] = Int32GetDatum(beentry->st_sslstatus->ssl_bits);
@@ -699,7 +637,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 		}
 		else
 		{
-			values[16] = BoolGetDatum(false); /* ssl */
+			values[16] = BoolGetDatum(false);	/* ssl */
 			nulls[17] = nulls[18] = nulls[19] = nulls[20] = nulls[21] = true;
 		}
 
@@ -839,15 +777,17 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 			nulls[13] = true;
 		}
 
-		tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls);
+		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
 
-		SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple));
-	}
-	else
-	{
-		/* nothing left */
-		SRF_RETURN_DONE(funcctx);
+		/* If only a single backend was requested, and we found it, break. */
+		if (pid != -1)
+			break;
 	}
+
+	/* clean up and return the tuplestore */
+	tuplestore_donestoring(tupstore);
+
+	return (Datum) 0;
 }
 
 
diff --git a/src/backend/utils/adt/pseudotypes.c b/src/backend/utils/adt/pseudotypes.c
index 1ecaaac563..5424acad21 100644
--- a/src/backend/utils/adt/pseudotypes.c
+++ b/src/backend/utils/adt/pseudotypes.c
@@ -591,11 +591,12 @@ pg_node_tree_in(PG_FUNCTION_ARGS)
 	 */
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a value of type pg_node_tree")));
+			 errmsg("cannot accept a value of type %s", "pg_node_tree")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
 
+
 /*
  * pg_node_tree_out		- output routine for type PG_NODE_TREE.
  *
@@ -615,7 +616,7 @@ pg_node_tree_recv(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a value of type pg_node_tree")));
+			 errmsg("cannot accept a value of type %s", "pg_node_tree")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -628,3 +629,63 @@ pg_node_tree_send(PG_FUNCTION_ARGS)
 {
 	return textsend(fcinfo);
 }
+
+/*
+ * pg_ddl_command_in	- input routine for type PG_DDL_COMMAND.
+ *
+ * Like pg_node_tree, pg_ddl_command isn't really a pseudotype; it's here for
+ * the same reasons as that one.
+ */
+Datum
+pg_ddl_command_in(PG_FUNCTION_ARGS)
+{
+	/*
+	 * Disallow input of pg_ddl_command value.
+	 */
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot accept a value of type %s", "pg_ddl_command")));
+
+	PG_RETURN_VOID();			/* keep compiler quiet */
+}
+
+/*
+ * pg_ddl_command_out		- output routine for type PG_DDL_COMMAND.
+ *
+ * We don't have any good way to output this type directly, so punt.
+ */
+Datum
+pg_ddl_command_out(PG_FUNCTION_ARGS)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot output a value of type %s", "pg_ddl_command")));
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * pg_ddl_command_recv		- binary input routine for type PG_DDL_COMMAND.
+ */
+Datum
+pg_ddl_command_recv(PG_FUNCTION_ARGS)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot accept a value of type %s", "pg_ddl_command")));
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * pg_ddl_command_send		- binary output routine for type PG_DDL_COMMAND.
+ */
+Datum
+pg_ddl_command_send(PG_FUNCTION_ARGS)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot output a value of type %s", "pg_ddl_command")));
+
+	PG_RETURN_VOID();
+}
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
index c037b05f93..aaf4cb6810 100644
--- a/src/backend/utils/adt/rangetypes.c
+++ b/src/backend/utils/adt/rangetypes.c
@@ -1006,13 +1006,14 @@ range_minus(PG_FUNCTION_ARGS)
 	PG_RETURN_NULL();
 }
 
-/* set union */
-Datum
-range_union(PG_FUNCTION_ARGS)
+/*
+ * Set union.  If strict is true, it is an error that the two input ranges
+ * are not adjacent or overlapping.
+ */
+static RangeType *
+range_union_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2,
+					 bool strict)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
-	TypeCacheEntry *typcache;
 	RangeBound	lower1,
 				lower2;
 	RangeBound	upper1,
@@ -1026,19 +1027,18 @@ range_union(PG_FUNCTION_ARGS)
 	if (RangeTypeGetOid(r1) != RangeTypeGetOid(r2))
 		elog(ERROR, "range types do not match");
 
-	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
-
 	range_deserialize(typcache, r1, &lower1, &upper1, &empty1);
 	range_deserialize(typcache, r2, &lower2, &upper2, &empty2);
 
 	/* if either is empty, the other is the correct answer */
 	if (empty1)
-		PG_RETURN_RANGE(r2);
+		return r2;
 	if (empty2)
-		PG_RETURN_RANGE(r1);
+		return r1;
 
-	if (!DatumGetBool(range_overlaps(fcinfo)) &&
-		!DatumGetBool(range_adjacent(fcinfo)))
+	if (strict &&
+		!DatumGetBool(range_overlaps_internal(typcache, r1, r2)) &&
+		!DatumGetBool(range_adjacent_internal(typcache, r1, r2)))
 		ereport(ERROR,
 				(errcode(ERRCODE_DATA_EXCEPTION),
 				 errmsg("result of range union would not be contiguous")));
@@ -1053,7 +1053,35 @@ range_union(PG_FUNCTION_ARGS)
 	else
 		result_upper = &upper2;
 
-	PG_RETURN_RANGE(make_range(typcache, result_lower, result_upper, false));
+	return make_range(typcache, result_lower, result_upper, false);
+}
+
+Datum
+range_union(PG_FUNCTION_ARGS)
+{
+	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r2 = PG_GETARG_RANGE(1);
+	TypeCacheEntry *typcache;
+
+	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
+
+	PG_RETURN_RANGE(range_union_internal(typcache, r1, r2, true));
+}
+
+/*
+ * range merge: like set union, except also allow and account for non-adjacent
+ * input ranges.
+ */
+Datum
+range_merge(PG_FUNCTION_ARGS)
+{
+	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r2 = PG_GETARG_RANGE(1);
+	TypeCacheEntry *typcache;
+
+	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
+
+	PG_RETURN_RANGE(range_union_internal(typcache, r1, r2, false));
 }
 
 /* set intersection */
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index ef841219d0..ddeb18b72f 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -15,7 +15,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/rangetypes.h"
diff --git a/src/backend/utils/adt/rangetypes_selfuncs.c b/src/backend/utils/adt/rangetypes_selfuncs.c
index a130b483f3..7cc5e48436 100644
--- a/src/backend/utils/adt/rangetypes_selfuncs.c
+++ b/src/backend/utils/adt/rangetypes_selfuncs.c
@@ -596,8 +596,8 @@ calc_hist_selectivity_scalar(TypeCacheEntry *typcache, RangeBound *constbound,
  * range bounds in array are greater or equal(greater) than given range bound,
  * return -1. When "equal" flag is set conditions in brackets are used.
  *
- * This function is used in scalar operators selectivity estimation. Another
- * goal of this function is to found an histogram bin where to stop
+ * This function is used in scalar operator selectivity estimation. Another
+ * goal of this function is to find a histogram bin where to stop
  * interpolation of portion of bounds which are less or equal to given bound.
  */
 static int
diff --git a/src/backend/utils/adt/rangetypes_spgist.c b/src/backend/utils/adt/rangetypes_spgist.c
index d7b208118f..3b5529eb30 100644
--- a/src/backend/utils/adt/rangetypes_spgist.c
+++ b/src/backend/utils/adt/rangetypes_spgist.c
@@ -37,7 +37,7 @@
 #include "postgres.h"
 
 #include "access/spgist.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
@@ -583,7 +583,7 @@ spg_range_quad_inner_consistent(PG_FUNCTION_ARGS)
 					 */
 					cmp = adjacent_inner_consistent(typcache, &lower,
 													&centroidUpper,
-											prevCentroid ? &prevUpper : NULL);
+										   prevCentroid ? &prevUpper : NULL);
 					if (cmp > 0)
 						which1 = (1 << 1) | (1 << 4);
 					else if (cmp < 0)
@@ -594,12 +594,12 @@ spg_range_quad_inner_consistent(PG_FUNCTION_ARGS)
 					/*
 					 * Also search for ranges's adjacent to argument's upper
 					 * bound. They will be found along the line adjacent to
-					 * (and just right of) X=upper, which falls in quadrants
-					 * 3 and 4, or 1 and 2.
+					 * (and just right of) X=upper, which falls in quadrants 3
+					 * and 4, or 1 and 2.
 					 */
 					cmp = adjacent_inner_consistent(typcache, &upper,
 													&centroidLower,
-											prevCentroid ? &prevLower : NULL);
+										   prevCentroid ? &prevLower : NULL);
 					if (cmp > 0)
 						which2 = (1 << 1) | (1 << 2);
 					else if (cmp < 0)
@@ -782,7 +782,7 @@ adjacent_cmp_bounds(TypeCacheEntry *typcache, RangeBound *arg,
 
 	Assert(arg->lower != centroid->lower);
 
-	cmp = range_cmp_bounds(typcache, arg,  centroid);
+	cmp = range_cmp_bounds(typcache, arg, centroid);
 
 	if (centroid->lower)
 	{
@@ -799,11 +799,11 @@ adjacent_cmp_bounds(TypeCacheEntry *typcache, RangeBound *arg,
 		 * With the argument range [..., 500), the adjacent range we're
 		 * searching for is [500, ...):
 		 *
-		 *  ARGUMENT   CENTROID     CMP   ADJ
-		 *  [..., 500) [498, ...)    >    (N)   [500, ...) is to the right
-		 *  [..., 500) [499, ...)    =    (N)   [500, ...) is to the right
-		 *  [..., 500) [500, ...)    <     Y    [500, ...) is to the right
-		 *  [..., 500) [501, ...)    <     N    [500, ...) is to the left
+		 *	ARGUMENT   CENTROID		CMP   ADJ
+		 *	[..., 500) [498, ...)	 >	  (N)	[500, ...) is to the right
+		 *	[..., 500) [499, ...)	 =	  (N)	[500, ...) is to the right
+		 *	[..., 500) [500, ...)	 <	   Y	[500, ...) is to the right
+		 *	[..., 500) [501, ...)	 <	   N	[500, ...) is to the left
 		 *
 		 * So, we must search left when the argument is smaller than, and not
 		 * adjacent, to the centroid. Otherwise search right.
@@ -821,11 +821,11 @@ adjacent_cmp_bounds(TypeCacheEntry *typcache, RangeBound *arg,
 		 * bounds. A matching adjacent upper bound must be *smaller* than the
 		 * argument, but only just.
 		 *
-		 *  ARGUMENT   CENTROID     CMP   ADJ
-		 *  [500, ...) [..., 499)    >    (N)   [..., 500) is to the right
-		 *  [500, ...) [..., 500)    >    (Y)   [..., 500) is to the right
-		 *  [500, ...) [..., 501)    =    (N)   [..., 500) is to the left
-		 *  [500, ...) [..., 502)    <    (N)   [..., 500) is to the left
+		 *	ARGUMENT   CENTROID		CMP   ADJ
+		 *	[500, ...) [..., 499)	 >	  (N)	[..., 500) is to the right
+		 *	[500, ...) [..., 500)	 >	  (Y)	[..., 500) is to the right
+		 *	[500, ...) [..., 501)	 =	  (N)	[..., 500) is to the left
+		 *	[500, ...) [..., 502)	 <	  (N)	[..., 500) is to the left
 		 *
 		 * We must search left when the argument is smaller than or equal to
 		 * the centroid. Otherwise search right. We don't need to check
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 4f35992629..6a0fcc20da 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -696,7 +696,7 @@ similar_escape(PG_FUNCTION_ARGS)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_ESCAPE_SEQUENCE),
 						 errmsg("invalid escape string"),
-						 errhint("Escape string must be empty or one character.")));
+				  errhint("Escape string must be empty or one character.")));
 		}
 	}
 
@@ -742,7 +742,8 @@ similar_escape(PG_FUNCTION_ARGS)
 
 		if (elen > 1)
 		{
-			int mblen = pg_mblen(p);
+			int			mblen = pg_mblen(p);
+
 			if (mblen > 1)
 			{
 				/* slow, multi-byte path */
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 11d663b295..0bfeb5e3fd 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -40,6 +40,7 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
+#include "utils/acl.h"
 
 static char *format_operator_internal(Oid operator_oid, bool force_qualify);
 static char *format_procedure_internal(Oid procedure_oid, bool force_qualify);
@@ -439,7 +440,7 @@ format_procedure_internal(Oid procedure_oid, bool force_qualify)
 }
 
 /*
- * Output a objname/objargs representation for the procedure with the
+ * Output an objname/objargs representation for the procedure with the
  * given OID.  If it doesn't exist, an error is thrown.
  *
  * This can be used to feed get_object_address.
@@ -465,7 +466,7 @@ format_procedure_parts(Oid procedure_oid, List **objnames, List **objargs)
 	*objargs = NIL;
 	for (i = 0; i < nargs; i++)
 	{
-		Oid		thisargtype = procform->proargtypes.values[i];
+		Oid			thisargtype = procform->proargtypes.values[i];
 
 		*objargs = lappend(*objargs, format_type_be_qualified(thisargtype));
 	}
@@ -1553,6 +1554,205 @@ regdictionarysend(PG_FUNCTION_ARGS)
 	return oidsend(fcinfo);
 }
 
+/*
+ * regrolein	- converts "rolename" to role OID
+ *
+ * We also accept a numeric OID, for symmetry with the output routine.
+ *
+ * '-' signifies unknown (OID 0).  In all other cases, the input must
+ * match an existing pg_authid entry.
+ *
+ * This function is not needed in bootstrap mode, so we don't worry about
+ * making it work then.
+ */
+Datum
+regrolein(PG_FUNCTION_ARGS)
+{
+	char	   *role_name_or_oid = PG_GETARG_CSTRING(0);
+	Oid			result;
+
+	/* '-' ? */
+	if (strcmp(role_name_or_oid, "-") == 0)
+		PG_RETURN_OID(InvalidOid);
+
+	/* Numeric OID? */
+	if (role_name_or_oid[0] >= '0' &&
+		role_name_or_oid[0] <= '9' &&
+		strspn(role_name_or_oid, "0123456789") == strlen(role_name_or_oid))
+	{
+		result = DatumGetObjectId(DirectFunctionCall1(oidin,
+										 CStringGetDatum(role_name_or_oid)));
+		PG_RETURN_OID(result);
+	}
+
+	/* Normal case: see if the name matches any pg_authid entry. */
+	result = get_role_oid(role_name_or_oid, false);
+
+	PG_RETURN_OID(result);
+}
+
+/*
+ * to_regrole		- converts "rolename" to role OID
+ *
+ * If the name is not found, we return NULL.
+ */
+Datum
+to_regrole(PG_FUNCTION_ARGS)
+{
+	char	   *role_name = PG_GETARG_CSTRING(0);
+	Oid			result;
+
+	result = get_role_oid(role_name, true);
+
+	if (OidIsValid(result))
+		PG_RETURN_OID(result);
+	else
+		PG_RETURN_NULL();
+}
+
+/*
+ * regroleout		- converts role OID to "role_name"
+ */
+Datum
+regroleout(PG_FUNCTION_ARGS)
+{
+	Oid			roleoid = PG_GETARG_OID(0);
+	char	   *result;
+
+
+	if (roleoid == InvalidOid)
+	{
+		result = pstrdup("-");
+		PG_RETURN_CSTRING(result);
+	}
+
+	result = GetUserNameFromId(roleoid, true);
+	if (!result)
+	{
+		/* If OID doesn't match any role, return it numerically */
+		result = (char *) palloc(NAMEDATALEN);
+		snprintf(result, NAMEDATALEN, "%u", roleoid);
+	}
+	PG_RETURN_CSTRING(result);
+}
+
+/*
+ *		regrolerecv - converts external binary format to regrole
+ */
+Datum
+regrolerecv(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidrecv, so share code */
+	return oidrecv(fcinfo);
+}
+
+/*
+ *		regrolesend - converts regrole to binary format
+ */
+Datum
+regrolesend(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidsend, so share code */
+	return oidsend(fcinfo);
+}
+
+/*
+ * regnamespacein		- converts "nspname" to namespace OID
+ *
+ * We also accept a numeric OID, for symmetry with the output routine.
+ *
+ * '-' signifies unknown (OID 0).  In all other cases, the input must
+ * match an existing pg_namespace entry.
+ */
+Datum
+regnamespacein(PG_FUNCTION_ARGS)
+{
+	char	   *nsp_name_or_oid = PG_GETARG_CSTRING(0);
+	Oid			result = InvalidOid;
+
+	/* '-' ? */
+	if (strcmp(nsp_name_or_oid, "-") == 0)
+		PG_RETURN_OID(InvalidOid);
+
+	/* Numeric OID? */
+	if (nsp_name_or_oid[0] >= '0' &&
+		nsp_name_or_oid[0] <= '9' &&
+		strspn(nsp_name_or_oid, "0123456789") == strlen(nsp_name_or_oid))
+	{
+		result = DatumGetObjectId(DirectFunctionCall1(oidin,
+										  CStringGetDatum(nsp_name_or_oid)));
+		PG_RETURN_OID(result);
+	}
+
+	/* Normal case: see if the name matches any pg_namespace entry. */
+	result = get_namespace_oid(nsp_name_or_oid, false);
+
+	PG_RETURN_OID(result);
+}
+
+/*
+ * to_regnamespace		- converts "nspname" to namespace OID
+ *
+ * If the name is not found, we return NULL.
+ */
+Datum
+to_regnamespace(PG_FUNCTION_ARGS)
+{
+	char	   *nsp_name = PG_GETARG_CSTRING(0);
+	Oid			result;
+
+	result = get_namespace_oid(nsp_name, true);
+
+	if (OidIsValid(result))
+		PG_RETURN_OID(result);
+	else
+		PG_RETURN_NULL();
+}
+
+/*
+ * regnamespaceout		- converts namespace OID to "nsp_name"
+ */
+Datum
+regnamespaceout(PG_FUNCTION_ARGS)
+{
+	Oid			nspid = PG_GETARG_OID(0);
+	char	   *result;
+
+	if (nspid == InvalidOid)
+	{
+		result = pstrdup("-");
+		PG_RETURN_CSTRING(result);
+	}
+
+	result = get_namespace_name(nspid);
+	if (!result)
+	{
+		/* If OID doesn't match any namespace, return it numerically */
+		result = (char *) palloc(NAMEDATALEN);
+		snprintf(result, NAMEDATALEN, "%u", nspid);
+	}
+	PG_RETURN_CSTRING(result);
+}
+
+/*
+ *		regnamespacerecv	- converts external binary format to regnamespace
+ */
+Datum
+regnamespacerecv(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidrecv, so share code */
+	return oidrecv(fcinfo);
+}
+
+/*
+ *		regnamespacesend		- converts regnamespace to binary format
+ */
+Datum
+regnamespacesend(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidsend, so share code */
+	return oidsend(fcinfo);
+}
 
 /*
  * text_regclass: convert text to regclass
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index cf961995a8..07be6f24a3 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -3300,7 +3300,7 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
 		{
 			int			fnum = attnums[idx];
 			char	   *name,
-				   *val;
+					   *val;
 
 			name = SPI_fname(tupdesc, fnum);
 			val = SPI_getvalue(violator, tupdesc, fnum);
@@ -3324,11 +3324,11 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
 						RelationGetRelationName(fk_rel),
 						NameStr(riinfo->conname)),
 				 has_perm ?
-					 errdetail("Key (%s)=(%s) is not present in table \"%s\".",
-							   key_names.data, key_values.data,
-							   RelationGetRelationName(pk_rel)) :
-					 errdetail("Key is not present in table \"%s\".",
-							   RelationGetRelationName(pk_rel)),
+				 errdetail("Key (%s)=(%s) is not present in table \"%s\".",
+						   key_names.data, key_values.data,
+						   RelationGetRelationName(pk_rel)) :
+				 errdetail("Key is not present in table \"%s\".",
+						   RelationGetRelationName(pk_rel)),
 				 errtableconstraint(fk_rel, NameStr(riinfo->conname))));
 	else
 		ereport(ERROR,
@@ -3341,8 +3341,8 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
 			errdetail("Key (%s)=(%s) is still referenced from table \"%s\".",
 					  key_names.data, key_values.data,
 					  RelationGetRelationName(fk_rel)) :
-					errdetail("Key is still referenced from table \"%s\".",
-					  RelationGetRelationName(fk_rel)),
+				 errdetail("Key is still referenced from table \"%s\".",
+						   RelationGetRelationName(fk_rel)),
 				 errtableconstraint(fk_rel, NameStr(riinfo->conname))));
 }
 
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 6396e84111..83c5169430 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -43,6 +43,7 @@
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
+#include "catalog/pg_tablesample_method.h"
 #include "catalog/pg_trigger.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
@@ -57,6 +58,7 @@
 #include "nodes/nodeFuncs.h"
 #include "optimizer/tlist.h"
 #include "parser/keywords.h"
+#include "parser/parse_node.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_func.h"
 #include "parser/parse_oper.h"
@@ -128,6 +130,8 @@ typedef struct
 	bool		finalise_aggs;	/* should Datanode finalise the aggregates? */
 #endif /* XCP */
 #endif /* PGXC */
+	ParseExprKind special_exprkind;		/* set only for exprkinds needing
+										 * special handling */
 } deparse_context;
 
 /*
@@ -152,8 +156,8 @@ typedef struct
  * varlevelsup > 0).  We store the PlanState node that is the immediate
  * parent of the expression to be deparsed, as well as a list of that
  * PlanState's ancestors.  In addition, we store its outer and inner subplan
- * state nodes, as well as their plan nodes' targetlists, and the indextlist
- * if the current PlanState is an IndexOnlyScanState.  (These fields could
+ * state nodes, as well as their plan nodes' targetlists, and the index tlist
+ * if the current plan node might contain INDEX_VAR Vars.  (These fields could
  * be derived on-the-fly from the current PlanState, but it seems notationally
  * clearer to set them up as separate fields.)
  */
@@ -333,6 +337,7 @@ static text *pg_get_expr_worker(text *expr, Oid relid, const char *relname,
 static int print_function_arguments(StringInfo buf, HeapTuple proctup,
 						 bool print_table_args, bool print_defaults);
 static void print_function_rettype(StringInfo buf, HeapTuple proctup);
+static void print_function_trftypes(StringInfo buf, HeapTuple proctup);
 static void set_rtable_names(deparse_namespace *dpns, List *parent_namespaces,
 				 Bitmapset *rels_used);
 static bool refname_is_unique(char *refname, deparse_namespace *dpns,
@@ -374,6 +379,8 @@ static void make_ruledef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 			 int prettyFlags);
 static void make_viewdef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 			 int prettyFlags, int wrapColumn);
+static void get_tablesample_def(TableSampleClause *tablesample,
+					deparse_context *context);
 static void get_query_def(Query *query, StringInfo buf, List *parentnamespace,
 			  TupleDesc resultDesc,
 			  int prettyFlags, int wrapColumn, int startIndent);
@@ -383,6 +390,9 @@ static void get_select_query_def(Query *query, deparse_context *context,
 					 TupleDesc resultDesc);
 static void get_insert_query_def(Query *query, deparse_context *context);
 static void get_update_query_def(Query *query, deparse_context *context);
+static void get_update_query_targetlist_def(Query *query, List *targetList,
+								deparse_context *context,
+								RangeTblEntry *rte);
 static void get_delete_query_def(Query *query, deparse_context *context);
 static void get_utility_query_def(Query *query, deparse_context *context);
 static void get_basic_select_query(Query *query, deparse_context *context,
@@ -392,9 +402,11 @@ static void get_target_list(List *targetList, deparse_context *context,
 static void get_setop_query(Node *setOp, Query *query,
 				deparse_context *context,
 				TupleDesc resultDesc);
-static Node *get_rule_sortgroupclause(SortGroupClause *srt, List *tlist,
+static Node *get_rule_sortgroupclause(Index ref, List *tlist,
 						 bool force_colno,
 						 deparse_context *context);
+static void get_rule_groupingset(GroupingSet *gset, List *targetlist,
+					 bool omit_parens, deparse_context *context);
 static void get_rule_orderby(List *orderList, List *targetList,
 				 bool force_colno, deparse_context *context);
 static void get_rule_windowclause(Query *query, deparse_context *context);
@@ -443,7 +455,8 @@ static char *get_relation_name(Oid relid);
 static char *generate_relation_name(Oid relid, List *namespaces);
 static char *generate_function_name(Oid funcid, int nargs,
 					   List *argnames, Oid *argtypes,
-					   bool has_variadic, bool *use_variadic_p);
+					   bool has_variadic, bool *use_variadic_p,
+					   ParseExprKind special_exprkind);
 static char *generate_operator_name(Oid operid, Oid arg1, Oid arg2);
 static text *string_to_text(char *str);
 static char *flatten_reloptions(Oid relid);
@@ -906,6 +919,7 @@ pg_get_triggerdef_worker(Oid trigid, bool pretty)
 		context.prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
 		context.wrapColumn = WRAP_COLUMN_DEFAULT;
 		context.indentLevel = PRETTYINDENT_STD;
+		context.special_exprkind = EXPR_KIND_NONE;
 
 		get_rule_expr(qual, &context, false);
 
@@ -915,7 +929,7 @@ pg_get_triggerdef_worker(Oid trigid, bool pretty)
 	appendStringInfo(&buf, "EXECUTE PROCEDURE %s(",
 					 generate_function_name(trigrec->tgfoid, 0,
 											NIL, NULL,
-											false, NULL));
+											false, NULL, EXPR_KIND_NONE));
 
 	if (trigrec->tgnargs > 0)
 	{
@@ -1947,9 +1961,7 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 	StringInfoData dq;
 	HeapTuple	proctup;
-	HeapTuple	langtup;
 	Form_pg_proc proc;
-	Form_pg_language lang;
 	Datum		tmp;
 	bool		isnull;
 	const char *prosrc;
@@ -1972,12 +1984,6 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("\"%s\" is an aggregate function", name)));
 
-	/* Need its pg_language tuple for the language name */
-	langtup = SearchSysCache1(LANGOID, ObjectIdGetDatum(proc->prolang));
-	if (!HeapTupleIsValid(langtup))
-		elog(ERROR, "cache lookup failed for language %u", proc->prolang);
-	lang = (Form_pg_language) GETSTRUCT(langtup);
-
 	/*
 	 * We always qualify the function name, to ensure the right function gets
 	 * replaced.
@@ -1988,8 +1994,11 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 	(void) print_function_arguments(&buf, proctup, false, true);
 	appendStringInfoString(&buf, ")\n RETURNS ");
 	print_function_rettype(&buf, proctup);
+
+	print_function_trftypes(&buf, proctup);
+
 	appendStringInfo(&buf, "\n LANGUAGE %s\n",
-					 quote_identifier(NameStr(lang->lanname)));
+				  quote_identifier(get_language_name(proc->prolang, false)));
 
 	/* Emit some miscellaneous options on one line */
 	oldlen = buf.len;
@@ -2011,6 +2020,8 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 		appendStringInfoString(&buf, " STRICT");
 	if (proc->prosecdef)
 		appendStringInfoString(&buf, " SECURITY DEFINER");
+	if (proc->proleakproof)
+		appendStringInfoString(&buf, " LEAKPROOF");
 
 	/* This code for the default cost and rows should match functioncmds.c */
 	if (proc->prolang == INTERNALlanguageId ||
@@ -2109,7 +2120,6 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 
 	appendStringInfoChar(&buf, '\n');
 
-	ReleaseSysCache(langtup);
 	ReleaseSysCache(proctup);
 
 	PG_RETURN_TEXT_P(string_to_text(buf.data));
@@ -2211,7 +2221,7 @@ print_function_rettype(StringInfo buf, HeapTuple proctup)
 		appendStringInfoString(&rbuf, "TABLE(");
 		ntabargs = print_function_arguments(&rbuf, proctup, true, false);
 		if (ntabargs > 0)
-			appendStringInfoString(&rbuf, ")");
+			appendStringInfoChar(&rbuf, ')');
 		else
 			resetStringInfo(&rbuf);
 	}
@@ -2386,6 +2396,30 @@ is_input_argument(int nth, const char *argmodes)
 }
 
 /*
+ * Append used transformated types to specified buffer
+ */
+static void
+print_function_trftypes(StringInfo buf, HeapTuple proctup)
+{
+	Oid		   *trftypes;
+	int			ntypes;
+
+	ntypes = get_func_trftypes(proctup, &trftypes);
+	if (ntypes > 0)
+	{
+		int			i;
+
+		appendStringInfoString(buf, "\n TRANSFORM ");
+		for (i = 0; i < ntypes; i++)
+		{
+			if (i != 0)
+				appendStringInfoString(buf, ", ");
+			appendStringInfo(buf, "FOR TYPE %s", format_type_be(trftypes[i]));
+		}
+	}
+}
+
+/*
  * Get textual representation of a function argument's default value.  The
  * second argument of this function is the argument number among all arguments
  * (i.e. proallargtypes, *not* proargtypes), starting with 1, because that's
@@ -2517,6 +2551,7 @@ deparse_expression_pretty(Node *expr, List *dpcontext,
 #endif /* PGXC */
 	context.wrapColumn = WRAP_COLUMN_DEFAULT;
 	context.indentLevel = startIndent;
+	context.special_exprkind = EXPR_KIND_NONE;
 
 	get_rule_expr(expr, &context, showimplicit);
 
@@ -2637,10 +2672,11 @@ deparse_context_for_plan_rtable(List *rtable, List *rtable_names)
  * provide the parent PlanState node.  Then OUTER_VAR and INNER_VAR references
  * can be resolved by drilling down into the left and right child plans.
  * Similarly, INDEX_VAR references can be resolved by reference to the
- * indextlist given in the parent IndexOnlyScan node.  (Note that we don't
- * currently support deparsing of indexquals in regular IndexScan or
- * BitmapIndexScan nodes; for those, we can only deparse the indexqualorig
- * fields, which won't contain INDEX_VAR Vars.)
+ * indextlist given in a parent IndexOnlyScan node, or to the scan tlist in
+ * ForeignScan and CustomScan nodes.  (Note that we don't currently support
+ * deparsing of indexquals in regular IndexScan or BitmapIndexScan nodes;
+ * for those, we can only deparse the indexqualorig fields, which won't
+ * contain INDEX_VAR Vars.)
  *
  * Note: planstate really ought to be declared as "PlanState *", but we use
  * "Node *" to avoid having to include execnodes.h in ruleutils.h.
@@ -4001,22 +4037,34 @@ set_deparse_planstate(deparse_namespace *dpns, PlanState *ps)
 	 * For a SubqueryScan, pretend the subplan is INNER referent.  (We don't
 	 * use OUTER because that could someday conflict with the normal meaning.)
 	 * Likewise, for a CteScan, pretend the subquery's plan is INNER referent.
+	 * For ON CONFLICT .. UPDATE we just need the inner tlist to point to the
+	 * excluded expression's tlist. (Similar to the SubqueryScan we don't want
+	 * to reuse OUTER, it's used for RETURNING in some modify table cases,
+	 * although not INSERT .. CONFLICT).
 	 */
 	if (IsA(ps, SubqueryScanState))
 		dpns->inner_planstate = ((SubqueryScanState *) ps)->subplan;
 	else if (IsA(ps, CteScanState))
 		dpns->inner_planstate = ((CteScanState *) ps)->cteplanstate;
+	else if (IsA(ps, ModifyTableState))
+		dpns->inner_planstate = ps;
 	else
 		dpns->inner_planstate = innerPlanState(ps);
 
-	if (dpns->inner_planstate)
+	if (IsA(ps, ModifyTableState))
+		dpns->inner_tlist = ((ModifyTableState *) ps)->mt_excludedtlist;
+	else if (dpns->inner_planstate)
 		dpns->inner_tlist = dpns->inner_planstate->plan->targetlist;
 	else
 		dpns->inner_tlist = NIL;
 
-	/* index_tlist is set only if it's an IndexOnlyScan */
+	/* Set up referent for INDEX_VAR Vars, if needed */
 	if (IsA(ps->plan, IndexOnlyScan))
 		dpns->index_tlist = ((IndexOnlyScan *) ps->plan)->indextlist;
+	else if (IsA(ps->plan, ForeignScan))
+		dpns->index_tlist = ((ForeignScan *) ps->plan)->fdw_scan_tlist;
+	else if (IsA(ps->plan, CustomScan))
+		dpns->index_tlist = ((CustomScan *) ps->plan)->custom_scan_tlist;
 	else
 		dpns->index_tlist = NIL;
 }
@@ -4253,6 +4301,7 @@ make_ruledef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 		context.finalise_aggs = false;
 #endif /* XCP */
 #endif /* PGXC */
+		context.special_exprkind = EXPR_KIND_NONE;
 
 		set_deparse_for_query(&dpns, query, NIL);
 
@@ -4364,6 +4413,50 @@ make_viewdef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 	heap_close(ev_relation, AccessShareLock);
 }
 
+/* ----------
+ * get_tablesample_def			- Convert TableSampleClause back to SQL
+ * ----------
+ */
+static void
+get_tablesample_def(TableSampleClause *tablesample, deparse_context *context)
+{
+	StringInfo	buf = context->buf;
+	HeapTuple	tuple;
+	Form_pg_tablesample_method tsm;
+	char	   *tsmname;
+	int			nargs;
+	ListCell   *l;
+
+	/* Load the tablesample method */
+	tuple = SearchSysCache1(TABLESAMPLEMETHODOID, ObjectIdGetDatum(tablesample->tsmid));
+	if (!HeapTupleIsValid(tuple))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("cache lookup failed for tablesample method %u",
+						tablesample->tsmid)));
+
+	tsm = (Form_pg_tablesample_method) GETSTRUCT(tuple);
+	tsmname = NameStr(tsm->tsmname);
+	appendStringInfo(buf, " TABLESAMPLE %s (", quote_identifier(tsmname));
+
+	ReleaseSysCache(tuple);
+
+	nargs = 0;
+	foreach(l, tablesample->args)
+	{
+		if (nargs++ > 0)
+			appendStringInfoString(buf, ", ");
+		get_rule_expr((Node *) lfirst(l), context, true);
+	}
+	appendStringInfoChar(buf, ')');
+
+	if (tablesample->repeatable != NULL)
+	{
+		appendStringInfoString(buf, " REPEATABLE (");
+		get_rule_expr(tablesample->repeatable, context, true);
+		appendStringInfoChar(buf, ')');
+	}
+}
 
 #ifdef PGXC
 /* ----------
@@ -4582,6 +4675,7 @@ get_query_def(Query *query, StringInfo buf, List *parentnamespace,
 	context.finalise_aggs = query->qry_finalise_aggs;
 #endif /* XCP */
 #endif /* PGXC */
+	context.special_exprkind = EXPR_KIND_NONE;
 
 	set_deparse_for_query(&dpns, query, parentnamespace);
 
@@ -4952,7 +5046,7 @@ get_basic_select_query(Query *query, deparse_context *context,
 				SortGroupClause *srt = (SortGroupClause *) lfirst(l);
 
 				appendStringInfoString(buf, sep);
-				get_rule_sortgroupclause(srt, query->targetList,
+				get_rule_sortgroupclause(srt->tleSortGroupRef, query->targetList,
 										 false, context);
 				sep = ", ";
 			}
@@ -4977,20 +5071,43 @@ get_basic_select_query(Query *query, deparse_context *context,
 	}
 
 	/* Add the GROUP BY clause if given */
-	if (query->groupClause != NULL)
+	if (query->groupClause != NULL || query->groupingSets != NULL)
 	{
+		ParseExprKind save_exprkind;
+
 		appendContextKeyword(context, " GROUP BY ",
 							 -PRETTYINDENT_STD, PRETTYINDENT_STD, 1);
-		sep = "";
-		foreach(l, query->groupClause)
+
+		save_exprkind = context->special_exprkind;
+		context->special_exprkind = EXPR_KIND_GROUP_BY;
+
+		if (query->groupingSets == NIL)
 		{
-			SortGroupClause *grp = (SortGroupClause *) lfirst(l);
+			sep = "";
+			foreach(l, query->groupClause)
+			{
+				SortGroupClause *grp = (SortGroupClause *) lfirst(l);
 
-			appendStringInfoString(buf, sep);
-			get_rule_sortgroupclause(grp, query->targetList,
-									 false, context);
-			sep = ", ";
+				appendStringInfoString(buf, sep);
+				get_rule_sortgroupclause(grp->tleSortGroupRef, query->targetList,
+										 false, context);
+				sep = ", ";
+			}
 		}
+		else
+		{
+			sep = "";
+			foreach(l, query->groupingSets)
+			{
+				GroupingSet *grp = lfirst(l);
+
+				appendStringInfoString(buf, sep);
+				get_rule_groupingset(grp, query->targetList, true, context);
+				sep = ", ";
+			}
+		}
+
+		context->special_exprkind = save_exprkind;
 	}
 
 	/* Add the HAVING clause if given */
@@ -5066,7 +5183,7 @@ get_target_list(List *targetList, deparse_context *context,
 		 * different from a whole-row Var).  We need to call get_variable
 		 * directly so that we can tell it to do the right thing.
 		 */
-		if (tle->expr && IsA(tle->expr, Var))
+		if (tle->expr && (IsA(tle->expr, Var)))
 		{
 			attname = get_variable((Var *) tle->expr, 0, true, context);
 		}
@@ -5295,14 +5412,14 @@ get_setop_query(Node *setOp, Query *query, deparse_context *context,
  * Also returns the expression tree, so caller need not find it again.
  */
 static Node *
-get_rule_sortgroupclause(SortGroupClause *srt, List *tlist, bool force_colno,
+get_rule_sortgroupclause(Index ref, List *tlist, bool force_colno,
 						 deparse_context *context)
 {
 	StringInfo	buf = context->buf;
 	TargetEntry *tle;
 	Node	   *expr;
 
-	tle = get_sortgroupclause_tle(srt, tlist);
+	tle = get_sortgroupref_tle(ref, tlist);
 	expr = (Node *) tle->expr;
 
 	/*
@@ -5310,8 +5427,9 @@ get_rule_sortgroupclause(SortGroupClause *srt, List *tlist, bool force_colno,
 	 * expression is a constant, force it to be dumped with an explicit cast
 	 * as decoration --- this is because a simple integer constant is
 	 * ambiguous (and will be misinterpreted by findTargetlistEntry()) if we
-	 * dump it without any decoration.  Otherwise, just dump the expression
-	 * normally.
+	 * dump it without any decoration.  If it's anything more complex than a
+	 * simple Var, then force extra parens around it, to ensure it can't be
+	 * misinterpreted as a cube() or rollup() construct.
 	 */
 	if (force_colno)
 	{
@@ -5320,13 +5438,93 @@ get_rule_sortgroupclause(SortGroupClause *srt, List *tlist, bool force_colno,
 	}
 	else if (expr && IsA(expr, Const))
 		get_const_expr((Const *) expr, context, 1);
+	else if (!expr || IsA(expr, Var))
+		get_rule_expr(expr, context, true);
 	else
+	{
+		/*
+		 * We must force parens for function-like expressions even if
+		 * PRETTY_PAREN is off, since those are the ones in danger of
+		 * misparsing. For other expressions we need to force them only if
+		 * PRETTY_PAREN is on, since otherwise the expression will output them
+		 * itself. (We can't skip the parens.)
+		 */
+		bool		need_paren = (PRETTY_PAREN(context)
+								  || IsA(expr, FuncExpr)
+								  ||IsA(expr, Aggref)
+								  ||IsA(expr, WindowFunc));
+
+		if (need_paren)
+			appendStringInfoString(context->buf, "(");
 		get_rule_expr(expr, context, true);
+		if (need_paren)
+			appendStringInfoString(context->buf, ")");
+	}
 
 	return expr;
 }
 
 /*
+ * Display a GroupingSet
+ */
+static void
+get_rule_groupingset(GroupingSet *gset, List *targetlist,
+					 bool omit_parens, deparse_context *context)
+{
+	ListCell   *l;
+	StringInfo	buf = context->buf;
+	bool		omit_child_parens = true;
+	char	   *sep = "";
+
+	switch (gset->kind)
+	{
+		case GROUPING_SET_EMPTY:
+			appendStringInfoString(buf, "()");
+			return;
+
+		case GROUPING_SET_SIMPLE:
+			{
+				if (!omit_parens || list_length(gset->content) != 1)
+					appendStringInfoString(buf, "(");
+
+				foreach(l, gset->content)
+				{
+					Index		ref = lfirst_int(l);
+
+					appendStringInfoString(buf, sep);
+					get_rule_sortgroupclause(ref, targetlist,
+											 false, context);
+					sep = ", ";
+				}
+
+				if (!omit_parens || list_length(gset->content) != 1)
+					appendStringInfoString(buf, ")");
+			}
+			return;
+
+		case GROUPING_SET_ROLLUP:
+			appendStringInfoString(buf, "ROLLUP(");
+			break;
+		case GROUPING_SET_CUBE:
+			appendStringInfoString(buf, "CUBE(");
+			break;
+		case GROUPING_SET_SETS:
+			appendStringInfoString(buf, "GROUPING SETS (");
+			omit_child_parens = false;
+			break;
+	}
+
+	foreach(l, gset->content)
+	{
+		appendStringInfoString(buf, sep);
+		get_rule_groupingset(lfirst(l), targetlist, omit_child_parens, context);
+		sep = ", ";
+	}
+
+	appendStringInfoString(buf, ")");
+}
+
+/*
  * Display an ORDER BY list.
  */
 static void
@@ -5346,7 +5544,7 @@ get_rule_orderby(List *orderList, List *targetList,
 		TypeCacheEntry *typentry;
 
 		appendStringInfoString(buf, sep);
-		sortexpr = get_rule_sortgroupclause(srt, targetList,
+		sortexpr = get_rule_sortgroupclause(srt->tleSortGroupRef, targetList,
 											force_colno, context);
 		sortcoltype = exprType(sortexpr);
 		/* See whether operator is default < or > for datatype */
@@ -5446,7 +5644,7 @@ get_rule_windowspec(WindowClause *wc, List *targetList,
 			SortGroupClause *grp = (SortGroupClause *) lfirst(l);
 
 			appendStringInfoString(buf, sep);
-			get_rule_sortgroupclause(grp, targetList,
+			get_rule_sortgroupclause(grp->tleSortGroupRef, targetList,
 									 false, context);
 			sep = ", ";
 		}
@@ -5601,6 +5799,10 @@ get_insert_query_def(Query *query, deparse_context *context)
 	}
 	appendStringInfo(buf, "INSERT INTO %s ",
 					 generate_relation_name(rte->relid, NIL));
+	/* INSERT requires AS keyword for target alias */
+	if (rte->alias != NULL)
+		appendStringInfo(buf, "AS %s ",
+						 quote_identifier(rte->alias->aliasname));
 
 	/*
 	 * Add the insert-column-names list.  To handle indirection properly, we
@@ -5683,6 +5885,57 @@ get_insert_query_def(Query *query, deparse_context *context)
 		appendStringInfoString(buf, "DEFAULT VALUES");
 	}
 
+	/* Add ON CONFLICT if present */
+	if (query->onConflict)
+	{
+		OnConflictExpr *confl = query->onConflict;
+
+		appendStringInfo(buf, " ON CONFLICT");
+
+		if (confl->arbiterElems)
+		{
+			/* Add the single-VALUES expression list */
+			appendStringInfoChar(buf, '(');
+			get_rule_expr((Node *) confl->arbiterElems, context, false);
+			appendStringInfoChar(buf, ')');
+
+			/* Add a WHERE clause (for partial indexes) if given */
+			if (confl->arbiterWhere != NULL)
+			{
+				appendContextKeyword(context, " WHERE ",
+									 -PRETTYINDENT_STD, PRETTYINDENT_STD, 1);
+				get_rule_expr(confl->arbiterWhere, context, false);
+			}
+		}
+		else if (confl->constraint != InvalidOid)
+		{
+			char	   *constraint = get_constraint_name(confl->constraint);
+
+			appendStringInfo(buf, " ON CONSTRAINT %s",
+							 quote_qualified_identifier(NULL, constraint));
+		}
+
+		if (confl->action == ONCONFLICT_NOTHING)
+		{
+			appendStringInfoString(buf, " DO NOTHING");
+		}
+		else
+		{
+			appendStringInfoString(buf, " DO UPDATE SET ");
+			/* Deparse targetlist */
+			get_update_query_targetlist_def(query, confl->onConflictSet,
+											context, rte);
+
+			/* Add a WHERE clause if given */
+			if (confl->onConflictWhere != NULL)
+			{
+				appendContextKeyword(context, " WHERE ",
+									 -PRETTYINDENT_STD, PRETTYINDENT_STD, 1);
+				get_rule_expr(confl->onConflictWhere, context, false);
+			}
+		}
+	}
+
 	/* Add RETURNING if present */
 	if (query->returningList)
 	{
@@ -5702,12 +5955,6 @@ get_update_query_def(Query *query, deparse_context *context)
 {
 	StringInfo	buf = context->buf;
 	RangeTblEntry *rte;
-	List	   *ma_sublinks;
-	ListCell   *next_ma_cell;
-	SubLink    *cur_ma_sublink;
-	int			remaining_ma_columns;
-	const char *sep;
-	ListCell   *l;
 
 	/* Insert the WITH clause if given */
 	get_with_clause(query, context);
@@ -5730,6 +5977,46 @@ get_update_query_def(Query *query, deparse_context *context)
 						 quote_identifier(rte->alias->aliasname));
 	appendStringInfoString(buf, " SET ");
 
+	/* Deparse targetlist */
+	get_update_query_targetlist_def(query, query->targetList, context, rte);
+
+	/* Add the FROM clause if needed */
+	get_from_clause(query, " FROM ", context);
+
+	/* Add a WHERE clause if given */
+	if (query->jointree->quals != NULL)
+	{
+		appendContextKeyword(context, " WHERE ",
+							 -PRETTYINDENT_STD, PRETTYINDENT_STD, 1);
+		get_rule_expr(query->jointree->quals, context, false);
+	}
+
+	/* Add RETURNING if present */
+	if (query->returningList)
+	{
+		appendContextKeyword(context, " RETURNING",
+							 -PRETTYINDENT_STD, PRETTYINDENT_STD, 1);
+		get_target_list(query->returningList, context, NULL);
+	}
+}
+
+
+/* ----------
+ * get_update_query_targetlist_def			- Parse back an UPDATE targetlist
+ * ----------
+ */
+static void
+get_update_query_targetlist_def(Query *query, List *targetList,
+								deparse_context *context, RangeTblEntry *rte)
+{
+	StringInfo	buf = context->buf;
+	ListCell   *l;
+	ListCell   *next_ma_cell;
+	int			remaining_ma_columns;
+	const char *sep;
+	SubLink    *cur_ma_sublink;
+	List	   *ma_sublinks;
+
 	/*
 	 * Prepare to deal with MULTIEXPR assignments: collect the source SubLinks
 	 * into a list.  We expect them to appear, in ID order, in resjunk tlist
@@ -5738,7 +6025,7 @@ get_update_query_def(Query *query, deparse_context *context)
 	ma_sublinks = NIL;
 	if (query->hasSubLinks)		/* else there can't be any */
 	{
-		foreach(l, query->targetList)
+		foreach(l, targetList)
 		{
 			TargetEntry *tle = (TargetEntry *) lfirst(l);
 
@@ -5760,7 +6047,7 @@ get_update_query_def(Query *query, deparse_context *context)
 
 	/* Add the comma separated list of 'attname = value' */
 	sep = "";
-	foreach(l, query->targetList)
+	foreach(l, targetList)
 	{
 		TargetEntry *tle = (TargetEntry *) lfirst(l);
 		Node	   *expr;
@@ -5851,25 +6138,6 @@ get_update_query_def(Query *query, deparse_context *context)
 
 		get_rule_expr(expr, context, false);
 	}
-
-	/* Add the FROM clause if needed */
-	get_from_clause(query, " FROM ", context);
-
-	/* Add a WHERE clause if given */
-	if (query->jointree->quals != NULL)
-	{
-		appendContextKeyword(context, " WHERE ",
-							 -PRETTYINDENT_STD, PRETTYINDENT_STD, 1);
-		get_rule_expr(query->jointree->quals, context, false);
-	}
-
-	/* Add RETURNING if present */
-	if (query->returningList)
-	{
-		appendContextKeyword(context, " RETURNING",
-							 -PRETTYINDENT_STD, PRETTYINDENT_STD, 1);
-		get_target_list(query->returningList, context, NULL);
-	}
 }
 
 
@@ -7377,6 +7645,16 @@ get_rule_expr(Node *node, deparse_context *context,
 			get_agg_expr((Aggref *) node, context);
 			break;
 
+		case T_GroupingFunc:
+			{
+				GroupingFunc *gexpr = (GroupingFunc *) node;
+
+				appendStringInfoString(buf, "GROUPING(");
+				get_rule_expr((Node *) gexpr->args, context, true);
+				appendStringInfoChar(buf, ')');
+			}
+			break;
+
 		case T_WindowFunc:
 			get_windowfunc_expr((WindowFunc *) node, context);
 			break;
@@ -7454,7 +7732,7 @@ get_rule_expr(Node *node, deparse_context *context,
 			{
 				NamedArgExpr *na = (NamedArgExpr *) node;
 
-				appendStringInfo(buf, "%s := ", quote_identifier(na->name));
+				appendStringInfo(buf, "%s => ", quote_identifier(na->name));
 				get_rule_expr((Node *) na->arg, context, showimplicit);
 			}
 			break;
@@ -8261,6 +8539,52 @@ get_rule_expr(Node *node, deparse_context *context,
 			}
 			break;
 
+		case T_InferenceElem:
+			{
+				InferenceElem *iexpr = (InferenceElem *) node;
+				bool		varprefix = context->varprefix;
+				bool		need_parens;
+
+				/*
+				 * InferenceElem can only refer to target relation, so a
+				 * prefix is never useful.
+				 */
+				context->varprefix = false;
+
+				/*
+				 * Parenthesize the element unless it's a simple Var or a bare
+				 * function call.  Follows pg_get_indexdef_worker().
+				 */
+				need_parens = !IsA(iexpr->expr, Var);
+				if (IsA(iexpr->expr, FuncExpr) &&
+					((FuncExpr *) iexpr->expr)->funcformat ==
+					COERCE_EXPLICIT_CALL)
+					need_parens = false;
+
+				if (need_parens)
+					appendStringInfoChar(buf, '(');
+				get_rule_expr((Node *) iexpr->expr,
+							  context, false);
+				if (need_parens)
+					appendStringInfoChar(buf, ')');
+
+				context->varprefix = varprefix;
+
+				if (iexpr->infercollid)
+					appendStringInfo(buf, " COLLATE %s",
+								generate_collation_name(iexpr->infercollid));
+
+				/* Add the operator class name, if not default */
+				if (iexpr->inferopclass)
+				{
+					Oid			inferopclass = iexpr->inferopclass;
+					Oid			inferopcinputtype = get_opclass_input_type(iexpr->inferopclass);
+
+					get_opclass_name(inferopclass, inferopcinputtype, buf);
+				}
+			}
+			break;
+
 		case T_List:
 			{
 				char	   *sep;
@@ -8415,7 +8739,8 @@ get_func_expr(FuncExpr *expr, deparse_context *context,
 					 generate_function_name(funcoid, nargs,
 											argnames, argtypes,
 											expr->funcvariadic,
-											&use_variadic));
+											&use_variadic,
+											context->special_exprkind));
 	nargs = 0;
 	foreach(l, expr->args)
 	{
@@ -8482,7 +8807,8 @@ get_agg_expr(Aggref *aggref, deparse_context *context)
 					 generate_function_name(aggref->aggfnoid, nargs,
 											NIL, argtypes,
 											aggref->aggvariadic,
-											&use_variadic),
+											&use_variadic,
+											context->special_exprkind),
 					 (aggref->aggdistinct != NIL) ? "DISTINCT " : "");
 
 	if (AGGKIND_IS_ORDERED_SET(aggref->aggkind))
@@ -8577,7 +8903,8 @@ get_windowfunc_expr(WindowFunc *wfunc, deparse_context *context)
 	appendStringInfo(buf, "%s(",
 					 generate_function_name(wfunc->winfnoid, nargs,
 											argnames, argtypes,
-											false, NULL));
+											false, NULL,
+											context->special_exprkind));
 	/* winstar can be set only in zero-argument aggregates */
 	if (wfunc->winstar)
 		appendStringInfoChar(buf, '*');
@@ -9114,6 +9441,9 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
 								 only_marker(rte),
 								 generate_relation_name(rte->relid,
 														context->namespaces));
+
+				if (rte->tablesample)
+					get_tablesample_def(rte->tablesample, context);
 				break;
 			case RTE_SUBQUERY:
 				/* Subquery RTE */
@@ -9842,7 +10172,8 @@ generate_relation_name(Oid relid, List *namespaces)
  */
 static char *
 generate_function_name(Oid funcid, int nargs, List *argnames, Oid *argtypes,
-					   bool has_variadic, bool *use_variadic_p)
+					   bool has_variadic, bool *use_variadic_p,
+					   ParseExprKind special_exprkind)
 {
 	char	   *result;
 	HeapTuple	proctup;
@@ -9857,6 +10188,7 @@ generate_function_name(Oid funcid, int nargs, List *argnames, Oid *argtypes,
 	int			p_nvargs;
 	Oid			p_vatype;
 	Oid		   *p_true_typeids;
+	bool		force_qualify = false;
 
 	proctup = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid));
 	if (!HeapTupleIsValid(proctup))
@@ -9865,6 +10197,16 @@ generate_function_name(Oid funcid, int nargs, List *argnames, Oid *argtypes,
 	proname = NameStr(procform->proname);
 
 	/*
+	 * Due to parser hacks to avoid needing to reserve CUBE, we need to force
+	 * qualification in some special cases.
+	 */
+	if (special_exprkind == EXPR_KIND_GROUP_BY)
+	{
+		if (strcmp(proname, "cube") == 0 || strcmp(proname, "rollup") == 0)
+			force_qualify = true;
+	}
+
+	/*
 	 * Determine whether VARIADIC should be printed.  We must do this first
 	 * since it affects the lookup rules in func_get_detail().
 	 *
@@ -9895,14 +10237,23 @@ generate_function_name(Oid funcid, int nargs, List *argnames, Oid *argtypes,
 	/*
 	 * The idea here is to schema-qualify only if the parser would fail to
 	 * resolve the correct function given the unqualified func name with the
-	 * specified argtypes and VARIADIC flag.
+	 * specified argtypes and VARIADIC flag.  But if we already decided to
+	 * force qualification, then we can skip the lookup and pretend we didn't
+	 * find it.
 	 */
-	p_result = func_get_detail(list_make1(makeString(proname)),
-							   NIL, argnames, nargs, argtypes,
-							   !use_variadic, true,
-							   &p_funcid, &p_rettype,
-							   &p_retset, &p_nvargs, &p_vatype,
-							   &p_true_typeids, NULL);
+	if (!force_qualify)
+		p_result = func_get_detail(list_make1(makeString(proname)),
+								   NIL, argnames, nargs, argtypes,
+								   !use_variadic, true,
+								   &p_funcid, &p_rettype,
+								   &p_retset, &p_nvargs, &p_vatype,
+								   &p_true_typeids, NULL);
+	else
+	{
+		p_result = FUNCDETAIL_NOTFOUND;
+		p_funcid = InvalidOid;
+	}
+
 	if ((p_result == FUNCDETAIL_NORMAL ||
 		 p_result == FUNCDETAIL_AGGREGATE ||
 		 p_result == FUNCDETAIL_WINDOWFUNC) &&
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index bd681ed3cc..c6bfd7155f 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -3158,6 +3158,8 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
  *	groupExprs - list of expressions being grouped by
  *	input_rows - number of rows estimated to arrive at the group/unique
  *		filter step
+ *	pgset - NULL, or a List** pointing to a grouping set to filter the
+ *		groupExprs against
  *
  * Given the lack of any cross-correlation statistics in the system, it's
  * impossible to do anything really trustworthy with GROUP BY conditions
@@ -3205,11 +3207,13 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
  * but we don't have the info to do better).
  */
 double
-estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
+estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows,
+					List **pgset)
 {
 	List	   *varinfos = NIL;
 	double		numdistinct;
 	ListCell   *l;
+	int			i;
 
 	/*
 	 * We don't ever want to return an estimate of zero groups, as that tends
@@ -3224,7 +3228,7 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
 	 * for normal cases with GROUP BY or DISTINCT, but it is possible for
 	 * corner cases with set operations.)
 	 */
-	if (groupExprs == NIL)
+	if (groupExprs == NIL || (pgset && list_length(*pgset) < 1))
 		return 1.0;
 
 	/*
@@ -3236,6 +3240,7 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
 	 */
 	numdistinct = 1.0;
 
+	i = 0;
 	foreach(l, groupExprs)
 	{
 		Node	   *groupexpr = (Node *) lfirst(l);
@@ -3243,6 +3248,10 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
 		List	   *varshere;
 		ListCell   *l2;
 
+		/* is expression in this grouping set? */
+		if (pgset && !list_member_int(*pgset, i++))
+			continue;
+
 		/* Short-circuit for expressions returning boolean */
 		if (exprType(groupexpr) == BOOLOID)
 		{
@@ -3619,6 +3628,8 @@ convert_to_scalar(Datum value, Oid valuetypid, double *scaledvalue,
 		case REGTYPEOID:
 		case REGCONFIGOID:
 		case REGDICTIONARYOID:
+		case REGROLEOID:
+		case REGNAMESPACEOID:
 			*scaledvalue = convert_numeric_to_scalar(value, valuetypid);
 			*scaledlobound = convert_numeric_to_scalar(lobound, boundstypid);
 			*scaledhibound = convert_numeric_to_scalar(hibound, boundstypid);
@@ -3724,6 +3735,8 @@ convert_numeric_to_scalar(Datum value, Oid typid)
 		case REGTYPEOID:
 		case REGCONFIGOID:
 		case REGDICTIONARYOID:
+		case REGROLEOID:
+		case REGNAMESPACEOID:
 			/* we can treat OIDs as integers... */
 			return (double) DatumGetObjectId(value);
 	}
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 7290a00cd8..2322519852 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -1967,7 +1967,7 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
 
 
 /* interval2tm()
- * Convert a interval data type to a tm structure.
+ * Convert an interval data type to a tm structure.
  */
 int
 interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec)
@@ -2911,7 +2911,7 @@ interval_justify_days(PG_FUNCTION_ARGS)
 }
 
 /* timestamp_pl_interval()
- * Add a interval to a timestamp data type.
+ * Add an interval to a timestamp data type.
  * Note that interval has provisions for qualitative year/month and day
  *	units, so try to do the right thing with them.
  * To add a month, increment the month, and use the same day of month.
@@ -3011,7 +3011,7 @@ timestamp_mi_interval(PG_FUNCTION_ARGS)
 
 
 /* timestamptz_pl_interval()
- * Add a interval to a timestamp with time zone data type.
+ * Add an interval to a timestamp with time zone data type.
  * Note that interval has provisions for qualitative year/month
  *	units, so try to do the right thing with them.
  * To add a month, increment the month, and use the same day of month.
diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c
index 828175b7a1..da90ca84f8 100644
--- a/src/backend/utils/adt/tsginidx.c
+++ b/src/backend/utils/adt/tsginidx.c
@@ -14,7 +14,7 @@
 #include "postgres.h"
 
 #include "access/gin.h"
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "miscadmin.h"
 #include "tsearch/ts_type.h"
 #include "tsearch/ts_utils.h"
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index d610bbc791..232715c574 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "access/skey.h"
+#include "access/stratnum.h"
 #include "access/gist.h"
 #include "tsearch/ts_utils.h"
 
diff --git a/src/backend/utils/adt/tsquery_op.c b/src/backend/utils/adt/tsquery_op.c
index bd6fc25099..8afd558db3 100644
--- a/src/backend/utils/adt/tsquery_op.c
+++ b/src/backend/utils/adt/tsquery_op.c
@@ -249,6 +249,7 @@ cmp_string(const void *a, const void *b)
 {
 	const char *sa = *((const char **) a);
 	const char *sb = *((const char **) b);
+
 	return strcmp(sa, sb);
 }
 
@@ -300,8 +301,8 @@ tsq_mcontains(PG_FUNCTION_ARGS)
 		result = false;
 	else
 	{
-		int i;
-		int j = 0;
+		int			i;
+		int			j = 0;
 
 		for (i = 0; i < ex_nvalues; i++)
 		{
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 266a728ef6..eb15937b35 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -38,8 +38,8 @@ typedef struct
 
 typedef struct StatEntry
 {
-	uint32		ndoc;			/* zero indicates that we already was here
-								 * while walking throug the tree */
+	uint32		ndoc;			/* zero indicates that we were already here
+								 * while walking through the tree */
 	uint32		nentry;
 	struct StatEntry *left;
 	struct StatEntry *right;
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index 1d7bb02ca4..ce1d9abdde 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -142,8 +142,10 @@ cmp_txid(const void *aa, const void *bb)
 static void
 sort_snapshot(TxidSnapshot *snap)
 {
-	txid	last = 0;
-	int		nxip, idx1, idx2;
+	txid		last = 0;
+	int			nxip,
+				idx1,
+				idx2;
 
 	if (snap->nxip > 1)
 	{
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 18cbdd0e76..779729d724 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -56,14 +56,15 @@ typedef struct
 
 typedef struct
 {
-	char			   *buf1;		/* 1st string, or abbreviation original string buf */
-	char			   *buf2;		/* 2nd string, or abbreviation strxfrm() buf */
-	int					buflen1;
-	int					buflen2;
-	bool				collate_c;
-	hyperLogLogState	abbr_card;	/* Abbreviated key cardinality state */
-	hyperLogLogState	full_card;	/* Full key cardinality state */
-	double				prop_card;	/* Required cardinality proportion */
+	char	   *buf1;			/* 1st string, or abbreviation original string
+								 * buf */
+	char	   *buf2;			/* 2nd string, or abbreviation strxfrm() buf */
+	int			buflen1;
+	int			buflen2;
+	bool		collate_c;
+	hyperLogLogState abbr_card; /* Abbreviated key cardinality state */
+	hyperLogLogState full_card; /* Full key cardinality state */
+	double		prop_card;		/* Required cardinality proportion */
 #ifdef HAVE_LOCALE_T
 	pg_locale_t locale;
 #endif
@@ -82,9 +83,9 @@ typedef struct
 #define PG_RETURN_UNKNOWN_P(x)		PG_RETURN_POINTER(x)
 
 static void btsortsupport_worker(SortSupport ssup, Oid collid);
-static int bttextfastcmp_c(Datum x, Datum y, SortSupport ssup);
-static int bttextfastcmp_locale(Datum x, Datum y, SortSupport ssup);
-static int bttextcmp_abbrev(Datum x, Datum y, SortSupport ssup);
+static int	bttextfastcmp_c(Datum x, Datum y, SortSupport ssup);
+static int	bttextfastcmp_locale(Datum x, Datum y, SortSupport ssup);
+static int	bttextcmp_abbrev(Datum x, Datum y, SortSupport ssup);
 static Datum bttext_abbrev_convert(Datum original, SortSupport ssup);
 static bool bttext_abbrev_abort(int memtupcount, SortSupport ssup);
 static int32 text_length(Datum str);
@@ -1415,8 +1416,8 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2, Oid collid)
 		}
 
 		/*
-		 * memcmp() can't tell us which of two unequal strings sorts first, but
-		 * it's a cheap way to tell if they're equal.  Testing shows that
+		 * memcmp() can't tell us which of two unequal strings sorts first,
+		 * but it's a cheap way to tell if they're equal.  Testing shows that
 		 * memcmp() followed by strcoll() is only trivially slower than
 		 * strcoll() by itself, so we don't lose much if this doesn't work out
 		 * very often, and if it does - for example, because there are many
@@ -1726,9 +1727,9 @@ bttextcmp(PG_FUNCTION_ARGS)
 Datum
 bttextsortsupport(PG_FUNCTION_ARGS)
 {
-	SortSupport		ssup = (SortSupport) PG_GETARG_POINTER(0);
-	Oid				collid = ssup->ssup_collation;
-	MemoryContext	oldcontext;
+	SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0);
+	Oid			collid = ssup->ssup_collation;
+	MemoryContext oldcontext;
 
 	oldcontext = MemoryContextSwitchTo(ssup->ssup_cxt);
 
@@ -1742,30 +1743,30 @@ bttextsortsupport(PG_FUNCTION_ARGS)
 static void
 btsortsupport_worker(SortSupport ssup, Oid collid)
 {
-	bool				abbreviate = ssup->abbreviate;
-	bool				collate_c = false;
-	TextSortSupport	   *tss;
+	bool		abbreviate = ssup->abbreviate;
+	bool		collate_c = false;
+	TextSortSupport *tss;
 
 #ifdef HAVE_LOCALE_T
-	pg_locale_t			locale = 0;
+	pg_locale_t locale = 0;
 #endif
 
 	/*
 	 * If possible, set ssup->comparator to a function which can be used to
 	 * directly compare two datums.  If we can do this, we'll avoid the
-	 * overhead of a trip through the fmgr layer for every comparison,
-	 * which can be substantial.
+	 * overhead of a trip through the fmgr layer for every comparison, which
+	 * can be substantial.
 	 *
-	 * Most typically, we'll set the comparator to bttextfastcmp_locale,
-	 * which uses strcoll() to perform comparisons.  However, if LC_COLLATE
-	 * = C, we can make things quite a bit faster with bttextfastcmp_c,
-	 * which uses memcmp() rather than strcoll().
+	 * Most typically, we'll set the comparator to bttextfastcmp_locale, which
+	 * uses strcoll() to perform comparisons.  However, if LC_COLLATE = C, we
+	 * can make things quite a bit faster with bttextfastcmp_c, which uses
+	 * memcmp() rather than strcoll().
 	 *
-	 * There is a further exception on Windows.  When the database encoding
-	 * is UTF-8 and we are not using the C collation, complex hacks are
-	 * required.  We don't currently have a comparator that handles that case,
-	 * so we fall back on the slow method of having the sort code invoke
-	 * bttextcmp() via the fmgr trampoline.
+	 * There is a further exception on Windows.  When the database encoding is
+	 * UTF-8 and we are not using the C collation, complex hacks are required.
+	 * We don't currently have a comparator that handles that case, so we fall
+	 * back on the slow method of having the sort code invoke bttextcmp() via
+	 * the fmgr trampoline.
 	 */
 	if (lc_collate_is_c(collid))
 	{
@@ -1808,13 +1809,13 @@ btsortsupport_worker(SortSupport ssup, Oid collid)
 	 * It's possible that there are platforms where the use of abbreviated
 	 * keys should be disabled at compile time.  Having only 4 byte datums
 	 * could make worst-case performance drastically more likely, for example.
-	 * Moreover, Darwin's strxfrm() implementations is known to not effectively
-	 * concentrate a significant amount of entropy from the original string in
-	 * earlier transformed blobs.  It's possible that other supported platforms
-	 * are similarly encumbered.  However, even in those cases, the abbreviated
-	 * keys optimization may win, and if it doesn't, the "abort abbreviation"
-	 * code may rescue us.  So, for now, we don't disable this anywhere on the
-	 * basis of performance.
+	 * Moreover, Darwin's strxfrm() implementations is known to not
+	 * effectively concentrate a significant amount of entropy from the
+	 * original string in earlier transformed blobs.  It's possible that other
+	 * supported platforms are similarly encumbered.  However, even in those
+	 * cases, the abbreviated keys optimization may win, and if it doesn't,
+	 * the "abort abbreviation" code may rescue us.  So, for now, we don't
+	 * disable this anywhere on the basis of performance.
 	 */
 
 	/*
@@ -1893,16 +1894,16 @@ bttextfastcmp_c(Datum x, Datum y, SortSupport ssup)
 static int
 bttextfastcmp_locale(Datum x, Datum y, SortSupport ssup)
 {
-	text			   *arg1 = DatumGetTextPP(x);
-	text			   *arg2 = DatumGetTextPP(y);
-	TextSortSupport	   *tss = (TextSortSupport *) ssup->ssup_extra;
+	text	   *arg1 = DatumGetTextPP(x);
+	text	   *arg2 = DatumGetTextPP(y);
+	TextSortSupport *tss = (TextSortSupport *) ssup->ssup_extra;
 
 	/* working state */
-	char			   *a1p,
-					   *a2p;
-	int					len1,
-						len2,
-						result;
+	char	   *a1p,
+			   *a2p;
+	int			len1,
+				len2,
+				result;
 
 	a1p = VARDATA_ANY(arg1);
 	a2p = VARDATA_ANY(arg2);
@@ -1943,9 +1944,9 @@ bttextfastcmp_locale(Datum x, Datum y, SortSupport ssup)
 		result = strcoll(tss->buf1, tss->buf2);
 
 	/*
-	 * In some locales strcoll() can claim that nonidentical strings are equal.
-	 * Believing that would be bad news for a number of reasons, so we follow
-	 * Perl's lead and sort "equal" strings according to strcmp().
+	 * In some locales strcoll() can claim that nonidentical strings are
+	 * equal. Believing that would be bad news for a number of reasons, so we
+	 * follow Perl's lead and sort "equal" strings according to strcmp().
 	 */
 	if (result == 0)
 		result = strcmp(tss->buf1, tss->buf2);
@@ -1966,9 +1967,9 @@ done:
 static int
 bttextcmp_abbrev(Datum x, Datum y, SortSupport ssup)
 {
-	char   *a = (char *) &x;
-	char   *b = (char *) &y;
-	int 	result;
+	char	   *a = (char *) &x;
+	char	   *b = (char *) &y;
+	int			result;
 
 	result = memcmp(a, b, sizeof(Datum));
 
@@ -1989,15 +1990,15 @@ bttextcmp_abbrev(Datum x, Datum y, SortSupport ssup)
 static Datum
 bttext_abbrev_convert(Datum original, SortSupport ssup)
 {
-	TextSortSupport	   *tss = (TextSortSupport *) ssup->ssup_extra;
-	text			   *authoritative = DatumGetTextPP(original);
-	char			   *authoritative_data = VARDATA_ANY(authoritative);
+	TextSortSupport *tss = (TextSortSupport *) ssup->ssup_extra;
+	text	   *authoritative = DatumGetTextPP(original);
+	char	   *authoritative_data = VARDATA_ANY(authoritative);
 
 	/* working state */
-	Datum				res;
-	char			   *pres;
-	int					len;
-	uint32				hash;
+	Datum		res;
+	char	   *pres;
+	int			len;
+	uint32		hash;
 
 	/*
 	 * Abbreviated key representation is a pass-by-value Datum that is treated
@@ -2009,8 +2010,8 @@ bttext_abbrev_convert(Datum original, SortSupport ssup)
 	len = VARSIZE_ANY_EXHDR(authoritative);
 
 	/*
-	 * If we're using the C collation, use memcmp(), rather than strxfrm(),
-	 * to abbreviate keys.  The full comparator for the C locale is always
+	 * If we're using the C collation, use memcmp(), rather than strxfrm(), to
+	 * abbreviate keys.  The full comparator for the C locale is always
 	 * memcmp(), and we can't risk having this give a different answer.
 	 * Besides, this should be faster, too.
 	 */
@@ -2018,7 +2019,7 @@ bttext_abbrev_convert(Datum original, SortSupport ssup)
 		memcpy(pres, authoritative_data, Min(len, sizeof(Datum)));
 	else
 	{
-		Size			bsize;
+		Size		bsize;
 
 		/*
 		 * We're not using the C collation, so fall back on strxfrm.
@@ -2075,8 +2076,8 @@ bttext_abbrev_convert(Datum original, SortSupport ssup)
 	/*
 	 * Maintain approximate cardinality of both abbreviated keys and original,
 	 * authoritative keys using HyperLogLog.  Used as cheap insurance against
-	 * the worst case, where we do many string transformations for no saving in
-	 * full strcoll()-based comparisons.  These statistics are used by
+	 * the worst case, where we do many string transformations for no saving
+	 * in full strcoll()-based comparisons.  These statistics are used by
 	 * bttext_abbrev_abort().
 	 *
 	 * First, Hash key proper, or a significant fraction of it.  Mix in length
@@ -2094,8 +2095,8 @@ bttext_abbrev_convert(Datum original, SortSupport ssup)
 	/* Hash abbreviated key */
 #if SIZEOF_DATUM == 8
 	{
-		uint32				lohalf,
-							hihalf;
+		uint32		lohalf,
+					hihalf;
 
 		lohalf = (uint32) res;
 		hihalf = (uint32) (res >> 32);
@@ -2118,8 +2119,9 @@ bttext_abbrev_convert(Datum original, SortSupport ssup)
 static bool
 bttext_abbrev_abort(int memtupcount, SortSupport ssup)
 {
-	TextSortSupport	   *tss = (TextSortSupport *) ssup->ssup_extra;
-	double				abbrev_distinct, key_distinct;
+	TextSortSupport *tss = (TextSortSupport *) ssup->ssup_extra;
+	double		abbrev_distinct,
+				key_distinct;
 
 	Assert(ssup->abbreviate);
 
@@ -2131,9 +2133,9 @@ bttext_abbrev_abort(int memtupcount, SortSupport ssup)
 	key_distinct = estimateHyperLogLog(&tss->full_card);
 
 	/*
-	 * Clamp cardinality estimates to at least one distinct value.  While NULLs
-	 * are generally disregarded, if only NULL values were seen so far, that
-	 * might misrepresent costs if we failed to clamp.
+	 * Clamp cardinality estimates to at least one distinct value.  While
+	 * NULLs are generally disregarded, if only NULL values were seen so far,
+	 * that might misrepresent costs if we failed to clamp.
 	 */
 	if (abbrev_distinct <= 1.0)
 		abbrev_distinct = 1.0;
@@ -2149,7 +2151,7 @@ bttext_abbrev_abort(int memtupcount, SortSupport ssup)
 #ifdef TRACE_SORT
 	if (trace_sort)
 	{
-		double norm_abbrev_card = abbrev_distinct / (double) memtupcount;
+		double		norm_abbrev_card = abbrev_distinct / (double) memtupcount;
 
 		elog(LOG, "bttext_abbrev: abbrev_distinct after %d: %f "
 			 "(key_distinct: %f, norm_abbrev_card: %f, prop_card: %f)",
@@ -2180,26 +2182,26 @@ bttext_abbrev_abort(int memtupcount, SortSupport ssup)
 		 * When we have exceeded 10,000 tuples, decay required cardinality
 		 * aggressively for next call.
 		 *
-		 * This is useful because the number of comparisons required on average
-		 * increases at a linearithmic rate, and at roughly 10,000 tuples that
-		 * factor will start to dominate over the linear costs of string
-		 * transformation (this is a conservative estimate).  The decay rate is
-		 * chosen to be a little less aggressive than halving -- which (since
-		 * we're called at points at which memtupcount has doubled) would never
-		 * see the cost model actually abort past the first call following a
-		 * decay.  This decay rate is mostly a precaution against a sudden,
-		 * violent swing in how well abbreviated cardinality tracks full key
-		 * cardinality.  The decay also serves to prevent a marginal case from
-		 * being aborted too late, when too much has already been invested in
-		 * string transformation.
+		 * This is useful because the number of comparisons required on
+		 * average increases at a linearithmic rate, and at roughly 10,000
+		 * tuples that factor will start to dominate over the linear costs of
+		 * string transformation (this is a conservative estimate).  The decay
+		 * rate is chosen to be a little less aggressive than halving -- which
+		 * (since we're called at points at which memtupcount has doubled)
+		 * would never see the cost model actually abort past the first call
+		 * following a decay.  This decay rate is mostly a precaution against
+		 * a sudden, violent swing in how well abbreviated cardinality tracks
+		 * full key cardinality.  The decay also serves to prevent a marginal
+		 * case from being aborted too late, when too much has already been
+		 * invested in string transformation.
 		 *
-		 * It's possible for sets of several million distinct strings with mere
-		 * tens of thousands of distinct abbreviated keys to still benefit very
-		 * significantly.  This will generally occur provided each abbreviated
-		 * key is a proxy for a roughly uniform number of the set's full keys.
-		 * If it isn't so, we hope to catch that early and abort.  If it isn't
-		 * caught early, by the time the problem is apparent it's probably not
-		 * worth aborting.
+		 * It's possible for sets of several million distinct strings with
+		 * mere tens of thousands of distinct abbreviated keys to still
+		 * benefit very significantly.  This will generally occur provided
+		 * each abbreviated key is a proxy for a roughly uniform number of the
+		 * set's full keys. If it isn't so, we hope to catch that early and
+		 * abort.  If it isn't caught early, by the time the problem is
+		 * apparent it's probably not worth aborting.
 		 */
 		if (memtupcount > 10000)
 			tss->prop_card *= 0.65;
@@ -4126,7 +4128,7 @@ array_to_text_internal(FunctionCallInfo fcinfo, ArrayType *v,
 
 #define HEXBASE 16
 /*
- * Convert a int32 to a string containing a base 16 (hex) representation of
+ * Convert an int32 to a string containing a base 16 (hex) representation of
  * the number.
  */
 Datum
@@ -4150,7 +4152,7 @@ to_hex32(PG_FUNCTION_ARGS)
 }
 
 /*
- * Convert a int64 to a string containing a base 16 (hex) representation of
+ * Convert an int64 to a string containing a base 16 (hex) representation of
  * the number.
  */
 Datum
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 8bb7144ecf..99bc832ab8 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -1405,7 +1405,7 @@ xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace,
 			if (*(utf8string + count))
 			{
 				res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0,
-													   utf8string + count, NULL);
+												   utf8string + count, NULL);
 				if (res_code != 0 || xmlerrcxt->err_occurred)
 					xml_ereport(xmlerrcxt, ERROR, ERRCODE_INVALID_XML_CONTENT,
 								"invalid XML content");
@@ -3697,7 +3697,7 @@ xml_xpathobjtoxmlarray(xmlXPathObjectPtr xpathobj,
 					for (i = 0; i < result; i++)
 					{
 						datum = PointerGetDatum(xml_xmlnodetoxmltype(xpathobj->nodesetval->nodeTab[i],
-																	 xmlerrcxt));
+																 xmlerrcxt));
 						(void) accumArrayResult(astate, datum, false,
 												XMLOID, CurrentMemoryContext);
 					}
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 1af43c6de6..577c059072 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -150,6 +150,8 @@ GetCCHashEqFuncs(Oid keytype, PGFunction *hashfunc, RegProcedure *eqfunc)
 		case REGTYPEOID:
 		case REGCONFIGOID:
 		case REGDICTIONARYOID:
+		case REGROLEOID:
+		case REGNAMESPACEOID:
 			*hashfunc = hashoid;
 
 			*eqfunc = F_OIDEQ;
@@ -1121,7 +1123,7 @@ SearchCatCache(CatCache *cache,
 	SysScanDesc scandesc;
 	HeapTuple	ntp;
 
-	/* Make sure we're in a xact, even if this ends up being a cache hit */
+	/* Make sure we're in an xact, even if this ends up being a cache hit */
 	Assert(IsTransactionState());
 
 	/*
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 9c6b186304..a933ebbb37 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -234,7 +234,7 @@ AddInvalidationMessage(InvalidationChunk **listHdr,
 		chunk = (InvalidationChunk *)
 			MemoryContextAlloc(CurTransactionContext,
 							   offsetof(InvalidationChunk, msgs) +
-					FIRSTCHUNKSIZE * sizeof(SharedInvalidationMessage));
+						 FIRSTCHUNKSIZE * sizeof(SharedInvalidationMessage));
 		chunk->nitems = 0;
 		chunk->maxitems = FIRSTCHUNKSIZE;
 		chunk->next = *listHdr;
@@ -248,7 +248,7 @@ AddInvalidationMessage(InvalidationChunk **listHdr,
 		chunk = (InvalidationChunk *)
 			MemoryContextAlloc(CurTransactionContext,
 							   offsetof(InvalidationChunk, msgs) +
-						 chunksize * sizeof(SharedInvalidationMessage));
+							   chunksize * sizeof(SharedInvalidationMessage));
 		chunk->nitems = 0;
 		chunk->maxitems = chunksize;
 		chunk->next = *listHdr;
@@ -341,6 +341,7 @@ AddCatcacheInvalidationMessage(InvalidationListHeader *hdr,
 	msg.cc.id = (int8) id;
 	msg.cc.dbId = dbId;
 	msg.cc.hashValue = hashValue;
+
 	/*
 	 * Define padding bytes in SharedInvalidationMessage structs to be
 	 * defined. Otherwise the sinvaladt.c ringbuffer, which is accessed by
@@ -524,7 +525,7 @@ RegisterRelcacheInvalidation(Oid dbId, Oid relId)
 /*
  * RegisterSnapshotInvalidation
  *
- * Register a invalidation event for MVCC scans against a given catalog.
+ * Register an invalidation event for MVCC scans against a given catalog.
  * Only needed for catalogs that don't have catcaches.
  */
 static void
@@ -720,11 +721,11 @@ PrepareInvalidationState(void)
 	myInfo->my_level = GetCurrentTransactionNestLevel();
 
 	/*
-	 * If there's any previous entry, this one should be for a deeper
-	 * nesting level.
+	 * If there's any previous entry, this one should be for a deeper nesting
+	 * level.
 	 */
 	Assert(transInvalInfo == NULL ||
-		myInfo->my_level > transInvalInfo->my_level);
+		   myInfo->my_level > transInvalInfo->my_level);
 
 	transInvalInfo = myInfo;
 }
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 33c36a8952..78eec4179c 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -29,12 +29,15 @@
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
+#include "catalog/pg_language.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_range.h"
 #include "catalog/pg_statistic.h"
+#include "catalog/pg_transform.h"
+#include "catalog/pg_tablesample_method.h"
 #include "catalog/pg_type.h"
 #ifdef PGXC
 #include "catalog/pgxc_class.h"
@@ -1059,6 +1062,30 @@ get_constraint_name(Oid conoid)
 		return NULL;
 }
 
+/*				---------- LANGUAGE CACHE ----------					 */
+
+char *
+get_language_name(Oid langoid, bool missing_ok)
+{
+	HeapTuple	tp;
+
+	tp = SearchSysCache1(LANGOID, ObjectIdGetDatum(langoid));
+	if (HeapTupleIsValid(tp))
+	{
+		Form_pg_language lantup = (Form_pg_language) GETSTRUCT(tp);
+		char	   *result;
+
+		result = pstrdup(NameStr(lantup->lanname));
+		ReleaseSysCache(tp);
+		return result;
+	}
+
+	if (!missing_ok)
+		elog(ERROR, "cache lookup failed for language %u",
+			 langoid);
+	return NULL;
+}
+
 /*				---------- OPCLASS CACHE ----------						 */
 
 /*
@@ -1825,6 +1852,51 @@ get_rel_tablespace(Oid relid)
 }
 
 
+/*				---------- TRANSFORM CACHE ----------						 */
+
+Oid
+get_transform_fromsql(Oid typid, Oid langid, List *trftypes)
+{
+	HeapTuple	tup;
+
+	if (!list_member_oid(trftypes, typid))
+		return InvalidOid;
+
+	tup = SearchSysCache2(TRFTYPELANG, typid, langid);
+	if (HeapTupleIsValid(tup))
+	{
+		Oid			funcid;
+
+		funcid = ((Form_pg_transform) GETSTRUCT(tup))->trffromsql;
+		ReleaseSysCache(tup);
+		return funcid;
+	}
+	else
+		return InvalidOid;
+}
+
+Oid
+get_transform_tosql(Oid typid, Oid langid, List *trftypes)
+{
+	HeapTuple	tup;
+
+	if (!list_member_oid(trftypes, typid))
+		return InvalidOid;
+
+	tup = SearchSysCache2(TRFTYPELANG, typid, langid);
+	if (HeapTupleIsValid(tup))
+	{
+		Oid			funcid;
+
+		funcid = ((Form_pg_transform) GETSTRUCT(tup))->trftosql;
+		ReleaseSysCache(tup);
+		return funcid;
+	}
+	else
+		return InvalidOid;
+}
+
+
 /*				---------- TYPE CACHE ----------						 */
 
 /*
@@ -3428,3 +3500,29 @@ get_range_subtype(Oid rangeOid)
 	else
 		return InvalidOid;
 }
+
+/*				---------- PG_TABLESAMPLE_METHOD CACHE ----------			 */
+
+/*
+ * get_tablesample_method_name - given a tablesample method OID,
+ * look up the name or NULL if not found
+ */
+char *
+get_tablesample_method_name(Oid tsmid)
+{
+	HeapTuple	tuple;
+
+	tuple = SearchSysCache1(TABLESAMPLEMETHODOID, ObjectIdGetDatum(tsmid));
+	if (HeapTupleIsValid(tuple))
+	{
+		Form_pg_tablesample_method tup =
+		(Form_pg_tablesample_method) GETSTRUCT(tuple);
+		char	   *result;
+
+		result = pstrdup(NameStr(tup->tsmname));
+		ReleaseSysCache(tuple);
+		return result;
+	}
+	else
+		return NULL;
+}
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
index e321c34687..837e19eb3a 100644
--- a/src/backend/utils/cache/plancache.c
+++ b/src/backend/utils/cache/plancache.c
@@ -174,8 +174,8 @@ CreateCachedPlan(Node *raw_parse_tree,
 	CachedPlanSource *plansource;
 	MemoryContext source_context;
 	MemoryContext oldcxt;
-	Oid user_id;
-	int security_context;
+	Oid			user_id;
+	int			security_context;
 
 	Assert(query_string != NULL);		/* required as of 8.4 */
 
@@ -651,7 +651,7 @@ RevalidateCachedQuery(CachedPlanSource *plansource)
 	 * RemoteSubplan gets invalidated because of search_path changes as temp
 	 * namespace gets added in subsequent revalidation.
 	 */
-	if (plansource->raw_parse_tree == NIL)
+	if (plansource->raw_parse_tree == NULL)
 	{
 		Assert(plansource->is_valid);
 		return NIL;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 17ee7a1232..58d5f6bf84 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -883,7 +883,7 @@ equalPolicy(RowSecurityPolicy *policy1, RowSecurityPolicy *policy2)
 			return false;
 		if (policy1->hassublinks != policy2->hassublinks)
 			return false;
-		if (strcmp(policy1->policy_name,policy2->policy_name) != 0)
+		if (strcmp(policy1->policy_name, policy2->policy_name) != 0)
 			return false;
 		if (ARR_DIMS(policy1->roles)[0] != ARR_DIMS(policy2->roles)[0])
 			return false;
@@ -897,7 +897,7 @@ equalPolicy(RowSecurityPolicy *policy1, RowSecurityPolicy *policy2)
 				return false;
 		}
 
-		if (!equal(policy1->qual, policy1->qual))
+		if (!equal(policy1->qual, policy2->qual))
 			return false;
 		if (!equal(policy1->with_check_qual, policy2->with_check_qual))
 			return false;
@@ -916,8 +916,8 @@ equalPolicy(RowSecurityPolicy *policy1, RowSecurityPolicy *policy2)
 static bool
 equalRSDesc(RowSecurityDesc *rsdesc1, RowSecurityDesc *rsdesc2)
 {
-	ListCell 	*lc,
-				*rc;
+	ListCell   *lc,
+			   *rc;
 
 	if (rsdesc1 == NULL && rsdesc2 == NULL)
 		return true;
@@ -932,10 +932,10 @@ equalRSDesc(RowSecurityDesc *rsdesc1, RowSecurityDesc *rsdesc2)
 	/* RelationBuildRowSecurity should build policies in order */
 	forboth(lc, rsdesc1->policies, rc, rsdesc2->policies)
 	{
-		RowSecurityPolicy	   *l = (RowSecurityPolicy *) lfirst(lc);
-		RowSecurityPolicy	   *r = (RowSecurityPolicy *) lfirst(rc);
+		RowSecurityPolicy *l = (RowSecurityPolicy *) lfirst(lc);
+		RowSecurityPolicy *r = (RowSecurityPolicy *) lfirst(rc);
 
-		if (!equalPolicy(l,r))
+		if (!equalPolicy(l, r))
 			return false;
 	}
 
@@ -3492,7 +3492,7 @@ RelationCacheInitializePhase3(void)
 		{
 			RelationBuildRowSecurity(relation);
 
-			Assert (relation->rd_rsdesc != NULL);
+			Assert(relation->rd_rsdesc != NULL);
 			restart = true;
 		}
 
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 37f18858e3..24ffc82863 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -55,8 +55,11 @@
 #include "catalog/pg_shdepend.h"
 #include "catalog/pg_shdescription.h"
 #include "catalog/pg_shseclabel.h"
+#include "catalog/pg_replication_origin.h"
 #include "catalog/pg_statistic.h"
+#include "catalog/pg_tablesample_method.h"
 #include "catalog/pg_tablespace.h"
+#include "catalog/pg_transform.h"
 #include "catalog/pg_ts_config.h"
 #include "catalog/pg_ts_config_map.h"
 #include "catalog/pg_ts_dict.h"
@@ -694,6 +697,28 @@ static const struct cachedesc cacheinfo[] = {
 		},
 		128
 	},
+	{ReplicationOriginRelationId,		/* REPLORIGIDENT */
+		ReplicationOriginIdentIndex,
+		1,
+		{
+			Anum_pg_replication_origin_roident,
+			0,
+			0,
+			0
+		},
+		16
+	},
+	{ReplicationOriginRelationId,		/* REPLORIGNAME */
+		ReplicationOriginNameIndex,
+		1,
+		{
+			Anum_pg_replication_origin_roname,
+			0,
+			0,
+			0
+		},
+		16
+	},
 	{RewriteRelationId,			/* RULERELNAME */
 		RewriteRelRulenameIndexId,
 		2,
@@ -716,6 +741,28 @@ static const struct cachedesc cacheinfo[] = {
 		},
 		128
 	},
+	{TableSampleMethodRelationId,		/* TABLESAMPLEMETHODNAME */
+		TableSampleMethodNameIndexId,
+		1,
+		{
+			Anum_pg_tablesample_method_tsmname,
+			0,
+			0,
+			0,
+		},
+		2
+	},
+	{TableSampleMethodRelationId,		/* TABLESAMPLEMETHODOID */
+		TableSampleMethodOidIndexId,
+		1,
+		{
+			ObjectIdAttributeNumber,
+			0,
+			0,
+			0,
+		},
+		2
+	},
 	{TableSpaceRelationId,		/* TABLESPACEOID */
 		TablespaceOidIndexId,
 		1,
@@ -727,6 +774,28 @@ static const struct cachedesc cacheinfo[] = {
 		},
 		4
 	},
+	{TransformRelationId,		/* TRFOID */
+		TransformOidIndexId,
+		1,
+		{
+			ObjectIdAttributeNumber,
+			0,
+			0,
+			0,
+		},
+		16
+	},
+	{TransformRelationId,		/* TRFTYPELANG */
+		TransformTypeLangIndexId,
+		2,
+		{
+			Anum_pg_transform_trftype,
+			Anum_pg_transform_trflang,
+			0,
+			0,
+		},
+		16
+	},
 	{TSConfigMapRelationId,		/* TSCONFIGMAP */
 		TSConfigMapIndexId,
 		3,
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 1c9ec89807..73a19f51fa 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -1596,8 +1596,8 @@ FlushErrorState(void)
 void
 ThrowErrorData(ErrorData *edata)
 {
-	ErrorData *newedata;
-	MemoryContext	oldcontext;
+	ErrorData  *newedata;
+	MemoryContext oldcontext;
 
 	if (!errstart(edata->elevel, edata->filename, edata->lineno,
 				  edata->funcname, NULL))
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 7476a26b79..cd3db871e0 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -23,6 +23,7 @@
 #endif
 #include "lib/stringinfo.h"
 #include "miscadmin.h"
+#include "storage/shmem.h"
 #include "utils/dynamic_loader.h"
 #include "utils/hsearch.h"
 
@@ -692,3 +693,56 @@ find_rendezvous_variable(const char *varName)
 
 	return &hentry->varValue;
 }
+
+/*
+ * Estimate the amount of space needed to serialize the list of libraries
+ * we have loaded.
+ */
+Size
+EstimateLibraryStateSpace(void)
+{
+	DynamicFileList *file_scanner;
+	Size		size = 1;
+
+	for (file_scanner = file_list;
+		 file_scanner != NULL;
+		 file_scanner = file_scanner->next)
+		size = add_size(size, strlen(file_scanner->filename) + 1);
+
+	return size;
+}
+
+/*
+ * Serialize the list of libraries we have loaded to a chunk of memory.
+ */
+void
+SerializeLibraryState(Size maxsize, char *start_address)
+{
+	DynamicFileList *file_scanner;
+
+	for (file_scanner = file_list;
+		 file_scanner != NULL;
+		 file_scanner = file_scanner->next)
+	{
+		Size		len;
+
+		len = strlcpy(start_address, file_scanner->filename, maxsize) + 1;
+		Assert(len < maxsize);
+		maxsize -= len;
+		start_address += len;
+	}
+	start_address[0] = '\0';
+}
+
+/*
+ * Load every library the serializing backend had loaded.
+ */
+void
+RestoreLibraryState(char *start_address)
+{
+	while (*start_address != '\0')
+	{
+		internal_load_library(start_address);
+		start_address += strlen(start_address) + 1;
+	}
+}
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index 204e124355..2b09076b61 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -877,6 +877,48 @@ get_func_arg_info(HeapTuple procTup,
 	return numargs;
 }
 
+/*
+ * get_func_trftypes
+ *
+ * Returns a number of transformated types used by function.
+ */
+int
+get_func_trftypes(HeapTuple procTup,
+				  Oid **p_trftypes)
+{
+	Datum		protrftypes;
+	ArrayType  *arr;
+	int			nelems;
+	bool		isNull;
+
+	protrftypes = SysCacheGetAttr(PROCOID, procTup,
+								  Anum_pg_proc_protrftypes,
+								  &isNull);
+	if (!isNull)
+	{
+		/*
+		 * We expect the arrays to be 1-D arrays of the right types; verify
+		 * that.  For the OID and char arrays, we don't need to use
+		 * deconstruct_array() since the array data is just going to look like
+		 * a C array of values.
+		 */
+		arr = DatumGetArrayTypeP(protrftypes);	/* ensure not toasted */
+		nelems = ARR_DIMS(arr)[0];
+		if (ARR_NDIM(arr) != 1 ||
+			nelems < 0 ||
+			ARR_HASNULL(arr) ||
+			ARR_ELEMTYPE(arr) != OIDOID)
+			elog(ERROR, "protrftypes is not a 1-D Oid array");
+		Assert(nelems >= ((Form_pg_proc) GETSTRUCT(procTup))->pronargs);
+		*p_trftypes = (Oid *) palloc(nelems * sizeof(Oid));
+		memcpy(*p_trftypes, ARR_DATA_PTR(arr),
+			   nelems * sizeof(Oid));
+
+		return nelems;
+	}
+	else
+		return 0;
+}
 
 /*
  * get_func_input_arg_names
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index a5788a6f9d..136b81cb71 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -57,6 +57,9 @@
 #include "utils/builtins.h"
 #include "utils/guc.h"
 #include "utils/memutils.h"
+#ifdef XCP
+#include "utils/snapmgr.h"
+#endif
 #include "utils/syscache.h"
 
 
@@ -257,6 +260,7 @@ SwitchToSharedLatch(void)
 	Assert(MyProc != NULL);
 
 	MyLatch = &MyProc->procLatch;
+
 	/*
 	 * Set the shared latch as the local one might have been set. This
 	 * shouldn't normally be necessary as code is supposed to check the
@@ -713,7 +717,7 @@ retry:
 char *
 GetClusterUserName(void)
 {
-	return GetUserNameFromId(AuthenticatedUserId);
+	return GetUserNameFromId(AuthenticatedUserId, false);
 }
 #endif
 
@@ -777,23 +781,29 @@ SetCurrentRoleId(Oid roleid, bool is_superuser)
 
 
 /*
- * Get user name from user oid
+ * Get user name from user oid, returns NULL for nonexistent roleid if noerr
+ * is true.
  */
 char *
-GetUserNameFromId(Oid roleid)
+GetUserNameFromId(Oid roleid, bool noerr)
 {
 	HeapTuple	tuple;
 	char	   *result;
 
 	tuple = SearchSysCache1(AUTHOID, ObjectIdGetDatum(roleid));
 	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("invalid role OID: %u", roleid)));
-
-	result = pstrdup(NameStr(((Form_pg_authid) GETSTRUCT(tuple))->rolname));
-
-	ReleaseSysCache(tuple);
+	{
+		if (!noerr)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("invalid role OID: %u", roleid)));
+		result = NULL;
+	}
+	else
+	{
+		result = pstrdup(NameStr(((Form_pg_authid) GETSTRUCT(tuple))->rolname));
+		ReleaseSysCache(tuple);
+	}
 	return result;
 }
 
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 17eb3ab1e2..e0697ecaa8 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -1117,7 +1117,7 @@ ShutdownPostgres(int code, Datum arg)
 static void
 StatementTimeoutHandler(void)
 {
-	int sig = SIGINT;
+	int			sig = SIGINT;
 
 	/*
 	 * During authentication the timeout is used to deal with
diff --git a/src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT b/src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT
deleted file mode 100644
index a26bab48a7..0000000000
--- a/src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT
+++ /dev/null
@@ -1,63488 +0,0 @@
-0000	00
-0001	01
-0002	02
-0003	03
-0004	04
-0005	05
-0006	06
-0007	07
-0008	08
-0009	09
-000A	0A
-000B	0B
-000C	0C
-000D	0D
-000E	0E
-000F	0F
-0010	10
-0011	11
-0012	12
-0013	13
-0014	14
-0015	15
-0016	16
-0017	17
-0018	18
-0019	19
-001A	1A
-001B	1B
-001C	1C
-001D	1D
-001E	1E
-001F	1F
-0020	20
-0021	21
-0022	22
-0023	23
-0024	24
-0025	25
-0026	26
-0027	27
-0028	28
-0029	29
-002A	2A
-002B	2B
-002C	2C
-002D	2D
-002E	2E
-002F	2F
-0030	30
-0031	31
-0032	32
-0033	33
-0034	34
-0035	35
-0036	36
-0037	37
-0038	38
-0039	39
-003A	3A
-003B	3B
-003C	3C
-003D	3D
-003E	3E
-003F	3F
-0040	40
-0041	41
-0042	42
-0043	43
-0044	44
-0045	45
-0046	46
-0047	47
-0048	48
-0049	49
-004A	4A
-004B	4B
-004C	4C
-004D	4D
-004E	4E
-004F	4F
-0050	50
-0051	51
-0052	52
-0053	53
-0054	54
-0055	55
-0056	56
-0057	57
-0058	58
-0059	59
-005A	5A
-005B	5B
-005C	5C
-005D	5D
-005E	5E
-005F	5F
-0060	60
-0061	61
-0062	62
-0063	63
-0064	64
-0065	65
-0066	66
-0067	67
-0068	68
-0069	69
-006A	6A
-006B	6B
-006C	6C
-006D	6D
-006E	6E
-006F	6F
-0070	70
-0071	71
-0072	72
-0073	73
-0074	74
-0075	75
-0076	76
-0077	77
-0078	78
-0079	79
-007A	7A
-007B	7B
-007C	7C
-007D	7D
-007E	7E
-007F	7F
-0080	81308130
-0081	81308131
-0082	81308132
-0083	81308133
-0084	81308134
-0085	81308135
-0086	81308136
-0087	81308137
-0088	81308138
-0089	81308139
-008A	81308230
-008B	81308231
-008C	81308232
-008D	81308233
-008E	81308234
-008F	81308235
-0090	81308236
-0091	81308237
-0092	81308238
-0093	81308239
-0094	81308330
-0095	81308331
-0096	81308332
-0097	81308333
-0098	81308334
-0099	81308335
-009A	81308336
-009B	81308337
-009C	81308338
-009D	81308339
-009E	81308430
-009F	81308431
-00A0	81308432
-00A1	81308433
-00A2	81308434
-00A3	81308435
-00A4	A1E8
-00A5	81308436
-00A6	81308437
-00A7	A1EC
-00A8	A1A7
-00A9	81308438
-00AA	81308439
-00AB	81308530
-00AC	81308531
-00AD	81308532
-00AE	81308533
-00AF	81308534
-00B0	A1E3
-00B1	A1C0
-00B2	81308535
-00B3	81308536
-00B4	81308537
-00B5	81308538
-00B6	81308539
-00B7	A1A4
-00B8	81308630
-00B9	81308631
-00BA	81308632
-00BB	81308633
-00BC	81308634
-00BD	81308635
-00BE	81308636
-00BF	81308637
-00C0	81308638
-00C1	81308639
-00C2	81308730
-00C3	81308731
-00C4	81308732
-00C5	81308733
-00C6	81308734
-00C7	81308735
-00C8	81308736
-00C9	81308737
-00CA	81308738
-00CB	81308739
-00CC	81308830
-00CD	81308831
-00CE	81308832
-00CF	81308833
-00D0	81308834
-00D1	81308835
-00D2	81308836
-00D3	81308837
-00D4	81308838
-00D5	81308839
-00D6	81308930
-00D7	A1C1
-00D8	81308931
-00D9	81308932
-00DA	81308933
-00DB	81308934
-00DC	81308935
-00DD	81308936
-00DE	81308937
-00DF	81308938
-00E0	A8A4
-00E1	A8A2
-00E2	81308939
-00E3	81308A30
-00E4	81308A31
-00E5	81308A32
-00E6	81308A33
-00E7	81308A34
-00E8	A8A8
-00E9	A8A6
-00EA	A8BA
-00EB	81308A35
-00EC	A8AC
-00ED	A8AA
-00EE	81308A36
-00EF	81308A37
-00F0	81308A38
-00F1	81308A39
-00F2	A8B0
-00F3	A8AE
-00F4	81308B30
-00F5	81308B31
-00F6	81308B32
-00F7	A1C2
-00F8	81308B33
-00F9	A8B4
-00FA	A8B2
-00FB	81308B34
-00FC	A8B9
-00FD	81308B35
-00FE	81308B36
-00FF	81308B37
-0100	81308B38
-0101	A8A1
-0102	81308B39
-0103	81308C30
-0104	81308C31
-0105	81308C32
-0106	81308C33
-0107	81308C34
-0108	81308C35
-0109	81308C36
-010A	81308C37
-010B	81308C38
-010C	81308C39
-010D	81308D30
-010E	81308D31
-010F	81308D32
-0110	81308D33
-0111	81308D34
-0112	81308D35
-0113	A8A5
-0114	81308D36
-0115	81308D37
-0116	81308D38
-0117	81308D39
-0118	81308E30
-0119	81308E31
-011A	81308E32
-011B	A8A7
-011C	81308E33
-011D	81308E34
-011E	81308E35
-011F	81308E36
-0120	81308E37
-0121	81308E38
-0122	81308E39
-0123	81308F30
-0124	81308F31
-0125	81308F32
-0126	81308F33
-0127	81308F34
-0128	81308F35
-0129	81308F36
-012A	81308F37
-012B	A8A9
-012C	81308F38
-012D	81308F39
-012E	81309030
-012F	81309031
-0130	81309032
-0131	81309033
-0132	81309034
-0133	81309035
-0134	81309036
-0135	81309037
-0136	81309038
-0137	81309039
-0138	81309130
-0139	81309131
-013A	81309132
-013B	81309133
-013C	81309134
-013D	81309135
-013E	81309136
-013F	81309137
-0140	81309138
-0141	81309139
-0142	81309230
-0143	81309231
-0144	A8BD
-0145	81309232
-0146	81309233
-0147	81309234
-0148	A8BE
-0149	81309235
-014A	81309236
-014B	81309237
-014C	81309238
-014D	A8AD
-014E	81309239
-014F	81309330
-0150	81309331
-0151	81309332
-0152	81309333
-0153	81309334
-0154	81309335
-0155	81309336
-0156	81309337
-0157	81309338
-0158	81309339
-0159	81309430
-015A	81309431
-015B	81309432
-015C	81309433
-015D	81309434
-015E	81309435
-015F	81309436
-0160	81309437
-0161	81309438
-0162	81309439
-0163	81309530
-0164	81309531
-0165	81309532
-0166	81309533
-0167	81309534
-0168	81309535
-0169	81309536
-016A	81309537
-016B	A8B1
-016C	81309538
-016D	81309539
-016E	81309630
-016F	81309631
-0170	81309632
-0171	81309633
-0172	81309634
-0173	81309635
-0174	81309636
-0175	81309637
-0176	81309638
-0177	81309639
-0178	81309730
-0179	81309731
-017A	81309732
-017B	81309733
-017C	81309734
-017D	81309735
-017E	81309736
-017F	81309737
-0180	81309738
-0181	81309739
-0182	81309830
-0183	81309831
-0184	81309832
-0185	81309833
-0186	81309834
-0187	81309835
-0188	81309836
-0189	81309837
-018A	81309838
-018B	81309839
-018C	81309930
-018D	81309931
-018E	81309932
-018F	81309933
-0190	81309934
-0191	81309935
-0192	81309936
-0193	81309937
-0194	81309938
-0195	81309939
-0196	81309A30
-0197	81309A31
-0198	81309A32
-0199	81309A33
-019A	81309A34
-019B	81309A35
-019C	81309A36
-019D	81309A37
-019E	81309A38
-019F	81309A39
-01A0	81309B30
-01A1	81309B31
-01A2	81309B32
-01A3	81309B33
-01A4	81309B34
-01A5	81309B35
-01A6	81309B36
-01A7	81309B37
-01A8	81309B38
-01A9	81309B39
-01AA	81309C30
-01AB	81309C31
-01AC	81309C32
-01AD	81309C33
-01AE	81309C34
-01AF	81309C35
-01B0	81309C36
-01B1	81309C37
-01B2	81309C38
-01B3	81309C39
-01B4	81309D30
-01B5	81309D31
-01B6	81309D32
-01B7	81309D33
-01B8	81309D34
-01B9	81309D35
-01BA	81309D36
-01BB	81309D37
-01BC	81309D38
-01BD	81309D39
-01BE	81309E30
-01BF	81309E31
-01C0	81309E32
-01C1	81309E33
-01C2	81309E34
-01C3	81309E35
-01C4	81309E36
-01C5	81309E37
-01C6	81309E38
-01C7	81309E39
-01C8	81309F30
-01C9	81309F31
-01CA	81309F32
-01CB	81309F33
-01CC	81309F34
-01CD	81309F35
-01CE	A8A3
-01CF	81309F36
-01D0	A8AB
-01D1	81309F37
-01D2	A8AF
-01D3	81309F38
-01D4	A8B3
-01D5	81309F39
-01D6	A8B5
-01D7	8130A030
-01D8	A8B6
-01D9	8130A031
-01DA	A8B7
-01DB	8130A032
-01DC	A8B8
-01DD	8130A033
-01DE	8130A034
-01DF	8130A035
-01E0	8130A036
-01E1	8130A037
-01E2	8130A038
-01E3	8130A039
-01E4	8130A130
-01E5	8130A131
-01E6	8130A132
-01E7	8130A133
-01E8	8130A134
-01E9	8130A135
-01EA	8130A136
-01EB	8130A137
-01EC	8130A138
-01ED	8130A139
-01EE	8130A230
-01EF	8130A231
-01F0	8130A232
-01F1	8130A233
-01F2	8130A234
-01F3	8130A235
-01F4	8130A236
-01F5	8130A237
-01F6	8130A238
-01F7	8130A239
-01F8	8130A330
-01F9	A8BF
-01FA	8130A331
-01FB	8130A332
-01FC	8130A333
-01FD	8130A334
-01FE	8130A335
-01FF	8130A336
-0200	8130A337
-0201	8130A338
-0202	8130A339
-0203	8130A430
-0204	8130A431
-0205	8130A432
-0206	8130A433
-0207	8130A434
-0208	8130A435
-0209	8130A436
-020A	8130A437
-020B	8130A438
-020C	8130A439
-020D	8130A530
-020E	8130A531
-020F	8130A532
-0210	8130A533
-0211	8130A534
-0212	8130A535
-0213	8130A536
-0214	8130A537
-0215	8130A538
-0216	8130A539
-0217	8130A630
-0218	8130A631
-0219	8130A632
-021A	8130A633
-021B	8130A634
-021C	8130A635
-021D	8130A636
-021E	8130A637
-021F	8130A638
-0220	8130A639
-0221	8130A730
-0222	8130A731
-0223	8130A732
-0224	8130A733
-0225	8130A734
-0226	8130A735
-0227	8130A736
-0228	8130A737
-0229	8130A738
-022A	8130A739
-022B	8130A830
-022C	8130A831
-022D	8130A832
-022E	8130A833
-022F	8130A834
-0230	8130A835
-0231	8130A836
-0232	8130A837
-0233	8130A838
-0234	8130A839
-0235	8130A930
-0236	8130A931
-0237	8130A932
-0238	8130A933
-0239	8130A934
-023A	8130A935
-023B	8130A936
-023C	8130A937
-023D	8130A938
-023E	8130A939
-023F	8130AA30
-0240	8130AA31
-0241	8130AA32
-0242	8130AA33
-0243	8130AA34
-0244	8130AA35
-0245	8130AA36
-0246	8130AA37
-0247	8130AA38
-0248	8130AA39
-0249	8130AB30
-024A	8130AB31
-024B	8130AB32
-024C	8130AB33
-024D	8130AB34
-024E	8130AB35
-024F	8130AB36
-0250	8130AB37
-0251	A8BB
-0252	8130AB38
-0253	8130AB39
-0254	8130AC30
-0255	8130AC31
-0256	8130AC32
-0257	8130AC33
-0258	8130AC34
-0259	8130AC35
-025A	8130AC36
-025B	8130AC37
-025C	8130AC38
-025D	8130AC39
-025E	8130AD30
-025F	8130AD31
-0260	8130AD32
-0261	A8C0
-0262	8130AD33
-0263	8130AD34
-0264	8130AD35
-0265	8130AD36
-0266	8130AD37
-0267	8130AD38
-0268	8130AD39
-0269	8130AE30
-026A	8130AE31
-026B	8130AE32
-026C	8130AE33
-026D	8130AE34
-026E	8130AE35
-026F	8130AE36
-0270	8130AE37
-0271	8130AE38
-0272	8130AE39
-0273	8130AF30
-0274	8130AF31
-0275	8130AF32
-0276	8130AF33
-0277	8130AF34
-0278	8130AF35
-0279	8130AF36
-027A	8130AF37
-027B	8130AF38
-027C	8130AF39
-027D	8130B030
-027E	8130B031
-027F	8130B032
-0280	8130B033
-0281	8130B034
-0282	8130B035
-0283	8130B036
-0284	8130B037
-0285	8130B038
-0286	8130B039
-0287	8130B130
-0288	8130B131
-0289	8130B132
-028A	8130B133
-028B	8130B134
-028C	8130B135
-028D	8130B136
-028E	8130B137
-028F	8130B138
-0290	8130B139
-0291	8130B230
-0292	8130B231
-0293	8130B232
-0294	8130B233
-0295	8130B234
-0296	8130B235
-0297	8130B236
-0298	8130B237
-0299	8130B238
-029A	8130B239
-029B	8130B330
-029C	8130B331
-029D	8130B332
-029E	8130B333
-029F	8130B334
-02A0	8130B335
-02A1	8130B336
-02A2	8130B337
-02A3	8130B338
-02A4	8130B339
-02A5	8130B430
-02A6	8130B431
-02A7	8130B432
-02A8	8130B433
-02A9	8130B434
-02AA	8130B435
-02AB	8130B436
-02AC	8130B437
-02AD	8130B438
-02AE	8130B439
-02AF	8130B530
-02B0	8130B531
-02B1	8130B532
-02B2	8130B533
-02B3	8130B534
-02B4	8130B535
-02B5	8130B536
-02B6	8130B537
-02B7	8130B538
-02B8	8130B539
-02B9	8130B630
-02BA	8130B631
-02BB	8130B632
-02BC	8130B633
-02BD	8130B634
-02BE	8130B635
-02BF	8130B636
-02C0	8130B637
-02C1	8130B638
-02C2	8130B639
-02C3	8130B730
-02C4	8130B731
-02C5	8130B732
-02C6	8130B733
-02C7	A1A6
-02C8	8130B734
-02C9	A1A5
-02CA	A840
-02CB	A841
-02CC	8130B735
-02CD	8130B736
-02CE	8130B737
-02CF	8130B738
-02D0	8130B739
-02D1	8130B830
-02D2	8130B831
-02D3	8130B832
-02D4	8130B833
-02D5	8130B834
-02D6	8130B835
-02D7	8130B836
-02D8	8130B837
-02D9	A842
-02DA	8130B838
-02DB	8130B839
-02DC	8130B930
-02DD	8130B931
-02DE	8130B932
-02DF	8130B933
-02E0	8130B934
-02E1	8130B935
-02E2	8130B936
-02E3	8130B937
-02E4	8130B938
-02E5	8130B939
-02E6	8130BA30
-02E7	8130BA31
-02E8	8130BA32
-02E9	8130BA33
-02EA	8130BA34
-02EB	8130BA35
-02EC	8130BA36
-02ED	8130BA37
-02EE	8130BA38
-02EF	8130BA39
-02F0	8130BB30
-02F1	8130BB31
-02F2	8130BB32
-02F3	8130BB33
-02F4	8130BB34
-02F5	8130BB35
-02F6	8130BB36
-02F7	8130BB37
-02F8	8130BB38
-02F9	8130BB39
-02FA	8130BC30
-02FB	8130BC31
-02FC	8130BC32
-02FD	8130BC33
-02FE	8130BC34
-02FF	8130BC35
-0300	8130BC36
-0301	8130BC37
-0302	8130BC38
-0303	8130BC39
-0304	8130BD30
-0305	8130BD31
-0306	8130BD32
-0307	8130BD33
-0308	8130BD34
-0309	8130BD35
-030A	8130BD36
-030B	8130BD37
-030C	8130BD38
-030D	8130BD39
-030E	8130BE30
-030F	8130BE31
-0310	8130BE32
-0311	8130BE33
-0312	8130BE34
-0313	8130BE35
-0314	8130BE36
-0315	8130BE37
-0316	8130BE38
-0317	8130BE39
-0318	8130BF30
-0319	8130BF31
-031A	8130BF32
-031B	8130BF33
-031C	8130BF34
-031D	8130BF35
-031E	8130BF36
-031F	8130BF37
-0320	8130BF38
-0321	8130BF39
-0322	8130C030
-0323	8130C031
-0324	8130C032
-0325	8130C033
-0326	8130C034
-0327	8130C035
-0328	8130C036
-0329	8130C037
-032A	8130C038
-032B	8130C039
-032C	8130C130
-032D	8130C131
-032E	8130C132
-032F	8130C133
-0330	8130C134
-0331	8130C135
-0332	8130C136
-0333	8130C137
-0334	8130C138
-0335	8130C139
-0336	8130C230
-0337	8130C231
-0338	8130C232
-0339	8130C233
-033A	8130C234
-033B	8130C235
-033C	8130C236
-033D	8130C237
-033E	8130C238
-033F	8130C239
-0340	8130C330
-0341	8130C331
-0342	8130C332
-0343	8130C333
-0344	8130C334
-0345	8130C335
-0346	8130C336
-0347	8130C337
-0348	8130C338
-0349	8130C339
-034A	8130C430
-034B	8130C431
-034C	8130C432
-034D	8130C433
-034E	8130C434
-034F	8130C435
-0350	8130C436
-0351	8130C437
-0352	8130C438
-0353	8130C439
-0354	8130C530
-0355	8130C531
-0356	8130C532
-0357	8130C533
-0358	8130C534
-0359	8130C535
-035A	8130C536
-035B	8130C537
-035C	8130C538
-035D	8130C539
-035E	8130C630
-035F	8130C631
-0360	8130C632
-0361	8130C633
-0362	8130C634
-0363	8130C635
-0364	8130C636
-0365	8130C637
-0366	8130C638
-0367	8130C639
-0368	8130C730
-0369	8130C731
-036A	8130C732
-036B	8130C733
-036C	8130C734
-036D	8130C735
-036E	8130C736
-036F	8130C737
-0370	8130C738
-0371	8130C739
-0372	8130C830
-0373	8130C831
-0374	8130C832
-0375	8130C833
-0376	8130C834
-0377	8130C835
-0378	8130C836
-0379	8130C837
-037A	8130C838
-037B	8130C839
-037C	8130C930
-037D	8130C931
-037E	8130C932
-037F	8130C933
-0380	8130C934
-0381	8130C935
-0382	8130C936
-0383	8130C937
-0384	8130C938
-0385	8130C939
-0386	8130CA30
-0387	8130CA31
-0388	8130CA32
-0389	8130CA33
-038A	8130CA34
-038B	8130CA35
-038C	8130CA36
-038D	8130CA37
-038E	8130CA38
-038F	8130CA39
-0390	8130CB30
-0391	A6A1
-0392	A6A2
-0393	A6A3
-0394	A6A4
-0395	A6A5
-0396	A6A6
-0397	A6A7
-0398	A6A8
-0399	A6A9
-039A	A6AA
-039B	A6AB
-039C	A6AC
-039D	A6AD
-039E	A6AE
-039F	A6AF
-03A0	A6B0
-03A1	A6B1
-03A2	8130CB31
-03A3	A6B2
-03A4	A6B3
-03A5	A6B4
-03A6	A6B5
-03A7	A6B6
-03A8	A6B7
-03A9	A6B8
-03AA	8130CB32
-03AB	8130CB33
-03AC	8130CB34
-03AD	8130CB35
-03AE	8130CB36
-03AF	8130CB37
-03B0	8130CB38
-03B1	A6C1
-03B2	A6C2
-03B3	A6C3
-03B4	A6C4
-03B5	A6C5
-03B6	A6C6
-03B7	A6C7
-03B8	A6C8
-03B9	A6C9
-03BA	A6CA
-03BB	A6CB
-03BC	A6CC
-03BD	A6CD
-03BE	A6CE
-03BF	A6CF
-03C0	A6D0
-03C1	A6D1
-03C2	8130CB39
-03C3	A6D2
-03C4	A6D3
-03C5	A6D4
-03C6	A6D5
-03C7	A6D6
-03C8	A6D7
-03C9	A6D8
-03CA	8130CC30
-03CB	8130CC31
-03CC	8130CC32
-03CD	8130CC33
-03CE	8130CC34
-03CF	8130CC35
-03D0	8130CC36
-03D1	8130CC37
-03D2	8130CC38
-03D3	8130CC39
-03D4	8130CD30
-03D5	8130CD31
-03D6	8130CD32
-03D7	8130CD33
-03D8	8130CD34
-03D9	8130CD35
-03DA	8130CD36
-03DB	8130CD37
-03DC	8130CD38
-03DD	8130CD39
-03DE	8130CE30
-03DF	8130CE31
-03E0	8130CE32
-03E1	8130CE33
-03E2	8130CE34
-03E3	8130CE35
-03E4	8130CE36
-03E5	8130CE37
-03E6	8130CE38
-03E7	8130CE39
-03E8	8130CF30
-03E9	8130CF31
-03EA	8130CF32
-03EB	8130CF33
-03EC	8130CF34
-03ED	8130CF35
-03EE	8130CF36
-03EF	8130CF37
-03F0	8130CF38
-03F1	8130CF39
-03F2	8130D030
-03F3	8130D031
-03F4	8130D032
-03F5	8130D033
-03F6	8130D034
-03F7	8130D035
-03F8	8130D036
-03F9	8130D037
-03FA	8130D038
-03FB	8130D039
-03FC	8130D130
-03FD	8130D131
-03FE	8130D132
-03FF	8130D133
-0400	8130D134
-0401	A7A7
-0402	8130D135
-0403	8130D136
-0404	8130D137
-0405	8130D138
-0406	8130D139
-0407	8130D230
-0408	8130D231
-0409	8130D232
-040A	8130D233
-040B	8130D234
-040C	8130D235
-040D	8130D236
-040E	8130D237
-040F	8130D238
-0410	A7A1
-0411	A7A2
-0412	A7A3
-0413	A7A4
-0414	A7A5
-0415	A7A6
-0416	A7A8
-0417	A7A9
-0418	A7AA
-0419	A7AB
-041A	A7AC
-041B	A7AD
-041C	A7AE
-041D	A7AF
-041E	A7B0
-041F	A7B1
-0420	A7B2
-0421	A7B3
-0422	A7B4
-0423	A7B5
-0424	A7B6
-0425	A7B7
-0426	A7B8
-0427	A7B9
-0428	A7BA
-0429	A7BB
-042A	A7BC
-042B	A7BD
-042C	A7BE
-042D	A7BF
-042E	A7C0
-042F	A7C1
-0430	A7D1
-0431	A7D2
-0432	A7D3
-0433	A7D4
-0434	A7D5
-0435	A7D6
-0436	A7D8
-0437	A7D9
-0438	A7DA
-0439	A7DB
-043A	A7DC
-043B	A7DD
-043C	A7DE
-043D	A7DF
-043E	A7E0
-043F	A7E1
-0440	A7E2
-0441	A7E3
-0442	A7E4
-0443	A7E5
-0444	A7E6
-0445	A7E7
-0446	A7E8
-0447	A7E9
-0448	A7EA
-0449	A7EB
-044A	A7EC
-044B	A7ED
-044C	A7EE
-044D	A7EF
-044E	A7F0
-044F	A7F1
-0450	8130D239
-0451	A7D7
-0452	8130D330
-0453	8130D331
-0454	8130D332
-0455	8130D333
-0456	8130D334
-0457	8130D335
-0458	8130D336
-0459	8130D337
-045A	8130D338
-045B	8130D339
-045C	8130D430
-045D	8130D431
-045E	8130D432
-045F	8130D433
-0460	8130D434
-0461	8130D435
-0462	8130D436
-0463	8130D437
-0464	8130D438
-0465	8130D439
-0466	8130D530
-0467	8130D531
-0468	8130D532
-0469	8130D533
-046A	8130D534
-046B	8130D535
-046C	8130D536
-046D	8130D537
-046E	8130D538
-046F	8130D539
-0470	8130D630
-0471	8130D631
-0472	8130D632
-0473	8130D633
-0474	8130D634
-0475	8130D635
-0476	8130D636
-0477	8130D637
-0478	8130D638
-0479	8130D639
-047A	8130D730
-047B	8130D731
-047C	8130D732
-047D	8130D733
-047E	8130D734
-047F	8130D735
-0480	8130D736
-0481	8130D737
-0482	8130D738
-0483	8130D739
-0484	8130D830
-0485	8130D831
-0486	8130D832
-0487	8130D833
-0488	8130D834
-0489	8130D835
-048A	8130D836
-048B	8130D837
-048C	8130D838
-048D	8130D839
-048E	8130D930
-048F	8130D931
-0490	8130D932
-0491	8130D933
-0492	8130D934
-0493	8130D935
-0494	8130D936
-0495	8130D937
-0496	8130D938
-0497	8130D939
-0498	8130DA30
-0499	8130DA31
-049A	8130DA32
-049B	8130DA33
-049C	8130DA34
-049D	8130DA35
-049E	8130DA36
-049F	8130DA37
-04A0	8130DA38
-04A1	8130DA39
-04A2	8130DB30
-04A3	8130DB31
-04A4	8130DB32
-04A5	8130DB33
-04A6	8130DB34
-04A7	8130DB35
-04A8	8130DB36
-04A9	8130DB37
-04AA	8130DB38
-04AB	8130DB39
-04AC	8130DC30
-04AD	8130DC31
-04AE	8130DC32
-04AF	8130DC33
-04B0	8130DC34
-04B1	8130DC35
-04B2	8130DC36
-04B3	8130DC37
-04B4	8130DC38
-04B5	8130DC39
-04B6	8130DD30
-04B7	8130DD31
-04B8	8130DD32
-04B9	8130DD33
-04BA	8130DD34
-04BB	8130DD35
-04BC	8130DD36
-04BD	8130DD37
-04BE	8130DD38
-04BF	8130DD39
-04C0	8130DE30
-04C1	8130DE31
-04C2	8130DE32
-04C3	8130DE33
-04C4	8130DE34
-04C5	8130DE35
-04C6	8130DE36
-04C7	8130DE37
-04C8	8130DE38
-04C9	8130DE39
-04CA	8130DF30
-04CB	8130DF31
-04CC	8130DF32
-04CD	8130DF33
-04CE	8130DF34
-04CF	8130DF35
-04D0	8130DF36
-04D1	8130DF37
-04D2	8130DF38
-04D3	8130DF39
-04D4	8130E030
-04D5	8130E031
-04D6	8130E032
-04D7	8130E033
-04D8	8130E034
-04D9	8130E035
-04DA	8130E036
-04DB	8130E037
-04DC	8130E038
-04DD	8130E039
-04DE	8130E130
-04DF	8130E131
-04E0	8130E132
-04E1	8130E133
-04E2	8130E134
-04E3	8130E135
-04E4	8130E136
-04E5	8130E137
-04E6	8130E138
-04E7	8130E139
-04E8	8130E230
-04E9	8130E231
-04EA	8130E232
-04EB	8130E233
-04EC	8130E234
-04ED	8130E235
-04EE	8130E236
-04EF	8130E237
-04F0	8130E238
-04F1	8130E239
-04F2	8130E330
-04F3	8130E331
-04F4	8130E332
-04F5	8130E333
-04F6	8130E334
-04F7	8130E335
-04F8	8130E336
-04F9	8130E337
-04FA	8130E338
-04FB	8130E339
-04FC	8130E430
-04FD	8130E431
-04FE	8130E432
-04FF	8130E433
-0500	8130E434
-0501	8130E435
-0502	8130E436
-0503	8130E437
-0504	8130E438
-0505	8130E439
-0506	8130E530
-0507	8130E531
-0508	8130E532
-0509	8130E533
-050A	8130E534
-050B	8130E535
-050C	8130E536
-050D	8130E537
-050E	8130E538
-050F	8130E539
-0510	8130E630
-0511	8130E631
-0512	8130E632
-0513	8130E633
-0514	8130E634
-0515	8130E635
-0516	8130E636
-0517	8130E637
-0518	8130E638
-0519	8130E639
-051A	8130E730
-051B	8130E731
-051C	8130E732
-051D	8130E733
-051E	8130E734
-051F	8130E735
-0520	8130E736
-0521	8130E737
-0522	8130E738
-0523	8130E739
-0524	8130E830
-0525	8130E831
-0526	8130E832
-0527	8130E833
-0528	8130E834
-0529	8130E835
-052A	8130E836
-052B	8130E837
-052C	8130E838
-052D	8130E839
-052E	8130E930
-052F	8130E931
-0530	8130E932
-0531	8130E933
-0532	8130E934
-0533	8130E935
-0534	8130E936
-0535	8130E937
-0536	8130E938
-0537	8130E939
-0538	8130EA30
-0539	8130EA31
-053A	8130EA32
-053B	8130EA33
-053C	8130EA34
-053D	8130EA35
-053E	8130EA36
-053F	8130EA37
-0540	8130EA38
-0541	8130EA39
-0542	8130EB30
-0543	8130EB31
-0544	8130EB32
-0545	8130EB33
-0546	8130EB34
-0547	8130EB35
-0548	8130EB36
-0549	8130EB37
-054A	8130EB38
-054B	8130EB39
-054C	8130EC30
-054D	8130EC31
-054E	8130EC32
-054F	8130EC33
-0550	8130EC34
-0551	8130EC35
-0552	8130EC36
-0553	8130EC37
-0554	8130EC38
-0555	8130EC39
-0556	8130ED30
-0557	8130ED31
-0558	8130ED32
-0559	8130ED33
-055A	8130ED34
-055B	8130ED35
-055C	8130ED36
-055D	8130ED37
-055E	8130ED38
-055F	8130ED39
-0560	8130EE30
-0561	8130EE31
-0562	8130EE32
-0563	8130EE33
-0564	8130EE34
-0565	8130EE35
-0566	8130EE36
-0567	8130EE37
-0568	8130EE38
-0569	8130EE39
-056A	8130EF30
-056B	8130EF31
-056C	8130EF32
-056D	8130EF33
-056E	8130EF34
-056F	8130EF35
-0570	8130EF36
-0571	8130EF37
-0572	8130EF38
-0573	8130EF39
-0574	8130F030
-0575	8130F031
-0576	8130F032
-0577	8130F033
-0578	8130F034
-0579	8130F035
-057A	8130F036
-057B	8130F037
-057C	8130F038
-057D	8130F039
-057E	8130F130
-057F	8130F131
-0580	8130F132
-0581	8130F133
-0582	8130F134
-0583	8130F135
-0584	8130F136
-0585	8130F137
-0586	8130F138
-0587	8130F139
-0588	8130F230
-0589	8130F231
-058A	8130F232
-058B	8130F233
-058C	8130F234
-058D	8130F235
-058E	8130F236
-058F	8130F237
-0590	8130F238
-0591	8130F239
-0592	8130F330
-0593	8130F331
-0594	8130F332
-0595	8130F333
-0596	8130F334
-0597	8130F335
-0598	8130F336
-0599	8130F337
-059A	8130F338
-059B	8130F339
-059C	8130F430
-059D	8130F431
-059E	8130F432
-059F	8130F433
-05A0	8130F434
-05A1	8130F435
-05A2	8130F436
-05A3	8130F437
-05A4	8130F438
-05A5	8130F439
-05A6	8130F530
-05A7	8130F531
-05A8	8130F532
-05A9	8130F533
-05AA	8130F534
-05AB	8130F535
-05AC	8130F536
-05AD	8130F537
-05AE	8130F538
-05AF	8130F539
-05B0	8130F630
-05B1	8130F631
-05B2	8130F632
-05B3	8130F633
-05B4	8130F634
-05B5	8130F635
-05B6	8130F636
-05B7	8130F637
-05B8	8130F638
-05B9	8130F639
-05BA	8130F730
-05BB	8130F731
-05BC	8130F732
-05BD	8130F733
-05BE	8130F734
-05BF	8130F735
-05C0	8130F736
-05C1	8130F737
-05C2	8130F738
-05C3	8130F739
-05C4	8130F830
-05C5	8130F831
-05C6	8130F832
-05C7	8130F833
-05C8	8130F834
-05C9	8130F835
-05CA	8130F836
-05CB	8130F837
-05CC	8130F838
-05CD	8130F839
-05CE	8130F930
-05CF	8130F931
-05D0	8130F932
-05D1	8130F933
-05D2	8130F934
-05D3	8130F935
-05D4	8130F936
-05D5	8130F937
-05D6	8130F938
-05D7	8130F939
-05D8	8130FA30
-05D9	8130FA31
-05DA	8130FA32
-05DB	8130FA33
-05DC	8130FA34
-05DD	8130FA35
-05DE	8130FA36
-05DF	8130FA37
-05E0	8130FA38
-05E1	8130FA39
-05E2	8130FB30
-05E3	8130FB31
-05E4	8130FB32
-05E5	8130FB33
-05E6	8130FB34
-05E7	8130FB35
-05E8	8130FB36
-05E9	8130FB37
-05EA	8130FB38
-05EB	8130FB39
-05EC	8130FC30
-05ED	8130FC31
-05EE	8130FC32
-05EF	8130FC33
-05F0	8130FC34
-05F1	8130FC35
-05F2	8130FC36
-05F3	8130FC37
-05F4	8130FC38
-05F5	8130FC39
-05F6	8130FD30
-05F7	8130FD31
-05F8	8130FD32
-05F9	8130FD33
-05FA	8130FD34
-05FB	8130FD35
-05FC	8130FD36
-05FD	8130FD37
-05FE	8130FD38
-05FF	8130FD39
-0600	8130FE30
-0601	8130FE31
-0602	8130FE32
-0603	8130FE33
-0604	8130FE34
-0605	8130FE35
-0606	8130FE36
-0607	8130FE37
-0608	8130FE38
-0609	8130FE39
-060A	81318130
-060B	81318131
-060C	81318132
-060D	81318133
-060E	81318134
-060F	81318135
-0610	81318136
-0611	81318137
-0612	81318138
-0613	81318139
-0614	81318230
-0615	81318231
-0616	81318232
-0617	81318233
-0618	81318234
-0619	81318235
-061A	81318236
-061B	81318237
-061C	81318238
-061D	81318239
-061E	81318330
-061F	81318331
-0620	81318332
-0621	81318333
-0622	81318334
-0623	81318335
-0624	81318336
-0625	81318337
-0626	81318338
-0627	81318339
-0628	81318430
-0629	81318431
-062A	81318432
-062B	81318433
-062C	81318434
-062D	81318435
-062E	81318436
-062F	81318437
-0630	81318438
-0631	81318439
-0632	81318530
-0633	81318531
-0634	81318532
-0635	81318533
-0636	81318534
-0637	81318535
-0638	81318536
-0639	81318537
-063A	81318538
-063B	81318539
-063C	81318630
-063D	81318631
-063E	81318632
-063F	81318633
-0640	81318634
-0641	81318635
-0642	81318636
-0643	81318637
-0644	81318638
-0645	81318639
-0646	81318730
-0647	81318731
-0648	81318732
-0649	81318733
-064A	81318734
-064B	81318735
-064C	81318736
-064D	81318737
-064E	81318738
-064F	81318739
-0650	81318830
-0651	81318831
-0652	81318832
-0653	81318833
-0654	81318834
-0655	81318835
-0656	81318836
-0657	81318837
-0658	81318838
-0659	81318839
-065A	81318930
-065B	81318931
-065C	81318932
-065D	81318933
-065E	81318934
-065F	81318935
-0660	81318936
-0661	81318937
-0662	81318938
-0663	81318939
-0664	81318A30
-0665	81318A31
-0666	81318A32
-0667	81318A33
-0668	81318A34
-0669	81318A35
-066A	81318A36
-066B	81318A37
-066C	81318A38
-066D	81318A39
-066E	81318B30
-066F	81318B31
-0670	81318B32
-0671	81318B33
-0672	81318B34
-0673	81318B35
-0674	81318B36
-0675	81318B37
-0676	81318B38
-0677	81318B39
-0678	81318C30
-0679	81318C31
-067A	81318C32
-067B	81318C33
-067C	81318C34
-067D	81318C35
-067E	81318C36
-067F	81318C37
-0680	81318C38
-0681	81318C39
-0682	81318D30
-0683	81318D31
-0684	81318D32
-0685	81318D33
-0686	81318D34
-0687	81318D35
-0688	81318D36
-0689	81318D37
-068A	81318D38
-068B	81318D39
-068C	81318E30
-068D	81318E31
-068E	81318E32
-068F	81318E33
-0690	81318E34
-0691	81318E35
-0692	81318E36
-0693	81318E37
-0694	81318E38
-0695	81318E39
-0696	81318F30
-0697	81318F31
-0698	81318F32
-0699	81318F33
-069A	81318F34
-069B	81318F35
-069C	81318F36
-069D	81318F37
-069E	81318F38
-069F	81318F39
-06A0	81319030
-06A1	81319031
-06A2	81319032
-06A3	81319033
-06A4	81319034
-06A5	81319035
-06A6	81319036
-06A7	81319037
-06A8	81319038
-06A9	81319039
-06AA	81319130
-06AB	81319131
-06AC	81319132
-06AD	81319133
-06AE	81319134
-06AF	81319135
-06B0	81319136
-06B1	81319137
-06B2	81319138
-06B3	81319139
-06B4	81319230
-06B5	81319231
-06B6	81319232
-06B7	81319233
-06B8	81319234
-06B9	81319235
-06BA	81319236
-06BB	81319237
-06BC	81319238
-06BD	81319239
-06BE	81319330
-06BF	81319331
-06C0	81319332
-06C1	81319333
-06C2	81319334
-06C3	81319335
-06C4	81319336
-06C5	81319337
-06C6	81319338
-06C7	81319339
-06C8	81319430
-06C9	81319431
-06CA	81319432
-06CB	81319433
-06CC	81319434
-06CD	81319435
-06CE	81319436
-06CF	81319437
-06D0	81319438
-06D1	81319439
-06D2	81319530
-06D3	81319531
-06D4	81319532
-06D5	81319533
-06D6	81319534
-06D7	81319535
-06D8	81319536
-06D9	81319537
-06DA	81319538
-06DB	81319539
-06DC	81319630
-06DD	81319631
-06DE	81319632
-06DF	81319633
-06E0	81319634
-06E1	81319635
-06E2	81319636
-06E3	81319637
-06E4	81319638
-06E5	81319639
-06E6	81319730
-06E7	81319731
-06E8	81319732
-06E9	81319733
-06EA	81319734
-06EB	81319735
-06EC	81319736
-06ED	81319737
-06EE	81319738
-06EF	81319739
-06F0	81319830
-06F1	81319831
-06F2	81319832
-06F3	81319833
-06F4	81319834
-06F5	81319835
-06F6	81319836
-06F7	81319837
-06F8	81319838
-06F9	81319839
-06FA	81319930
-06FB	81319931
-06FC	81319932
-06FD	81319933
-06FE	81319934
-06FF	81319935
-0700	81319936
-0701	81319937
-0702	81319938
-0703	81319939
-0704	81319A30
-0705	81319A31
-0706	81319A32
-0707	81319A33
-0708	81319A34
-0709	81319A35
-070A	81319A36
-070B	81319A37
-070C	81319A38
-070D	81319A39
-070E	81319B30
-070F	81319B31
-0710	81319B32
-0711	81319B33
-0712	81319B34
-0713	81319B35
-0714	81319B36
-0715	81319B37
-0716	81319B38
-0717	81319B39
-0718	81319C30
-0719	81319C31
-071A	81319C32
-071B	81319C33
-071C	81319C34
-071D	81319C35
-071E	81319C36
-071F	81319C37
-0720	81319C38
-0721	81319C39
-0722	81319D30
-0723	81319D31
-0724	81319D32
-0725	81319D33
-0726	81319D34
-0727	81319D35
-0728	81319D36
-0729	81319D37
-072A	81319D38
-072B	81319D39
-072C	81319E30
-072D	81319E31
-072E	81319E32
-072F	81319E33
-0730	81319E34
-0731	81319E35
-0732	81319E36
-0733	81319E37
-0734	81319E38
-0735	81319E39
-0736	81319F30
-0737	81319F31
-0738	81319F32
-0739	81319F33
-073A	81319F34
-073B	81319F35
-073C	81319F36
-073D	81319F37
-073E	81319F38
-073F	81319F39
-0740	8131A030
-0741	8131A031
-0742	8131A032
-0743	8131A033
-0744	8131A034
-0745	8131A035
-0746	8131A036
-0747	8131A037
-0748	8131A038
-0749	8131A039
-074A	8131A130
-074B	8131A131
-074C	8131A132
-074D	8131A133
-074E	8131A134
-074F	8131A135
-0750	8131A136
-0751	8131A137
-0752	8131A138
-0753	8131A139
-0754	8131A230
-0755	8131A231
-0756	8131A232
-0757	8131A233
-0758	8131A234
-0759	8131A235
-075A	8131A236
-075B	8131A237
-075C	8131A238
-075D	8131A239
-075E	8131A330
-075F	8131A331
-0760	8131A332
-0761	8131A333
-0762	8131A334
-0763	8131A335
-0764	8131A336
-0765	8131A337
-0766	8131A338
-0767	8131A339
-0768	8131A430
-0769	8131A431
-076A	8131A432
-076B	8131A433
-076C	8131A434
-076D	8131A435
-076E	8131A436
-076F	8131A437
-0770	8131A438
-0771	8131A439
-0772	8131A530
-0773	8131A531
-0774	8131A532
-0775	8131A533
-0776	8131A534
-0777	8131A535
-0778	8131A536
-0779	8131A537
-077A	8131A538
-077B	8131A539
-077C	8131A630
-077D	8131A631
-077E	8131A632
-077F	8131A633
-0780	8131A634
-0781	8131A635
-0782	8131A636
-0783	8131A637
-0784	8131A638
-0785	8131A639
-0786	8131A730
-0787	8131A731
-0788	8131A732
-0789	8131A733
-078A	8131A734
-078B	8131A735
-078C	8131A736
-078D	8131A737
-078E	8131A738
-078F	8131A739
-0790	8131A830
-0791	8131A831
-0792	8131A832
-0793	8131A833
-0794	8131A834
-0795	8131A835
-0796	8131A836
-0797	8131A837
-0798	8131A838
-0799	8131A839
-079A	8131A930
-079B	8131A931
-079C	8131A932
-079D	8131A933
-079E	8131A934
-079F	8131A935
-07A0	8131A936
-07A1	8131A937
-07A2	8131A938
-07A3	8131A939
-07A4	8131AA30
-07A5	8131AA31
-07A6	8131AA32
-07A7	8131AA33
-07A8	8131AA34
-07A9	8131AA35
-07AA	8131AA36
-07AB	8131AA37
-07AC	8131AA38
-07AD	8131AA39
-07AE	8131AB30
-07AF	8131AB31
-07B0	8131AB32
-07B1	8131AB33
-07B2	8131AB34
-07B3	8131AB35
-07B4	8131AB36
-07B5	8131AB37
-07B6	8131AB38
-07B7	8131AB39
-07B8	8131AC30
-07B9	8131AC31
-07BA	8131AC32
-07BB	8131AC33
-07BC	8131AC34
-07BD	8131AC35
-07BE	8131AC36
-07BF	8131AC37
-07C0	8131AC38
-07C1	8131AC39
-07C2	8131AD30
-07C3	8131AD31
-07C4	8131AD32
-07C5	8131AD33
-07C6	8131AD34
-07C7	8131AD35
-07C8	8131AD36
-07C9	8131AD37
-07CA	8131AD38
-07CB	8131AD39
-07CC	8131AE30
-07CD	8131AE31
-07CE	8131AE32
-07CF	8131AE33
-07D0	8131AE34
-07D1	8131AE35
-07D2	8131AE36
-07D3	8131AE37
-07D4	8131AE38
-07D5	8131AE39
-07D6	8131AF30
-07D7	8131AF31
-07D8	8131AF32
-07D9	8131AF33
-07DA	8131AF34
-07DB	8131AF35
-07DC	8131AF36
-07DD	8131AF37
-07DE	8131AF38
-07DF	8131AF39
-07E0	8131B030
-07E1	8131B031
-07E2	8131B032
-07E3	8131B033
-07E4	8131B034
-07E5	8131B035
-07E6	8131B036
-07E7	8131B037
-07E8	8131B038
-07E9	8131B039
-07EA	8131B130
-07EB	8131B131
-07EC	8131B132
-07ED	8131B133
-07EE	8131B134
-07EF	8131B135
-07F0	8131B136
-07F1	8131B137
-07F2	8131B138
-07F3	8131B139
-07F4	8131B230
-07F5	8131B231
-07F6	8131B232
-07F7	8131B233
-07F8	8131B234
-07F9	8131B235
-07FA	8131B236
-07FB	8131B237
-07FC	8131B238
-07FD	8131B239
-07FE	8131B330
-07FF	8131B331
-0800	8131B332
-0801	8131B333
-0802	8131B334
-0803	8131B335
-0804	8131B336
-0805	8131B337
-0806	8131B338
-0807	8131B339
-0808	8131B430
-0809	8131B431
-080A	8131B432
-080B	8131B433
-080C	8131B434
-080D	8131B435
-080E	8131B436
-080F	8131B437
-0810	8131B438
-0811	8131B439
-0812	8131B530
-0813	8131B531
-0814	8131B532
-0815	8131B533
-0816	8131B534
-0817	8131B535
-0818	8131B536
-0819	8131B537
-081A	8131B538
-081B	8131B539
-081C	8131B630
-081D	8131B631
-081E	8131B632
-081F	8131B633
-0820	8131B634
-0821	8131B635
-0822	8131B636
-0823	8131B637
-0824	8131B638
-0825	8131B639
-0826	8131B730
-0827	8131B731
-0828	8131B732
-0829	8131B733
-082A	8131B734
-082B	8131B735
-082C	8131B736
-082D	8131B737
-082E	8131B738
-082F	8131B739
-0830	8131B830
-0831	8131B831
-0832	8131B832
-0833	8131B833
-0834	8131B834
-0835	8131B835
-0836	8131B836
-0837	8131B837
-0838	8131B838
-0839	8131B839
-083A	8131B930
-083B	8131B931
-083C	8131B932
-083D	8131B933
-083E	8131B934
-083F	8131B935
-0840	8131B936
-0841	8131B937
-0842	8131B938
-0843	8131B939
-0844	8131BA30
-0845	8131BA31
-0846	8131BA32
-0847	8131BA33
-0848	8131BA34
-0849	8131BA35
-084A	8131BA36
-084B	8131BA37
-084C	8131BA38
-084D	8131BA39
-084E	8131BB30
-084F	8131BB31
-0850	8131BB32
-0851	8131BB33
-0852	8131BB34
-0853	8131BB35
-0854	8131BB36
-0855	8131BB37
-0856	8131BB38
-0857	8131BB39
-0858	8131BC30
-0859	8131BC31
-085A	8131BC32
-085B	8131BC33
-085C	8131BC34
-085D	8131BC35
-085E	8131BC36
-085F	8131BC37
-0860	8131BC38
-0861	8131BC39
-0862	8131BD30
-0863	8131BD31
-0864	8131BD32
-0865	8131BD33
-0866	8131BD34
-0867	8131BD35
-0868	8131BD36
-0869	8131BD37
-086A	8131BD38
-086B	8131BD39
-086C	8131BE30
-086D	8131BE31
-086E	8131BE32
-086F	8131BE33
-0870	8131BE34
-0871	8131BE35
-0872	8131BE36
-0873	8131BE37
-0874	8131BE38
-0875	8131BE39
-0876	8131BF30
-0877	8131BF31
-0878	8131BF32
-0879	8131BF33
-087A	8131BF34
-087B	8131BF35
-087C	8131BF36
-087D	8131BF37
-087E	8131BF38
-087F	8131BF39
-0880	8131C030
-0881	8131C031
-0882	8131C032
-0883	8131C033
-0884	8131C034
-0885	8131C035
-0886	8131C036
-0887	8131C037
-0888	8131C038
-0889	8131C039
-088A	8131C130
-088B	8131C131
-088C	8131C132
-088D	8131C133
-088E	8131C134
-088F	8131C135
-0890	8131C136
-0891	8131C137
-0892	8131C138
-0893	8131C139
-0894	8131C230
-0895	8131C231
-0896	8131C232
-0897	8131C233
-0898	8131C234
-0899	8131C235
-089A	8131C236
-089B	8131C237
-089C	8131C238
-089D	8131C239
-089E	8131C330
-089F	8131C331
-08A0	8131C332
-08A1	8131C333
-08A2	8131C334
-08A3	8131C335
-08A4	8131C336
-08A5	8131C337
-08A6	8131C338
-08A7	8131C339
-08A8	8131C430
-08A9	8131C431
-08AA	8131C432
-08AB	8131C433
-08AC	8131C434
-08AD	8131C435
-08AE	8131C436
-08AF	8131C437
-08B0	8131C438
-08B1	8131C439
-08B2	8131C530
-08B3	8131C531
-08B4	8131C532
-08B5	8131C533
-08B6	8131C534
-08B7	8131C535
-08B8	8131C536
-08B9	8131C537
-08BA	8131C538
-08BB	8131C539
-08BC	8131C630
-08BD	8131C631
-08BE	8131C632
-08BF	8131C633
-08C0	8131C634
-08C1	8131C635
-08C2	8131C636
-08C3	8131C637
-08C4	8131C638
-08C5	8131C639
-08C6	8131C730
-08C7	8131C731
-08C8	8131C732
-08C9	8131C733
-08CA	8131C734
-08CB	8131C735
-08CC	8131C736
-08CD	8131C737
-08CE	8131C738
-08CF	8131C739
-08D0	8131C830
-08D1	8131C831
-08D2	8131C832
-08D3	8131C833
-08D4	8131C834
-08D5	8131C835
-08D6	8131C836
-08D7	8131C837
-08D8	8131C838
-08D9	8131C839
-08DA	8131C930
-08DB	8131C931
-08DC	8131C932
-08DD	8131C933
-08DE	8131C934
-08DF	8131C935
-08E0	8131C936
-08E1	8131C937
-08E2	8131C938
-08E3	8131C939
-08E4	8131CA30
-08E5	8131CA31
-08E6	8131CA32
-08E7	8131CA33
-08E8	8131CA34
-08E9	8131CA35
-08EA	8131CA36
-08EB	8131CA37
-08EC	8131CA38
-08ED	8131CA39
-08EE	8131CB30
-08EF	8131CB31
-08F0	8131CB32
-08F1	8131CB33
-08F2	8131CB34
-08F3	8131CB35
-08F4	8131CB36
-08F5	8131CB37
-08F6	8131CB38
-08F7	8131CB39
-08F8	8131CC30
-08F9	8131CC31
-08FA	8131CC32
-08FB	8131CC33
-08FC	8131CC34
-08FD	8131CC35
-08FE	8131CC36
-08FF	8131CC37
-0900	8131CC38
-0901	8131CC39
-0902	8131CD30
-0903	8131CD31
-0904	8131CD32
-0905	8131CD33
-0906	8131CD34
-0907	8131CD35
-0908	8131CD36
-0909	8131CD37
-090A	8131CD38
-090B	8131CD39
-090C	8131CE30
-090D	8131CE31
-090E	8131CE32
-090F	8131CE33
-0910	8131CE34
-0911	8131CE35
-0912	8131CE36
-0913	8131CE37
-0914	8131CE38
-0915	8131CE39
-0916	8131CF30
-0917	8131CF31
-0918	8131CF32
-0919	8131CF33
-091A	8131CF34
-091B	8131CF35
-091C	8131CF36
-091D	8131CF37
-091E	8131CF38
-091F	8131CF39
-0920	8131D030
-0921	8131D031
-0922	8131D032
-0923	8131D033
-0924	8131D034
-0925	8131D035
-0926	8131D036
-0927	8131D037
-0928	8131D038
-0929	8131D039
-092A	8131D130
-092B	8131D131
-092C	8131D132
-092D	8131D133
-092E	8131D134
-092F	8131D135
-0930	8131D136
-0931	8131D137
-0932	8131D138
-0933	8131D139
-0934	8131D230
-0935	8131D231
-0936	8131D232
-0937	8131D233
-0938	8131D234
-0939	8131D235
-093A	8131D236
-093B	8131D237
-093C	8131D238
-093D	8131D239
-093E	8131D330
-093F	8131D331
-0940	8131D332
-0941	8131D333
-0942	8131D334
-0943	8131D335
-0944	8131D336
-0945	8131D337
-0946	8131D338
-0947	8131D339
-0948	8131D430
-0949	8131D431
-094A	8131D432
-094B	8131D433
-094C	8131D434
-094D	8131D435
-094E	8131D436
-094F	8131D437
-0950	8131D438
-0951	8131D439
-0952	8131D530
-0953	8131D531
-0954	8131D532
-0955	8131D533
-0956	8131D534
-0957	8131D535
-0958	8131D536
-0959	8131D537
-095A	8131D538
-095B	8131D539
-095C	8131D630
-095D	8131D631
-095E	8131D632
-095F	8131D633
-0960	8131D634
-0961	8131D635
-0962	8131D636
-0963	8131D637
-0964	8131D638
-0965	8131D639
-0966	8131D730
-0967	8131D731
-0968	8131D732
-0969	8131D733
-096A	8131D734
-096B	8131D735
-096C	8131D736
-096D	8131D737
-096E	8131D738
-096F	8131D739
-0970	8131D830
-0971	8131D831
-0972	8131D832
-0973	8131D833
-0974	8131D834
-0975	8131D835
-0976	8131D836
-0977	8131D837
-0978	8131D838
-0979	8131D839
-097A	8131D930
-097B	8131D931
-097C	8131D932
-097D	8131D933
-097E	8131D934
-097F	8131D935
-0980	8131D936
-0981	8131D937
-0982	8131D938
-0983	8131D939
-0984	8131DA30
-0985	8131DA31
-0986	8131DA32
-0987	8131DA33
-0988	8131DA34
-0989	8131DA35
-098A	8131DA36
-098B	8131DA37
-098C	8131DA38
-098D	8131DA39
-098E	8131DB30
-098F	8131DB31
-0990	8131DB32
-0991	8131DB33
-0992	8131DB34
-0993	8131DB35
-0994	8131DB36
-0995	8131DB37
-0996	8131DB38
-0997	8131DB39
-0998	8131DC30
-0999	8131DC31
-099A	8131DC32
-099B	8131DC33
-099C	8131DC34
-099D	8131DC35
-099E	8131DC36
-099F	8131DC37
-09A0	8131DC38
-09A1	8131DC39
-09A2	8131DD30
-09A3	8131DD31
-09A4	8131DD32
-09A5	8131DD33
-09A6	8131DD34
-09A7	8131DD35
-09A8	8131DD36
-09A9	8131DD37
-09AA	8131DD38
-09AB	8131DD39
-09AC	8131DE30
-09AD	8131DE31
-09AE	8131DE32
-09AF	8131DE33
-09B0	8131DE34
-09B1	8131DE35
-09B2	8131DE36
-09B3	8131DE37
-09B4	8131DE38
-09B5	8131DE39
-09B6	8131DF30
-09B7	8131DF31
-09B8	8131DF32
-09B9	8131DF33
-09BA	8131DF34
-09BB	8131DF35
-09BC	8131DF36
-09BD	8131DF37
-09BE	8131DF38
-09BF	8131DF39
-09C0	8131E030
-09C1	8131E031
-09C2	8131E032
-09C3	8131E033
-09C4	8131E034
-09C5	8131E035
-09C6	8131E036
-09C7	8131E037
-09C8	8131E038
-09C9	8131E039
-09CA	8131E130
-09CB	8131E131
-09CC	8131E132
-09CD	8131E133
-09CE	8131E134
-09CF	8131E135
-09D0	8131E136
-09D1	8131E137
-09D2	8131E138
-09D3	8131E139
-09D4	8131E230
-09D5	8131E231
-09D6	8131E232
-09D7	8131E233
-09D8	8131E234
-09D9	8131E235
-09DA	8131E236
-09DB	8131E237
-09DC	8131E238
-09DD	8131E239
-09DE	8131E330
-09DF	8131E331
-09E0	8131E332
-09E1	8131E333
-09E2	8131E334
-09E3	8131E335
-09E4	8131E336
-09E5	8131E337
-09E6	8131E338
-09E7	8131E339
-09E8	8131E430
-09E9	8131E431
-09EA	8131E432
-09EB	8131E433
-09EC	8131E434
-09ED	8131E435
-09EE	8131E436
-09EF	8131E437
-09F0	8131E438
-09F1	8131E439
-09F2	8131E530
-09F3	8131E531
-09F4	8131E532
-09F5	8131E533
-09F6	8131E534
-09F7	8131E535
-09F8	8131E536
-09F9	8131E537
-09FA	8131E538
-09FB	8131E539
-09FC	8131E630
-09FD	8131E631
-09FE	8131E632
-09FF	8131E633
-0A00	8131E634
-0A01	8131E635
-0A02	8131E636
-0A03	8131E637
-0A04	8131E638
-0A05	8131E639
-0A06	8131E730
-0A07	8131E731
-0A08	8131E732
-0A09	8131E733
-0A0A	8131E734
-0A0B	8131E735
-0A0C	8131E736
-0A0D	8131E737
-0A0E	8131E738
-0A0F	8131E739
-0A10	8131E830
-0A11	8131E831
-0A12	8131E832
-0A13	8131E833
-0A14	8131E834
-0A15	8131E835
-0A16	8131E836
-0A17	8131E837
-0A18	8131E838
-0A19	8131E839
-0A1A	8131E930
-0A1B	8131E931
-0A1C	8131E932
-0A1D	8131E933
-0A1E	8131E934
-0A1F	8131E935
-0A20	8131E936
-0A21	8131E937
-0A22	8131E938
-0A23	8131E939
-0A24	8131EA30
-0A25	8131EA31
-0A26	8131EA32
-0A27	8131EA33
-0A28	8131EA34
-0A29	8131EA35
-0A2A	8131EA36
-0A2B	8131EA37
-0A2C	8131EA38
-0A2D	8131EA39
-0A2E	8131EB30
-0A2F	8131EB31
-0A30	8131EB32
-0A31	8131EB33
-0A32	8131EB34
-0A33	8131EB35
-0A34	8131EB36
-0A35	8131EB37
-0A36	8131EB38
-0A37	8131EB39
-0A38	8131EC30
-0A39	8131EC31
-0A3A	8131EC32
-0A3B	8131EC33
-0A3C	8131EC34
-0A3D	8131EC35
-0A3E	8131EC36
-0A3F	8131EC37
-0A40	8131EC38
-0A41	8131EC39
-0A42	8131ED30
-0A43	8131ED31
-0A44	8131ED32
-0A45	8131ED33
-0A46	8131ED34
-0A47	8131ED35
-0A48	8131ED36
-0A49	8131ED37
-0A4A	8131ED38
-0A4B	8131ED39
-0A4C	8131EE30
-0A4D	8131EE31
-0A4E	8131EE32
-0A4F	8131EE33
-0A50	8131EE34
-0A51	8131EE35
-0A52	8131EE36
-0A53	8131EE37
-0A54	8131EE38
-0A55	8131EE39
-0A56	8131EF30
-0A57	8131EF31
-0A58	8131EF32
-0A59	8131EF33
-0A5A	8131EF34
-0A5B	8131EF35
-0A5C	8131EF36
-0A5D	8131EF37
-0A5E	8131EF38
-0A5F	8131EF39
-0A60	8131F030
-0A61	8131F031
-0A62	8131F032
-0A63	8131F033
-0A64	8131F034
-0A65	8131F035
-0A66	8131F036
-0A67	8131F037
-0A68	8131F038
-0A69	8131F039
-0A6A	8131F130
-0A6B	8131F131
-0A6C	8131F132
-0A6D	8131F133
-0A6E	8131F134
-0A6F	8131F135
-0A70	8131F136
-0A71	8131F137
-0A72	8131F138
-0A73	8131F139
-0A74	8131F230
-0A75	8131F231
-0A76	8131F232
-0A77	8131F233
-0A78	8131F234
-0A79	8131F235
-0A7A	8131F236
-0A7B	8131F237
-0A7C	8131F238
-0A7D	8131F239
-0A7E	8131F330
-0A7F	8131F331
-0A80	8131F332
-0A81	8131F333
-0A82	8131F334
-0A83	8131F335
-0A84	8131F336
-0A85	8131F337
-0A86	8131F338
-0A87	8131F339
-0A88	8131F430
-0A89	8131F431
-0A8A	8131F432
-0A8B	8131F433
-0A8C	8131F434
-0A8D	8131F435
-0A8E	8131F436
-0A8F	8131F437
-0A90	8131F438
-0A91	8131F439
-0A92	8131F530
-0A93	8131F531
-0A94	8131F532
-0A95	8131F533
-0A96	8131F534
-0A97	8131F535
-0A98	8131F536
-0A99	8131F537
-0A9A	8131F538
-0A9B	8131F539
-0A9C	8131F630
-0A9D	8131F631
-0A9E	8131F632
-0A9F	8131F633
-0AA0	8131F634
-0AA1	8131F635
-0AA2	8131F636
-0AA3	8131F637
-0AA4	8131F638
-0AA5	8131F639
-0AA6	8131F730
-0AA7	8131F731
-0AA8	8131F732
-0AA9	8131F733
-0AAA	8131F734
-0AAB	8131F735
-0AAC	8131F736
-0AAD	8131F737
-0AAE	8131F738
-0AAF	8131F739
-0AB0	8131F830
-0AB1	8131F831
-0AB2	8131F832
-0AB3	8131F833
-0AB4	8131F834
-0AB5	8131F835
-0AB6	8131F836
-0AB7	8131F837
-0AB8	8131F838
-0AB9	8131F839
-0ABA	8131F930
-0ABB	8131F931
-0ABC	8131F932
-0ABD	8131F933
-0ABE	8131F934
-0ABF	8131F935
-0AC0	8131F936
-0AC1	8131F937
-0AC2	8131F938
-0AC3	8131F939
-0AC4	8131FA30
-0AC5	8131FA31
-0AC6	8131FA32
-0AC7	8131FA33
-0AC8	8131FA34
-0AC9	8131FA35
-0ACA	8131FA36
-0ACB	8131FA37
-0ACC	8131FA38
-0ACD	8131FA39
-0ACE	8131FB30
-0ACF	8131FB31
-0AD0	8131FB32
-0AD1	8131FB33
-0AD2	8131FB34
-0AD3	8131FB35
-0AD4	8131FB36
-0AD5	8131FB37
-0AD6	8131FB38
-0AD7	8131FB39
-0AD8	8131FC30
-0AD9	8131FC31
-0ADA	8131FC32
-0ADB	8131FC33
-0ADC	8131FC34
-0ADD	8131FC35
-0ADE	8131FC36
-0ADF	8131FC37
-0AE0	8131FC38
-0AE1	8131FC39
-0AE2	8131FD30
-0AE3	8131FD31
-0AE4	8131FD32
-0AE5	8131FD33
-0AE6	8131FD34
-0AE7	8131FD35
-0AE8	8131FD36
-0AE9	8131FD37
-0AEA	8131FD38
-0AEB	8131FD39
-0AEC	8131FE30
-0AED	8131FE31
-0AEE	8131FE32
-0AEF	8131FE33
-0AF0	8131FE34
-0AF1	8131FE35
-0AF2	8131FE36
-0AF3	8131FE37
-0AF4	8131FE38
-0AF5	8131FE39
-0AF6	81328130
-0AF7	81328131
-0AF8	81328132
-0AF9	81328133
-0AFA	81328134
-0AFB	81328135
-0AFC	81328136
-0AFD	81328137
-0AFE	81328138
-0AFF	81328139
-0B00	81328230
-0B01	81328231
-0B02	81328232
-0B03	81328233
-0B04	81328234
-0B05	81328235
-0B06	81328236
-0B07	81328237
-0B08	81328238
-0B09	81328239
-0B0A	81328330
-0B0B	81328331
-0B0C	81328332
-0B0D	81328333
-0B0E	81328334
-0B0F	81328335
-0B10	81328336
-0B11	81328337
-0B12	81328338
-0B13	81328339
-0B14	81328430
-0B15	81328431
-0B16	81328432
-0B17	81328433
-0B18	81328434
-0B19	81328435
-0B1A	81328436
-0B1B	81328437
-0B1C	81328438
-0B1D	81328439
-0B1E	81328530
-0B1F	81328531
-0B20	81328532
-0B21	81328533
-0B22	81328534
-0B23	81328535
-0B24	81328536
-0B25	81328537
-0B26	81328538
-0B27	81328539
-0B28	81328630
-0B29	81328631
-0B2A	81328632
-0B2B	81328633
-0B2C	81328634
-0B2D	81328635
-0B2E	81328636
-0B2F	81328637
-0B30	81328638
-0B31	81328639
-0B32	81328730
-0B33	81328731
-0B34	81328732
-0B35	81328733
-0B36	81328734
-0B37	81328735
-0B38	81328736
-0B39	81328737
-0B3A	81328738
-0B3B	81328739
-0B3C	81328830
-0B3D	81328831
-0B3E	81328832
-0B3F	81328833
-0B40	81328834
-0B41	81328835
-0B42	81328836
-0B43	81328837
-0B44	81328838
-0B45	81328839
-0B46	81328930
-0B47	81328931
-0B48	81328932
-0B49	81328933
-0B4A	81328934
-0B4B	81328935
-0B4C	81328936
-0B4D	81328937
-0B4E	81328938
-0B4F	81328939
-0B50	81328A30
-0B51	81328A31
-0B52	81328A32
-0B53	81328A33
-0B54	81328A34
-0B55	81328A35
-0B56	81328A36
-0B57	81328A37
-0B58	81328A38
-0B59	81328A39
-0B5A	81328B30
-0B5B	81328B31
-0B5C	81328B32
-0B5D	81328B33
-0B5E	81328B34
-0B5F	81328B35
-0B60	81328B36
-0B61	81328B37
-0B62	81328B38
-0B63	81328B39
-0B64	81328C30
-0B65	81328C31
-0B66	81328C32
-0B67	81328C33
-0B68	81328C34
-0B69	81328C35
-0B6A	81328C36
-0B6B	81328C37
-0B6C	81328C38
-0B6D	81328C39
-0B6E	81328D30
-0B6F	81328D31
-0B70	81328D32
-0B71	81328D33
-0B72	81328D34
-0B73	81328D35
-0B74	81328D36
-0B75	81328D37
-0B76	81328D38
-0B77	81328D39
-0B78	81328E30
-0B79	81328E31
-0B7A	81328E32
-0B7B	81328E33
-0B7C	81328E34
-0B7D	81328E35
-0B7E	81328E36
-0B7F	81328E37
-0B80	81328E38
-0B81	81328E39
-0B82	81328F30
-0B83	81328F31
-0B84	81328F32
-0B85	81328F33
-0B86	81328F34
-0B87	81328F35
-0B88	81328F36
-0B89	81328F37
-0B8A	81328F38
-0B8B	81328F39
-0B8C	81329030
-0B8D	81329031
-0B8E	81329032
-0B8F	81329033
-0B90	81329034
-0B91	81329035
-0B92	81329036
-0B93	81329037
-0B94	81329038
-0B95	81329039
-0B96	81329130
-0B97	81329131
-0B98	81329132
-0B99	81329133
-0B9A	81329134
-0B9B	81329135
-0B9C	81329136
-0B9D	81329137
-0B9E	81329138
-0B9F	81329139
-0BA0	81329230
-0BA1	81329231
-0BA2	81329232
-0BA3	81329233
-0BA4	81329234
-0BA5	81329235
-0BA6	81329236
-0BA7	81329237
-0BA8	81329238
-0BA9	81329239
-0BAA	81329330
-0BAB	81329331
-0BAC	81329332
-0BAD	81329333
-0BAE	81329334
-0BAF	81329335
-0BB0	81329336
-0BB1	81329337
-0BB2	81329338
-0BB3	81329339
-0BB4	81329430
-0BB5	81329431
-0BB6	81329432
-0BB7	81329433
-0BB8	81329434
-0BB9	81329435
-0BBA	81329436
-0BBB	81329437
-0BBC	81329438
-0BBD	81329439
-0BBE	81329530
-0BBF	81329531
-0BC0	81329532
-0BC1	81329533
-0BC2	81329534
-0BC3	81329535
-0BC4	81329536
-0BC5	81329537
-0BC6	81329538
-0BC7	81329539
-0BC8	81329630
-0BC9	81329631
-0BCA	81329632
-0BCB	81329633
-0BCC	81329634
-0BCD	81329635
-0BCE	81329636
-0BCF	81329637
-0BD0	81329638
-0BD1	81329639
-0BD2	81329730
-0BD3	81329731
-0BD4	81329732
-0BD5	81329733
-0BD6	81329734
-0BD7	81329735
-0BD8	81329736
-0BD9	81329737
-0BDA	81329738
-0BDB	81329739
-0BDC	81329830
-0BDD	81329831
-0BDE	81329832
-0BDF	81329833
-0BE0	81329834
-0BE1	81329835
-0BE2	81329836
-0BE3	81329837
-0BE4	81329838
-0BE5	81329839
-0BE6	81329930
-0BE7	81329931
-0BE8	81329932
-0BE9	81329933
-0BEA	81329934
-0BEB	81329935
-0BEC	81329936
-0BED	81329937
-0BEE	81329938
-0BEF	81329939
-0BF0	81329A30
-0BF1	81329A31
-0BF2	81329A32
-0BF3	81329A33
-0BF4	81329A34
-0BF5	81329A35
-0BF6	81329A36
-0BF7	81329A37
-0BF8	81329A38
-0BF9	81329A39
-0BFA	81329B30
-0BFB	81329B31
-0BFC	81329B32
-0BFD	81329B33
-0BFE	81329B34
-0BFF	81329B35
-0C00	81329B36
-0C01	81329B37
-0C02	81329B38
-0C03	81329B39
-0C04	81329C30
-0C05	81329C31
-0C06	81329C32
-0C07	81329C33
-0C08	81329C34
-0C09	81329C35
-0C0A	81329C36
-0C0B	81329C37
-0C0C	81329C38
-0C0D	81329C39
-0C0E	81329D30
-0C0F	81329D31
-0C10	81329D32
-0C11	81329D33
-0C12	81329D34
-0C13	81329D35
-0C14	81329D36
-0C15	81329D37
-0C16	81329D38
-0C17	81329D39
-0C18	81329E30
-0C19	81329E31
-0C1A	81329E32
-0C1B	81329E33
-0C1C	81329E34
-0C1D	81329E35
-0C1E	81329E36
-0C1F	81329E37
-0C20	81329E38
-0C21	81329E39
-0C22	81329F30
-0C23	81329F31
-0C24	81329F32
-0C25	81329F33
-0C26	81329F34
-0C27	81329F35
-0C28	81329F36
-0C29	81329F37
-0C2A	81329F38
-0C2B	81329F39
-0C2C	8132A030
-0C2D	8132A031
-0C2E	8132A032
-0C2F	8132A033
-0C30	8132A034
-0C31	8132A035
-0C32	8132A036
-0C33	8132A037
-0C34	8132A038
-0C35	8132A039
-0C36	8132A130
-0C37	8132A131
-0C38	8132A132
-0C39	8132A133
-0C3A	8132A134
-0C3B	8132A135
-0C3C	8132A136
-0C3D	8132A137
-0C3E	8132A138
-0C3F	8132A139
-0C40	8132A230
-0C41	8132A231
-0C42	8132A232
-0C43	8132A233
-0C44	8132A234
-0C45	8132A235
-0C46	8132A236
-0C47	8132A237
-0C48	8132A238
-0C49	8132A239
-0C4A	8132A330
-0C4B	8132A331
-0C4C	8132A332
-0C4D	8132A333
-0C4E	8132A334
-0C4F	8132A335
-0C50	8132A336
-0C51	8132A337
-0C52	8132A338
-0C53	8132A339
-0C54	8132A430
-0C55	8132A431
-0C56	8132A432
-0C57	8132A433
-0C58	8132A434
-0C59	8132A435
-0C5A	8132A436
-0C5B	8132A437
-0C5C	8132A438
-0C5D	8132A439
-0C5E	8132A530
-0C5F	8132A531
-0C60	8132A532
-0C61	8132A533
-0C62	8132A534
-0C63	8132A535
-0C64	8132A536
-0C65	8132A537
-0C66	8132A538
-0C67	8132A539
-0C68	8132A630
-0C69	8132A631
-0C6A	8132A632
-0C6B	8132A633
-0C6C	8132A634
-0C6D	8132A635
-0C6E	8132A636
-0C6F	8132A637
-0C70	8132A638
-0C71	8132A639
-0C72	8132A730
-0C73	8132A731
-0C74	8132A732
-0C75	8132A733
-0C76	8132A734
-0C77	8132A735
-0C78	8132A736
-0C79	8132A737
-0C7A	8132A738
-0C7B	8132A739
-0C7C	8132A830
-0C7D	8132A831
-0C7E	8132A832
-0C7F	8132A833
-0C80	8132A834
-0C81	8132A835
-0C82	8132A836
-0C83	8132A837
-0C84	8132A838
-0C85	8132A839
-0C86	8132A930
-0C87	8132A931
-0C88	8132A932
-0C89	8132A933
-0C8A	8132A934
-0C8B	8132A935
-0C8C	8132A936
-0C8D	8132A937
-0C8E	8132A938
-0C8F	8132A939
-0C90	8132AA30
-0C91	8132AA31
-0C92	8132AA32
-0C93	8132AA33
-0C94	8132AA34
-0C95	8132AA35
-0C96	8132AA36
-0C97	8132AA37
-0C98	8132AA38
-0C99	8132AA39
-0C9A	8132AB30
-0C9B	8132AB31
-0C9C	8132AB32
-0C9D	8132AB33
-0C9E	8132AB34
-0C9F	8132AB35
-0CA0	8132AB36
-0CA1	8132AB37
-0CA2	8132AB38
-0CA3	8132AB39
-0CA4	8132AC30
-0CA5	8132AC31
-0CA6	8132AC32
-0CA7	8132AC33
-0CA8	8132AC34
-0CA9	8132AC35
-0CAA	8132AC36
-0CAB	8132AC37
-0CAC	8132AC38
-0CAD	8132AC39
-0CAE	8132AD30
-0CAF	8132AD31
-0CB0	8132AD32
-0CB1	8132AD33
-0CB2	8132AD34
-0CB3	8132AD35
-0CB4	8132AD36
-0CB5	8132AD37
-0CB6	8132AD38
-0CB7	8132AD39
-0CB8	8132AE30
-0CB9	8132AE31
-0CBA	8132AE32
-0CBB	8132AE33
-0CBC	8132AE34
-0CBD	8132AE35
-0CBE	8132AE36
-0CBF	8132AE37
-0CC0	8132AE38
-0CC1	8132AE39
-0CC2	8132AF30
-0CC3	8132AF31
-0CC4	8132AF32
-0CC5	8132AF33
-0CC6	8132AF34
-0CC7	8132AF35
-0CC8	8132AF36
-0CC9	8132AF37
-0CCA	8132AF38
-0CCB	8132AF39
-0CCC	8132B030
-0CCD	8132B031
-0CCE	8132B032
-0CCF	8132B033
-0CD0	8132B034
-0CD1	8132B035
-0CD2	8132B036
-0CD3	8132B037
-0CD4	8132B038
-0CD5	8132B039
-0CD6	8132B130
-0CD7	8132B131
-0CD8	8132B132
-0CD9	8132B133
-0CDA	8132B134
-0CDB	8132B135
-0CDC	8132B136
-0CDD	8132B137
-0CDE	8132B138
-0CDF	8132B139
-0CE0	8132B230
-0CE1	8132B231
-0CE2	8132B232
-0CE3	8132B233
-0CE4	8132B234
-0CE5	8132B235
-0CE6	8132B236
-0CE7	8132B237
-0CE8	8132B238
-0CE9	8132B239
-0CEA	8132B330
-0CEB	8132B331
-0CEC	8132B332
-0CED	8132B333
-0CEE	8132B334
-0CEF	8132B335
-0CF0	8132B336
-0CF1	8132B337
-0CF2	8132B338
-0CF3	8132B339
-0CF4	8132B430
-0CF5	8132B431
-0CF6	8132B432
-0CF7	8132B433
-0CF8	8132B434
-0CF9	8132B435
-0CFA	8132B436
-0CFB	8132B437
-0CFC	8132B438
-0CFD	8132B439
-0CFE	8132B530
-0CFF	8132B531
-0D00	8132B532
-0D01	8132B533
-0D02	8132B534
-0D03	8132B535
-0D04	8132B536
-0D05	8132B537
-0D06	8132B538
-0D07	8132B539
-0D08	8132B630
-0D09	8132B631
-0D0A	8132B632
-0D0B	8132B633
-0D0C	8132B634
-0D0D	8132B635
-0D0E	8132B636
-0D0F	8132B637
-0D10	8132B638
-0D11	8132B639
-0D12	8132B730
-0D13	8132B731
-0D14	8132B732
-0D15	8132B733
-0D16	8132B734
-0D17	8132B735
-0D18	8132B736
-0D19	8132B737
-0D1A	8132B738
-0D1B	8132B739
-0D1C	8132B830
-0D1D	8132B831
-0D1E	8132B832
-0D1F	8132B833
-0D20	8132B834
-0D21	8132B835
-0D22	8132B836
-0D23	8132B837
-0D24	8132B838
-0D25	8132B839
-0D26	8132B930
-0D27	8132B931
-0D28	8132B932
-0D29	8132B933
-0D2A	8132B934
-0D2B	8132B935
-0D2C	8132B936
-0D2D	8132B937
-0D2E	8132B938
-0D2F	8132B939
-0D30	8132BA30
-0D31	8132BA31
-0D32	8132BA32
-0D33	8132BA33
-0D34	8132BA34
-0D35	8132BA35
-0D36	8132BA36
-0D37	8132BA37
-0D38	8132BA38
-0D39	8132BA39
-0D3A	8132BB30
-0D3B	8132BB31
-0D3C	8132BB32
-0D3D	8132BB33
-0D3E	8132BB34
-0D3F	8132BB35
-0D40	8132BB36
-0D41	8132BB37
-0D42	8132BB38
-0D43	8132BB39
-0D44	8132BC30
-0D45	8132BC31
-0D46	8132BC32
-0D47	8132BC33
-0D48	8132BC34
-0D49	8132BC35
-0D4A	8132BC36
-0D4B	8132BC37
-0D4C	8132BC38
-0D4D	8132BC39
-0D4E	8132BD30
-0D4F	8132BD31
-0D50	8132BD32
-0D51	8132BD33
-0D52	8132BD34
-0D53	8132BD35
-0D54	8132BD36
-0D55	8132BD37
-0D56	8132BD38
-0D57	8132BD39
-0D58	8132BE30
-0D59	8132BE31
-0D5A	8132BE32
-0D5B	8132BE33
-0D5C	8132BE34
-0D5D	8132BE35
-0D5E	8132BE36
-0D5F	8132BE37
-0D60	8132BE38
-0D61	8132BE39
-0D62	8132BF30
-0D63	8132BF31
-0D64	8132BF32
-0D65	8132BF33
-0D66	8132BF34
-0D67	8132BF35
-0D68	8132BF36
-0D69	8132BF37
-0D6A	8132BF38
-0D6B	8132BF39
-0D6C	8132C030
-0D6D	8132C031
-0D6E	8132C032
-0D6F	8132C033
-0D70	8132C034
-0D71	8132C035
-0D72	8132C036
-0D73	8132C037
-0D74	8132C038
-0D75	8132C039
-0D76	8132C130
-0D77	8132C131
-0D78	8132C132
-0D79	8132C133
-0D7A	8132C134
-0D7B	8132C135
-0D7C	8132C136
-0D7D	8132C137
-0D7E	8132C138
-0D7F	8132C139
-0D80	8132C230
-0D81	8132C231
-0D82	8132C232
-0D83	8132C233
-0D84	8132C234
-0D85	8132C235
-0D86	8132C236
-0D87	8132C237
-0D88	8132C238
-0D89	8132C239
-0D8A	8132C330
-0D8B	8132C331
-0D8C	8132C332
-0D8D	8132C333
-0D8E	8132C334
-0D8F	8132C335
-0D90	8132C336
-0D91	8132C337
-0D92	8132C338
-0D93	8132C339
-0D94	8132C430
-0D95	8132C431
-0D96	8132C432
-0D97	8132C433
-0D98	8132C434
-0D99	8132C435
-0D9A	8132C436
-0D9B	8132C437
-0D9C	8132C438
-0D9D	8132C439
-0D9E	8132C530
-0D9F	8132C531
-0DA0	8132C532
-0DA1	8132C533
-0DA2	8132C534
-0DA3	8132C535
-0DA4	8132C536
-0DA5	8132C537
-0DA6	8132C538
-0DA7	8132C539
-0DA8	8132C630
-0DA9	8132C631
-0DAA	8132C632
-0DAB	8132C633
-0DAC	8132C634
-0DAD	8132C635
-0DAE	8132C636
-0DAF	8132C637
-0DB0	8132C638
-0DB1	8132C639
-0DB2	8132C730
-0DB3	8132C731
-0DB4	8132C732
-0DB5	8132C733
-0DB6	8132C734
-0DB7	8132C735
-0DB8	8132C736
-0DB9	8132C737
-0DBA	8132C738
-0DBB	8132C739
-0DBC	8132C830
-0DBD	8132C831
-0DBE	8132C832
-0DBF	8132C833
-0DC0	8132C834
-0DC1	8132C835
-0DC2	8132C836
-0DC3	8132C837
-0DC4	8132C838
-0DC5	8132C839
-0DC6	8132C930
-0DC7	8132C931
-0DC8	8132C932
-0DC9	8132C933
-0DCA	8132C934
-0DCB	8132C935
-0DCC	8132C936
-0DCD	8132C937
-0DCE	8132C938
-0DCF	8132C939
-0DD0	8132CA30
-0DD1	8132CA31
-0DD2	8132CA32
-0DD3	8132CA33
-0DD4	8132CA34
-0DD5	8132CA35
-0DD6	8132CA36
-0DD7	8132CA37
-0DD8	8132CA38
-0DD9	8132CA39
-0DDA	8132CB30
-0DDB	8132CB31
-0DDC	8132CB32
-0DDD	8132CB33
-0DDE	8132CB34
-0DDF	8132CB35
-0DE0	8132CB36
-0DE1	8132CB37
-0DE2	8132CB38
-0DE3	8132CB39
-0DE4	8132CC30
-0DE5	8132CC31
-0DE6	8132CC32
-0DE7	8132CC33
-0DE8	8132CC34
-0DE9	8132CC35
-0DEA	8132CC36
-0DEB	8132CC37
-0DEC	8132CC38
-0DED	8132CC39
-0DEE	8132CD30
-0DEF	8132CD31
-0DF0	8132CD32
-0DF1	8132CD33
-0DF2	8132CD34
-0DF3	8132CD35
-0DF4	8132CD36
-0DF5	8132CD37
-0DF6	8132CD38
-0DF7	8132CD39
-0DF8	8132CE30
-0DF9	8132CE31
-0DFA	8132CE32
-0DFB	8132CE33
-0DFC	8132CE34
-0DFD	8132CE35
-0DFE	8132CE36
-0DFF	8132CE37
-0E00	8132CE38
-0E01	8132CE39
-0E02	8132CF30
-0E03	8132CF31
-0E04	8132CF32
-0E05	8132CF33
-0E06	8132CF34
-0E07	8132CF35
-0E08	8132CF36
-0E09	8132CF37
-0E0A	8132CF38
-0E0B	8132CF39
-0E0C	8132D030
-0E0D	8132D031
-0E0E	8132D032
-0E0F	8132D033
-0E10	8132D034
-0E11	8132D035
-0E12	8132D036
-0E13	8132D037
-0E14	8132D038
-0E15	8132D039
-0E16	8132D130
-0E17	8132D131
-0E18	8132D132
-0E19	8132D133
-0E1A	8132D134
-0E1B	8132D135
-0E1C	8132D136
-0E1D	8132D137
-0E1E	8132D138
-0E1F	8132D139
-0E20	8132D230
-0E21	8132D231
-0E22	8132D232
-0E23	8132D233
-0E24	8132D234
-0E25	8132D235
-0E26	8132D236
-0E27	8132D237
-0E28	8132D238
-0E29	8132D239
-0E2A	8132D330
-0E2B	8132D331
-0E2C	8132D332
-0E2D	8132D333
-0E2E	8132D334
-0E2F	8132D335
-0E30	8132D336
-0E31	8132D337
-0E32	8132D338
-0E33	8132D339
-0E34	8132D430
-0E35	8132D431
-0E36	8132D432
-0E37	8132D433
-0E38	8132D434
-0E39	8132D435
-0E3A	8132D436
-0E3B	8132D437
-0E3C	8132D438
-0E3D	8132D439
-0E3E	8132D530
-0E3F	8132D531
-0E40	8132D532
-0E41	8132D533
-0E42	8132D534
-0E43	8132D535
-0E44	8132D536
-0E45	8132D537
-0E46	8132D538
-0E47	8132D539
-0E48	8132D630
-0E49	8132D631
-0E4A	8132D632
-0E4B	8132D633
-0E4C	8132D634
-0E4D	8132D635
-0E4E	8132D636
-0E4F	8132D637
-0E50	8132D638
-0E51	8132D639
-0E52	8132D730
-0E53	8132D731
-0E54	8132D732
-0E55	8132D733
-0E56	8132D734
-0E57	8132D735
-0E58	8132D736
-0E59	8132D737
-0E5A	8132D738
-0E5B	8132D739
-0E5C	8132D830
-0E5D	8132D831
-0E5E	8132D832
-0E5F	8132D833
-0E60	8132D834
-0E61	8132D835
-0E62	8132D836
-0E63	8132D837
-0E64	8132D838
-0E65	8132D839
-0E66	8132D930
-0E67	8132D931
-0E68	8132D932
-0E69	8132D933
-0E6A	8132D934
-0E6B	8132D935
-0E6C	8132D936
-0E6D	8132D937
-0E6E	8132D938
-0E6F	8132D939
-0E70	8132DA30
-0E71	8132DA31
-0E72	8132DA32
-0E73	8132DA33
-0E74	8132DA34
-0E75	8132DA35
-0E76	8132DA36
-0E77	8132DA37
-0E78	8132DA38
-0E79	8132DA39
-0E7A	8132DB30
-0E7B	8132DB31
-0E7C	8132DB32
-0E7D	8132DB33
-0E7E	8132DB34
-0E7F	8132DB35
-0E80	8132DB36
-0E81	8132DB37
-0E82	8132DB38
-0E83	8132DB39
-0E84	8132DC30
-0E85	8132DC31
-0E86	8132DC32
-0E87	8132DC33
-0E88	8132DC34
-0E89	8132DC35
-0E8A	8132DC36
-0E8B	8132DC37
-0E8C	8132DC38
-0E8D	8132DC39
-0E8E	8132DD30
-0E8F	8132DD31
-0E90	8132DD32
-0E91	8132DD33
-0E92	8132DD34
-0E93	8132DD35
-0E94	8132DD36
-0E95	8132DD37
-0E96	8132DD38
-0E97	8132DD39
-0E98	8132DE30
-0E99	8132DE31
-0E9A	8132DE32
-0E9B	8132DE33
-0E9C	8132DE34
-0E9D	8132DE35
-0E9E	8132DE36
-0E9F	8132DE37
-0EA0	8132DE38
-0EA1	8132DE39
-0EA2	8132DF30
-0EA3	8132DF31
-0EA4	8132DF32
-0EA5	8132DF33
-0EA6	8132DF34
-0EA7	8132DF35
-0EA8	8132DF36
-0EA9	8132DF37
-0EAA	8132DF38
-0EAB	8132DF39
-0EAC	8132E030
-0EAD	8132E031
-0EAE	8132E032
-0EAF	8132E033
-0EB0	8132E034
-0EB1	8132E035
-0EB2	8132E036
-0EB3	8132E037
-0EB4	8132E038
-0EB5	8132E039
-0EB6	8132E130
-0EB7	8132E131
-0EB8	8132E132
-0EB9	8132E133
-0EBA	8132E134
-0EBB	8132E135
-0EBC	8132E136
-0EBD	8132E137
-0EBE	8132E138
-0EBF	8132E139
-0EC0	8132E230
-0EC1	8132E231
-0EC2	8132E232
-0EC3	8132E233
-0EC4	8132E234
-0EC5	8132E235
-0EC6	8132E236
-0EC7	8132E237
-0EC8	8132E238
-0EC9	8132E239
-0ECA	8132E330
-0ECB	8132E331
-0ECC	8132E332
-0ECD	8132E333
-0ECE	8132E334
-0ECF	8132E335
-0ED0	8132E336
-0ED1	8132E337
-0ED2	8132E338
-0ED3	8132E339
-0ED4	8132E430
-0ED5	8132E431
-0ED6	8132E432
-0ED7	8132E433
-0ED8	8132E434
-0ED9	8132E435
-0EDA	8132E436
-0EDB	8132E437
-0EDC	8132E438
-0EDD	8132E439
-0EDE	8132E530
-0EDF	8132E531
-0EE0	8132E532
-0EE1	8132E533
-0EE2	8132E534
-0EE3	8132E535
-0EE4	8132E536
-0EE5	8132E537
-0EE6	8132E538
-0EE7	8132E539
-0EE8	8132E630
-0EE9	8132E631
-0EEA	8132E632
-0EEB	8132E633
-0EEC	8132E634
-0EED	8132E635
-0EEE	8132E636
-0EEF	8132E637
-0EF0	8132E638
-0EF1	8132E639
-0EF2	8132E730
-0EF3	8132E731
-0EF4	8132E732
-0EF5	8132E733
-0EF6	8132E734
-0EF7	8132E735
-0EF8	8132E736
-0EF9	8132E737
-0EFA	8132E738
-0EFB	8132E739
-0EFC	8132E830
-0EFD	8132E831
-0EFE	8132E832
-0EFF	8132E833
-0F00	8132E834
-0F01	8132E835
-0F02	8132E836
-0F03	8132E837
-0F04	8132E838
-0F05	8132E839
-0F06	8132E930
-0F07	8132E931
-0F08	8132E932
-0F09	8132E933
-0F0A	8132E934
-0F0B	8132E935
-0F0C	8132E936
-0F0D	8132E937
-0F0E	8132E938
-0F0F	8132E939
-0F10	8132EA30
-0F11	8132EA31
-0F12	8132EA32
-0F13	8132EA33
-0F14	8132EA34
-0F15	8132EA35
-0F16	8132EA36
-0F17	8132EA37
-0F18	8132EA38
-0F19	8132EA39
-0F1A	8132EB30
-0F1B	8132EB31
-0F1C	8132EB32
-0F1D	8132EB33
-0F1E	8132EB34
-0F1F	8132EB35
-0F20	8132EB36
-0F21	8132EB37
-0F22	8132EB38
-0F23	8132EB39
-0F24	8132EC30
-0F25	8132EC31
-0F26	8132EC32
-0F27	8132EC33
-0F28	8132EC34
-0F29	8132EC35
-0F2A	8132EC36
-0F2B	8132EC37
-0F2C	8132EC38
-0F2D	8132EC39
-0F2E	8132ED30
-0F2F	8132ED31
-0F30	8132ED32
-0F31	8132ED33
-0F32	8132ED34
-0F33	8132ED35
-0F34	8132ED36
-0F35	8132ED37
-0F36	8132ED38
-0F37	8132ED39
-0F38	8132EE30
-0F39	8132EE31
-0F3A	8132EE32
-0F3B	8132EE33
-0F3C	8132EE34
-0F3D	8132EE35
-0F3E	8132EE36
-0F3F	8132EE37
-0F40	8132EE38
-0F41	8132EE39
-0F42	8132EF30
-0F43	8132EF31
-0F44	8132EF32
-0F45	8132EF33
-0F46	8132EF34
-0F47	8132EF35
-0F48	8132EF36
-0F49	8132EF37
-0F4A	8132EF38
-0F4B	8132EF39
-0F4C	8132F030
-0F4D	8132F031
-0F4E	8132F032
-0F4F	8132F033
-0F50	8132F034
-0F51	8132F035
-0F52	8132F036
-0F53	8132F037
-0F54	8132F038
-0F55	8132F039
-0F56	8132F130
-0F57	8132F131
-0F58	8132F132
-0F59	8132F133
-0F5A	8132F134
-0F5B	8132F135
-0F5C	8132F136
-0F5D	8132F137
-0F5E	8132F138
-0F5F	8132F139
-0F60	8132F230
-0F61	8132F231
-0F62	8132F232
-0F63	8132F233
-0F64	8132F234
-0F65	8132F235
-0F66	8132F236
-0F67	8132F237
-0F68	8132F238
-0F69	8132F239
-0F6A	8132F330
-0F6B	8132F331
-0F6C	8132F332
-0F6D	8132F333
-0F6E	8132F334
-0F6F	8132F335
-0F70	8132F336
-0F71	8132F337
-0F72	8132F338
-0F73	8132F339
-0F74	8132F430
-0F75	8132F431
-0F76	8132F432
-0F77	8132F433
-0F78	8132F434
-0F79	8132F435
-0F7A	8132F436
-0F7B	8132F437
-0F7C	8132F438
-0F7D	8132F439
-0F7E	8132F530
-0F7F	8132F531
-0F80	8132F532
-0F81	8132F533
-0F82	8132F534
-0F83	8132F535
-0F84	8132F536
-0F85	8132F537
-0F86	8132F538
-0F87	8132F539
-0F88	8132F630
-0F89	8132F631
-0F8A	8132F632
-0F8B	8132F633
-0F8C	8132F634
-0F8D	8132F635
-0F8E	8132F636
-0F8F	8132F637
-0F90	8132F638
-0F91	8132F639
-0F92	8132F730
-0F93	8132F731
-0F94	8132F732
-0F95	8132F733
-0F96	8132F734
-0F97	8132F735
-0F98	8132F736
-0F99	8132F737
-0F9A	8132F738
-0F9B	8132F739
-0F9C	8132F830
-0F9D	8132F831
-0F9E	8132F832
-0F9F	8132F833
-0FA0	8132F834
-0FA1	8132F835
-0FA2	8132F836
-0FA3	8132F837
-0FA4	8132F838
-0FA5	8132F839
-0FA6	8132F930
-0FA7	8132F931
-0FA8	8132F932
-0FA9	8132F933
-0FAA	8132F934
-0FAB	8132F935
-0FAC	8132F936
-0FAD	8132F937
-0FAE	8132F938
-0FAF	8132F939
-0FB0	8132FA30
-0FB1	8132FA31
-0FB2	8132FA32
-0FB3	8132FA33
-0FB4	8132FA34
-0FB5	8132FA35
-0FB6	8132FA36
-0FB7	8132FA37
-0FB8	8132FA38
-0FB9	8132FA39
-0FBA	8132FB30
-0FBB	8132FB31
-0FBC	8132FB32
-0FBD	8132FB33
-0FBE	8132FB34
-0FBF	8132FB35
-0FC0	8132FB36
-0FC1	8132FB37
-0FC2	8132FB38
-0FC3	8132FB39
-0FC4	8132FC30
-0FC5	8132FC31
-0FC6	8132FC32
-0FC7	8132FC33
-0FC8	8132FC34
-0FC9	8132FC35
-0FCA	8132FC36
-0FCB	8132FC37
-0FCC	8132FC38
-0FCD	8132FC39
-0FCE	8132FD30
-0FCF	8132FD31
-0FD0	8132FD32
-0FD1	8132FD33
-0FD2	8132FD34
-0FD3	8132FD35
-0FD4	8132FD36
-0FD5	8132FD37
-0FD6	8132FD38
-0FD7	8132FD39
-0FD8	8132FE30
-0FD9	8132FE31
-0FDA	8132FE32
-0FDB	8132FE33
-0FDC	8132FE34
-0FDD	8132FE35
-0FDE	8132FE36
-0FDF	8132FE37
-0FE0	8132FE38
-0FE1	8132FE39
-0FE2	81338130
-0FE3	81338131
-0FE4	81338132
-0FE5	81338133
-0FE6	81338134
-0FE7	81338135
-0FE8	81338136
-0FE9	81338137
-0FEA	81338138
-0FEB	81338139
-0FEC	81338230
-0FED	81338231
-0FEE	81338232
-0FEF	81338233
-0FF0	81338234
-0FF1	81338235
-0FF2	81338236
-0FF3	81338237
-0FF4	81338238
-0FF5	81338239
-0FF6	81338330
-0FF7	81338331
-0FF8	81338332
-0FF9	81338333
-0FFA	81338334
-0FFB	81338335
-0FFC	81338336
-0FFD	81338337
-0FFE	81338338
-0FFF	81338339
-1000	81338430
-1001	81338431
-1002	81338432
-1003	81338433
-1004	81338434
-1005	81338435
-1006	81338436
-1007	81338437
-1008	81338438
-1009	81338439
-100A	81338530
-100B	81338531
-100C	81338532
-100D	81338533
-100E	81338534
-100F	81338535
-1010	81338536
-1011	81338537
-1012	81338538
-1013	81338539
-1014	81338630
-1015	81338631
-1016	81338632
-1017	81338633
-1018	81338634
-1019	81338635
-101A	81338636
-101B	81338637
-101C	81338638
-101D	81338639
-101E	81338730
-101F	81338731
-1020	81338732
-1021	81338733
-1022	81338734
-1023	81338735
-1024	81338736
-1025	81338737
-1026	81338738
-1027	81338739
-1028	81338830
-1029	81338831
-102A	81338832
-102B	81338833
-102C	81338834
-102D	81338835
-102E	81338836
-102F	81338837
-1030	81338838
-1031	81338839
-1032	81338930
-1033	81338931
-1034	81338932
-1035	81338933
-1036	81338934
-1037	81338935
-1038	81338936
-1039	81338937
-103A	81338938
-103B	81338939
-103C	81338A30
-103D	81338A31
-103E	81338A32
-103F	81338A33
-1040	81338A34
-1041	81338A35
-1042	81338A36
-1043	81338A37
-1044	81338A38
-1045	81338A39
-1046	81338B30
-1047	81338B31
-1048	81338B32
-1049	81338B33
-104A	81338B34
-104B	81338B35
-104C	81338B36
-104D	81338B37
-104E	81338B38
-104F	81338B39
-1050	81338C30
-1051	81338C31
-1052	81338C32
-1053	81338C33
-1054	81338C34
-1055	81338C35
-1056	81338C36
-1057	81338C37
-1058	81338C38
-1059	81338C39
-105A	81338D30
-105B	81338D31
-105C	81338D32
-105D	81338D33
-105E	81338D34
-105F	81338D35
-1060	81338D36
-1061	81338D37
-1062	81338D38
-1063	81338D39
-1064	81338E30
-1065	81338E31
-1066	81338E32
-1067	81338E33
-1068	81338E34
-1069	81338E35
-106A	81338E36
-106B	81338E37
-106C	81338E38
-106D	81338E39
-106E	81338F30
-106F	81338F31
-1070	81338F32
-1071	81338F33
-1072	81338F34
-1073	81338F35
-1074	81338F36
-1075	81338F37
-1076	81338F38
-1077	81338F39
-1078	81339030
-1079	81339031
-107A	81339032
-107B	81339033
-107C	81339034
-107D	81339035
-107E	81339036
-107F	81339037
-1080	81339038
-1081	81339039
-1082	81339130
-1083	81339131
-1084	81339132
-1085	81339133
-1086	81339134
-1087	81339135
-1088	81339136
-1089	81339137
-108A	81339138
-108B	81339139
-108C	81339230
-108D	81339231
-108E	81339232
-108F	81339233
-1090	81339234
-1091	81339235
-1092	81339236
-1093	81339237
-1094	81339238
-1095	81339239
-1096	81339330
-1097	81339331
-1098	81339332
-1099	81339333
-109A	81339334
-109B	81339335
-109C	81339336
-109D	81339337
-109E	81339338
-109F	81339339
-10A0	81339430
-10A1	81339431
-10A2	81339432
-10A3	81339433
-10A4	81339434
-10A5	81339435
-10A6	81339436
-10A7	81339437
-10A8	81339438
-10A9	81339439
-10AA	81339530
-10AB	81339531
-10AC	81339532
-10AD	81339533
-10AE	81339534
-10AF	81339535
-10B0	81339536
-10B1	81339537
-10B2	81339538
-10B3	81339539
-10B4	81339630
-10B5	81339631
-10B6	81339632
-10B7	81339633
-10B8	81339634
-10B9	81339635
-10BA	81339636
-10BB	81339637
-10BC	81339638
-10BD	81339639
-10BE	81339730
-10BF	81339731
-10C0	81339732
-10C1	81339733
-10C2	81339734
-10C3	81339735
-10C4	81339736
-10C5	81339737
-10C6	81339738
-10C7	81339739
-10C8	81339830
-10C9	81339831
-10CA	81339832
-10CB	81339833
-10CC	81339834
-10CD	81339835
-10CE	81339836
-10CF	81339837
-10D0	81339838
-10D1	81339839
-10D2	81339930
-10D3	81339931
-10D4	81339932
-10D5	81339933
-10D6	81339934
-10D7	81339935
-10D8	81339936
-10D9	81339937
-10DA	81339938
-10DB	81339939
-10DC	81339A30
-10DD	81339A31
-10DE	81339A32
-10DF	81339A33
-10E0	81339A34
-10E1	81339A35
-10E2	81339A36
-10E3	81339A37
-10E4	81339A38
-10E5	81339A39
-10E6	81339B30
-10E7	81339B31
-10E8	81339B32
-10E9	81339B33
-10EA	81339B34
-10EB	81339B35
-10EC	81339B36
-10ED	81339B37
-10EE	81339B38
-10EF	81339B39
-10F0	81339C30
-10F1	81339C31
-10F2	81339C32
-10F3	81339C33
-10F4	81339C34
-10F5	81339C35
-10F6	81339C36
-10F7	81339C37
-10F8	81339C38
-10F9	81339C39
-10FA	81339D30
-10FB	81339D31
-10FC	81339D32
-10FD	81339D33
-10FE	81339D34
-10FF	81339D35
-1100	81339D36
-1101	81339D37
-1102	81339D38
-1103	81339D39
-1104	81339E30
-1105	81339E31
-1106	81339E32
-1107	81339E33
-1108	81339E34
-1109	81339E35
-110A	81339E36
-110B	81339E37
-110C	81339E38
-110D	81339E39
-110E	81339F30
-110F	81339F31
-1110	81339F32
-1111	81339F33
-1112	81339F34
-1113	81339F35
-1114	81339F36
-1115	81339F37
-1116	81339F38
-1117	81339F39
-1118	8133A030
-1119	8133A031
-111A	8133A032
-111B	8133A033
-111C	8133A034
-111D	8133A035
-111E	8133A036
-111F	8133A037
-1120	8133A038
-1121	8133A039
-1122	8133A130
-1123	8133A131
-1124	8133A132
-1125	8133A133
-1126	8133A134
-1127	8133A135
-1128	8133A136
-1129	8133A137
-112A	8133A138
-112B	8133A139
-112C	8133A230
-112D	8133A231
-112E	8133A232
-112F	8133A233
-1130	8133A234
-1131	8133A235
-1132	8133A236
-1133	8133A237
-1134	8133A238
-1135	8133A239
-1136	8133A330
-1137	8133A331
-1138	8133A332
-1139	8133A333
-113A	8133A334
-113B	8133A335
-113C	8133A336
-113D	8133A337
-113E	8133A338
-113F	8133A339
-1140	8133A430
-1141	8133A431
-1142	8133A432
-1143	8133A433
-1144	8133A434
-1145	8133A435
-1146	8133A436
-1147	8133A437
-1148	8133A438
-1149	8133A439
-114A	8133A530
-114B	8133A531
-114C	8133A532
-114D	8133A533
-114E	8133A534
-114F	8133A535
-1150	8133A536
-1151	8133A537
-1152	8133A538
-1153	8133A539
-1154	8133A630
-1155	8133A631
-1156	8133A632
-1157	8133A633
-1158	8133A634
-1159	8133A635
-115A	8133A636
-115B	8133A637
-115C	8133A638
-115D	8133A639
-115E	8133A730
-115F	8133A731
-1160	8133A732
-1161	8133A733
-1162	8133A734
-1163	8133A735
-1164	8133A736
-1165	8133A737
-1166	8133A738
-1167	8133A739
-1168	8133A830
-1169	8133A831
-116A	8133A832
-116B	8133A833
-116C	8133A834
-116D	8133A835
-116E	8133A836
-116F	8133A837
-1170	8133A838
-1171	8133A839
-1172	8133A930
-1173	8133A931
-1174	8133A932
-1175	8133A933
-1176	8133A934
-1177	8133A935
-1178	8133A936
-1179	8133A937
-117A	8133A938
-117B	8133A939
-117C	8133AA30
-117D	8133AA31
-117E	8133AA32
-117F	8133AA33
-1180	8133AA34
-1181	8133AA35
-1182	8133AA36
-1183	8133AA37
-1184	8133AA38
-1185	8133AA39
-1186	8133AB30
-1187	8133AB31
-1188	8133AB32
-1189	8133AB33
-118A	8133AB34
-118B	8133AB35
-118C	8133AB36
-118D	8133AB37
-118E	8133AB38
-118F	8133AB39
-1190	8133AC30
-1191	8133AC31
-1192	8133AC32
-1193	8133AC33
-1194	8133AC34
-1195	8133AC35
-1196	8133AC36
-1197	8133AC37
-1198	8133AC38
-1199	8133AC39
-119A	8133AD30
-119B	8133AD31
-119C	8133AD32
-119D	8133AD33
-119E	8133AD34
-119F	8133AD35
-11A0	8133AD36
-11A1	8133AD37
-11A2	8133AD38
-11A3	8133AD39
-11A4	8133AE30
-11A5	8133AE31
-11A6	8133AE32
-11A7	8133AE33
-11A8	8133AE34
-11A9	8133AE35
-11AA	8133AE36
-11AB	8133AE37
-11AC	8133AE38
-11AD	8133AE39
-11AE	8133AF30
-11AF	8133AF31
-11B0	8133AF32
-11B1	8133AF33
-11B2	8133AF34
-11B3	8133AF35
-11B4	8133AF36
-11B5	8133AF37
-11B6	8133AF38
-11B7	8133AF39
-11B8	8133B030
-11B9	8133B031
-11BA	8133B032
-11BB	8133B033
-11BC	8133B034
-11BD	8133B035
-11BE	8133B036
-11BF	8133B037
-11C0	8133B038
-11C1	8133B039
-11C2	8133B130
-11C3	8133B131
-11C4	8133B132
-11C5	8133B133
-11C6	8133B134
-11C7	8133B135
-11C8	8133B136
-11C9	8133B137
-11CA	8133B138
-11CB	8133B139
-11CC	8133B230
-11CD	8133B231
-11CE	8133B232
-11CF	8133B233
-11D0	8133B234
-11D1	8133B235
-11D2	8133B236
-11D3	8133B237
-11D4	8133B238
-11D5	8133B239
-11D6	8133B330
-11D7	8133B331
-11D8	8133B332
-11D9	8133B333
-11DA	8133B334
-11DB	8133B335
-11DC	8133B336
-11DD	8133B337
-11DE	8133B338
-11DF	8133B339
-11E0	8133B430
-11E1	8133B431
-11E2	8133B432
-11E3	8133B433
-11E4	8133B434
-11E5	8133B435
-11E6	8133B436
-11E7	8133B437
-11E8	8133B438
-11E9	8133B439
-11EA	8133B530
-11EB	8133B531
-11EC	8133B532
-11ED	8133B533
-11EE	8133B534
-11EF	8133B535
-11F0	8133B536
-11F1	8133B537
-11F2	8133B538
-11F3	8133B539
-11F4	8133B630
-11F5	8133B631
-11F6	8133B632
-11F7	8133B633
-11F8	8133B634
-11F9	8133B635
-11FA	8133B636
-11FB	8133B637
-11FC	8133B638
-11FD	8133B639
-11FE	8133B730
-11FF	8133B731
-1200	8133B732
-1201	8133B733
-1202	8133B734
-1203	8133B735
-1204	8133B736
-1205	8133B737
-1206	8133B738
-1207	8133B739
-1208	8133B830
-1209	8133B831
-120A	8133B832
-120B	8133B833
-120C	8133B834
-120D	8133B835
-120E	8133B836
-120F	8133B837
-1210	8133B838
-1211	8133B839
-1212	8133B930
-1213	8133B931
-1214	8133B932
-1215	8133B933
-1216	8133B934
-1217	8133B935
-1218	8133B936
-1219	8133B937
-121A	8133B938
-121B	8133B939
-121C	8133BA30
-121D	8133BA31
-121E	8133BA32
-121F	8133BA33
-1220	8133BA34
-1221	8133BA35
-1222	8133BA36
-1223	8133BA37
-1224	8133BA38
-1225	8133BA39
-1226	8133BB30
-1227	8133BB31
-1228	8133BB32
-1229	8133BB33
-122A	8133BB34
-122B	8133BB35
-122C	8133BB36
-122D	8133BB37
-122E	8133BB38
-122F	8133BB39
-1230	8133BC30
-1231	8133BC31
-1232	8133BC32
-1233	8133BC33
-1234	8133BC34
-1235	8133BC35
-1236	8133BC36
-1237	8133BC37
-1238	8133BC38
-1239	8133BC39
-123A	8133BD30
-123B	8133BD31
-123C	8133BD32
-123D	8133BD33
-123E	8133BD34
-123F	8133BD35
-1240	8133BD36
-1241	8133BD37
-1242	8133BD38
-1243	8133BD39
-1244	8133BE30
-1245	8133BE31
-1246	8133BE32
-1247	8133BE33
-1248	8133BE34
-1249	8133BE35
-124A	8133BE36
-124B	8133BE37
-124C	8133BE38
-124D	8133BE39
-124E	8133BF30
-124F	8133BF31
-1250	8133BF32
-1251	8133BF33
-1252	8133BF34
-1253	8133BF35
-1254	8133BF36
-1255	8133BF37
-1256	8133BF38
-1257	8133BF39
-1258	8133C030
-1259	8133C031
-125A	8133C032
-125B	8133C033
-125C	8133C034
-125D	8133C035
-125E	8133C036
-125F	8133C037
-1260	8133C038
-1261	8133C039
-1262	8133C130
-1263	8133C131
-1264	8133C132
-1265	8133C133
-1266	8133C134
-1267	8133C135
-1268	8133C136
-1269	8133C137
-126A	8133C138
-126B	8133C139
-126C	8133C230
-126D	8133C231
-126E	8133C232
-126F	8133C233
-1270	8133C234
-1271	8133C235
-1272	8133C236
-1273	8133C237
-1274	8133C238
-1275	8133C239
-1276	8133C330
-1277	8133C331
-1278	8133C332
-1279	8133C333
-127A	8133C334
-127B	8133C335
-127C	8133C336
-127D	8133C337
-127E	8133C338
-127F	8133C339
-1280	8133C430
-1281	8133C431
-1282	8133C432
-1283	8133C433
-1284	8133C434
-1285	8133C435
-1286	8133C436
-1287	8133C437
-1288	8133C438
-1289	8133C439
-128A	8133C530
-128B	8133C531
-128C	8133C532
-128D	8133C533
-128E	8133C534
-128F	8133C535
-1290	8133C536
-1291	8133C537
-1292	8133C538
-1293	8133C539
-1294	8133C630
-1295	8133C631
-1296	8133C632
-1297	8133C633
-1298	8133C634
-1299	8133C635
-129A	8133C636
-129B	8133C637
-129C	8133C638
-129D	8133C639
-129E	8133C730
-129F	8133C731
-12A0	8133C732
-12A1	8133C733
-12A2	8133C734
-12A3	8133C735
-12A4	8133C736
-12A5	8133C737
-12A6	8133C738
-12A7	8133C739
-12A8	8133C830
-12A9	8133C831
-12AA	8133C832
-12AB	8133C833
-12AC	8133C834
-12AD	8133C835
-12AE	8133C836
-12AF	8133C837
-12B0	8133C838
-12B1	8133C839
-12B2	8133C930
-12B3	8133C931
-12B4	8133C932
-12B5	8133C933
-12B6	8133C934
-12B7	8133C935
-12B8	8133C936
-12B9	8133C937
-12BA	8133C938
-12BB	8133C939
-12BC	8133CA30
-12BD	8133CA31
-12BE	8133CA32
-12BF	8133CA33
-12C0	8133CA34
-12C1	8133CA35
-12C2	8133CA36
-12C3	8133CA37
-12C4	8133CA38
-12C5	8133CA39
-12C6	8133CB30
-12C7	8133CB31
-12C8	8133CB32
-12C9	8133CB33
-12CA	8133CB34
-12CB	8133CB35
-12CC	8133CB36
-12CD	8133CB37
-12CE	8133CB38
-12CF	8133CB39
-12D0	8133CC30
-12D1	8133CC31
-12D2	8133CC32
-12D3	8133CC33
-12D4	8133CC34
-12D5	8133CC35
-12D6	8133CC36
-12D7	8133CC37
-12D8	8133CC38
-12D9	8133CC39
-12DA	8133CD30
-12DB	8133CD31
-12DC	8133CD32
-12DD	8133CD33
-12DE	8133CD34
-12DF	8133CD35
-12E0	8133CD36
-12E1	8133CD37
-12E2	8133CD38
-12E3	8133CD39
-12E4	8133CE30
-12E5	8133CE31
-12E6	8133CE32
-12E7	8133CE33
-12E8	8133CE34
-12E9	8133CE35
-12EA	8133CE36
-12EB	8133CE37
-12EC	8133CE38
-12ED	8133CE39
-12EE	8133CF30
-12EF	8133CF31
-12F0	8133CF32
-12F1	8133CF33
-12F2	8133CF34
-12F3	8133CF35
-12F4	8133CF36
-12F5	8133CF37
-12F6	8133CF38
-12F7	8133CF39
-12F8	8133D030
-12F9	8133D031
-12FA	8133D032
-12FB	8133D033
-12FC	8133D034
-12FD	8133D035
-12FE	8133D036
-12FF	8133D037
-1300	8133D038
-1301	8133D039
-1302	8133D130
-1303	8133D131
-1304	8133D132
-1305	8133D133
-1306	8133D134
-1307	8133D135
-1308	8133D136
-1309	8133D137
-130A	8133D138
-130B	8133D139
-130C	8133D230
-130D	8133D231
-130E	8133D232
-130F	8133D233
-1310	8133D234
-1311	8133D235
-1312	8133D236
-1313	8133D237
-1314	8133D238
-1315	8133D239
-1316	8133D330
-1317	8133D331
-1318	8133D332
-1319	8133D333
-131A	8133D334
-131B	8133D335
-131C	8133D336
-131D	8133D337
-131E	8133D338
-131F	8133D339
-1320	8133D430
-1321	8133D431
-1322	8133D432
-1323	8133D433
-1324	8133D434
-1325	8133D435
-1326	8133D436
-1327	8133D437
-1328	8133D438
-1329	8133D439
-132A	8133D530
-132B	8133D531
-132C	8133D532
-132D	8133D533
-132E	8133D534
-132F	8133D535
-1330	8133D536
-1331	8133D537
-1332	8133D538
-1333	8133D539
-1334	8133D630
-1335	8133D631
-1336	8133D632
-1337	8133D633
-1338	8133D634
-1339	8133D635
-133A	8133D636
-133B	8133D637
-133C	8133D638
-133D	8133D639
-133E	8133D730
-133F	8133D731
-1340	8133D732
-1341	8133D733
-1342	8133D734
-1343	8133D735
-1344	8133D736
-1345	8133D737
-1346	8133D738
-1347	8133D739
-1348	8133D830
-1349	8133D831
-134A	8133D832
-134B	8133D833
-134C	8133D834
-134D	8133D835
-134E	8133D836
-134F	8133D837
-1350	8133D838
-1351	8133D839
-1352	8133D930
-1353	8133D931
-1354	8133D932
-1355	8133D933
-1356	8133D934
-1357	8133D935
-1358	8133D936
-1359	8133D937
-135A	8133D938
-135B	8133D939
-135C	8133DA30
-135D	8133DA31
-135E	8133DA32
-135F	8133DA33
-1360	8133DA34
-1361	8133DA35
-1362	8133DA36
-1363	8133DA37
-1364	8133DA38
-1365	8133DA39
-1366	8133DB30
-1367	8133DB31
-1368	8133DB32
-1369	8133DB33
-136A	8133DB34
-136B	8133DB35
-136C	8133DB36
-136D	8133DB37
-136E	8133DB38
-136F	8133DB39
-1370	8133DC30
-1371	8133DC31
-1372	8133DC32
-1373	8133DC33
-1374	8133DC34
-1375	8133DC35
-1376	8133DC36
-1377	8133DC37
-1378	8133DC38
-1379	8133DC39
-137A	8133DD30
-137B	8133DD31
-137C	8133DD32
-137D	8133DD33
-137E	8133DD34
-137F	8133DD35
-1380	8133DD36
-1381	8133DD37
-1382	8133DD38
-1383	8133DD39
-1384	8133DE30
-1385	8133DE31
-1386	8133DE32
-1387	8133DE33
-1388	8133DE34
-1389	8133DE35
-138A	8133DE36
-138B	8133DE37
-138C	8133DE38
-138D	8133DE39
-138E	8133DF30
-138F	8133DF31
-1390	8133DF32
-1391	8133DF33
-1392	8133DF34
-1393	8133DF35
-1394	8133DF36
-1395	8133DF37
-1396	8133DF38
-1397	8133DF39
-1398	8133E030
-1399	8133E031
-139A	8133E032
-139B	8133E033
-139C	8133E034
-139D	8133E035
-139E	8133E036
-139F	8133E037
-13A0	8133E038
-13A1	8133E039
-13A2	8133E130
-13A3	8133E131
-13A4	8133E132
-13A5	8133E133
-13A6	8133E134
-13A7	8133E135
-13A8	8133E136
-13A9	8133E137
-13AA	8133E138
-13AB	8133E139
-13AC	8133E230
-13AD	8133E231
-13AE	8133E232
-13AF	8133E233
-13B0	8133E234
-13B1	8133E235
-13B2	8133E236
-13B3	8133E237
-13B4	8133E238
-13B5	8133E239
-13B6	8133E330
-13B7	8133E331
-13B8	8133E332
-13B9	8133E333
-13BA	8133E334
-13BB	8133E335
-13BC	8133E336
-13BD	8133E337
-13BE	8133E338
-13BF	8133E339
-13C0	8133E430
-13C1	8133E431
-13C2	8133E432
-13C3	8133E433
-13C4	8133E434
-13C5	8133E435
-13C6	8133E436
-13C7	8133E437
-13C8	8133E438
-13C9	8133E439
-13CA	8133E530
-13CB	8133E531
-13CC	8133E532
-13CD	8133E533
-13CE	8133E534
-13CF	8133E535
-13D0	8133E536
-13D1	8133E537
-13D2	8133E538
-13D3	8133E539
-13D4	8133E630
-13D5	8133E631
-13D6	8133E632
-13D7	8133E633
-13D8	8133E634
-13D9	8133E635
-13DA	8133E636
-13DB	8133E637
-13DC	8133E638
-13DD	8133E639
-13DE	8133E730
-13DF	8133E731
-13E0	8133E732
-13E1	8133E733
-13E2	8133E734
-13E3	8133E735
-13E4	8133E736
-13E5	8133E737
-13E6	8133E738
-13E7	8133E739
-13E8	8133E830
-13E9	8133E831
-13EA	8133E832
-13EB	8133E833
-13EC	8133E834
-13ED	8133E835
-13EE	8133E836
-13EF	8133E837
-13F0	8133E838
-13F1	8133E839
-13F2	8133E930
-13F3	8133E931
-13F4	8133E932
-13F5	8133E933
-13F6	8133E934
-13F7	8133E935
-13F8	8133E936
-13F9	8133E937
-13FA	8133E938
-13FB	8133E939
-13FC	8133EA30
-13FD	8133EA31
-13FE	8133EA32
-13FF	8133EA33
-1400	8133EA34
-1401	8133EA35
-1402	8133EA36
-1403	8133EA37
-1404	8133EA38
-1405	8133EA39
-1406	8133EB30
-1407	8133EB31
-1408	8133EB32
-1409	8133EB33
-140A	8133EB34
-140B	8133EB35
-140C	8133EB36
-140D	8133EB37
-140E	8133EB38
-140F	8133EB39
-1410	8133EC30
-1411	8133EC31
-1412	8133EC32
-1413	8133EC33
-1414	8133EC34
-1415	8133EC35
-1416	8133EC36
-1417	8133EC37
-1418	8133EC38
-1419	8133EC39
-141A	8133ED30
-141B	8133ED31
-141C	8133ED32
-141D	8133ED33
-141E	8133ED34
-141F	8133ED35
-1420	8133ED36
-1421	8133ED37
-1422	8133ED38
-1423	8133ED39
-1424	8133EE30
-1425	8133EE31
-1426	8133EE32
-1427	8133EE33
-1428	8133EE34
-1429	8133EE35
-142A	8133EE36
-142B	8133EE37
-142C	8133EE38
-142D	8133EE39
-142E	8133EF30
-142F	8133EF31
-1430	8133EF32
-1431	8133EF33
-1432	8133EF34
-1433	8133EF35
-1434	8133EF36
-1435	8133EF37
-1436	8133EF38
-1437	8133EF39
-1438	8133F030
-1439	8133F031
-143A	8133F032
-143B	8133F033
-143C	8133F034
-143D	8133F035
-143E	8133F036
-143F	8133F037
-1440	8133F038
-1441	8133F039
-1442	8133F130
-1443	8133F131
-1444	8133F132
-1445	8133F133
-1446	8133F134
-1447	8133F135
-1448	8133F136
-1449	8133F137
-144A	8133F138
-144B	8133F139
-144C	8133F230
-144D	8133F231
-144E	8133F232
-144F	8133F233
-1450	8133F234
-1451	8133F235
-1452	8133F236
-1453	8133F237
-1454	8133F238
-1455	8133F239
-1456	8133F330
-1457	8133F331
-1458	8133F332
-1459	8133F333
-145A	8133F334
-145B	8133F335
-145C	8133F336
-145D	8133F337
-145E	8133F338
-145F	8133F339
-1460	8133F430
-1461	8133F431
-1462	8133F432
-1463	8133F433
-1464	8133F434
-1465	8133F435
-1466	8133F436
-1467	8133F437
-1468	8133F438
-1469	8133F439
-146A	8133F530
-146B	8133F531
-146C	8133F532
-146D	8133F533
-146E	8133F534
-146F	8133F535
-1470	8133F536
-1471	8133F537
-1472	8133F538
-1473	8133F539
-1474	8133F630
-1475	8133F631
-1476	8133F632
-1477	8133F633
-1478	8133F634
-1479	8133F635
-147A	8133F636
-147B	8133F637
-147C	8133F638
-147D	8133F639
-147E	8133F730
-147F	8133F731
-1480	8133F732
-1481	8133F733
-1482	8133F734
-1483	8133F735
-1484	8133F736
-1485	8133F737
-1486	8133F738
-1487	8133F739
-1488	8133F830
-1489	8133F831
-148A	8133F832
-148B	8133F833
-148C	8133F834
-148D	8133F835
-148E	8133F836
-148F	8133F837
-1490	8133F838
-1491	8133F839
-1492	8133F930
-1493	8133F931
-1494	8133F932
-1495	8133F933
-1496	8133F934
-1497	8133F935
-1498	8133F936
-1499	8133F937
-149A	8133F938
-149B	8133F939
-149C	8133FA30
-149D	8133FA31
-149E	8133FA32
-149F	8133FA33
-14A0	8133FA34
-14A1	8133FA35
-14A2	8133FA36
-14A3	8133FA37
-14A4	8133FA38
-14A5	8133FA39
-14A6	8133FB30
-14A7	8133FB31
-14A8	8133FB32
-14A9	8133FB33
-14AA	8133FB34
-14AB	8133FB35
-14AC	8133FB36
-14AD	8133FB37
-14AE	8133FB38
-14AF	8133FB39
-14B0	8133FC30
-14B1	8133FC31
-14B2	8133FC32
-14B3	8133FC33
-14B4	8133FC34
-14B5	8133FC35
-14B6	8133FC36
-14B7	8133FC37
-14B8	8133FC38
-14B9	8133FC39
-14BA	8133FD30
-14BB	8133FD31
-14BC	8133FD32
-14BD	8133FD33
-14BE	8133FD34
-14BF	8133FD35
-14C0	8133FD36
-14C1	8133FD37
-14C2	8133FD38
-14C3	8133FD39
-14C4	8133FE30
-14C5	8133FE31
-14C6	8133FE32
-14C7	8133FE33
-14C8	8133FE34
-14C9	8133FE35
-14CA	8133FE36
-14CB	8133FE37
-14CC	8133FE38
-14CD	8133FE39
-14CE	81348130
-14CF	81348131
-14D0	81348132
-14D1	81348133
-14D2	81348134
-14D3	81348135
-14D4	81348136
-14D5	81348137
-14D6	81348138
-14D7	81348139
-14D8	81348230
-14D9	81348231
-14DA	81348232
-14DB	81348233
-14DC	81348234
-14DD	81348235
-14DE	81348236
-14DF	81348237
-14E0	81348238
-14E1	81348239
-14E2	81348330
-14E3	81348331
-14E4	81348332
-14E5	81348333
-14E6	81348334
-14E7	81348335
-14E8	81348336
-14E9	81348337
-14EA	81348338
-14EB	81348339
-14EC	81348430
-14ED	81348431
-14EE	81348432
-14EF	81348433
-14F0	81348434
-14F1	81348435
-14F2	81348436
-14F3	81348437
-14F4	81348438
-14F5	81348439
-14F6	81348530
-14F7	81348531
-14F8	81348532
-14F9	81348533
-14FA	81348534
-14FB	81348535
-14FC	81348536
-14FD	81348537
-14FE	81348538
-14FF	81348539
-1500	81348630
-1501	81348631
-1502	81348632
-1503	81348633
-1504	81348634
-1505	81348635
-1506	81348636
-1507	81348637
-1508	81348638
-1509	81348639
-150A	81348730
-150B	81348731
-150C	81348732
-150D	81348733
-150E	81348734
-150F	81348735
-1510	81348736
-1511	81348737
-1512	81348738
-1513	81348739
-1514	81348830
-1515	81348831
-1516	81348832
-1517	81348833
-1518	81348834
-1519	81348835
-151A	81348836
-151B	81348837
-151C	81348838
-151D	81348839
-151E	81348930
-151F	81348931
-1520	81348932
-1521	81348933
-1522	81348934
-1523	81348935
-1524	81348936
-1525	81348937
-1526	81348938
-1527	81348939
-1528	81348A30
-1529	81348A31
-152A	81348A32
-152B	81348A33
-152C	81348A34
-152D	81348A35
-152E	81348A36
-152F	81348A37
-1530	81348A38
-1531	81348A39
-1532	81348B30
-1533	81348B31
-1534	81348B32
-1535	81348B33
-1536	81348B34
-1537	81348B35
-1538	81348B36
-1539	81348B37
-153A	81348B38
-153B	81348B39
-153C	81348C30
-153D	81348C31
-153E	81348C32
-153F	81348C33
-1540	81348C34
-1541	81348C35
-1542	81348C36
-1543	81348C37
-1544	81348C38
-1545	81348C39
-1546	81348D30
-1547	81348D31
-1548	81348D32
-1549	81348D33
-154A	81348D34
-154B	81348D35
-154C	81348D36
-154D	81348D37
-154E	81348D38
-154F	81348D39
-1550	81348E30
-1551	81348E31
-1552	81348E32
-1553	81348E33
-1554	81348E34
-1555	81348E35
-1556	81348E36
-1557	81348E37
-1558	81348E38
-1559	81348E39
-155A	81348F30
-155B	81348F31
-155C	81348F32
-155D	81348F33
-155E	81348F34
-155F	81348F35
-1560	81348F36
-1561	81348F37
-1562	81348F38
-1563	81348F39
-1564	81349030
-1565	81349031
-1566	81349032
-1567	81349033
-1568	81349034
-1569	81349035
-156A	81349036
-156B	81349037
-156C	81349038
-156D	81349039
-156E	81349130
-156F	81349131
-1570	81349132
-1571	81349133
-1572	81349134
-1573	81349135
-1574	81349136
-1575	81349137
-1576	81349138
-1577	81349139
-1578	81349230
-1579	81349231
-157A	81349232
-157B	81349233
-157C	81349234
-157D	81349235
-157E	81349236
-157F	81349237
-1580	81349238
-1581	81349239
-1582	81349330
-1583	81349331
-1584	81349332
-1585	81349333
-1586	81349334
-1587	81349335
-1588	81349336
-1589	81349337
-158A	81349338
-158B	81349339
-158C	81349430
-158D	81349431
-158E	81349432
-158F	81349433
-1590	81349434
-1591	81349435
-1592	81349436
-1593	81349437
-1594	81349438
-1595	81349439
-1596	81349530
-1597	81349531
-1598	81349532
-1599	81349533
-159A	81349534
-159B	81349535
-159C	81349536
-159D	81349537
-159E	81349538
-159F	81349539
-15A0	81349630
-15A1	81349631
-15A2	81349632
-15A3	81349633
-15A4	81349634
-15A5	81349635
-15A6	81349636
-15A7	81349637
-15A8	81349638
-15A9	81349639
-15AA	81349730
-15AB	81349731
-15AC	81349732
-15AD	81349733
-15AE	81349734
-15AF	81349735
-15B0	81349736
-15B1	81349737
-15B2	81349738
-15B3	81349739
-15B4	81349830
-15B5	81349831
-15B6	81349832
-15B7	81349833
-15B8	81349834
-15B9	81349835
-15BA	81349836
-15BB	81349837
-15BC	81349838
-15BD	81349839
-15BE	81349930
-15BF	81349931
-15C0	81349932
-15C1	81349933
-15C2	81349934
-15C3	81349935
-15C4	81349936
-15C5	81349937
-15C6	81349938
-15C7	81349939
-15C8	81349A30
-15C9	81349A31
-15CA	81349A32
-15CB	81349A33
-15CC	81349A34
-15CD	81349A35
-15CE	81349A36
-15CF	81349A37
-15D0	81349A38
-15D1	81349A39
-15D2	81349B30
-15D3	81349B31
-15D4	81349B32
-15D5	81349B33
-15D6	81349B34
-15D7	81349B35
-15D8	81349B36
-15D9	81349B37
-15DA	81349B38
-15DB	81349B39
-15DC	81349C30
-15DD	81349C31
-15DE	81349C32
-15DF	81349C33
-15E0	81349C34
-15E1	81349C35
-15E2	81349C36
-15E3	81349C37
-15E4	81349C38
-15E5	81349C39
-15E6	81349D30
-15E7	81349D31
-15E8	81349D32
-15E9	81349D33
-15EA	81349D34
-15EB	81349D35
-15EC	81349D36
-15ED	81349D37
-15EE	81349D38
-15EF	81349D39
-15F0	81349E30
-15F1	81349E31
-15F2	81349E32
-15F3	81349E33
-15F4	81349E34
-15F5	81349E35
-15F6	81349E36
-15F7	81349E37
-15F8	81349E38
-15F9	81349E39
-15FA	81349F30
-15FB	81349F31
-15FC	81349F32
-15FD	81349F33
-15FE	81349F34
-15FF	81349F35
-1600	81349F36
-1601	81349F37
-1602	81349F38
-1603	81349F39
-1604	8134A030
-1605	8134A031
-1606	8134A032
-1607	8134A033
-1608	8134A034
-1609	8134A035
-160A	8134A036
-160B	8134A037
-160C	8134A038
-160D	8134A039
-160E	8134A130
-160F	8134A131
-1610	8134A132
-1611	8134A133
-1612	8134A134
-1613	8134A135
-1614	8134A136
-1615	8134A137
-1616	8134A138
-1617	8134A139
-1618	8134A230
-1619	8134A231
-161A	8134A232
-161B	8134A233
-161C	8134A234
-161D	8134A235
-161E	8134A236
-161F	8134A237
-1620	8134A238
-1621	8134A239
-1622	8134A330
-1623	8134A331
-1624	8134A332
-1625	8134A333
-1626	8134A334
-1627	8134A335
-1628	8134A336
-1629	8134A337
-162A	8134A338
-162B	8134A339
-162C	8134A430
-162D	8134A431
-162E	8134A432
-162F	8134A433
-1630	8134A434
-1631	8134A435
-1632	8134A436
-1633	8134A437
-1634	8134A438
-1635	8134A439
-1636	8134A530
-1637	8134A531
-1638	8134A532
-1639	8134A533
-163A	8134A534
-163B	8134A535
-163C	8134A536
-163D	8134A537
-163E	8134A538
-163F	8134A539
-1640	8134A630
-1641	8134A631
-1642	8134A632
-1643	8134A633
-1644	8134A634
-1645	8134A635
-1646	8134A636
-1647	8134A637
-1648	8134A638
-1649	8134A639
-164A	8134A730
-164B	8134A731
-164C	8134A732
-164D	8134A733
-164E	8134A734
-164F	8134A735
-1650	8134A736
-1651	8134A737
-1652	8134A738
-1653	8134A739
-1654	8134A830
-1655	8134A831
-1656	8134A832
-1657	8134A833
-1658	8134A834
-1659	8134A835
-165A	8134A836
-165B	8134A837
-165C	8134A838
-165D	8134A839
-165E	8134A930
-165F	8134A931
-1660	8134A932
-1661	8134A933
-1662	8134A934
-1663	8134A935
-1664	8134A936
-1665	8134A937
-1666	8134A938
-1667	8134A939
-1668	8134AA30
-1669	8134AA31
-166A	8134AA32
-166B	8134AA33
-166C	8134AA34
-166D	8134AA35
-166E	8134AA36
-166F	8134AA37
-1670	8134AA38
-1671	8134AA39
-1672	8134AB30
-1673	8134AB31
-1674	8134AB32
-1675	8134AB33
-1676	8134AB34
-1677	8134AB35
-1678	8134AB36
-1679	8134AB37
-167A	8134AB38
-167B	8134AB39
-167C	8134AC30
-167D	8134AC31
-167E	8134AC32
-167F	8134AC33
-1680	8134AC34
-1681	8134AC35
-1682	8134AC36
-1683	8134AC37
-1684	8134AC38
-1685	8134AC39
-1686	8134AD30
-1687	8134AD31
-1688	8134AD32
-1689	8134AD33
-168A	8134AD34
-168B	8134AD35
-168C	8134AD36
-168D	8134AD37
-168E	8134AD38
-168F	8134AD39
-1690	8134AE30
-1691	8134AE31
-1692	8134AE32
-1693	8134AE33
-1694	8134AE34
-1695	8134AE35
-1696	8134AE36
-1697	8134AE37
-1698	8134AE38
-1699	8134AE39
-169A	8134AF30
-169B	8134AF31
-169C	8134AF32
-169D	8134AF33
-169E	8134AF34
-169F	8134AF35
-16A0	8134AF36
-16A1	8134AF37
-16A2	8134AF38
-16A3	8134AF39
-16A4	8134B030
-16A5	8134B031
-16A6	8134B032
-16A7	8134B033
-16A8	8134B034
-16A9	8134B035
-16AA	8134B036
-16AB	8134B037
-16AC	8134B038
-16AD	8134B039
-16AE	8134B130
-16AF	8134B131
-16B0	8134B132
-16B1	8134B133
-16B2	8134B134
-16B3	8134B135
-16B4	8134B136
-16B5	8134B137
-16B6	8134B138
-16B7	8134B139
-16B8	8134B230
-16B9	8134B231
-16BA	8134B232
-16BB	8134B233
-16BC	8134B234
-16BD	8134B235
-16BE	8134B236
-16BF	8134B237
-16C0	8134B238
-16C1	8134B239
-16C2	8134B330
-16C3	8134B331
-16C4	8134B332
-16C5	8134B333
-16C6	8134B334
-16C7	8134B335
-16C8	8134B336
-16C9	8134B337
-16CA	8134B338
-16CB	8134B339
-16CC	8134B430
-16CD	8134B431
-16CE	8134B432
-16CF	8134B433
-16D0	8134B434
-16D1	8134B435
-16D2	8134B436
-16D3	8134B437
-16D4	8134B438
-16D5	8134B439
-16D6	8134B530
-16D7	8134B531
-16D8	8134B532
-16D9	8134B533
-16DA	8134B534
-16DB	8134B535
-16DC	8134B536
-16DD	8134B537
-16DE	8134B538
-16DF	8134B539
-16E0	8134B630
-16E1	8134B631
-16E2	8134B632
-16E3	8134B633
-16E4	8134B634
-16E5	8134B635
-16E6	8134B636
-16E7	8134B637
-16E8	8134B638
-16E9	8134B639
-16EA	8134B730
-16EB	8134B731
-16EC	8134B732
-16ED	8134B733
-16EE	8134B734
-16EF	8134B735
-16F0	8134B736
-16F1	8134B737
-16F2	8134B738
-16F3	8134B739
-16F4	8134B830
-16F5	8134B831
-16F6	8134B832
-16F7	8134B833
-16F8	8134B834
-16F9	8134B835
-16FA	8134B836
-16FB	8134B837
-16FC	8134B838
-16FD	8134B839
-16FE	8134B930
-16FF	8134B931
-1700	8134B932
-1701	8134B933
-1702	8134B934
-1703	8134B935
-1704	8134B936
-1705	8134B937
-1706	8134B938
-1707	8134B939
-1708	8134BA30
-1709	8134BA31
-170A	8134BA32
-170B	8134BA33
-170C	8134BA34
-170D	8134BA35
-170E	8134BA36
-170F	8134BA37
-1710	8134BA38
-1711	8134BA39
-1712	8134BB30
-1713	8134BB31
-1714	8134BB32
-1715	8134BB33
-1716	8134BB34
-1717	8134BB35
-1718	8134BB36
-1719	8134BB37
-171A	8134BB38
-171B	8134BB39
-171C	8134BC30
-171D	8134BC31
-171E	8134BC32
-171F	8134BC33
-1720	8134BC34
-1721	8134BC35
-1722	8134BC36
-1723	8134BC37
-1724	8134BC38
-1725	8134BC39
-1726	8134BD30
-1727	8134BD31
-1728	8134BD32
-1729	8134BD33
-172A	8134BD34
-172B	8134BD35
-172C	8134BD36
-172D	8134BD37
-172E	8134BD38
-172F	8134BD39
-1730	8134BE30
-1731	8134BE31
-1732	8134BE32
-1733	8134BE33
-1734	8134BE34
-1735	8134BE35
-1736	8134BE36
-1737	8134BE37
-1738	8134BE38
-1739	8134BE39
-173A	8134BF30
-173B	8134BF31
-173C	8134BF32
-173D	8134BF33
-173E	8134BF34
-173F	8134BF35
-1740	8134BF36
-1741	8134BF37
-1742	8134BF38
-1743	8134BF39
-1744	8134C030
-1745	8134C031
-1746	8134C032
-1747	8134C033
-1748	8134C034
-1749	8134C035
-174A	8134C036
-174B	8134C037
-174C	8134C038
-174D	8134C039
-174E	8134C130
-174F	8134C131
-1750	8134C132
-1751	8134C133
-1752	8134C134
-1753	8134C135
-1754	8134C136
-1755	8134C137
-1756	8134C138
-1757	8134C139
-1758	8134C230
-1759	8134C231
-175A	8134C232
-175B	8134C233
-175C	8134C234
-175D	8134C235
-175E	8134C236
-175F	8134C237
-1760	8134C238
-1761	8134C239
-1762	8134C330
-1763	8134C331
-1764	8134C332
-1765	8134C333
-1766	8134C334
-1767	8134C335
-1768	8134C336
-1769	8134C337
-176A	8134C338
-176B	8134C339
-176C	8134C430
-176D	8134C431
-176E	8134C432
-176F	8134C433
-1770	8134C434
-1771	8134C435
-1772	8134C436
-1773	8134C437
-1774	8134C438
-1775	8134C439
-1776	8134C530
-1777	8134C531
-1778	8134C532
-1779	8134C533
-177A	8134C534
-177B	8134C535
-177C	8134C536
-177D	8134C537
-177E	8134C538
-177F	8134C539
-1780	8134C630
-1781	8134C631
-1782	8134C632
-1783	8134C633
-1784	8134C634
-1785	8134C635
-1786	8134C636
-1787	8134C637
-1788	8134C638
-1789	8134C639
-178A	8134C730
-178B	8134C731
-178C	8134C732
-178D	8134C733
-178E	8134C734
-178F	8134C735
-1790	8134C736
-1791	8134C737
-1792	8134C738
-1793	8134C739
-1794	8134C830
-1795	8134C831
-1796	8134C832
-1797	8134C833
-1798	8134C834
-1799	8134C835
-179A	8134C836
-179B	8134C837
-179C	8134C838
-179D	8134C839
-179E	8134C930
-179F	8134C931
-17A0	8134C932
-17A1	8134C933
-17A2	8134C934
-17A3	8134C935
-17A4	8134C936
-17A5	8134C937
-17A6	8134C938
-17A7	8134C939
-17A8	8134CA30
-17A9	8134CA31
-17AA	8134CA32
-17AB	8134CA33
-17AC	8134CA34
-17AD	8134CA35
-17AE	8134CA36
-17AF	8134CA37
-17B0	8134CA38
-17B1	8134CA39
-17B2	8134CB30
-17B3	8134CB31
-17B4	8134CB32
-17B5	8134CB33
-17B6	8134CB34
-17B7	8134CB35
-17B8	8134CB36
-17B9	8134CB37
-17BA	8134CB38
-17BB	8134CB39
-17BC	8134CC30
-17BD	8134CC31
-17BE	8134CC32
-17BF	8134CC33
-17C0	8134CC34
-17C1	8134CC35
-17C2	8134CC36
-17C3	8134CC37
-17C4	8134CC38
-17C5	8134CC39
-17C6	8134CD30
-17C7	8134CD31
-17C8	8134CD32
-17C9	8134CD33
-17CA	8134CD34
-17CB	8134CD35
-17CC	8134CD36
-17CD	8134CD37
-17CE	8134CD38
-17CF	8134CD39
-17D0	8134CE30
-17D1	8134CE31
-17D2	8134CE32
-17D3	8134CE33
-17D4	8134CE34
-17D5	8134CE35
-17D6	8134CE36
-17D7	8134CE37
-17D8	8134CE38
-17D9	8134CE39
-17DA	8134CF30
-17DB	8134CF31
-17DC	8134CF32
-17DD	8134CF33
-17DE	8134CF34
-17DF	8134CF35
-17E0	8134CF36
-17E1	8134CF37
-17E2	8134CF38
-17E3	8134CF39
-17E4	8134D030
-17E5	8134D031
-17E6	8134D032
-17E7	8134D033
-17E8	8134D034
-17E9	8134D035
-17EA	8134D036
-17EB	8134D037
-17EC	8134D038
-17ED	8134D039
-17EE	8134D130
-17EF	8134D131
-17F0	8134D132
-17F1	8134D133
-17F2	8134D134
-17F3	8134D135
-17F4	8134D136
-17F5	8134D137
-17F6	8134D138
-17F7	8134D139
-17F8	8134D230
-17F9	8134D231
-17FA	8134D232
-17FB	8134D233
-17FC	8134D234
-17FD	8134D235
-17FE	8134D236
-17FF	8134D237
-1800	8134D238
-1801	8134D239
-1802	8134D330
-1803	8134D331
-1804	8134D332
-1805	8134D333
-1806	8134D334
-1807	8134D335
-1808	8134D336
-1809	8134D337
-180A	8134D338
-180B	8134D339
-180C	8134D430
-180D	8134D431
-180E	8134D432
-180F	8134D433
-1810	8134D434
-1811	8134D435
-1812	8134D436
-1813	8134D437
-1814	8134D438
-1815	8134D439
-1816	8134D530
-1817	8134D531
-1818	8134D532
-1819	8134D533
-181A	8134D534
-181B	8134D535
-181C	8134D536
-181D	8134D537
-181E	8134D538
-181F	8134D539
-1820	8134D630
-1821	8134D631
-1822	8134D632
-1823	8134D633
-1824	8134D634
-1825	8134D635
-1826	8134D636
-1827	8134D637
-1828	8134D638
-1829	8134D639
-182A	8134D730
-182B	8134D731
-182C	8134D732
-182D	8134D733
-182E	8134D734
-182F	8134D735
-1830	8134D736
-1831	8134D737
-1832	8134D738
-1833	8134D739
-1834	8134D830
-1835	8134D831
-1836	8134D832
-1837	8134D833
-1838	8134D834
-1839	8134D835
-183A	8134D836
-183B	8134D837
-183C	8134D838
-183D	8134D839
-183E	8134D930
-183F	8134D931
-1840	8134D932
-1841	8134D933
-1842	8134D934
-1843	8134D935
-1844	8134D936
-1845	8134D937
-1846	8134D938
-1847	8134D939
-1848	8134DA30
-1849	8134DA31
-184A	8134DA32
-184B	8134DA33
-184C	8134DA34
-184D	8134DA35
-184E	8134DA36
-184F	8134DA37
-1850	8134DA38
-1851	8134DA39
-1852	8134DB30
-1853	8134DB31
-1854	8134DB32
-1855	8134DB33
-1856	8134DB34
-1857	8134DB35
-1858	8134DB36
-1859	8134DB37
-185A	8134DB38
-185B	8134DB39
-185C	8134DC30
-185D	8134DC31
-185E	8134DC32
-185F	8134DC33
-1860	8134DC34
-1861	8134DC35
-1862	8134DC36
-1863	8134DC37
-1864	8134DC38
-1865	8134DC39
-1866	8134DD30
-1867	8134DD31
-1868	8134DD32
-1869	8134DD33
-186A	8134DD34
-186B	8134DD35
-186C	8134DD36
-186D	8134DD37
-186E	8134DD38
-186F	8134DD39
-1870	8134DE30
-1871	8134DE31
-1872	8134DE32
-1873	8134DE33
-1874	8134DE34
-1875	8134DE35
-1876	8134DE36
-1877	8134DE37
-1878	8134DE38
-1879	8134DE39
-187A	8134DF30
-187B	8134DF31
-187C	8134DF32
-187D	8134DF33
-187E	8134DF34
-187F	8134DF35
-1880	8134DF36
-1881	8134DF37
-1882	8134DF38
-1883	8134DF39
-1884	8134E030
-1885	8134E031
-1886	8134E032
-1887	8134E033
-1888	8134E034
-1889	8134E035
-188A	8134E036
-188B	8134E037
-188C	8134E038
-188D	8134E039
-188E	8134E130
-188F	8134E131
-1890	8134E132
-1891	8134E133
-1892	8134E134
-1893	8134E135
-1894	8134E136
-1895	8134E137
-1896	8134E138
-1897	8134E139
-1898	8134E230
-1899	8134E231
-189A	8134E232
-189B	8134E233
-189C	8134E234
-189D	8134E235
-189E	8134E236
-189F	8134E237
-18A0	8134E238
-18A1	8134E239
-18A2	8134E330
-18A3	8134E331
-18A4	8134E332
-18A5	8134E333
-18A6	8134E334
-18A7	8134E335
-18A8	8134E336
-18A9	8134E337
-18AA	8134E338
-18AB	8134E339
-18AC	8134E430
-18AD	8134E431
-18AE	8134E432
-18AF	8134E433
-18B0	8134E434
-18B1	8134E435
-18B2	8134E436
-18B3	8134E437
-18B4	8134E438
-18B5	8134E439
-18B6	8134E530
-18B7	8134E531
-18B8	8134E532
-18B9	8134E533
-18BA	8134E534
-18BB	8134E535
-18BC	8134E536
-18BD	8134E537
-18BE	8134E538
-18BF	8134E539
-18C0	8134E630
-18C1	8134E631
-18C2	8134E632
-18C3	8134E633
-18C4	8134E634
-18C5	8134E635
-18C6	8134E636
-18C7	8134E637
-18C8	8134E638
-18C9	8134E639
-18CA	8134E730
-18CB	8134E731
-18CC	8134E732
-18CD	8134E733
-18CE	8134E734
-18CF	8134E735
-18D0	8134E736
-18D1	8134E737
-18D2	8134E738
-18D3	8134E739
-18D4	8134E830
-18D5	8134E831
-18D6	8134E832
-18D7	8134E833
-18D8	8134E834
-18D9	8134E835
-18DA	8134E836
-18DB	8134E837
-18DC	8134E838
-18DD	8134E839
-18DE	8134E930
-18DF	8134E931
-18E0	8134E932
-18E1	8134E933
-18E2	8134E934
-18E3	8134E935
-18E4	8134E936
-18E5	8134E937
-18E6	8134E938
-18E7	8134E939
-18E8	8134EA30
-18E9	8134EA31
-18EA	8134EA32
-18EB	8134EA33
-18EC	8134EA34
-18ED	8134EA35
-18EE	8134EA36
-18EF	8134EA37
-18F0	8134EA38
-18F1	8134EA39
-18F2	8134EB30
-18F3	8134EB31
-18F4	8134EB32
-18F5	8134EB33
-18F6	8134EB34
-18F7	8134EB35
-18F8	8134EB36
-18F9	8134EB37
-18FA	8134EB38
-18FB	8134EB39
-18FC	8134EC30
-18FD	8134EC31
-18FE	8134EC32
-18FF	8134EC33
-1900	8134EC34
-1901	8134EC35
-1902	8134EC36
-1903	8134EC37
-1904	8134EC38
-1905	8134EC39
-1906	8134ED30
-1907	8134ED31
-1908	8134ED32
-1909	8134ED33
-190A	8134ED34
-190B	8134ED35
-190C	8134ED36
-190D	8134ED37
-190E	8134ED38
-190F	8134ED39
-1910	8134EE30
-1911	8134EE31
-1912	8134EE32
-1913	8134EE33
-1914	8134EE34
-1915	8134EE35
-1916	8134EE36
-1917	8134EE37
-1918	8134EE38
-1919	8134EE39
-191A	8134EF30
-191B	8134EF31
-191C	8134EF32
-191D	8134EF33
-191E	8134EF34
-191F	8134EF35
-1920	8134EF36
-1921	8134EF37
-1922	8134EF38
-1923	8134EF39
-1924	8134F030
-1925	8134F031
-1926	8134F032
-1927	8134F033
-1928	8134F034
-1929	8134F035
-192A	8134F036
-192B	8134F037
-192C	8134F038
-192D	8134F039
-192E	8134F130
-192F	8134F131
-1930	8134F132
-1931	8134F133
-1932	8134F134
-1933	8134F135
-1934	8134F136
-1935	8134F137
-1936	8134F138
-1937	8134F139
-1938	8134F230
-1939	8134F231
-193A	8134F232
-193B	8134F233
-193C	8134F234
-193D	8134F235
-193E	8134F236
-193F	8134F237
-1940	8134F238
-1941	8134F239
-1942	8134F330
-1943	8134F331
-1944	8134F332
-1945	8134F333
-1946	8134F334
-1947	8134F335
-1948	8134F336
-1949	8134F337
-194A	8134F338
-194B	8134F339
-194C	8134F430
-194D	8134F431
-194E	8134F432
-194F	8134F433
-1950	8134F434
-1951	8134F435
-1952	8134F436
-1953	8134F437
-1954	8134F438
-1955	8134F439
-1956	8134F530
-1957	8134F531
-1958	8134F532
-1959	8134F533
-195A	8134F534
-195B	8134F535
-195C	8134F536
-195D	8134F537
-195E	8134F538
-195F	8134F539
-1960	8134F630
-1961	8134F631
-1962	8134F632
-1963	8134F633
-1964	8134F634
-1965	8134F635
-1966	8134F636
-1967	8134F637
-1968	8134F638
-1969	8134F639
-196A	8134F730
-196B	8134F731
-196C	8134F732
-196D	8134F733
-196E	8134F734
-196F	8134F735
-1970	8134F736
-1971	8134F737
-1972	8134F738
-1973	8134F739
-1974	8134F830
-1975	8134F831
-1976	8134F832
-1977	8134F833
-1978	8134F834
-1979	8134F835
-197A	8134F836
-197B	8134F837
-197C	8134F838
-197D	8134F839
-197E	8134F930
-197F	8134F931
-1980	8134F932
-1981	8134F933
-1982	8134F934
-1983	8134F935
-1984	8134F936
-1985	8134F937
-1986	8134F938
-1987	8134F939
-1988	8134FA30
-1989	8134FA31
-198A	8134FA32
-198B	8134FA33
-198C	8134FA34
-198D	8134FA35
-198E	8134FA36
-198F	8134FA37
-1990	8134FA38
-1991	8134FA39
-1992	8134FB30
-1993	8134FB31
-1994	8134FB32
-1995	8134FB33
-1996	8134FB34
-1997	8134FB35
-1998	8134FB36
-1999	8134FB37
-199A	8134FB38
-199B	8134FB39
-199C	8134FC30
-199D	8134FC31
-199E	8134FC32
-199F	8134FC33
-19A0	8134FC34
-19A1	8134FC35
-19A2	8134FC36
-19A3	8134FC37
-19A4	8134FC38
-19A5	8134FC39
-19A6	8134FD30
-19A7	8134FD31
-19A8	8134FD32
-19A9	8134FD33
-19AA	8134FD34
-19AB	8134FD35
-19AC	8134FD36
-19AD	8134FD37
-19AE	8134FD38
-19AF	8134FD39
-19B0	8134FE30
-19B1	8134FE31
-19B2	8134FE32
-19B3	8134FE33
-19B4	8134FE34
-19B5	8134FE35
-19B6	8134FE36
-19B7	8134FE37
-19B8	8134FE38
-19B9	8134FE39
-19BA	81358130
-19BB	81358131
-19BC	81358132
-19BD	81358133
-19BE	81358134
-19BF	81358135
-19C0	81358136
-19C1	81358137
-19C2	81358138
-19C3	81358139
-19C4	81358230
-19C5	81358231
-19C6	81358232
-19C7	81358233
-19C8	81358234
-19C9	81358235
-19CA	81358236
-19CB	81358237
-19CC	81358238
-19CD	81358239
-19CE	81358330
-19CF	81358331
-19D0	81358332
-19D1	81358333
-19D2	81358334
-19D3	81358335
-19D4	81358336
-19D5	81358337
-19D6	81358338
-19D7	81358339
-19D8	81358430
-19D9	81358431
-19DA	81358432
-19DB	81358433
-19DC	81358434
-19DD	81358435
-19DE	81358436
-19DF	81358437
-19E0	81358438
-19E1	81358439
-19E2	81358530
-19E3	81358531
-19E4	81358532
-19E5	81358533
-19E6	81358534
-19E7	81358535
-19E8	81358536
-19E9	81358537
-19EA	81358538
-19EB	81358539
-19EC	81358630
-19ED	81358631
-19EE	81358632
-19EF	81358633
-19F0	81358634
-19F1	81358635
-19F2	81358636
-19F3	81358637
-19F4	81358638
-19F5	81358639
-19F6	81358730
-19F7	81358731
-19F8	81358732
-19F9	81358733
-19FA	81358734
-19FB	81358735
-19FC	81358736
-19FD	81358737
-19FE	81358738
-19FF	81358739
-1A00	81358830
-1A01	81358831
-1A02	81358832
-1A03	81358833
-1A04	81358834
-1A05	81358835
-1A06	81358836
-1A07	81358837
-1A08	81358838
-1A09	81358839
-1A0A	81358930
-1A0B	81358931
-1A0C	81358932
-1A0D	81358933
-1A0E	81358934
-1A0F	81358935
-1A10	81358936
-1A11	81358937
-1A12	81358938
-1A13	81358939
-1A14	81358A30
-1A15	81358A31
-1A16	81358A32
-1A17	81358A33
-1A18	81358A34
-1A19	81358A35
-1A1A	81358A36
-1A1B	81358A37
-1A1C	81358A38
-1A1D	81358A39
-1A1E	81358B30
-1A1F	81358B31
-1A20	81358B32
-1A21	81358B33
-1A22	81358B34
-1A23	81358B35
-1A24	81358B36
-1A25	81358B37
-1A26	81358B38
-1A27	81358B39
-1A28	81358C30
-1A29	81358C31
-1A2A	81358C32
-1A2B	81358C33
-1A2C	81358C34
-1A2D	81358C35
-1A2E	81358C36
-1A2F	81358C37
-1A30	81358C38
-1A31	81358C39
-1A32	81358D30
-1A33	81358D31
-1A34	81358D32
-1A35	81358D33
-1A36	81358D34
-1A37	81358D35
-1A38	81358D36
-1A39	81358D37
-1A3A	81358D38
-1A3B	81358D39
-1A3C	81358E30
-1A3D	81358E31
-1A3E	81358E32
-1A3F	81358E33
-1A40	81358E34
-1A41	81358E35
-1A42	81358E36
-1A43	81358E37
-1A44	81358E38
-1A45	81358E39
-1A46	81358F30
-1A47	81358F31
-1A48	81358F32
-1A49	81358F33
-1A4A	81358F34
-1A4B	81358F35
-1A4C	81358F36
-1A4D	81358F37
-1A4E	81358F38
-1A4F	81358F39
-1A50	81359030
-1A51	81359031
-1A52	81359032
-1A53	81359033
-1A54	81359034
-1A55	81359035
-1A56	81359036
-1A57	81359037
-1A58	81359038
-1A59	81359039
-1A5A	81359130
-1A5B	81359131
-1A5C	81359132
-1A5D	81359133
-1A5E	81359134
-1A5F	81359135
-1A60	81359136
-1A61	81359137
-1A62	81359138
-1A63	81359139
-1A64	81359230
-1A65	81359231
-1A66	81359232
-1A67	81359233
-1A68	81359234
-1A69	81359235
-1A6A	81359236
-1A6B	81359237
-1A6C	81359238
-1A6D	81359239
-1A6E	81359330
-1A6F	81359331
-1A70	81359332
-1A71	81359333
-1A72	81359334
-1A73	81359335
-1A74	81359336
-1A75	81359337
-1A76	81359338
-1A77	81359339
-1A78	81359430
-1A79	81359431
-1A7A	81359432
-1A7B	81359433
-1A7C	81359434
-1A7D	81359435
-1A7E	81359436
-1A7F	81359437
-1A80	81359438
-1A81	81359439
-1A82	81359530
-1A83	81359531
-1A84	81359532
-1A85	81359533
-1A86	81359534
-1A87	81359535
-1A88	81359536
-1A89	81359537
-1A8A	81359538
-1A8B	81359539
-1A8C	81359630
-1A8D	81359631
-1A8E	81359632
-1A8F	81359633
-1A90	81359634
-1A91	81359635
-1A92	81359636
-1A93	81359637
-1A94	81359638
-1A95	81359639
-1A96	81359730
-1A97	81359731
-1A98	81359732
-1A99	81359733
-1A9A	81359734
-1A9B	81359735
-1A9C	81359736
-1A9D	81359737
-1A9E	81359738
-1A9F	81359739
-1AA0	81359830
-1AA1	81359831
-1AA2	81359832
-1AA3	81359833
-1AA4	81359834
-1AA5	81359835
-1AA6	81359836
-1AA7	81359837
-1AA8	81359838
-1AA9	81359839
-1AAA	81359930
-1AAB	81359931
-1AAC	81359932
-1AAD	81359933
-1AAE	81359934
-1AAF	81359935
-1AB0	81359936
-1AB1	81359937
-1AB2	81359938
-1AB3	81359939
-1AB4	81359A30
-1AB5	81359A31
-1AB6	81359A32
-1AB7	81359A33
-1AB8	81359A34
-1AB9	81359A35
-1ABA	81359A36
-1ABB	81359A37
-1ABC	81359A38
-1ABD	81359A39
-1ABE	81359B30
-1ABF	81359B31
-1AC0	81359B32
-1AC1	81359B33
-1AC2	81359B34
-1AC3	81359B35
-1AC4	81359B36
-1AC5	81359B37
-1AC6	81359B38
-1AC7	81359B39
-1AC8	81359C30
-1AC9	81359C31
-1ACA	81359C32
-1ACB	81359C33
-1ACC	81359C34
-1ACD	81359C35
-1ACE	81359C36
-1ACF	81359C37
-1AD0	81359C38
-1AD1	81359C39
-1AD2	81359D30
-1AD3	81359D31
-1AD4	81359D32
-1AD5	81359D33
-1AD6	81359D34
-1AD7	81359D35
-1AD8	81359D36
-1AD9	81359D37
-1ADA	81359D38
-1ADB	81359D39
-1ADC	81359E30
-1ADD	81359E31
-1ADE	81359E32
-1ADF	81359E33
-1AE0	81359E34
-1AE1	81359E35
-1AE2	81359E36
-1AE3	81359E37
-1AE4	81359E38
-1AE5	81359E39
-1AE6	81359F30
-1AE7	81359F31
-1AE8	81359F32
-1AE9	81359F33
-1AEA	81359F34
-1AEB	81359F35
-1AEC	81359F36
-1AED	81359F37
-1AEE	81359F38
-1AEF	81359F39
-1AF0	8135A030
-1AF1	8135A031
-1AF2	8135A032
-1AF3	8135A033
-1AF4	8135A034
-1AF5	8135A035
-1AF6	8135A036
-1AF7	8135A037
-1AF8	8135A038
-1AF9	8135A039
-1AFA	8135A130
-1AFB	8135A131
-1AFC	8135A132
-1AFD	8135A133
-1AFE	8135A134
-1AFF	8135A135
-1B00	8135A136
-1B01	8135A137
-1B02	8135A138
-1B03	8135A139
-1B04	8135A230
-1B05	8135A231
-1B06	8135A232
-1B07	8135A233
-1B08	8135A234
-1B09	8135A235
-1B0A	8135A236
-1B0B	8135A237
-1B0C	8135A238
-1B0D	8135A239
-1B0E	8135A330
-1B0F	8135A331
-1B10	8135A332
-1B11	8135A333
-1B12	8135A334
-1B13	8135A335
-1B14	8135A336
-1B15	8135A337
-1B16	8135A338
-1B17	8135A339
-1B18	8135A430
-1B19	8135A431
-1B1A	8135A432
-1B1B	8135A433
-1B1C	8135A434
-1B1D	8135A435
-1B1E	8135A436
-1B1F	8135A437
-1B20	8135A438
-1B21	8135A439
-1B22	8135A530
-1B23	8135A531
-1B24	8135A532
-1B25	8135A533
-1B26	8135A534
-1B27	8135A535
-1B28	8135A536
-1B29	8135A537
-1B2A	8135A538
-1B2B	8135A539
-1B2C	8135A630
-1B2D	8135A631
-1B2E	8135A632
-1B2F	8135A633
-1B30	8135A634
-1B31	8135A635
-1B32	8135A636
-1B33	8135A637
-1B34	8135A638
-1B35	8135A639
-1B36	8135A730
-1B37	8135A731
-1B38	8135A732
-1B39	8135A733
-1B3A	8135A734
-1B3B	8135A735
-1B3C	8135A736
-1B3D	8135A737
-1B3E	8135A738
-1B3F	8135A739
-1B40	8135A830
-1B41	8135A831
-1B42	8135A832
-1B43	8135A833
-1B44	8135A834
-1B45	8135A835
-1B46	8135A836
-1B47	8135A837
-1B48	8135A838
-1B49	8135A839
-1B4A	8135A930
-1B4B	8135A931
-1B4C	8135A932
-1B4D	8135A933
-1B4E	8135A934
-1B4F	8135A935
-1B50	8135A936
-1B51	8135A937
-1B52	8135A938
-1B53	8135A939
-1B54	8135AA30
-1B55	8135AA31
-1B56	8135AA32
-1B57	8135AA33
-1B58	8135AA34
-1B59	8135AA35
-1B5A	8135AA36
-1B5B	8135AA37
-1B5C	8135AA38
-1B5D	8135AA39
-1B5E	8135AB30
-1B5F	8135AB31
-1B60	8135AB32
-1B61	8135AB33
-1B62	8135AB34
-1B63	8135AB35
-1B64	8135AB36
-1B65	8135AB37
-1B66	8135AB38
-1B67	8135AB39
-1B68	8135AC30
-1B69	8135AC31
-1B6A	8135AC32
-1B6B	8135AC33
-1B6C	8135AC34
-1B6D	8135AC35
-1B6E	8135AC36
-1B6F	8135AC37
-1B70	8135AC38
-1B71	8135AC39
-1B72	8135AD30
-1B73	8135AD31
-1B74	8135AD32
-1B75	8135AD33
-1B76	8135AD34
-1B77	8135AD35
-1B78	8135AD36
-1B79	8135AD37
-1B7A	8135AD38
-1B7B	8135AD39
-1B7C	8135AE30
-1B7D	8135AE31
-1B7E	8135AE32
-1B7F	8135AE33
-1B80	8135AE34
-1B81	8135AE35
-1B82	8135AE36
-1B83	8135AE37
-1B84	8135AE38
-1B85	8135AE39
-1B86	8135AF30
-1B87	8135AF31
-1B88	8135AF32
-1B89	8135AF33
-1B8A	8135AF34
-1B8B	8135AF35
-1B8C	8135AF36
-1B8D	8135AF37
-1B8E	8135AF38
-1B8F	8135AF39
-1B90	8135B030
-1B91	8135B031
-1B92	8135B032
-1B93	8135B033
-1B94	8135B034
-1B95	8135B035
-1B96	8135B036
-1B97	8135B037
-1B98	8135B038
-1B99	8135B039
-1B9A	8135B130
-1B9B	8135B131
-1B9C	8135B132
-1B9D	8135B133
-1B9E	8135B134
-1B9F	8135B135
-1BA0	8135B136
-1BA1	8135B137
-1BA2	8135B138
-1BA3	8135B139
-1BA4	8135B230
-1BA5	8135B231
-1BA6	8135B232
-1BA7	8135B233
-1BA8	8135B234
-1BA9	8135B235
-1BAA	8135B236
-1BAB	8135B237
-1BAC	8135B238
-1BAD	8135B239
-1BAE	8135B330
-1BAF	8135B331
-1BB0	8135B332
-1BB1	8135B333
-1BB2	8135B334
-1BB3	8135B335
-1BB4	8135B336
-1BB5	8135B337
-1BB6	8135B338
-1BB7	8135B339
-1BB8	8135B430
-1BB9	8135B431
-1BBA	8135B432
-1BBB	8135B433
-1BBC	8135B434
-1BBD	8135B435
-1BBE	8135B436
-1BBF	8135B437
-1BC0	8135B438
-1BC1	8135B439
-1BC2	8135B530
-1BC3	8135B531
-1BC4	8135B532
-1BC5	8135B533
-1BC6	8135B534
-1BC7	8135B535
-1BC8	8135B536
-1BC9	8135B537
-1BCA	8135B538
-1BCB	8135B539
-1BCC	8135B630
-1BCD	8135B631
-1BCE	8135B632
-1BCF	8135B633
-1BD0	8135B634
-1BD1	8135B635
-1BD2	8135B636
-1BD3	8135B637
-1BD4	8135B638
-1BD5	8135B639
-1BD6	8135B730
-1BD7	8135B731
-1BD8	8135B732
-1BD9	8135B733
-1BDA	8135B734
-1BDB	8135B735
-1BDC	8135B736
-1BDD	8135B737
-1BDE	8135B738
-1BDF	8135B739
-1BE0	8135B830
-1BE1	8135B831
-1BE2	8135B832
-1BE3	8135B833
-1BE4	8135B834
-1BE5	8135B835
-1BE6	8135B836
-1BE7	8135B837
-1BE8	8135B838
-1BE9	8135B839
-1BEA	8135B930
-1BEB	8135B931
-1BEC	8135B932
-1BED	8135B933
-1BEE	8135B934
-1BEF	8135B935
-1BF0	8135B936
-1BF1	8135B937
-1BF2	8135B938
-1BF3	8135B939
-1BF4	8135BA30
-1BF5	8135BA31
-1BF6	8135BA32
-1BF7	8135BA33
-1BF8	8135BA34
-1BF9	8135BA35
-1BFA	8135BA36
-1BFB	8135BA37
-1BFC	8135BA38
-1BFD	8135BA39
-1BFE	8135BB30
-1BFF	8135BB31
-1C00	8135BB32
-1C01	8135BB33
-1C02	8135BB34
-1C03	8135BB35
-1C04	8135BB36
-1C05	8135BB37
-1C06	8135BB38
-1C07	8135BB39
-1C08	8135BC30
-1C09	8135BC31
-1C0A	8135BC32
-1C0B	8135BC33
-1C0C	8135BC34
-1C0D	8135BC35
-1C0E	8135BC36
-1C0F	8135BC37
-1C10	8135BC38
-1C11	8135BC39
-1C12	8135BD30
-1C13	8135BD31
-1C14	8135BD32
-1C15	8135BD33
-1C16	8135BD34
-1C17	8135BD35
-1C18	8135BD36
-1C19	8135BD37
-1C1A	8135BD38
-1C1B	8135BD39
-1C1C	8135BE30
-1C1D	8135BE31
-1C1E	8135BE32
-1C1F	8135BE33
-1C20	8135BE34
-1C21	8135BE35
-1C22	8135BE36
-1C23	8135BE37
-1C24	8135BE38
-1C25	8135BE39
-1C26	8135BF30
-1C27	8135BF31
-1C28	8135BF32
-1C29	8135BF33
-1C2A	8135BF34
-1C2B	8135BF35
-1C2C	8135BF36
-1C2D	8135BF37
-1C2E	8135BF38
-1C2F	8135BF39
-1C30	8135C030
-1C31	8135C031
-1C32	8135C032
-1C33	8135C033
-1C34	8135C034
-1C35	8135C035
-1C36	8135C036
-1C37	8135C037
-1C38	8135C038
-1C39	8135C039
-1C3A	8135C130
-1C3B	8135C131
-1C3C	8135C132
-1C3D	8135C133
-1C3E	8135C134
-1C3F	8135C135
-1C40	8135C136
-1C41	8135C137
-1C42	8135C138
-1C43	8135C139
-1C44	8135C230
-1C45	8135C231
-1C46	8135C232
-1C47	8135C233
-1C48	8135C234
-1C49	8135C235
-1C4A	8135C236
-1C4B	8135C237
-1C4C	8135C238
-1C4D	8135C239
-1C4E	8135C330
-1C4F	8135C331
-1C50	8135C332
-1C51	8135C333
-1C52	8135C334
-1C53	8135C335
-1C54	8135C336
-1C55	8135C337
-1C56	8135C338
-1C57	8135C339
-1C58	8135C430
-1C59	8135C431
-1C5A	8135C432
-1C5B	8135C433
-1C5C	8135C434
-1C5D	8135C435
-1C5E	8135C436
-1C5F	8135C437
-1C60	8135C438
-1C61	8135C439
-1C62	8135C530
-1C63	8135C531
-1C64	8135C532
-1C65	8135C533
-1C66	8135C534
-1C67	8135C535
-1C68	8135C536
-1C69	8135C537
-1C6A	8135C538
-1C6B	8135C539
-1C6C	8135C630
-1C6D	8135C631
-1C6E	8135C632
-1C6F	8135C633
-1C70	8135C634
-1C71	8135C635
-1C72	8135C636
-1C73	8135C637
-1C74	8135C638
-1C75	8135C639
-1C76	8135C730
-1C77	8135C731
-1C78	8135C732
-1C79	8135C733
-1C7A	8135C734
-1C7B	8135C735
-1C7C	8135C736
-1C7D	8135C737
-1C7E	8135C738
-1C7F	8135C739
-1C80	8135C830
-1C81	8135C831
-1C82	8135C832
-1C83	8135C833
-1C84	8135C834
-1C85	8135C835
-1C86	8135C836
-1C87	8135C837
-1C88	8135C838
-1C89	8135C839
-1C8A	8135C930
-1C8B	8135C931
-1C8C	8135C932
-1C8D	8135C933
-1C8E	8135C934
-1C8F	8135C935
-1C90	8135C936
-1C91	8135C937
-1C92	8135C938
-1C93	8135C939
-1C94	8135CA30
-1C95	8135CA31
-1C96	8135CA32
-1C97	8135CA33
-1C98	8135CA34
-1C99	8135CA35
-1C9A	8135CA36
-1C9B	8135CA37
-1C9C	8135CA38
-1C9D	8135CA39
-1C9E	8135CB30
-1C9F	8135CB31
-1CA0	8135CB32
-1CA1	8135CB33
-1CA2	8135CB34
-1CA3	8135CB35
-1CA4	8135CB36
-1CA5	8135CB37
-1CA6	8135CB38
-1CA7	8135CB39
-1CA8	8135CC30
-1CA9	8135CC31
-1CAA	8135CC32
-1CAB	8135CC33
-1CAC	8135CC34
-1CAD	8135CC35
-1CAE	8135CC36
-1CAF	8135CC37
-1CB0	8135CC38
-1CB1	8135CC39
-1CB2	8135CD30
-1CB3	8135CD31
-1CB4	8135CD32
-1CB5	8135CD33
-1CB6	8135CD34
-1CB7	8135CD35
-1CB8	8135CD36
-1CB9	8135CD37
-1CBA	8135CD38
-1CBB	8135CD39
-1CBC	8135CE30
-1CBD	8135CE31
-1CBE	8135CE32
-1CBF	8135CE33
-1CC0	8135CE34
-1CC1	8135CE35
-1CC2	8135CE36
-1CC3	8135CE37
-1CC4	8135CE38
-1CC5	8135CE39
-1CC6	8135CF30
-1CC7	8135CF31
-1CC8	8135CF32
-1CC9	8135CF33
-1CCA	8135CF34
-1CCB	8135CF35
-1CCC	8135CF36
-1CCD	8135CF37
-1CCE	8135CF38
-1CCF	8135CF39
-1CD0	8135D030
-1CD1	8135D031
-1CD2	8135D032
-1CD3	8135D033
-1CD4	8135D034
-1CD5	8135D035
-1CD6	8135D036
-1CD7	8135D037
-1CD8	8135D038
-1CD9	8135D039
-1CDA	8135D130
-1CDB	8135D131
-1CDC	8135D132
-1CDD	8135D133
-1CDE	8135D134
-1CDF	8135D135
-1CE0	8135D136
-1CE1	8135D137
-1CE2	8135D138
-1CE3	8135D139
-1CE4	8135D230
-1CE5	8135D231
-1CE6	8135D232
-1CE7	8135D233
-1CE8	8135D234
-1CE9	8135D235
-1CEA	8135D236
-1CEB	8135D237
-1CEC	8135D238
-1CED	8135D239
-1CEE	8135D330
-1CEF	8135D331
-1CF0	8135D332
-1CF1	8135D333
-1CF2	8135D334
-1CF3	8135D335
-1CF4	8135D336
-1CF5	8135D337
-1CF6	8135D338
-1CF7	8135D339
-1CF8	8135D430
-1CF9	8135D431
-1CFA	8135D432
-1CFB	8135D433
-1CFC	8135D434
-1CFD	8135D435
-1CFE	8135D436
-1CFF	8135D437
-1D00	8135D438
-1D01	8135D439
-1D02	8135D530
-1D03	8135D531
-1D04	8135D532
-1D05	8135D533
-1D06	8135D534
-1D07	8135D535
-1D08	8135D536
-1D09	8135D537
-1D0A	8135D538
-1D0B	8135D539
-1D0C	8135D630
-1D0D	8135D631
-1D0E	8135D632
-1D0F	8135D633
-1D10	8135D634
-1D11	8135D635
-1D12	8135D636
-1D13	8135D637
-1D14	8135D638
-1D15	8135D639
-1D16	8135D730
-1D17	8135D731
-1D18	8135D732
-1D19	8135D733
-1D1A	8135D734
-1D1B	8135D735
-1D1C	8135D736
-1D1D	8135D737
-1D1E	8135D738
-1D1F	8135D739
-1D20	8135D830
-1D21	8135D831
-1D22	8135D832
-1D23	8135D833
-1D24	8135D834
-1D25	8135D835
-1D26	8135D836
-1D27	8135D837
-1D28	8135D838
-1D29	8135D839
-1D2A	8135D930
-1D2B	8135D931
-1D2C	8135D932
-1D2D	8135D933
-1D2E	8135D934
-1D2F	8135D935
-1D30	8135D936
-1D31	8135D937
-1D32	8135D938
-1D33	8135D939
-1D34	8135DA30
-1D35	8135DA31
-1D36	8135DA32
-1D37	8135DA33
-1D38	8135DA34
-1D39	8135DA35
-1D3A	8135DA36
-1D3B	8135DA37
-1D3C	8135DA38
-1D3D	8135DA39
-1D3E	8135DB30
-1D3F	8135DB31
-1D40	8135DB32
-1D41	8135DB33
-1D42	8135DB34
-1D43	8135DB35
-1D44	8135DB36
-1D45	8135DB37
-1D46	8135DB38
-1D47	8135DB39
-1D48	8135DC30
-1D49	8135DC31
-1D4A	8135DC32
-1D4B	8135DC33
-1D4C	8135DC34
-1D4D	8135DC35
-1D4E	8135DC36
-1D4F	8135DC37
-1D50	8135DC38
-1D51	8135DC39
-1D52	8135DD30
-1D53	8135DD31
-1D54	8135DD32
-1D55	8135DD33
-1D56	8135DD34
-1D57	8135DD35
-1D58	8135DD36
-1D59	8135DD37
-1D5A	8135DD38
-1D5B	8135DD39
-1D5C	8135DE30
-1D5D	8135DE31
-1D5E	8135DE32
-1D5F	8135DE33
-1D60	8135DE34
-1D61	8135DE35
-1D62	8135DE36
-1D63	8135DE37
-1D64	8135DE38
-1D65	8135DE39
-1D66	8135DF30
-1D67	8135DF31
-1D68	8135DF32
-1D69	8135DF33
-1D6A	8135DF34
-1D6B	8135DF35
-1D6C	8135DF36
-1D6D	8135DF37
-1D6E	8135DF38
-1D6F	8135DF39
-1D70	8135E030
-1D71	8135E031
-1D72	8135E032
-1D73	8135E033
-1D74	8135E034
-1D75	8135E035
-1D76	8135E036
-1D77	8135E037
-1D78	8135E038
-1D79	8135E039
-1D7A	8135E130
-1D7B	8135E131
-1D7C	8135E132
-1D7D	8135E133
-1D7E	8135E134
-1D7F	8135E135
-1D80	8135E136
-1D81	8135E137
-1D82	8135E138
-1D83	8135E139
-1D84	8135E230
-1D85	8135E231
-1D86	8135E232
-1D87	8135E233
-1D88	8135E234
-1D89	8135E235
-1D8A	8135E236
-1D8B	8135E237
-1D8C	8135E238
-1D8D	8135E239
-1D8E	8135E330
-1D8F	8135E331
-1D90	8135E332
-1D91	8135E333
-1D92	8135E334
-1D93	8135E335
-1D94	8135E336
-1D95	8135E337
-1D96	8135E338
-1D97	8135E339
-1D98	8135E430
-1D99	8135E431
-1D9A	8135E432
-1D9B	8135E433
-1D9C	8135E434
-1D9D	8135E435
-1D9E	8135E436
-1D9F	8135E437
-1DA0	8135E438
-1DA1	8135E439
-1DA2	8135E530
-1DA3	8135E531
-1DA4	8135E532
-1DA5	8135E533
-1DA6	8135E534
-1DA7	8135E535
-1DA8	8135E536
-1DA9	8135E537
-1DAA	8135E538
-1DAB	8135E539
-1DAC	8135E630
-1DAD	8135E631
-1DAE	8135E632
-1DAF	8135E633
-1DB0	8135E634
-1DB1	8135E635
-1DB2	8135E636
-1DB3	8135E637
-1DB4	8135E638
-1DB5	8135E639
-1DB6	8135E730
-1DB7	8135E731
-1DB8	8135E732
-1DB9	8135E733
-1DBA	8135E734
-1DBB	8135E735
-1DBC	8135E736
-1DBD	8135E737
-1DBE	8135E738
-1DBF	8135E739
-1DC0	8135E830
-1DC1	8135E831
-1DC2	8135E832
-1DC3	8135E833
-1DC4	8135E834
-1DC5	8135E835
-1DC6	8135E836
-1DC7	8135E837
-1DC8	8135E838
-1DC9	8135E839
-1DCA	8135E930
-1DCB	8135E931
-1DCC	8135E932
-1DCD	8135E933
-1DCE	8135E934
-1DCF	8135E935
-1DD0	8135E936
-1DD1	8135E937
-1DD2	8135E938
-1DD3	8135E939
-1DD4	8135EA30
-1DD5	8135EA31
-1DD6	8135EA32
-1DD7	8135EA33
-1DD8	8135EA34
-1DD9	8135EA35
-1DDA	8135EA36
-1DDB	8135EA37
-1DDC	8135EA38
-1DDD	8135EA39
-1DDE	8135EB30
-1DDF	8135EB31
-1DE0	8135EB32
-1DE1	8135EB33
-1DE2	8135EB34
-1DE3	8135EB35
-1DE4	8135EB36
-1DE5	8135EB37
-1DE6	8135EB38
-1DE7	8135EB39
-1DE8	8135EC30
-1DE9	8135EC31
-1DEA	8135EC32
-1DEB	8135EC33
-1DEC	8135EC34
-1DED	8135EC35
-1DEE	8135EC36
-1DEF	8135EC37
-1DF0	8135EC38
-1DF1	8135EC39
-1DF2	8135ED30
-1DF3	8135ED31
-1DF4	8135ED32
-1DF5	8135ED33
-1DF6	8135ED34
-1DF7	8135ED35
-1DF8	8135ED36
-1DF9	8135ED37
-1DFA	8135ED38
-1DFB	8135ED39
-1DFC	8135EE30
-1DFD	8135EE31
-1DFE	8135EE32
-1DFF	8135EE33
-1E00	8135EE34
-1E01	8135EE35
-1E02	8135EE36
-1E03	8135EE37
-1E04	8135EE38
-1E05	8135EE39
-1E06	8135EF30
-1E07	8135EF31
-1E08	8135EF32
-1E09	8135EF33
-1E0A	8135EF34
-1E0B	8135EF35
-1E0C	8135EF36
-1E0D	8135EF37
-1E0E	8135EF38
-1E0F	8135EF39
-1E10	8135F030
-1E11	8135F031
-1E12	8135F032
-1E13	8135F033
-1E14	8135F034
-1E15	8135F035
-1E16	8135F036
-1E17	8135F037
-1E18	8135F038
-1E19	8135F039
-1E1A	8135F130
-1E1B	8135F131
-1E1C	8135F132
-1E1D	8135F133
-1E1E	8135F134
-1E1F	8135F135
-1E20	8135F136
-1E21	8135F137
-1E22	8135F138
-1E23	8135F139
-1E24	8135F230
-1E25	8135F231
-1E26	8135F232
-1E27	8135F233
-1E28	8135F234
-1E29	8135F235
-1E2A	8135F236
-1E2B	8135F237
-1E2C	8135F238
-1E2D	8135F239
-1E2E	8135F330
-1E2F	8135F331
-1E30	8135F332
-1E31	8135F333
-1E32	8135F334
-1E33	8135F335
-1E34	8135F336
-1E35	8135F337
-1E36	8135F338
-1E37	8135F339
-1E38	8135F430
-1E39	8135F431
-1E3A	8135F432
-1E3B	8135F433
-1E3C	8135F434
-1E3D	8135F435
-1E3E	8135F436
-1E3F	8135F437
-1E40	8135F438
-1E41	8135F439
-1E42	8135F530
-1E43	8135F531
-1E44	8135F532
-1E45	8135F533
-1E46	8135F534
-1E47	8135F535
-1E48	8135F536
-1E49	8135F537
-1E4A	8135F538
-1E4B	8135F539
-1E4C	8135F630
-1E4D	8135F631
-1E4E	8135F632
-1E4F	8135F633
-1E50	8135F634
-1E51	8135F635
-1E52	8135F636
-1E53	8135F637
-1E54	8135F638
-1E55	8135F639
-1E56	8135F730
-1E57	8135F731
-1E58	8135F732
-1E59	8135F733
-1E5A	8135F734
-1E5B	8135F735
-1E5C	8135F736
-1E5D	8135F737
-1E5E	8135F738
-1E5F	8135F739
-1E60	8135F830
-1E61	8135F831
-1E62	8135F832
-1E63	8135F833
-1E64	8135F834
-1E65	8135F835
-1E66	8135F836
-1E67	8135F837
-1E68	8135F838
-1E69	8135F839
-1E6A	8135F930
-1E6B	8135F931
-1E6C	8135F932
-1E6D	8135F933
-1E6E	8135F934
-1E6F	8135F935
-1E70	8135F936
-1E71	8135F937
-1E72	8135F938
-1E73	8135F939
-1E74	8135FA30
-1E75	8135FA31
-1E76	8135FA32
-1E77	8135FA33
-1E78	8135FA34
-1E79	8135FA35
-1E7A	8135FA36
-1E7B	8135FA37
-1E7C	8135FA38
-1E7D	8135FA39
-1E7E	8135FB30
-1E7F	8135FB31
-1E80	8135FB32
-1E81	8135FB33
-1E82	8135FB34
-1E83	8135FB35
-1E84	8135FB36
-1E85	8135FB37
-1E86	8135FB38
-1E87	8135FB39
-1E88	8135FC30
-1E89	8135FC31
-1E8A	8135FC32
-1E8B	8135FC33
-1E8C	8135FC34
-1E8D	8135FC35
-1E8E	8135FC36
-1E8F	8135FC37
-1E90	8135FC38
-1E91	8135FC39
-1E92	8135FD30
-1E93	8135FD31
-1E94	8135FD32
-1E95	8135FD33
-1E96	8135FD34
-1E97	8135FD35
-1E98	8135FD36
-1E99	8135FD37
-1E9A	8135FD38
-1E9B	8135FD39
-1E9C	8135FE30
-1E9D	8135FE31
-1E9E	8135FE32
-1E9F	8135FE33
-1EA0	8135FE34
-1EA1	8135FE35
-1EA2	8135FE36
-1EA3	8135FE37
-1EA4	8135FE38
-1EA5	8135FE39
-1EA6	81368130
-1EA7	81368131
-1EA8	81368132
-1EA9	81368133
-1EAA	81368134
-1EAB	81368135
-1EAC	81368136
-1EAD	81368137
-1EAE	81368138
-1EAF	81368139
-1EB0	81368230
-1EB1	81368231
-1EB2	81368232
-1EB3	81368233
-1EB4	81368234
-1EB5	81368235
-1EB6	81368236
-1EB7	81368237
-1EB8	81368238
-1EB9	81368239
-1EBA	81368330
-1EBB	81368331
-1EBC	81368332
-1EBD	81368333
-1EBE	81368334
-1EBF	81368335
-1EC0	81368336
-1EC1	81368337
-1EC2	81368338
-1EC3	81368339
-1EC4	81368430
-1EC5	81368431
-1EC6	81368432
-1EC7	81368433
-1EC8	81368434
-1EC9	81368435
-1ECA	81368436
-1ECB	81368437
-1ECC	81368438
-1ECD	81368439
-1ECE	81368530
-1ECF	81368531
-1ED0	81368532
-1ED1	81368533
-1ED2	81368534
-1ED3	81368535
-1ED4	81368536
-1ED5	81368537
-1ED6	81368538
-1ED7	81368539
-1ED8	81368630
-1ED9	81368631
-1EDA	81368632
-1EDB	81368633
-1EDC	81368634
-1EDD	81368635
-1EDE	81368636
-1EDF	81368637
-1EE0	81368638
-1EE1	81368639
-1EE2	81368730
-1EE3	81368731
-1EE4	81368732
-1EE5	81368733
-1EE6	81368734
-1EE7	81368735
-1EE8	81368736
-1EE9	81368737
-1EEA	81368738
-1EEB	81368739
-1EEC	81368830
-1EED	81368831
-1EEE	81368832
-1EEF	81368833
-1EF0	81368834
-1EF1	81368835
-1EF2	81368836
-1EF3	81368837
-1EF4	81368838
-1EF5	81368839
-1EF6	81368930
-1EF7	81368931
-1EF8	81368932
-1EF9	81368933
-1EFA	81368934
-1EFB	81368935
-1EFC	81368936
-1EFD	81368937
-1EFE	81368938
-1EFF	81368939
-1F00	81368A30
-1F01	81368A31
-1F02	81368A32
-1F03	81368A33
-1F04	81368A34
-1F05	81368A35
-1F06	81368A36
-1F07	81368A37
-1F08	81368A38
-1F09	81368A39
-1F0A	81368B30
-1F0B	81368B31
-1F0C	81368B32
-1F0D	81368B33
-1F0E	81368B34
-1F0F	81368B35
-1F10	81368B36
-1F11	81368B37
-1F12	81368B38
-1F13	81368B39
-1F14	81368C30
-1F15	81368C31
-1F16	81368C32
-1F17	81368C33
-1F18	81368C34
-1F19	81368C35
-1F1A	81368C36
-1F1B	81368C37
-1F1C	81368C38
-1F1D	81368C39
-1F1E	81368D30
-1F1F	81368D31
-1F20	81368D32
-1F21	81368D33
-1F22	81368D34
-1F23	81368D35
-1F24	81368D36
-1F25	81368D37
-1F26	81368D38
-1F27	81368D39
-1F28	81368E30
-1F29	81368E31
-1F2A	81368E32
-1F2B	81368E33
-1F2C	81368E34
-1F2D	81368E35
-1F2E	81368E36
-1F2F	81368E37
-1F30	81368E38
-1F31	81368E39
-1F32	81368F30
-1F33	81368F31
-1F34	81368F32
-1F35	81368F33
-1F36	81368F34
-1F37	81368F35
-1F38	81368F36
-1F39	81368F37
-1F3A	81368F38
-1F3B	81368F39
-1F3C	81369030
-1F3D	81369031
-1F3E	81369032
-1F3F	81369033
-1F40	81369034
-1F41	81369035
-1F42	81369036
-1F43	81369037
-1F44	81369038
-1F45	81369039
-1F46	81369130
-1F47	81369131
-1F48	81369132
-1F49	81369133
-1F4A	81369134
-1F4B	81369135
-1F4C	81369136
-1F4D	81369137
-1F4E	81369138
-1F4F	81369139
-1F50	81369230
-1F51	81369231
-1F52	81369232
-1F53	81369233
-1F54	81369234
-1F55	81369235
-1F56	81369236
-1F57	81369237
-1F58	81369238
-1F59	81369239
-1F5A	81369330
-1F5B	81369331
-1F5C	81369332
-1F5D	81369333
-1F5E	81369334
-1F5F	81369335
-1F60	81369336
-1F61	81369337
-1F62	81369338
-1F63	81369339
-1F64	81369430
-1F65	81369431
-1F66	81369432
-1F67	81369433
-1F68	81369434
-1F69	81369435
-1F6A	81369436
-1F6B	81369437
-1F6C	81369438
-1F6D	81369439
-1F6E	81369530
-1F6F	81369531
-1F70	81369532
-1F71	81369533
-1F72	81369534
-1F73	81369535
-1F74	81369536
-1F75	81369537
-1F76	81369538
-1F77	81369539
-1F78	81369630
-1F79	81369631
-1F7A	81369632
-1F7B	81369633
-1F7C	81369634
-1F7D	81369635
-1F7E	81369636
-1F7F	81369637
-1F80	81369638
-1F81	81369639
-1F82	81369730
-1F83	81369731
-1F84	81369732
-1F85	81369733
-1F86	81369734
-1F87	81369735
-1F88	81369736
-1F89	81369737
-1F8A	81369738
-1F8B	81369739
-1F8C	81369830
-1F8D	81369831
-1F8E	81369832
-1F8F	81369833
-1F90	81369834
-1F91	81369835
-1F92	81369836
-1F93	81369837
-1F94	81369838
-1F95	81369839
-1F96	81369930
-1F97	81369931
-1F98	81369932
-1F99	81369933
-1F9A	81369934
-1F9B	81369935
-1F9C	81369936
-1F9D	81369937
-1F9E	81369938
-1F9F	81369939
-1FA0	81369A30
-1FA1	81369A31
-1FA2	81369A32
-1FA3	81369A33
-1FA4	81369A34
-1FA5	81369A35
-1FA6	81369A36
-1FA7	81369A37
-1FA8	81369A38
-1FA9	81369A39
-1FAA	81369B30
-1FAB	81369B31
-1FAC	81369B32
-1FAD	81369B33
-1FAE	81369B34
-1FAF	81369B35
-1FB0	81369B36
-1FB1	81369B37
-1FB2	81369B38
-1FB3	81369B39
-1FB4	81369C30
-1FB5	81369C31
-1FB6	81369C32
-1FB7	81369C33
-1FB8	81369C34
-1FB9	81369C35
-1FBA	81369C36
-1FBB	81369C37
-1FBC	81369C38
-1FBD	81369C39
-1FBE	81369D30
-1FBF	81369D31
-1FC0	81369D32
-1FC1	81369D33
-1FC2	81369D34
-1FC3	81369D35
-1FC4	81369D36
-1FC5	81369D37
-1FC6	81369D38
-1FC7	81369D39
-1FC8	81369E30
-1FC9	81369E31
-1FCA	81369E32
-1FCB	81369E33
-1FCC	81369E34
-1FCD	81369E35
-1FCE	81369E36
-1FCF	81369E37
-1FD0	81369E38
-1FD1	81369E39
-1FD2	81369F30
-1FD3	81369F31
-1FD4	81369F32
-1FD5	81369F33
-1FD6	81369F34
-1FD7	81369F35
-1FD8	81369F36
-1FD9	81369F37
-1FDA	81369F38
-1FDB	81369F39
-1FDC	8136A030
-1FDD	8136A031
-1FDE	8136A032
-1FDF	8136A033
-1FE0	8136A034
-1FE1	8136A035
-1FE2	8136A036
-1FE3	8136A037
-1FE4	8136A038
-1FE5	8136A039
-1FE6	8136A130
-1FE7	8136A131
-1FE8	8136A132
-1FE9	8136A133
-1FEA	8136A134
-1FEB	8136A135
-1FEC	8136A136
-1FED	8136A137
-1FEE	8136A138
-1FEF	8136A139
-1FF0	8136A230
-1FF1	8136A231
-1FF2	8136A232
-1FF3	8136A233
-1FF4	8136A234
-1FF5	8136A235
-1FF6	8136A236
-1FF7	8136A237
-1FF8	8136A238
-1FF9	8136A239
-1FFA	8136A330
-1FFB	8136A331
-1FFC	8136A332
-1FFD	8136A333
-1FFE	8136A334
-1FFF	8136A335
-2000	8136A336
-2001	8136A337
-2002	8136A338
-2003	8136A339
-2004	8136A430
-2005	8136A431
-2006	8136A432
-2007	8136A433
-2008	8136A434
-2009	8136A435
-200A	8136A436
-200B	8136A437
-200C	8136A438
-200D	8136A439
-200E	8136A530
-200F	8136A531
-2010	A95C
-2011	8136A532
-2012	8136A533
-2013	A843
-2014	A1AA
-2015	A844
-2016	A1AC
-2017	8136A534
-2018	A1AE
-2019	A1AF
-201A	8136A535
-201B	8136A536
-201C	A1B0
-201D	A1B1
-201E	8136A537
-201F	8136A538
-2020	8136A539
-2021	8136A630
-2022	8136A631
-2023	8136A632
-2024	8136A633
-2025	A845
-2026	A1AD
-2027	8136A634
-2028	8136A635
-2029	8136A636
-202A	8136A637
-202B	8136A638
-202C	8136A639
-202D	8136A730
-202E	8136A731
-202F	8136A732
-2030	A1EB
-2031	8136A733
-2032	A1E4
-2033	A1E5
-2034	8136A734
-2035	A846
-2036	8136A735
-2037	8136A736
-2038	8136A737
-2039	8136A738
-203A	8136A739
-203B	A1F9
-203C	8136A830
-203D	8136A831
-203E	8136A832
-203F	8136A833
-2040	8136A834
-2041	8136A835
-2042	8136A836
-2043	8136A837
-2044	8136A838
-2045	8136A839
-2046	8136A930
-2047	8136A931
-2048	8136A932
-2049	8136A933
-204A	8136A934
-204B	8136A935
-204C	8136A936
-204D	8136A937
-204E	8136A938
-204F	8136A939
-2050	8136AA30
-2051	8136AA31
-2052	8136AA32
-2053	8136AA33
-2054	8136AA34
-2055	8136AA35
-2056	8136AA36
-2057	8136AA37
-2058	8136AA38
-2059	8136AA39
-205A	8136AB30
-205B	8136AB31
-205C	8136AB32
-205D	8136AB33
-205E	8136AB34
-205F	8136AB35
-2060	8136AB36
-2061	8136AB37
-2062	8136AB38
-2063	8136AB39
-2064	8136AC30
-2065	8136AC31
-2066	8136AC32
-2067	8136AC33
-2068	8136AC34
-2069	8136AC35
-206A	8136AC36
-206B	8136AC37
-206C	8136AC38
-206D	8136AC39
-206E	8136AD30
-206F	8136AD31
-2070	8136AD32
-2071	8136AD33
-2072	8136AD34
-2073	8136AD35
-2074	8136AD36
-2075	8136AD37
-2076	8136AD38
-2077	8136AD39
-2078	8136AE30
-2079	8136AE31
-207A	8136AE32
-207B	8136AE33
-207C	8136AE34
-207D	8136AE35
-207E	8136AE36
-207F	8136AE37
-2080	8136AE38
-2081	8136AE39
-2082	8136AF30
-2083	8136AF31
-2084	8136AF32
-2085	8136AF33
-2086	8136AF34
-2087	8136AF35
-2088	8136AF36
-2089	8136AF37
-208A	8136AF38
-208B	8136AF39
-208C	8136B030
-208D	8136B031
-208E	8136B032
-208F	8136B033
-2090	8136B034
-2091	8136B035
-2092	8136B036
-2093	8136B037
-2094	8136B038
-2095	8136B039
-2096	8136B130
-2097	8136B131
-2098	8136B132
-2099	8136B133
-209A	8136B134
-209B	8136B135
-209C	8136B136
-209D	8136B137
-209E	8136B138
-209F	8136B139
-20A0	8136B230
-20A1	8136B231
-20A2	8136B232
-20A3	8136B233
-20A4	8136B234
-20A5	8136B235
-20A6	8136B236
-20A7	8136B237
-20A8	8136B238
-20A9	8136B239
-20AA	8136B330
-20AB	8136B331
-20AC	A2E3
-20AD	8136B332
-20AE	8136B333
-20AF	8136B334
-20B0	8136B335
-20B1	8136B336
-20B2	8136B337
-20B3	8136B338
-20B4	8136B339
-20B5	8136B430
-20B6	8136B431
-20B7	8136B432
-20B8	8136B433
-20B9	8136B434
-20BA	8136B435
-20BB	8136B436
-20BC	8136B437
-20BD	8136B438
-20BE	8136B439
-20BF	8136B530
-20C0	8136B531
-20C1	8136B532
-20C2	8136B533
-20C3	8136B534
-20C4	8136B535
-20C5	8136B536
-20C6	8136B537
-20C7	8136B538
-20C8	8136B539
-20C9	8136B630
-20CA	8136B631
-20CB	8136B632
-20CC	8136B633
-20CD	8136B634
-20CE	8136B635
-20CF	8136B636
-20D0	8136B637
-20D1	8136B638
-20D2	8136B639
-20D3	8136B730
-20D4	8136B731
-20D5	8136B732
-20D6	8136B733
-20D7	8136B734
-20D8	8136B735
-20D9	8136B736
-20DA	8136B737
-20DB	8136B738
-20DC	8136B739
-20DD	8136B830
-20DE	8136B831
-20DF	8136B832
-20E0	8136B833
-20E1	8136B834
-20E2	8136B835
-20E3	8136B836
-20E4	8136B837
-20E5	8136B838
-20E6	8136B839
-20E7	8136B930
-20E8	8136B931
-20E9	8136B932
-20EA	8136B933
-20EB	8136B934
-20EC	8136B935
-20ED	8136B936
-20EE	8136B937
-20EF	8136B938
-20F0	8136B939
-20F1	8136BA30
-20F2	8136BA31
-20F3	8136BA32
-20F4	8136BA33
-20F5	8136BA34
-20F6	8136BA35
-20F7	8136BA36
-20F8	8136BA37
-20F9	8136BA38
-20FA	8136BA39
-20FB	8136BB30
-20FC	8136BB31
-20FD	8136BB32
-20FE	8136BB33
-20FF	8136BB34
-2100	8136BB35
-2101	8136BB36
-2102	8136BB37
-2103	A1E6
-2104	8136BB38
-2105	A847
-2106	8136BB39
-2107	8136BC30
-2108	8136BC31
-2109	A848
-210A	8136BC32
-210B	8136BC33
-210C	8136BC34
-210D	8136BC35
-210E	8136BC36
-210F	8136BC37
-2110	8136BC38
-2111	8136BC39
-2112	8136BD30
-2113	8136BD31
-2114	8136BD32
-2115	8136BD33
-2116	A1ED
-2117	8136BD34
-2118	8136BD35
-2119	8136BD36
-211A	8136BD37
-211B	8136BD38
-211C	8136BD39
-211D	8136BE30
-211E	8136BE31
-211F	8136BE32
-2120	8136BE33
-2121	A959
-2122	8136BE34
-2123	8136BE35
-2124	8136BE36
-2125	8136BE37
-2126	8136BE38
-2127	8136BE39
-2128	8136BF30
-2129	8136BF31
-212A	8136BF32
-212B	8136BF33
-212C	8136BF34
-212D	8136BF35
-212E	8136BF36
-212F	8136BF37
-2130	8136BF38
-2131	8136BF39
-2132	8136C030
-2133	8136C031
-2134	8136C032
-2135	8136C033
-2136	8136C034
-2137	8136C035
-2138	8136C036
-2139	8136C037
-213A	8136C038
-213B	8136C039
-213C	8136C130
-213D	8136C131
-213E	8136C132
-213F	8136C133
-2140	8136C134
-2141	8136C135
-2142	8136C136
-2143	8136C137
-2144	8136C138
-2145	8136C139
-2146	8136C230
-2147	8136C231
-2148	8136C232
-2149	8136C233
-214A	8136C234
-214B	8136C235
-214C	8136C236
-214D	8136C237
-214E	8136C238
-214F	8136C239
-2150	8136C330
-2151	8136C331
-2152	8136C332
-2153	8136C333
-2154	8136C334
-2155	8136C335
-2156	8136C336
-2157	8136C337
-2158	8136C338
-2159	8136C339
-215A	8136C430
-215B	8136C431
-215C	8136C432
-215D	8136C433
-215E	8136C434
-215F	8136C435
-2160	A2F1
-2161	A2F2
-2162	A2F3
-2163	A2F4
-2164	A2F5
-2165	A2F6
-2166	A2F7
-2167	A2F8
-2168	A2F9
-2169	A2FA
-216A	A2FB
-216B	A2FC
-216C	8136C436
-216D	8136C437
-216E	8136C438
-216F	8136C439
-2170	A2A1
-2171	A2A2
-2172	A2A3
-2173	A2A4
-2174	A2A5
-2175	A2A6
-2176	A2A7
-2177	A2A8
-2178	A2A9
-2179	A2AA
-217A	8136C530
-217B	8136C531
-217C	8136C532
-217D	8136C533
-217E	8136C534
-217F	8136C535
-2180	8136C536
-2181	8136C537
-2182	8136C538
-2183	8136C539
-2184	8136C630
-2185	8136C631
-2186	8136C632
-2187	8136C633
-2188	8136C634
-2189	8136C635
-218A	8136C636
-218B	8136C637
-218C	8136C638
-218D	8136C639
-218E	8136C730
-218F	8136C731
-2190	A1FB
-2191	A1FC
-2192	A1FA
-2193	A1FD
-2194	8136C732
-2195	8136C733
-2196	A849
-2197	A84A
-2198	A84B
-2199	A84C
-219A	8136C734
-219B	8136C735
-219C	8136C736
-219D	8136C737
-219E	8136C738
-219F	8136C739
-21A0	8136C830
-21A1	8136C831
-21A2	8136C832
-21A3	8136C833
-21A4	8136C834
-21A5	8136C835
-21A6	8136C836
-21A7	8136C837
-21A8	8136C838
-21A9	8136C839
-21AA	8136C930
-21AB	8136C931
-21AC	8136C932
-21AD	8136C933
-21AE	8136C934
-21AF	8136C935
-21B0	8136C936
-21B1	8136C937
-21B2	8136C938
-21B3	8136C939
-21B4	8136CA30
-21B5	8136CA31
-21B6	8136CA32
-21B7	8136CA33
-21B8	8136CA34
-21B9	8136CA35
-21BA	8136CA36
-21BB	8136CA37
-21BC	8136CA38
-21BD	8136CA39
-21BE	8136CB30
-21BF	8136CB31
-21C0	8136CB32
-21C1	8136CB33
-21C2	8136CB34
-21C3	8136CB35
-21C4	8136CB36
-21C5	8136CB37
-21C6	8136CB38
-21C7	8136CB39
-21C8	8136CC30
-21C9	8136CC31
-21CA	8136CC32
-21CB	8136CC33
-21CC	8136CC34
-21CD	8136CC35
-21CE	8136CC36
-21CF	8136CC37
-21D0	8136CC38
-21D1	8136CC39
-21D2	8136CD30
-21D3	8136CD31
-21D4	8136CD32
-21D5	8136CD33
-21D6	8136CD34
-21D7	8136CD35
-21D8	8136CD36
-21D9	8136CD37
-21DA	8136CD38
-21DB	8136CD39
-21DC	8136CE30
-21DD	8136CE31
-21DE	8136CE32
-21DF	8136CE33
-21E0	8136CE34
-21E1	8136CE35
-21E2	8136CE36
-21E3	8136CE37
-21E4	8136CE38
-21E5	8136CE39
-21E6	8136CF30
-21E7	8136CF31
-21E8	8136CF32
-21E9	8136CF33
-21EA	8136CF34
-21EB	8136CF35
-21EC	8136CF36
-21ED	8136CF37
-21EE	8136CF38
-21EF	8136CF39
-21F0	8136D030
-21F1	8136D031
-21F2	8136D032
-21F3	8136D033
-21F4	8136D034
-21F5	8136D035
-21F6	8136D036
-21F7	8136D037
-21F8	8136D038
-21F9	8136D039
-21FA	8136D130
-21FB	8136D131
-21FC	8136D132
-21FD	8136D133
-21FE	8136D134
-21FF	8136D135
-2200	8136D136
-2201	8136D137
-2202	8136D138
-2203	8136D139
-2204	8136D230
-2205	8136D231
-2206	8136D232
-2207	8136D233
-2208	A1CA
-2209	8136D234
-220A	8136D235
-220B	8136D236
-220C	8136D237
-220D	8136D238
-220E	8136D239
-220F	A1C7
-2210	8136D330
-2211	A1C6
-2212	8136D331
-2213	8136D332
-2214	8136D333
-2215	A84D
-2216	8136D334
-2217	8136D335
-2218	8136D336
-2219	8136D337
-221A	A1CC
-221B	8136D338
-221C	8136D339
-221D	A1D8
-221E	A1DE
-221F	A84E
-2220	A1CF
-2221	8136D430
-2222	8136D431
-2223	A84F
-2224	8136D432
-2225	A1CE
-2226	8136D433
-2227	A1C4
-2228	A1C5
-2229	A1C9
-222A	A1C8
-222B	A1D2
-222C	8136D434
-222D	8136D435
-222E	A1D3
-222F	8136D436
-2230	8136D437
-2231	8136D438
-2232	8136D439
-2233	8136D530
-2234	A1E0
-2235	A1DF
-2236	A1C3
-2237	A1CB
-2238	8136D531
-2239	8136D532
-223A	8136D533
-223B	8136D534
-223C	8136D535
-223D	A1D7
-223E	8136D536
-223F	8136D537
-2240	8136D538
-2241	8136D539
-2242	8136D630
-2243	8136D631
-2244	8136D632
-2245	8136D633
-2246	8136D634
-2247	8136D635
-2248	A1D6
-2249	8136D636
-224A	8136D637
-224B	8136D638
-224C	A1D5
-224D	8136D639
-224E	8136D730
-224F	8136D731
-2250	8136D732
-2251	8136D733
-2252	A850
-2253	8136D734
-2254	8136D735
-2255	8136D736
-2256	8136D737
-2257	8136D738
-2258	8136D739
-2259	8136D830
-225A	8136D831
-225B	8136D832
-225C	8136D833
-225D	8136D834
-225E	8136D835
-225F	8136D836
-2260	A1D9
-2261	A1D4
-2262	8136D837
-2263	8136D838
-2264	A1DC
-2265	A1DD
-2266	A851
-2267	A852
-2268	8136D839
-2269	8136D930
-226A	8136D931
-226B	8136D932
-226C	8136D933
-226D	8136D934
-226E	A1DA
-226F	A1DB
-2270	8136D935
-2271	8136D936
-2272	8136D937
-2273	8136D938
-2274	8136D939
-2275	8136DA30
-2276	8136DA31
-2277	8136DA32
-2278	8136DA33
-2279	8136DA34
-227A	8136DA35
-227B	8136DA36
-227C	8136DA37
-227D	8136DA38
-227E	8136DA39
-227F	8136DB30
-2280	8136DB31
-2281	8136DB32
-2282	8136DB33
-2283	8136DB34
-2284	8136DB35
-2285	8136DB36
-2286	8136DB37
-2287	8136DB38
-2288	8136DB39
-2289	8136DC30
-228A	8136DC31
-228B	8136DC32
-228C	8136DC33
-228D	8136DC34
-228E	8136DC35
-228F	8136DC36
-2290	8136DC37
-2291	8136DC38
-2292	8136DC39
-2293	8136DD30
-2294	8136DD31
-2295	A892
-2296	8136DD32
-2297	8136DD33
-2298	8136DD34
-2299	A1D1
-229A	8136DD35
-229B	8136DD36
-229C	8136DD37
-229D	8136DD38
-229E	8136DD39
-229F	8136DE30
-22A0	8136DE31
-22A1	8136DE32
-22A2	8136DE33
-22A3	8136DE34
-22A4	8136DE35
-22A5	A1CD
-22A6	8136DE36
-22A7	8136DE37
-22A8	8136DE38
-22A9	8136DE39
-22AA	8136DF30
-22AB	8136DF31
-22AC	8136DF32
-22AD	8136DF33
-22AE	8136DF34
-22AF	8136DF35
-22B0	8136DF36
-22B1	8136DF37
-22B2	8136DF38
-22B3	8136DF39
-22B4	8136E030
-22B5	8136E031
-22B6	8136E032
-22B7	8136E033
-22B8	8136E034
-22B9	8136E035
-22BA	8136E036
-22BB	8136E037
-22BC	8136E038
-22BD	8136E039
-22BE	8136E130
-22BF	A853
-22C0	8136E131
-22C1	8136E132
-22C2	8136E133
-22C3	8136E134
-22C4	8136E135
-22C5	8136E136
-22C6	8136E137
-22C7	8136E138
-22C8	8136E139
-22C9	8136E230
-22CA	8136E231
-22CB	8136E232
-22CC	8136E233
-22CD	8136E234
-22CE	8136E235
-22CF	8136E236
-22D0	8136E237
-22D1	8136E238
-22D2	8136E239
-22D3	8136E330
-22D4	8136E331
-22D5	8136E332
-22D6	8136E333
-22D7	8136E334
-22D8	8136E335
-22D9	8136E336
-22DA	8136E337
-22DB	8136E338
-22DC	8136E339
-22DD	8136E430
-22DE	8136E431
-22DF	8136E432
-22E0	8136E433
-22E1	8136E434
-22E2	8136E435
-22E3	8136E436
-22E4	8136E437
-22E5	8136E438
-22E6	8136E439
-22E7	8136E530
-22E8	8136E531
-22E9	8136E532
-22EA	8136E533
-22EB	8136E534
-22EC	8136E535
-22ED	8136E536
-22EE	8136E537
-22EF	8136E538
-22F0	8136E539
-22F1	8136E630
-22F2	8136E631
-22F3	8136E632
-22F4	8136E633
-22F5	8136E634
-22F6	8136E635
-22F7	8136E636
-22F8	8136E637
-22F9	8136E638
-22FA	8136E639
-22FB	8136E730
-22FC	8136E731
-22FD	8136E732
-22FE	8136E733
-22FF	8136E734
-2300	8136E735
-2301	8136E736
-2302	8136E737
-2303	8136E738
-2304	8136E739
-2305	8136E830
-2306	8136E831
-2307	8136E832
-2308	8136E833
-2309	8136E834
-230A	8136E835
-230B	8136E836
-230C	8136E837
-230D	8136E838
-230E	8136E839
-230F	8136E930
-2310	8136E931
-2311	8136E932
-2312	A1D0
-2313	8136E933
-2314	8136E934
-2315	8136E935
-2316	8136E936
-2317	8136E937
-2318	8136E938
-2319	8136E939
-231A	8136EA30
-231B	8136EA31
-231C	8136EA32
-231D	8136EA33
-231E	8136EA34
-231F	8136EA35
-2320	8136EA36
-2321	8136EA37
-2322	8136EA38
-2323	8136EA39
-2324	8136EB30
-2325	8136EB31
-2326	8136EB32
-2327	8136EB33
-2328	8136EB34
-2329	8136EB35
-232A	8136EB36
-232B	8136EB37
-232C	8136EB38
-232D	8136EB39
-232E	8136EC30
-232F	8136EC31
-2330	8136EC32
-2331	8136EC33
-2332	8136EC34
-2333	8136EC35
-2334	8136EC36
-2335	8136EC37
-2336	8136EC38
-2337	8136EC39
-2338	8136ED30
-2339	8136ED31
-233A	8136ED32
-233B	8136ED33
-233C	8136ED34
-233D	8136ED35
-233E	8136ED36
-233F	8136ED37
-2340	8136ED38
-2341	8136ED39
-2342	8136EE30
-2343	8136EE31
-2344	8136EE32
-2345	8136EE33
-2346	8136EE34
-2347	8136EE35
-2348	8136EE36
-2349	8136EE37
-234A	8136EE38
-234B	8136EE39
-234C	8136EF30
-234D	8136EF31
-234E	8136EF32
-234F	8136EF33
-2350	8136EF34
-2351	8136EF35
-2352	8136EF36
-2353	8136EF37
-2354	8136EF38
-2355	8136EF39
-2356	8136F030
-2357	8136F031
-2358	8136F032
-2359	8136F033
-235A	8136F034
-235B	8136F035
-235C	8136F036
-235D	8136F037
-235E	8136F038
-235F	8136F039
-2360	8136F130
-2361	8136F131
-2362	8136F132
-2363	8136F133
-2364	8136F134
-2365	8136F135
-2366	8136F136
-2367	8136F137
-2368	8136F138
-2369	8136F139
-236A	8136F230
-236B	8136F231
-236C	8136F232
-236D	8136F233
-236E	8136F234
-236F	8136F235
-2370	8136F236
-2371	8136F237
-2372	8136F238
-2373	8136F239
-2374	8136F330
-2375	8136F331
-2376	8136F332
-2377	8136F333
-2378	8136F334
-2379	8136F335
-237A	8136F336
-237B	8136F337
-237C	8136F338
-237D	8136F339
-237E	8136F430
-237F	8136F431
-2380	8136F432
-2381	8136F433
-2382	8136F434
-2383	8136F435
-2384	8136F436
-2385	8136F437
-2386	8136F438
-2387	8136F439
-2388	8136F530
-2389	8136F531
-238A	8136F532
-238B	8136F533
-238C	8136F534
-238D	8136F535
-238E	8136F536
-238F	8136F537
-2390	8136F538
-2391	8136F539
-2392	8136F630
-2393	8136F631
-2394	8136F632
-2395	8136F633
-2396	8136F634
-2397	8136F635
-2398	8136F636
-2399	8136F637
-239A	8136F638
-239B	8136F639
-239C	8136F730
-239D	8136F731
-239E	8136F732
-239F	8136F733
-23A0	8136F734
-23A1	8136F735
-23A2	8136F736
-23A3	8136F737
-23A4	8136F738
-23A5	8136F739
-23A6	8136F830
-23A7	8136F831
-23A8	8136F832
-23A9	8136F833
-23AA	8136F834
-23AB	8136F835
-23AC	8136F836
-23AD	8136F837
-23AE	8136F838
-23AF	8136F839
-23B0	8136F930
-23B1	8136F931
-23B2	8136F932
-23B3	8136F933
-23B4	8136F934
-23B5	8136F935
-23B6	8136F936
-23B7	8136F937
-23B8	8136F938
-23B9	8136F939
-23BA	8136FA30
-23BB	8136FA31
-23BC	8136FA32
-23BD	8136FA33
-23BE	8136FA34
-23BF	8136FA35
-23C0	8136FA36
-23C1	8136FA37
-23C2	8136FA38
-23C3	8136FA39
-23C4	8136FB30
-23C5	8136FB31
-23C6	8136FB32
-23C7	8136FB33
-23C8	8136FB34
-23C9	8136FB35
-23CA	8136FB36
-23CB	8136FB37
-23CC	8136FB38
-23CD	8136FB39
-23CE	8136FC30
-23CF	8136FC31
-23D0	8136FC32
-23D1	8136FC33
-23D2	8136FC34
-23D3	8136FC35
-23D4	8136FC36
-23D5	8136FC37
-23D6	8136FC38
-23D7	8136FC39
-23D8	8136FD30
-23D9	8136FD31
-23DA	8136FD32
-23DB	8136FD33
-23DC	8136FD34
-23DD	8136FD35
-23DE	8136FD36
-23DF	8136FD37
-23E0	8136FD38
-23E1	8136FD39
-23E2	8136FE30
-23E3	8136FE31
-23E4	8136FE32
-23E5	8136FE33
-23E6	8136FE34
-23E7	8136FE35
-23E8	8136FE36
-23E9	8136FE37
-23EA	8136FE38
-23EB	8136FE39
-23EC	81378130
-23ED	81378131
-23EE	81378132
-23EF	81378133
-23F0	81378134
-23F1	81378135
-23F2	81378136
-23F3	81378137
-23F4	81378138
-23F5	81378139
-23F6	81378230
-23F7	81378231
-23F8	81378232
-23F9	81378233
-23FA	81378234
-23FB	81378235
-23FC	81378236
-23FD	81378237
-23FE	81378238
-23FF	81378239
-2400	81378330
-2401	81378331
-2402	81378332
-2403	81378333
-2404	81378334
-2405	81378335
-2406	81378336
-2407	81378337
-2408	81378338
-2409	81378339
-240A	81378430
-240B	81378431
-240C	81378432
-240D	81378433
-240E	81378434
-240F	81378435
-2410	81378436
-2411	81378437
-2412	81378438
-2413	81378439
-2414	81378530
-2415	81378531
-2416	81378532
-2417	81378533
-2418	81378534
-2419	81378535
-241A	81378536
-241B	81378537
-241C	81378538
-241D	81378539
-241E	81378630
-241F	81378631
-2420	81378632
-2421	81378633
-2422	81378634
-2423	81378635
-2424	81378636
-2425	81378637
-2426	81378638
-2427	81378639
-2428	81378730
-2429	81378731
-242A	81378732
-242B	81378733
-242C	81378734
-242D	81378735
-242E	81378736
-242F	81378737
-2430	81378738
-2431	81378739
-2432	81378830
-2433	81378831
-2434	81378832
-2435	81378833
-2436	81378834
-2437	81378835
-2438	81378836
-2439	81378837
-243A	81378838
-243B	81378839
-243C	81378930
-243D	81378931
-243E	81378932
-243F	81378933
-2440	81378934
-2441	81378935
-2442	81378936
-2443	81378937
-2444	81378938
-2445	81378939
-2446	81378A30
-2447	81378A31
-2448	81378A32
-2449	81378A33
-244A	81378A34
-244B	81378A35
-244C	81378A36
-244D	81378A37
-244E	81378A38
-244F	81378A39
-2450	81378B30
-2451	81378B31
-2452	81378B32
-2453	81378B33
-2454	81378B34
-2455	81378B35
-2456	81378B36
-2457	81378B37
-2458	81378B38
-2459	81378B39
-245A	81378C30
-245B	81378C31
-245C	81378C32
-245D	81378C33
-245E	81378C34
-245F	81378C35
-2460	A2D9
-2461	A2DA
-2462	A2DB
-2463	A2DC
-2464	A2DD
-2465	A2DE
-2466	A2DF
-2467	A2E0
-2468	A2E1
-2469	A2E2
-246A	81378C36
-246B	81378C37
-246C	81378C38
-246D	81378C39
-246E	81378D30
-246F	81378D31
-2470	81378D32
-2471	81378D33
-2472	81378D34
-2473	81378D35
-2474	A2C5
-2475	A2C6
-2476	A2C7
-2477	A2C8
-2478	A2C9
-2479	A2CA
-247A	A2CB
-247B	A2CC
-247C	A2CD
-247D	A2CE
-247E	A2CF
-247F	A2D0
-2480	A2D1
-2481	A2D2
-2482	A2D3
-2483	A2D4
-2484	A2D5
-2485	A2D6
-2486	A2D7
-2487	A2D8
-2488	A2B1
-2489	A2B2
-248A	A2B3
-248B	A2B4
-248C	A2B5
-248D	A2B6
-248E	A2B7
-248F	A2B8
-2490	A2B9
-2491	A2BA
-2492	A2BB
-2493	A2BC
-2494	A2BD
-2495	A2BE
-2496	A2BF
-2497	A2C0
-2498	A2C1
-2499	A2C2
-249A	A2C3
-249B	A2C4
-249C	81378D36
-249D	81378D37
-249E	81378D38
-249F	81378D39
-24A0	81378E30
-24A1	81378E31
-24A2	81378E32
-24A3	81378E33
-24A4	81378E34
-24A5	81378E35
-24A6	81378E36
-24A7	81378E37
-24A8	81378E38
-24A9	81378E39
-24AA	81378F30
-24AB	81378F31
-24AC	81378F32
-24AD	81378F33
-24AE	81378F34
-24AF	81378F35
-24B0	81378F36
-24B1	81378F37
-24B2	81378F38
-24B3	81378F39
-24B4	81379030
-24B5	81379031
-24B6	81379032
-24B7	81379033
-24B8	81379034
-24B9	81379035
-24BA	81379036
-24BB	81379037
-24BC	81379038
-24BD	81379039
-24BE	81379130
-24BF	81379131
-24C0	81379132
-24C1	81379133
-24C2	81379134
-24C3	81379135
-24C4	81379136
-24C5	81379137
-24C6	81379138
-24C7	81379139
-24C8	81379230
-24C9	81379231
-24CA	81379232
-24CB	81379233
-24CC	81379234
-24CD	81379235
-24CE	81379236
-24CF	81379237
-24D0	81379238
-24D1	81379239
-24D2	81379330
-24D3	81379331
-24D4	81379332
-24D5	81379333
-24D6	81379334
-24D7	81379335
-24D8	81379336
-24D9	81379337
-24DA	81379338
-24DB	81379339
-24DC	81379430
-24DD	81379431
-24DE	81379432
-24DF	81379433
-24E0	81379434
-24E1	81379435
-24E2	81379436
-24E3	81379437
-24E4	81379438
-24E5	81379439
-24E6	81379530
-24E7	81379531
-24E8	81379532
-24E9	81379533
-24EA	81379534
-24EB	81379535
-24EC	81379536
-24ED	81379537
-24EE	81379538
-24EF	81379539
-24F0	81379630
-24F1	81379631
-24F2	81379632
-24F3	81379633
-24F4	81379634
-24F5	81379635
-24F6	81379636
-24F7	81379637
-24F8	81379638
-24F9	81379639
-24FA	81379730
-24FB	81379731
-24FC	81379732
-24FD	81379733
-24FE	81379734
-24FF	81379735
-2500	A9A4
-2501	A9A5
-2502	A9A6
-2503	A9A7
-2504	A9A8
-2505	A9A9
-2506	A9AA
-2507	A9AB
-2508	A9AC
-2509	A9AD
-250A	A9AE
-250B	A9AF
-250C	A9B0
-250D	A9B1
-250E	A9B2
-250F	A9B3
-2510	A9B4
-2511	A9B5
-2512	A9B6
-2513	A9B7
-2514	A9B8
-2515	A9B9
-2516	A9BA
-2517	A9BB
-2518	A9BC
-2519	A9BD
-251A	A9BE
-251B	A9BF
-251C	A9C0
-251D	A9C1
-251E	A9C2
-251F	A9C3
-2520	A9C4
-2521	A9C5
-2522	A9C6
-2523	A9C7
-2524	A9C8
-2525	A9C9
-2526	A9CA
-2527	A9CB
-2528	A9CC
-2529	A9CD
-252A	A9CE
-252B	A9CF
-252C	A9D0
-252D	A9D1
-252E	A9D2
-252F	A9D3
-2530	A9D4
-2531	A9D5
-2532	A9D6
-2533	A9D7
-2534	A9D8
-2535	A9D9
-2536	A9DA
-2537	A9DB
-2538	A9DC
-2539	A9DD
-253A	A9DE
-253B	A9DF
-253C	A9E0
-253D	A9E1
-253E	A9E2
-253F	A9E3
-2540	A9E4
-2541	A9E5
-2542	A9E6
-2543	A9E7
-2544	A9E8
-2545	A9E9
-2546	A9EA
-2547	A9EB
-2548	A9EC
-2549	A9ED
-254A	A9EE
-254B	A9EF
-254C	81379736
-254D	81379737
-254E	81379738
-254F	81379739
-2550	A854
-2551	A855
-2552	A856
-2553	A857
-2554	A858
-2555	A859
-2556	A85A
-2557	A85B
-2558	A85C
-2559	A85D
-255A	A85E
-255B	A85F
-255C	A860
-255D	A861
-255E	A862
-255F	A863
-2560	A864
-2561	A865
-2562	A866
-2563	A867
-2564	A868
-2565	A869
-2566	A86A
-2567	A86B
-2568	A86C
-2569	A86D
-256A	A86E
-256B	A86F
-256C	A870
-256D	A871
-256E	A872
-256F	A873
-2570	A874
-2571	A875
-2572	A876
-2573	A877
-2574	81379830
-2575	81379831
-2576	81379832
-2577	81379833
-2578	81379834
-2579	81379835
-257A	81379836
-257B	81379837
-257C	81379838
-257D	81379839
-257E	81379930
-257F	81379931
-2580	81379932
-2581	A878
-2582	A879
-2583	A87A
-2584	A87B
-2585	A87C
-2586	A87D
-2587	A87E
-2588	A880
-2589	A881
-258A	A882
-258B	A883
-258C	A884
-258D	A885
-258E	A886
-258F	A887
-2590	81379933
-2591	81379934
-2592	81379935
-2593	A888
-2594	A889
-2595	A88A
-2596	81379936
-2597	81379937
-2598	81379938
-2599	81379939
-259A	81379A30
-259B	81379A31
-259C	81379A32
-259D	81379A33
-259E	81379A34
-259F	81379A35
-25A0	A1F6
-25A1	A1F5
-25A2	81379A36
-25A3	81379A37
-25A4	81379A38
-25A5	81379A39
-25A6	81379B30
-25A7	81379B31
-25A8	81379B32
-25A9	81379B33
-25AA	81379B34
-25AB	81379B35
-25AC	81379B36
-25AD	81379B37
-25AE	81379B38
-25AF	81379B39
-25B0	81379C30
-25B1	81379C31
-25B2	A1F8
-25B3	A1F7
-25B4	81379C32
-25B5	81379C33
-25B6	81379C34
-25B7	81379C35
-25B8	81379C36
-25B9	81379C37
-25BA	81379C38
-25BB	81379C39
-25BC	A88B
-25BD	A88C
-25BE	81379D30
-25BF	81379D31
-25C0	81379D32
-25C1	81379D33
-25C2	81379D34
-25C3	81379D35
-25C4	81379D36
-25C5	81379D37
-25C6	A1F4
-25C7	A1F3
-25C8	81379D38
-25C9	81379D39
-25CA	81379E30
-25CB	A1F0
-25CC	81379E31
-25CD	81379E32
-25CE	A1F2
-25CF	A1F1
-25D0	81379E33
-25D1	81379E34
-25D2	81379E35
-25D3	81379E36
-25D4	81379E37
-25D5	81379E38
-25D6	81379E39
-25D7	81379F30
-25D8	81379F31
-25D9	81379F32
-25DA	81379F33
-25DB	81379F34
-25DC	81379F35
-25DD	81379F36
-25DE	81379F37
-25DF	81379F38
-25E0	81379F39
-25E1	8137A030
-25E2	A88D
-25E3	A88E
-25E4	A88F
-25E5	A890
-25E6	8137A031
-25E7	8137A032
-25E8	8137A033
-25E9	8137A034
-25EA	8137A035
-25EB	8137A036
-25EC	8137A037
-25ED	8137A038
-25EE	8137A039
-25EF	8137A130
-25F0	8137A131
-25F1	8137A132
-25F2	8137A133
-25F3	8137A134
-25F4	8137A135
-25F5	8137A136
-25F6	8137A137
-25F7	8137A138
-25F8	8137A139
-25F9	8137A230
-25FA	8137A231
-25FB	8137A232
-25FC	8137A233
-25FD	8137A234
-25FE	8137A235
-25FF	8137A236
-2600	8137A237
-2601	8137A238
-2602	8137A239
-2603	8137A330
-2604	8137A331
-2605	A1EF
-2606	A1EE
-2607	8137A332
-2608	8137A333
-2609	A891
-260A	8137A334
-260B	8137A335
-260C	8137A336
-260D	8137A337
-260E	8137A338
-260F	8137A339
-2610	8137A430
-2611	8137A431
-2612	8137A432
-2613	8137A433
-2614	8137A434
-2615	8137A435
-2616	8137A436
-2617	8137A437
-2618	8137A438
-2619	8137A439
-261A	8137A530
-261B	8137A531
-261C	8137A532
-261D	8137A533
-261E	8137A534
-261F	8137A535
-2620	8137A536
-2621	8137A537
-2622	8137A538
-2623	8137A539
-2624	8137A630
-2625	8137A631
-2626	8137A632
-2627	8137A633
-2628	8137A634
-2629	8137A635
-262A	8137A636
-262B	8137A637
-262C	8137A638
-262D	8137A639
-262E	8137A730
-262F	8137A731
-2630	8137A732
-2631	8137A733
-2632	8137A734
-2633	8137A735
-2634	8137A736
-2635	8137A737
-2636	8137A738
-2637	8137A739
-2638	8137A830
-2639	8137A831
-263A	8137A832
-263B	8137A833
-263C	8137A834
-263D	8137A835
-263E	8137A836
-263F	8137A837
-2640	A1E2
-2641	8137A838
-2642	A1E1
-2643	8137A839
-2644	8137A930
-2645	8137A931
-2646	8137A932
-2647	8137A933
-2648	8137A934
-2649	8137A935
-264A	8137A936
-264B	8137A937
-264C	8137A938
-264D	8137A939
-264E	8137AA30
-264F	8137AA31
-2650	8137AA32
-2651	8137AA33
-2652	8137AA34
-2653	8137AA35
-2654	8137AA36
-2655	8137AA37
-2656	8137AA38
-2657	8137AA39
-2658	8137AB30
-2659	8137AB31
-265A	8137AB32
-265B	8137AB33
-265C	8137AB34
-265D	8137AB35
-265E	8137AB36
-265F	8137AB37
-2660	8137AB38
-2661	8137AB39
-2662	8137AC30
-2663	8137AC31
-2664	8137AC32
-2665	8137AC33
-2666	8137AC34
-2667	8137AC35
-2668	8137AC36
-2669	8137AC37
-266A	8137AC38
-266B	8137AC39
-266C	8137AD30
-266D	8137AD31
-266E	8137AD32
-266F	8137AD33
-2670	8137AD34
-2671	8137AD35
-2672	8137AD36
-2673	8137AD37
-2674	8137AD38
-2675	8137AD39
-2676	8137AE30
-2677	8137AE31
-2678	8137AE32
-2679	8137AE33
-267A	8137AE34
-267B	8137AE35
-267C	8137AE36
-267D	8137AE37
-267E	8137AE38
-267F	8137AE39
-2680	8137AF30
-2681	8137AF31
-2682	8137AF32
-2683	8137AF33
-2684	8137AF34
-2685	8137AF35
-2686	8137AF36
-2687	8137AF37
-2688	8137AF38
-2689	8137AF39
-268A	8137B030
-268B	8137B031
-268C	8137B032
-268D	8137B033
-268E	8137B034
-268F	8137B035
-2690	8137B036
-2691	8137B037
-2692	8137B038
-2693	8137B039
-2694	8137B130
-2695	8137B131
-2696	8137B132
-2697	8137B133
-2698	8137B134
-2699	8137B135
-269A	8137B136
-269B	8137B137
-269C	8137B138
-269D	8137B139
-269E	8137B230
-269F	8137B231
-26A0	8137B232
-26A1	8137B233
-26A2	8137B234
-26A3	8137B235
-26A4	8137B236
-26A5	8137B237
-26A6	8137B238
-26A7	8137B239
-26A8	8137B330
-26A9	8137B331
-26AA	8137B332
-26AB	8137B333
-26AC	8137B334
-26AD	8137B335
-26AE	8137B336
-26AF	8137B337
-26B0	8137B338
-26B1	8137B339
-26B2	8137B430
-26B3	8137B431
-26B4	8137B432
-26B5	8137B433
-26B6	8137B434
-26B7	8137B435
-26B8	8137B436
-26B9	8137B437
-26BA	8137B438
-26BB	8137B439
-26BC	8137B530
-26BD	8137B531
-26BE	8137B532
-26BF	8137B533
-26C0	8137B534
-26C1	8137B535
-26C2	8137B536
-26C3	8137B537
-26C4	8137B538
-26C5	8137B539
-26C6	8137B630
-26C7	8137B631
-26C8	8137B632
-26C9	8137B633
-26CA	8137B634
-26CB	8137B635
-26CC	8137B636
-26CD	8137B637
-26CE	8137B638
-26CF	8137B639
-26D0	8137B730
-26D1	8137B731
-26D2	8137B732
-26D3	8137B733
-26D4	8137B734
-26D5	8137B735
-26D6	8137B736
-26D7	8137B737
-26D8	8137B738
-26D9	8137B739
-26DA	8137B830
-26DB	8137B831
-26DC	8137B832
-26DD	8137B833
-26DE	8137B834
-26DF	8137B835
-26E0	8137B836
-26E1	8137B837
-26E2	8137B838
-26E3	8137B839
-26E4	8137B930
-26E5	8137B931
-26E6	8137B932
-26E7	8137B933
-26E8	8137B934
-26E9	8137B935
-26EA	8137B936
-26EB	8137B937
-26EC	8137B938
-26ED	8137B939
-26EE	8137BA30
-26EF	8137BA31
-26F0	8137BA32
-26F1	8137BA33
-26F2	8137BA34
-26F3	8137BA35
-26F4	8137BA36
-26F5	8137BA37
-26F6	8137BA38
-26F7	8137BA39
-26F8	8137BB30
-26F9	8137BB31
-26FA	8137BB32
-26FB	8137BB33
-26FC	8137BB34
-26FD	8137BB35
-26FE	8137BB36
-26FF	8137BB37
-2700	8137BB38
-2701	8137BB39
-2702	8137BC30
-2703	8137BC31
-2704	8137BC32
-2705	8137BC33
-2706	8137BC34
-2707	8137BC35
-2708	8137BC36
-2709	8137BC37
-270A	8137BC38
-270B	8137BC39
-270C	8137BD30
-270D	8137BD31
-270E	8137BD32
-270F	8137BD33
-2710	8137BD34
-2711	8137BD35
-2712	8137BD36
-2713	8137BD37
-2714	8137BD38
-2715	8137BD39
-2716	8137BE30
-2717	8137BE31
-2718	8137BE32
-2719	8137BE33
-271A	8137BE34
-271B	8137BE35
-271C	8137BE36
-271D	8137BE37
-271E	8137BE38
-271F	8137BE39
-2720	8137BF30
-2721	8137BF31
-2722	8137BF32
-2723	8137BF33
-2724	8137BF34
-2725	8137BF35
-2726	8137BF36
-2727	8137BF37
-2728	8137BF38
-2729	8137BF39
-272A	8137C030
-272B	8137C031
-272C	8137C032
-272D	8137C033
-272E	8137C034
-272F	8137C035
-2730	8137C036
-2731	8137C037
-2732	8137C038
-2733	8137C039
-2734	8137C130
-2735	8137C131
-2736	8137C132
-2737	8137C133
-2738	8137C134
-2739	8137C135
-273A	8137C136
-273B	8137C137
-273C	8137C138
-273D	8137C139
-273E	8137C230
-273F	8137C231
-2740	8137C232
-2741	8137C233
-2742	8137C234
-2743	8137C235
-2744	8137C236
-2745	8137C237
-2746	8137C238
-2747	8137C239
-2748	8137C330
-2749	8137C331
-274A	8137C332
-274B	8137C333
-274C	8137C334
-274D	8137C335
-274E	8137C336
-274F	8137C337
-2750	8137C338
-2751	8137C339
-2752	8137C430
-2753	8137C431
-2754	8137C432
-2755	8137C433
-2756	8137C434
-2757	8137C435
-2758	8137C436
-2759	8137C437
-275A	8137C438
-275B	8137C439
-275C	8137C530
-275D	8137C531
-275E	8137C532
-275F	8137C533
-2760	8137C534
-2761	8137C535
-2762	8137C536
-2763	8137C537
-2764	8137C538
-2765	8137C539
-2766	8137C630
-2767	8137C631
-2768	8137C632
-2769	8137C633
-276A	8137C634
-276B	8137C635
-276C	8137C636
-276D	8137C637
-276E	8137C638
-276F	8137C639
-2770	8137C730
-2771	8137C731
-2772	8137C732
-2773	8137C733
-2774	8137C734
-2775	8137C735
-2776	8137C736
-2777	8137C737
-2778	8137C738
-2779	8137C739
-277A	8137C830
-277B	8137C831
-277C	8137C832
-277D	8137C833
-277E	8137C834
-277F	8137C835
-2780	8137C836
-2781	8137C837
-2782	8137C838
-2783	8137C839
-2784	8137C930
-2785	8137C931
-2786	8137C932
-2787	8137C933
-2788	8137C934
-2789	8137C935
-278A	8137C936
-278B	8137C937
-278C	8137C938
-278D	8137C939
-278E	8137CA30
-278F	8137CA31
-2790	8137CA32
-2791	8137CA33
-2792	8137CA34
-2793	8137CA35
-2794	8137CA36
-2795	8137CA37
-2796	8137CA38
-2797	8137CA39
-2798	8137CB30
-2799	8137CB31
-279A	8137CB32
-279B	8137CB33
-279C	8137CB34
-279D	8137CB35
-279E	8137CB36
-279F	8137CB37
-27A0	8137CB38
-27A1	8137CB39
-27A2	8137CC30
-27A3	8137CC31
-27A4	8137CC32
-27A5	8137CC33
-27A6	8137CC34
-27A7	8137CC35
-27A8	8137CC36
-27A9	8137CC37
-27AA	8137CC38
-27AB	8137CC39
-27AC	8137CD30
-27AD	8137CD31
-27AE	8137CD32
-27AF	8137CD33
-27B0	8137CD34
-27B1	8137CD35
-27B2	8137CD36
-27B3	8137CD37
-27B4	8137CD38
-27B5	8137CD39
-27B6	8137CE30
-27B7	8137CE31
-27B8	8137CE32
-27B9	8137CE33
-27BA	8137CE34
-27BB	8137CE35
-27BC	8137CE36
-27BD	8137CE37
-27BE	8137CE38
-27BF	8137CE39
-27C0	8137CF30
-27C1	8137CF31
-27C2	8137CF32
-27C3	8137CF33
-27C4	8137CF34
-27C5	8137CF35
-27C6	8137CF36
-27C7	8137CF37
-27C8	8137CF38
-27C9	8137CF39
-27CA	8137D030
-27CB	8137D031
-27CC	8137D032
-27CD	8137D033
-27CE	8137D034
-27CF	8137D035
-27D0	8137D036
-27D1	8137D037
-27D2	8137D038
-27D3	8137D039
-27D4	8137D130
-27D5	8137D131
-27D6	8137D132
-27D7	8137D133
-27D8	8137D134
-27D9	8137D135
-27DA	8137D136
-27DB	8137D137
-27DC	8137D138
-27DD	8137D139
-27DE	8137D230
-27DF	8137D231
-27E0	8137D232
-27E1	8137D233
-27E2	8137D234
-27E3	8137D235
-27E4	8137D236
-27E5	8137D237
-27E6	8137D238
-27E7	8137D239
-27E8	8137D330
-27E9	8137D331
-27EA	8137D332
-27EB	8137D333
-27EC	8137D334
-27ED	8137D335
-27EE	8137D336
-27EF	8137D337
-27F0	8137D338
-27F1	8137D339
-27F2	8137D430
-27F3	8137D431
-27F4	8137D432
-27F5	8137D433
-27F6	8137D434
-27F7	8137D435
-27F8	8137D436
-27F9	8137D437
-27FA	8137D438
-27FB	8137D439
-27FC	8137D530
-27FD	8137D531
-27FE	8137D532
-27FF	8137D533
-2800	8137D534
-2801	8137D535
-2802	8137D536
-2803	8137D537
-2804	8137D538
-2805	8137D539
-2806	8137D630
-2807	8137D631
-2808	8137D632
-2809	8137D633
-280A	8137D634
-280B	8137D635
-280C	8137D636
-280D	8137D637
-280E	8137D638
-280F	8137D639
-2810	8137D730
-2811	8137D731
-2812	8137D732
-2813	8137D733
-2814	8137D734
-2815	8137D735
-2816	8137D736
-2817	8137D737
-2818	8137D738
-2819	8137D739
-281A	8137D830
-281B	8137D831
-281C	8137D832
-281D	8137D833
-281E	8137D834
-281F	8137D835
-2820	8137D836
-2821	8137D837
-2822	8137D838
-2823	8137D839
-2824	8137D930
-2825	8137D931
-2826	8137D932
-2827	8137D933
-2828	8137D934
-2829	8137D935
-282A	8137D936
-282B	8137D937
-282C	8137D938
-282D	8137D939
-282E	8137DA30
-282F	8137DA31
-2830	8137DA32
-2831	8137DA33
-2832	8137DA34
-2833	8137DA35
-2834	8137DA36
-2835	8137DA37
-2836	8137DA38
-2837	8137DA39
-2838	8137DB30
-2839	8137DB31
-283A	8137DB32
-283B	8137DB33
-283C	8137DB34
-283D	8137DB35
-283E	8137DB36
-283F	8137DB37
-2840	8137DB38
-2841	8137DB39
-2842	8137DC30
-2843	8137DC31
-2844	8137DC32
-2845	8137DC33
-2846	8137DC34
-2847	8137DC35
-2848	8137DC36
-2849	8137DC37
-284A	8137DC38
-284B	8137DC39
-284C	8137DD30
-284D	8137DD31
-284E	8137DD32
-284F	8137DD33
-2850	8137DD34
-2851	8137DD35
-2852	8137DD36
-2853	8137DD37
-2854	8137DD38
-2855	8137DD39
-2856	8137DE30
-2857	8137DE31
-2858	8137DE32
-2859	8137DE33
-285A	8137DE34
-285B	8137DE35
-285C	8137DE36
-285D	8137DE37
-285E	8137DE38
-285F	8137DE39
-2860	8137DF30
-2861	8137DF31
-2862	8137DF32
-2863	8137DF33
-2864	8137DF34
-2865	8137DF35
-2866	8137DF36
-2867	8137DF37
-2868	8137DF38
-2869	8137DF39
-286A	8137E030
-286B	8137E031
-286C	8137E032
-286D	8137E033
-286E	8137E034
-286F	8137E035
-2870	8137E036
-2871	8137E037
-2872	8137E038
-2873	8137E039
-2874	8137E130
-2875	8137E131
-2876	8137E132
-2877	8137E133
-2878	8137E134
-2879	8137E135
-287A	8137E136
-287B	8137E137
-287C	8137E138
-287D	8137E139
-287E	8137E230
-287F	8137E231
-2880	8137E232
-2881	8137E233
-2882	8137E234
-2883	8137E235
-2884	8137E236
-2885	8137E237
-2886	8137E238
-2887	8137E239
-2888	8137E330
-2889	8137E331
-288A	8137E332
-288B	8137E333
-288C	8137E334
-288D	8137E335
-288E	8137E336
-288F	8137E337
-2890	8137E338
-2891	8137E339
-2892	8137E430
-2893	8137E431
-2894	8137E432
-2895	8137E433
-2896	8137E434
-2897	8137E435
-2898	8137E436
-2899	8137E437
-289A	8137E438
-289B	8137E439
-289C	8137E530
-289D	8137E531
-289E	8137E532
-289F	8137E533
-28A0	8137E534
-28A1	8137E535
-28A2	8137E536
-28A3	8137E537
-28A4	8137E538
-28A5	8137E539
-28A6	8137E630
-28A7	8137E631
-28A8	8137E632
-28A9	8137E633
-28AA	8137E634
-28AB	8137E635
-28AC	8137E636
-28AD	8137E637
-28AE	8137E638
-28AF	8137E639
-28B0	8137E730
-28B1	8137E731
-28B2	8137E732
-28B3	8137E733
-28B4	8137E734
-28B5	8137E735
-28B6	8137E736
-28B7	8137E737
-28B8	8137E738
-28B9	8137E739
-28BA	8137E830
-28BB	8137E831
-28BC	8137E832
-28BD	8137E833
-28BE	8137E834
-28BF	8137E835
-28C0	8137E836
-28C1	8137E837
-28C2	8137E838
-28C3	8137E839
-28C4	8137E930
-28C5	8137E931
-28C6	8137E932
-28C7	8137E933
-28C8	8137E934
-28C9	8137E935
-28CA	8137E936
-28CB	8137E937
-28CC	8137E938
-28CD	8137E939
-28CE	8137EA30
-28CF	8137EA31
-28D0	8137EA32
-28D1	8137EA33
-28D2	8137EA34
-28D3	8137EA35
-28D4	8137EA36
-28D5	8137EA37
-28D6	8137EA38
-28D7	8137EA39
-28D8	8137EB30
-28D9	8137EB31
-28DA	8137EB32
-28DB	8137EB33
-28DC	8137EB34
-28DD	8137EB35
-28DE	8137EB36
-28DF	8137EB37
-28E0	8137EB38
-28E1	8137EB39
-28E2	8137EC30
-28E3	8137EC31
-28E4	8137EC32
-28E5	8137EC33
-28E6	8137EC34
-28E7	8137EC35
-28E8	8137EC36
-28E9	8137EC37
-28EA	8137EC38
-28EB	8137EC39
-28EC	8137ED30
-28ED	8137ED31
-28EE	8137ED32
-28EF	8137ED33
-28F0	8137ED34
-28F1	8137ED35
-28F2	8137ED36
-28F3	8137ED37
-28F4	8137ED38
-28F5	8137ED39
-28F6	8137EE30
-28F7	8137EE31
-28F8	8137EE32
-28F9	8137EE33
-28FA	8137EE34
-28FB	8137EE35
-28FC	8137EE36
-28FD	8137EE37
-28FE	8137EE38
-28FF	8137EE39
-2900	8137EF30
-2901	8137EF31
-2902	8137EF32
-2903	8137EF33
-2904	8137EF34
-2905	8137EF35
-2906	8137EF36
-2907	8137EF37
-2908	8137EF38
-2909	8137EF39
-290A	8137F030
-290B	8137F031
-290C	8137F032
-290D	8137F033
-290E	8137F034
-290F	8137F035
-2910	8137F036
-2911	8137F037
-2912	8137F038
-2913	8137F039
-2914	8137F130
-2915	8137F131
-2916	8137F132
-2917	8137F133
-2918	8137F134
-2919	8137F135
-291A	8137F136
-291B	8137F137
-291C	8137F138
-291D	8137F139
-291E	8137F230
-291F	8137F231
-2920	8137F232
-2921	8137F233
-2922	8137F234
-2923	8137F235
-2924	8137F236
-2925	8137F237
-2926	8137F238
-2927	8137F239
-2928	8137F330
-2929	8137F331
-292A	8137F332
-292B	8137F333
-292C	8137F334
-292D	8137F335
-292E	8137F336
-292F	8137F337
-2930	8137F338
-2931	8137F339
-2932	8137F430
-2933	8137F431
-2934	8137F432
-2935	8137F433
-2936	8137F434
-2937	8137F435
-2938	8137F436
-2939	8137F437
-293A	8137F438
-293B	8137F439
-293C	8137F530
-293D	8137F531
-293E	8137F532
-293F	8137F533
-2940	8137F534
-2941	8137F535
-2942	8137F536
-2943	8137F537
-2944	8137F538
-2945	8137F539
-2946	8137F630
-2947	8137F631
-2948	8137F632
-2949	8137F633
-294A	8137F634
-294B	8137F635
-294C	8137F636
-294D	8137F637
-294E	8137F638
-294F	8137F639
-2950	8137F730
-2951	8137F731
-2952	8137F732
-2953	8137F733
-2954	8137F734
-2955	8137F735
-2956	8137F736
-2957	8137F737
-2958	8137F738
-2959	8137F739
-295A	8137F830
-295B	8137F831
-295C	8137F832
-295D	8137F833
-295E	8137F834
-295F	8137F835
-2960	8137F836
-2961	8137F837
-2962	8137F838
-2963	8137F839
-2964	8137F930
-2965	8137F931
-2966	8137F932
-2967	8137F933
-2968	8137F934
-2969	8137F935
-296A	8137F936
-296B	8137F937
-296C	8137F938
-296D	8137F939
-296E	8137FA30
-296F	8137FA31
-2970	8137FA32
-2971	8137FA33
-2972	8137FA34
-2973	8137FA35
-2974	8137FA36
-2975	8137FA37
-2976	8137FA38
-2977	8137FA39
-2978	8137FB30
-2979	8137FB31
-297A	8137FB32
-297B	8137FB33
-297C	8137FB34
-297D	8137FB35
-297E	8137FB36
-297F	8137FB37
-2980	8137FB38
-2981	8137FB39
-2982	8137FC30
-2983	8137FC31
-2984	8137FC32
-2985	8137FC33
-2986	8137FC34
-2987	8137FC35
-2988	8137FC36
-2989	8137FC37
-298A	8137FC38
-298B	8137FC39
-298C	8137FD30
-298D	8137FD31
-298E	8137FD32
-298F	8137FD33
-2990	8137FD34
-2991	8137FD35
-2992	8137FD36
-2993	8137FD37
-2994	8137FD38
-2995	8137FD39
-2996	8137FE30
-2997	8137FE31
-2998	8137FE32
-2999	8137FE33
-299A	8137FE34
-299B	8137FE35
-299C	8137FE36
-299D	8137FE37
-299E	8137FE38
-299F	8137FE39
-29A0	81388130
-29A1	81388131
-29A2	81388132
-29A3	81388133
-29A4	81388134
-29A5	81388135
-29A6	81388136
-29A7	81388137
-29A8	81388138
-29A9	81388139
-29AA	81388230
-29AB	81388231
-29AC	81388232
-29AD	81388233
-29AE	81388234
-29AF	81388235
-29B0	81388236
-29B1	81388237
-29B2	81388238
-29B3	81388239
-29B4	81388330
-29B5	81388331
-29B6	81388332
-29B7	81388333
-29B8	81388334
-29B9	81388335
-29BA	81388336
-29BB	81388337
-29BC	81388338
-29BD	81388339
-29BE	81388430
-29BF	81388431
-29C0	81388432
-29C1	81388433
-29C2	81388434
-29C3	81388435
-29C4	81388436
-29C5	81388437
-29C6	81388438
-29C7	81388439
-29C8	81388530
-29C9	81388531
-29CA	81388532
-29CB	81388533
-29CC	81388534
-29CD	81388535
-29CE	81388536
-29CF	81388537
-29D0	81388538
-29D1	81388539
-29D2	81388630
-29D3	81388631
-29D4	81388632
-29D5	81388633
-29D6	81388634
-29D7	81388635
-29D8	81388636
-29D9	81388637
-29DA	81388638
-29DB	81388639
-29DC	81388730
-29DD	81388731
-29DE	81388732
-29DF	81388733
-29E0	81388734
-29E1	81388735
-29E2	81388736
-29E3	81388737
-29E4	81388738
-29E5	81388739
-29E6	81388830
-29E7	81388831
-29E8	81388832
-29E9	81388833
-29EA	81388834
-29EB	81388835
-29EC	81388836
-29ED	81388837
-29EE	81388838
-29EF	81388839
-29F0	81388930
-29F1	81388931
-29F2	81388932
-29F3	81388933
-29F4	81388934
-29F5	81388935
-29F6	81388936
-29F7	81388937
-29F8	81388938
-29F9	81388939
-29FA	81388A30
-29FB	81388A31
-29FC	81388A32
-29FD	81388A33
-29FE	81388A34
-29FF	81388A35
-2A00	81388A36
-2A01	81388A37
-2A02	81388A38
-2A03	81388A39
-2A04	81388B30
-2A05	81388B31
-2A06	81388B32
-2A07	81388B33
-2A08	81388B34
-2A09	81388B35
-2A0A	81388B36
-2A0B	81388B37
-2A0C	81388B38
-2A0D	81388B39
-2A0E	81388C30
-2A0F	81388C31
-2A10	81388C32
-2A11	81388C33
-2A12	81388C34
-2A13	81388C35
-2A14	81388C36
-2A15	81388C37
-2A16	81388C38
-2A17	81388C39
-2A18	81388D30
-2A19	81388D31
-2A1A	81388D32
-2A1B	81388D33
-2A1C	81388D34
-2A1D	81388D35
-2A1E	81388D36
-2A1F	81388D37
-2A20	81388D38
-2A21	81388D39
-2A22	81388E30
-2A23	81388E31
-2A24	81388E32
-2A25	81388E33
-2A26	81388E34
-2A27	81388E35
-2A28	81388E36
-2A29	81388E37
-2A2A	81388E38
-2A2B	81388E39
-2A2C	81388F30
-2A2D	81388F31
-2A2E	81388F32
-2A2F	81388F33
-2A30	81388F34
-2A31	81388F35
-2A32	81388F36
-2A33	81388F37
-2A34	81388F38
-2A35	81388F39
-2A36	81389030
-2A37	81389031
-2A38	81389032
-2A39	81389033
-2A3A	81389034
-2A3B	81389035
-2A3C	81389036
-2A3D	81389037
-2A3E	81389038
-2A3F	81389039
-2A40	81389130
-2A41	81389131
-2A42	81389132
-2A43	81389133
-2A44	81389134
-2A45	81389135
-2A46	81389136
-2A47	81389137
-2A48	81389138
-2A49	81389139
-2A4A	81389230
-2A4B	81389231
-2A4C	81389232
-2A4D	81389233
-2A4E	81389234
-2A4F	81389235
-2A50	81389236
-2A51	81389237
-2A52	81389238
-2A53	81389239
-2A54	81389330
-2A55	81389331
-2A56	81389332
-2A57	81389333
-2A58	81389334
-2A59	81389335
-2A5A	81389336
-2A5B	81389337
-2A5C	81389338
-2A5D	81389339
-2A5E	81389430
-2A5F	81389431
-2A60	81389432
-2A61	81389433
-2A62	81389434
-2A63	81389435
-2A64	81389436
-2A65	81389437
-2A66	81389438
-2A67	81389439
-2A68	81389530
-2A69	81389531
-2A6A	81389532
-2A6B	81389533
-2A6C	81389534
-2A6D	81389535
-2A6E	81389536
-2A6F	81389537
-2A70	81389538
-2A71	81389539
-2A72	81389630
-2A73	81389631
-2A74	81389632
-2A75	81389633
-2A76	81389634
-2A77	81389635
-2A78	81389636
-2A79	81389637
-2A7A	81389638
-2A7B	81389639
-2A7C	81389730
-2A7D	81389731
-2A7E	81389732
-2A7F	81389733
-2A80	81389734
-2A81	81389735
-2A82	81389736
-2A83	81389737
-2A84	81389738
-2A85	81389739
-2A86	81389830
-2A87	81389831
-2A88	81389832
-2A89	81389833
-2A8A	81389834
-2A8B	81389835
-2A8C	81389836
-2A8D	81389837
-2A8E	81389838
-2A8F	81389839
-2A90	81389930
-2A91	81389931
-2A92	81389932
-2A93	81389933
-2A94	81389934
-2A95	81389935
-2A96	81389936
-2A97	81389937
-2A98	81389938
-2A99	81389939
-2A9A	81389A30
-2A9B	81389A31
-2A9C	81389A32
-2A9D	81389A33
-2A9E	81389A34
-2A9F	81389A35
-2AA0	81389A36
-2AA1	81389A37
-2AA2	81389A38
-2AA3	81389A39
-2AA4	81389B30
-2AA5	81389B31
-2AA6	81389B32
-2AA7	81389B33
-2AA8	81389B34
-2AA9	81389B35
-2AAA	81389B36
-2AAB	81389B37
-2AAC	81389B38
-2AAD	81389B39
-2AAE	81389C30
-2AAF	81389C31
-2AB0	81389C32
-2AB1	81389C33
-2AB2	81389C34
-2AB3	81389C35
-2AB4	81389C36
-2AB5	81389C37
-2AB6	81389C38
-2AB7	81389C39
-2AB8	81389D30
-2AB9	81389D31
-2ABA	81389D32
-2ABB	81389D33
-2ABC	81389D34
-2ABD	81389D35
-2ABE	81389D36
-2ABF	81389D37
-2AC0	81389D38
-2AC1	81389D39
-2AC2	81389E30
-2AC3	81389E31
-2AC4	81389E32
-2AC5	81389E33
-2AC6	81389E34
-2AC7	81389E35
-2AC8	81389E36
-2AC9	81389E37
-2ACA	81389E38
-2ACB	81389E39
-2ACC	81389F30
-2ACD	81389F31
-2ACE	81389F32
-2ACF	81389F33
-2AD0	81389F34
-2AD1	81389F35
-2AD2	81389F36
-2AD3	81389F37
-2AD4	81389F38
-2AD5	81389F39
-2AD6	8138A030
-2AD7	8138A031
-2AD8	8138A032
-2AD9	8138A033
-2ADA	8138A034
-2ADB	8138A035
-2ADC	8138A036
-2ADD	8138A037
-2ADE	8138A038
-2ADF	8138A039
-2AE0	8138A130
-2AE1	8138A131
-2AE2	8138A132
-2AE3	8138A133
-2AE4	8138A134
-2AE5	8138A135
-2AE6	8138A136
-2AE7	8138A137
-2AE8	8138A138
-2AE9	8138A139
-2AEA	8138A230
-2AEB	8138A231
-2AEC	8138A232
-2AED	8138A233
-2AEE	8138A234
-2AEF	8138A235
-2AF0	8138A236
-2AF1	8138A237
-2AF2	8138A238
-2AF3	8138A239
-2AF4	8138A330
-2AF5	8138A331
-2AF6	8138A332
-2AF7	8138A333
-2AF8	8138A334
-2AF9	8138A335
-2AFA	8138A336
-2AFB	8138A337
-2AFC	8138A338
-2AFD	8138A339
-2AFE	8138A430
-2AFF	8138A431
-2B00	8138A432
-2B01	8138A433
-2B02	8138A434
-2B03	8138A435
-2B04	8138A436
-2B05	8138A437
-2B06	8138A438
-2B07	8138A439
-2B08	8138A530
-2B09	8138A531
-2B0A	8138A532
-2B0B	8138A533
-2B0C	8138A534
-2B0D	8138A535
-2B0E	8138A536
-2B0F	8138A537
-2B10	8138A538
-2B11	8138A539
-2B12	8138A630
-2B13	8138A631
-2B14	8138A632
-2B15	8138A633
-2B16	8138A634
-2B17	8138A635
-2B18	8138A636
-2B19	8138A637
-2B1A	8138A638
-2B1B	8138A639
-2B1C	8138A730
-2B1D	8138A731
-2B1E	8138A732
-2B1F	8138A733
-2B20	8138A734
-2B21	8138A735
-2B22	8138A736
-2B23	8138A737
-2B24	8138A738
-2B25	8138A739
-2B26	8138A830
-2B27	8138A831
-2B28	8138A832
-2B29	8138A833
-2B2A	8138A834
-2B2B	8138A835
-2B2C	8138A836
-2B2D	8138A837
-2B2E	8138A838
-2B2F	8138A839
-2B30	8138A930
-2B31	8138A931
-2B32	8138A932
-2B33	8138A933
-2B34	8138A934
-2B35	8138A935
-2B36	8138A936
-2B37	8138A937
-2B38	8138A938
-2B39	8138A939
-2B3A	8138AA30
-2B3B	8138AA31
-2B3C	8138AA32
-2B3D	8138AA33
-2B3E	8138AA34
-2B3F	8138AA35
-2B40	8138AA36
-2B41	8138AA37
-2B42	8138AA38
-2B43	8138AA39
-2B44	8138AB30
-2B45	8138AB31
-2B46	8138AB32
-2B47	8138AB33
-2B48	8138AB34
-2B49	8138AB35
-2B4A	8138AB36
-2B4B	8138AB37
-2B4C	8138AB38
-2B4D	8138AB39
-2B4E	8138AC30
-2B4F	8138AC31
-2B50	8138AC32
-2B51	8138AC33
-2B52	8138AC34
-2B53	8138AC35
-2B54	8138AC36
-2B55	8138AC37
-2B56	8138AC38
-2B57	8138AC39
-2B58	8138AD30
-2B59	8138AD31
-2B5A	8138AD32
-2B5B	8138AD33
-2B5C	8138AD34
-2B5D	8138AD35
-2B5E	8138AD36
-2B5F	8138AD37
-2B60	8138AD38
-2B61	8138AD39
-2B62	8138AE30
-2B63	8138AE31
-2B64	8138AE32
-2B65	8138AE33
-2B66	8138AE34
-2B67	8138AE35
-2B68	8138AE36
-2B69	8138AE37
-2B6A	8138AE38
-2B6B	8138AE39
-2B6C	8138AF30
-2B6D	8138AF31
-2B6E	8138AF32
-2B6F	8138AF33
-2B70	8138AF34
-2B71	8138AF35
-2B72	8138AF36
-2B73	8138AF37
-2B74	8138AF38
-2B75	8138AF39
-2B76	8138B030
-2B77	8138B031
-2B78	8138B032
-2B79	8138B033
-2B7A	8138B034
-2B7B	8138B035
-2B7C	8138B036
-2B7D	8138B037
-2B7E	8138B038
-2B7F	8138B039
-2B80	8138B130
-2B81	8138B131
-2B82	8138B132
-2B83	8138B133
-2B84	8138B134
-2B85	8138B135
-2B86	8138B136
-2B87	8138B137
-2B88	8138B138
-2B89	8138B139
-2B8A	8138B230
-2B8B	8138B231
-2B8C	8138B232
-2B8D	8138B233
-2B8E	8138B234
-2B8F	8138B235
-2B90	8138B236
-2B91	8138B237
-2B92	8138B238
-2B93	8138B239
-2B94	8138B330
-2B95	8138B331
-2B96	8138B332
-2B97	8138B333
-2B98	8138B334
-2B99	8138B335
-2B9A	8138B336
-2B9B	8138B337
-2B9C	8138B338
-2B9D	8138B339
-2B9E	8138B430
-2B9F	8138B431
-2BA0	8138B432
-2BA1	8138B433
-2BA2	8138B434
-2BA3	8138B435
-2BA4	8138B436
-2BA5	8138B437
-2BA6	8138B438
-2BA7	8138B439
-2BA8	8138B530
-2BA9	8138B531
-2BAA	8138B532
-2BAB	8138B533
-2BAC	8138B534
-2BAD	8138B535
-2BAE	8138B536
-2BAF	8138B537
-2BB0	8138B538
-2BB1	8138B539
-2BB2	8138B630
-2BB3	8138B631
-2BB4	8138B632
-2BB5	8138B633
-2BB6	8138B634
-2BB7	8138B635
-2BB8	8138B636
-2BB9	8138B637
-2BBA	8138B638
-2BBB	8138B639
-2BBC	8138B730
-2BBD	8138B731
-2BBE	8138B732
-2BBF	8138B733
-2BC0	8138B734
-2BC1	8138B735
-2BC2	8138B736
-2BC3	8138B737
-2BC4	8138B738
-2BC5	8138B739
-2BC6	8138B830
-2BC7	8138B831
-2BC8	8138B832
-2BC9	8138B833
-2BCA	8138B834
-2BCB	8138B835
-2BCC	8138B836
-2BCD	8138B837
-2BCE	8138B838
-2BCF	8138B839
-2BD0	8138B930
-2BD1	8138B931
-2BD2	8138B932
-2BD3	8138B933
-2BD4	8138B934
-2BD5	8138B935
-2BD6	8138B936
-2BD7	8138B937
-2BD8	8138B938
-2BD9	8138B939
-2BDA	8138BA30
-2BDB	8138BA31
-2BDC	8138BA32
-2BDD	8138BA33
-2BDE	8138BA34
-2BDF	8138BA35
-2BE0	8138BA36
-2BE1	8138BA37
-2BE2	8138BA38
-2BE3	8138BA39
-2BE4	8138BB30
-2BE5	8138BB31
-2BE6	8138BB32
-2BE7	8138BB33
-2BE8	8138BB34
-2BE9	8138BB35
-2BEA	8138BB36
-2BEB	8138BB37
-2BEC	8138BB38
-2BED	8138BB39
-2BEE	8138BC30
-2BEF	8138BC31
-2BF0	8138BC32
-2BF1	8138BC33
-2BF2	8138BC34
-2BF3	8138BC35
-2BF4	8138BC36
-2BF5	8138BC37
-2BF6	8138BC38
-2BF7	8138BC39
-2BF8	8138BD30
-2BF9	8138BD31
-2BFA	8138BD32
-2BFB	8138BD33
-2BFC	8138BD34
-2BFD	8138BD35
-2BFE	8138BD36
-2BFF	8138BD37
-2C00	8138BD38
-2C01	8138BD39
-2C02	8138BE30
-2C03	8138BE31
-2C04	8138BE32
-2C05	8138BE33
-2C06	8138BE34
-2C07	8138BE35
-2C08	8138BE36
-2C09	8138BE37
-2C0A	8138BE38
-2C0B	8138BE39
-2C0C	8138BF30
-2C0D	8138BF31
-2C0E	8138BF32
-2C0F	8138BF33
-2C10	8138BF34
-2C11	8138BF35
-2C12	8138BF36
-2C13	8138BF37
-2C14	8138BF38
-2C15	8138BF39
-2C16	8138C030
-2C17	8138C031
-2C18	8138C032
-2C19	8138C033
-2C1A	8138C034
-2C1B	8138C035
-2C1C	8138C036
-2C1D	8138C037
-2C1E	8138C038
-2C1F	8138C039
-2C20	8138C130
-2C21	8138C131
-2C22	8138C132
-2C23	8138C133
-2C24	8138C134
-2C25	8138C135
-2C26	8138C136
-2C27	8138C137
-2C28	8138C138
-2C29	8138C139
-2C2A	8138C230
-2C2B	8138C231
-2C2C	8138C232
-2C2D	8138C233
-2C2E	8138C234
-2C2F	8138C235
-2C30	8138C236
-2C31	8138C237
-2C32	8138C238
-2C33	8138C239
-2C34	8138C330
-2C35	8138C331
-2C36	8138C332
-2C37	8138C333
-2C38	8138C334
-2C39	8138C335
-2C3A	8138C336
-2C3B	8138C337
-2C3C	8138C338
-2C3D	8138C339
-2C3E	8138C430
-2C3F	8138C431
-2C40	8138C432
-2C41	8138C433
-2C42	8138C434
-2C43	8138C435
-2C44	8138C436
-2C45	8138C437
-2C46	8138C438
-2C47	8138C439
-2C48	8138C530
-2C49	8138C531
-2C4A	8138C532
-2C4B	8138C533
-2C4C	8138C534
-2C4D	8138C535
-2C4E	8138C536
-2C4F	8138C537
-2C50	8138C538
-2C51	8138C539
-2C52	8138C630
-2C53	8138C631
-2C54	8138C632
-2C55	8138C633
-2C56	8138C634
-2C57	8138C635
-2C58	8138C636
-2C59	8138C637
-2C5A	8138C638
-2C5B	8138C639
-2C5C	8138C730
-2C5D	8138C731
-2C5E	8138C732
-2C5F	8138C733
-2C60	8138C734
-2C61	8138C735
-2C62	8138C736
-2C63	8138C737
-2C64	8138C738
-2C65	8138C739
-2C66	8138C830
-2C67	8138C831
-2C68	8138C832
-2C69	8138C833
-2C6A	8138C834
-2C6B	8138C835
-2C6C	8138C836
-2C6D	8138C837
-2C6E	8138C838
-2C6F	8138C839
-2C70	8138C930
-2C71	8138C931
-2C72	8138C932
-2C73	8138C933
-2C74	8138C934
-2C75	8138C935
-2C76	8138C936
-2C77	8138C937
-2C78	8138C938
-2C79	8138C939
-2C7A	8138CA30
-2C7B	8138CA31
-2C7C	8138CA32
-2C7D	8138CA33
-2C7E	8138CA34
-2C7F	8138CA35
-2C80	8138CA36
-2C81	8138CA37
-2C82	8138CA38
-2C83	8138CA39
-2C84	8138CB30
-2C85	8138CB31
-2C86	8138CB32
-2C87	8138CB33
-2C88	8138CB34
-2C89	8138CB35
-2C8A	8138CB36
-2C8B	8138CB37
-2C8C	8138CB38
-2C8D	8138CB39
-2C8E	8138CC30
-2C8F	8138CC31
-2C90	8138CC32
-2C91	8138CC33
-2C92	8138CC34
-2C93	8138CC35
-2C94	8138CC36
-2C95	8138CC37
-2C96	8138CC38
-2C97	8138CC39
-2C98	8138CD30
-2C99	8138CD31
-2C9A	8138CD32
-2C9B	8138CD33
-2C9C	8138CD34
-2C9D	8138CD35
-2C9E	8138CD36
-2C9F	8138CD37
-2CA0	8138CD38
-2CA1	8138CD39
-2CA2	8138CE30
-2CA3	8138CE31
-2CA4	8138CE32
-2CA5	8138CE33
-2CA6	8138CE34
-2CA7	8138CE35
-2CA8	8138CE36
-2CA9	8138CE37
-2CAA	8138CE38
-2CAB	8138CE39
-2CAC	8138CF30
-2CAD	8138CF31
-2CAE	8138CF32
-2CAF	8138CF33
-2CB0	8138CF34
-2CB1	8138CF35
-2CB2	8138CF36
-2CB3	8138CF37
-2CB4	8138CF38
-2CB5	8138CF39
-2CB6	8138D030
-2CB7	8138D031
-2CB8	8138D032
-2CB9	8138D033
-2CBA	8138D034
-2CBB	8138D035
-2CBC	8138D036
-2CBD	8138D037
-2CBE	8138D038
-2CBF	8138D039
-2CC0	8138D130
-2CC1	8138D131
-2CC2	8138D132
-2CC3	8138D133
-2CC4	8138D134
-2CC5	8138D135
-2CC6	8138D136
-2CC7	8138D137
-2CC8	8138D138
-2CC9	8138D139
-2CCA	8138D230
-2CCB	8138D231
-2CCC	8138D232
-2CCD	8138D233
-2CCE	8138D234
-2CCF	8138D235
-2CD0	8138D236
-2CD1	8138D237
-2CD2	8138D238
-2CD3	8138D239
-2CD4	8138D330
-2CD5	8138D331
-2CD6	8138D332
-2CD7	8138D333
-2CD8	8138D334
-2CD9	8138D335
-2CDA	8138D336
-2CDB	8138D337
-2CDC	8138D338
-2CDD	8138D339
-2CDE	8138D430
-2CDF	8138D431
-2CE0	8138D432
-2CE1	8138D433
-2CE2	8138D434
-2CE3	8138D435
-2CE4	8138D436
-2CE5	8138D437
-2CE6	8138D438
-2CE7	8138D439
-2CE8	8138D530
-2CE9	8138D531
-2CEA	8138D532
-2CEB	8138D533
-2CEC	8138D534
-2CED	8138D535
-2CEE	8138D536
-2CEF	8138D537
-2CF0	8138D538
-2CF1	8138D539
-2CF2	8138D630
-2CF3	8138D631
-2CF4	8138D632
-2CF5	8138D633
-2CF6	8138D634
-2CF7	8138D635
-2CF8	8138D636
-2CF9	8138D637
-2CFA	8138D638
-2CFB	8138D639
-2CFC	8138D730
-2CFD	8138D731
-2CFE	8138D732
-2CFF	8138D733
-2D00	8138D734
-2D01	8138D735
-2D02	8138D736
-2D03	8138D737
-2D04	8138D738
-2D05	8138D739
-2D06	8138D830
-2D07	8138D831
-2D08	8138D832
-2D09	8138D833
-2D0A	8138D834
-2D0B	8138D835
-2D0C	8138D836
-2D0D	8138D837
-2D0E	8138D838
-2D0F	8138D839
-2D10	8138D930
-2D11	8138D931
-2D12	8138D932
-2D13	8138D933
-2D14	8138D934
-2D15	8138D935
-2D16	8138D936
-2D17	8138D937
-2D18	8138D938
-2D19	8138D939
-2D1A	8138DA30
-2D1B	8138DA31
-2D1C	8138DA32
-2D1D	8138DA33
-2D1E	8138DA34
-2D1F	8138DA35
-2D20	8138DA36
-2D21	8138DA37
-2D22	8138DA38
-2D23	8138DA39
-2D24	8138DB30
-2D25	8138DB31
-2D26	8138DB32
-2D27	8138DB33
-2D28	8138DB34
-2D29	8138DB35
-2D2A	8138DB36
-2D2B	8138DB37
-2D2C	8138DB38
-2D2D	8138DB39
-2D2E	8138DC30
-2D2F	8138DC31
-2D30	8138DC32
-2D31	8138DC33
-2D32	8138DC34
-2D33	8138DC35
-2D34	8138DC36
-2D35	8138DC37
-2D36	8138DC38
-2D37	8138DC39
-2D38	8138DD30
-2D39	8138DD31
-2D3A	8138DD32
-2D3B	8138DD33
-2D3C	8138DD34
-2D3D	8138DD35
-2D3E	8138DD36
-2D3F	8138DD37
-2D40	8138DD38
-2D41	8138DD39
-2D42	8138DE30
-2D43	8138DE31
-2D44	8138DE32
-2D45	8138DE33
-2D46	8138DE34
-2D47	8138DE35
-2D48	8138DE36
-2D49	8138DE37
-2D4A	8138DE38
-2D4B	8138DE39
-2D4C	8138DF30
-2D4D	8138DF31
-2D4E	8138DF32
-2D4F	8138DF33
-2D50	8138DF34
-2D51	8138DF35
-2D52	8138DF36
-2D53	8138DF37
-2D54	8138DF38
-2D55	8138DF39
-2D56	8138E030
-2D57	8138E031
-2D58	8138E032
-2D59	8138E033
-2D5A	8138E034
-2D5B	8138E035
-2D5C	8138E036
-2D5D	8138E037
-2D5E	8138E038
-2D5F	8138E039
-2D60	8138E130
-2D61	8138E131
-2D62	8138E132
-2D63	8138E133
-2D64	8138E134
-2D65	8138E135
-2D66	8138E136
-2D67	8138E137
-2D68	8138E138
-2D69	8138E139
-2D6A	8138E230
-2D6B	8138E231
-2D6C	8138E232
-2D6D	8138E233
-2D6E	8138E234
-2D6F	8138E235
-2D70	8138E236
-2D71	8138E237
-2D72	8138E238
-2D73	8138E239
-2D74	8138E330
-2D75	8138E331
-2D76	8138E332
-2D77	8138E333
-2D78	8138E334
-2D79	8138E335
-2D7A	8138E336
-2D7B	8138E337
-2D7C	8138E338
-2D7D	8138E339
-2D7E	8138E430
-2D7F	8138E431
-2D80	8138E432
-2D81	8138E433
-2D82	8138E434
-2D83	8138E435
-2D84	8138E436
-2D85	8138E437
-2D86	8138E438
-2D87	8138E439
-2D88	8138E530
-2D89	8138E531
-2D8A	8138E532
-2D8B	8138E533
-2D8C	8138E534
-2D8D	8138E535
-2D8E	8138E536
-2D8F	8138E537
-2D90	8138E538
-2D91	8138E539
-2D92	8138E630
-2D93	8138E631
-2D94	8138E632
-2D95	8138E633
-2D96	8138E634
-2D97	8138E635
-2D98	8138E636
-2D99	8138E637
-2D9A	8138E638
-2D9B	8138E639
-2D9C	8138E730
-2D9D	8138E731
-2D9E	8138E732
-2D9F	8138E733
-2DA0	8138E734
-2DA1	8138E735
-2DA2	8138E736
-2DA3	8138E737
-2DA4	8138E738
-2DA5	8138E739
-2DA6	8138E830
-2DA7	8138E831
-2DA8	8138E832
-2DA9	8138E833
-2DAA	8138E834
-2DAB	8138E835
-2DAC	8138E836
-2DAD	8138E837
-2DAE	8138E838
-2DAF	8138E839
-2DB0	8138E930
-2DB1	8138E931
-2DB2	8138E932
-2DB3	8138E933
-2DB4	8138E934
-2DB5	8138E935
-2DB6	8138E936
-2DB7	8138E937
-2DB8	8138E938
-2DB9	8138E939
-2DBA	8138EA30
-2DBB	8138EA31
-2DBC	8138EA32
-2DBD	8138EA33
-2DBE	8138EA34
-2DBF	8138EA35
-2DC0	8138EA36
-2DC1	8138EA37
-2DC2	8138EA38
-2DC3	8138EA39
-2DC4	8138EB30
-2DC5	8138EB31
-2DC6	8138EB32
-2DC7	8138EB33
-2DC8	8138EB34
-2DC9	8138EB35
-2DCA	8138EB36
-2DCB	8138EB37
-2DCC	8138EB38
-2DCD	8138EB39
-2DCE	8138EC30
-2DCF	8138EC31
-2DD0	8138EC32
-2DD1	8138EC33
-2DD2	8138EC34
-2DD3	8138EC35
-2DD4	8138EC36
-2DD5	8138EC37
-2DD6	8138EC38
-2DD7	8138EC39
-2DD8	8138ED30
-2DD9	8138ED31
-2DDA	8138ED32
-2DDB	8138ED33
-2DDC	8138ED34
-2DDD	8138ED35
-2DDE	8138ED36
-2DDF	8138ED37
-2DE0	8138ED38
-2DE1	8138ED39
-2DE2	8138EE30
-2DE3	8138EE31
-2DE4	8138EE32
-2DE5	8138EE33
-2DE6	8138EE34
-2DE7	8138EE35
-2DE8	8138EE36
-2DE9	8138EE37
-2DEA	8138EE38
-2DEB	8138EE39
-2DEC	8138EF30
-2DED	8138EF31
-2DEE	8138EF32
-2DEF	8138EF33
-2DF0	8138EF34
-2DF1	8138EF35
-2DF2	8138EF36
-2DF3	8138EF37
-2DF4	8138EF38
-2DF5	8138EF39
-2DF6	8138F030
-2DF7	8138F031
-2DF8	8138F032
-2DF9	8138F033
-2DFA	8138F034
-2DFB	8138F035
-2DFC	8138F036
-2DFD	8138F037
-2DFE	8138F038
-2DFF	8138F039
-2E00	8138F130
-2E01	8138F131
-2E02	8138F132
-2E03	8138F133
-2E04	8138F134
-2E05	8138F135
-2E06	8138F136
-2E07	8138F137
-2E08	8138F138
-2E09	8138F139
-2E0A	8138F230
-2E0B	8138F231
-2E0C	8138F232
-2E0D	8138F233
-2E0E	8138F234
-2E0F	8138F235
-2E10	8138F236
-2E11	8138F237
-2E12	8138F238
-2E13	8138F239
-2E14	8138F330
-2E15	8138F331
-2E16	8138F332
-2E17	8138F333
-2E18	8138F334
-2E19	8138F335
-2E1A	8138F336
-2E1B	8138F337
-2E1C	8138F338
-2E1D	8138F339
-2E1E	8138F430
-2E1F	8138F431
-2E20	8138F432
-2E21	8138F433
-2E22	8138F434
-2E23	8138F435
-2E24	8138F436
-2E25	8138F437
-2E26	8138F438
-2E27	8138F439
-2E28	8138F530
-2E29	8138F531
-2E2A	8138F532
-2E2B	8138F533
-2E2C	8138F534
-2E2D	8138F535
-2E2E	8138F536
-2E2F	8138F537
-2E30	8138F538
-2E31	8138F539
-2E32	8138F630
-2E33	8138F631
-2E34	8138F632
-2E35	8138F633
-2E36	8138F634
-2E37	8138F635
-2E38	8138F636
-2E39	8138F637
-2E3A	8138F638
-2E3B	8138F639
-2E3C	8138F730
-2E3D	8138F731
-2E3E	8138F732
-2E3F	8138F733
-2E40	8138F734
-2E41	8138F735
-2E42	8138F736
-2E43	8138F737
-2E44	8138F738
-2E45	8138F739
-2E46	8138F830
-2E47	8138F831
-2E48	8138F832
-2E49	8138F833
-2E4A	8138F834
-2E4B	8138F835
-2E4C	8138F836
-2E4D	8138F837
-2E4E	8138F838
-2E4F	8138F839
-2E50	8138F930
-2E51	8138F931
-2E52	8138F932
-2E53	8138F933
-2E54	8138F934
-2E55	8138F935
-2E56	8138F936
-2E57	8138F937
-2E58	8138F938
-2E59	8138F939
-2E5A	8138FA30
-2E5B	8138FA31
-2E5C	8138FA32
-2E5D	8138FA33
-2E5E	8138FA34
-2E5F	8138FA35
-2E60	8138FA36
-2E61	8138FA37
-2E62	8138FA38
-2E63	8138FA39
-2E64	8138FB30
-2E65	8138FB31
-2E66	8138FB32
-2E67	8138FB33
-2E68	8138FB34
-2E69	8138FB35
-2E6A	8138FB36
-2E6B	8138FB37
-2E6C	8138FB38
-2E6D	8138FB39
-2E6E	8138FC30
-2E6F	8138FC31
-2E70	8138FC32
-2E71	8138FC33
-2E72	8138FC34
-2E73	8138FC35
-2E74	8138FC36
-2E75	8138FC37
-2E76	8138FC38
-2E77	8138FC39
-2E78	8138FD30
-2E79	8138FD31
-2E7A	8138FD32
-2E7B	8138FD33
-2E7C	8138FD34
-2E7D	8138FD35
-2E7E	8138FD36
-2E7F	8138FD37
-2E80	8138FD38
-2E81	FE50
-2E82	8138FD39
-2E83	8138FE30
-2E84	FE54
-2E85	8138FE31
-2E86	8138FE32
-2E87	8138FE33
-2E88	FE57
-2E89	8138FE34
-2E8A	8138FE35
-2E8B	FE58
-2E8C	FE5D
-2E8D	8138FE36
-2E8E	8138FE37
-2E8F	8138FE38
-2E90	8138FE39
-2E91	81398130
-2E92	81398131
-2E93	81398132
-2E94	81398133
-2E95	81398134
-2E96	81398135
-2E97	FE5E
-2E98	81398136
-2E99	81398137
-2E9A	81398138
-2E9B	81398139
-2E9C	81398230
-2E9D	81398231
-2E9E	81398232
-2E9F	81398233
-2EA0	81398234
-2EA1	81398235
-2EA2	81398236
-2EA3	81398237
-2EA4	81398238
-2EA5	81398239
-2EA6	81398330
-2EA7	FE6B
-2EA8	81398331
-2EA9	81398332
-2EAA	FE6E
-2EAB	81398333
-2EAC	81398334
-2EAD	81398335
-2EAE	FE71
-2EAF	81398336
-2EB0	81398337
-2EB1	81398338
-2EB2	81398339
-2EB3	FE73
-2EB4	81398430
-2EB5	81398431
-2EB6	FE74
-2EB7	FE75
-2EB8	81398432
-2EB9	81398433
-2EBA	81398434
-2EBB	FE79
-2EBC	81398435
-2EBD	81398436
-2EBE	81398437
-2EBF	81398438
-2EC0	81398439
-2EC1	81398530
-2EC2	81398531
-2EC3	81398532
-2EC4	81398533
-2EC5	81398534
-2EC6	81398535
-2EC7	81398536
-2EC8	81398537
-2EC9	81398538
-2ECA	FE84
-2ECB	81398539
-2ECC	81398630
-2ECD	81398631
-2ECE	81398632
-2ECF	81398633
-2ED0	81398634
-2ED1	81398635
-2ED2	81398636
-2ED3	81398637
-2ED4	81398638
-2ED5	81398639
-2ED6	81398730
-2ED7	81398731
-2ED8	81398732
-2ED9	81398733
-2EDA	81398734
-2EDB	81398735
-2EDC	81398736
-2EDD	81398737
-2EDE	81398738
-2EDF	81398739
-2EE0	81398830
-2EE1	81398831
-2EE2	81398832
-2EE3	81398833
-2EE4	81398834
-2EE5	81398835
-2EE6	81398836
-2EE7	81398837
-2EE8	81398838
-2EE9	81398839
-2EEA	81398930
-2EEB	81398931
-2EEC	81398932
-2EED	81398933
-2EEE	81398934
-2EEF	81398935
-2EF0	81398936
-2EF1	81398937
-2EF2	81398938
-2EF3	81398939
-2EF4	81398A30
-2EF5	81398A31
-2EF6	81398A32
-2EF7	81398A33
-2EF8	81398A34
-2EF9	81398A35
-2EFA	81398A36
-2EFB	81398A37
-2EFC	81398A38
-2EFD	81398A39
-2EFE	81398B30
-2EFF	81398B31
-2F00	81398B32
-2F01	81398B33
-2F02	81398B34
-2F03	81398B35
-2F04	81398B36
-2F05	81398B37
-2F06	81398B38
-2F07	81398B39
-2F08	81398C30
-2F09	81398C31
-2F0A	81398C32
-2F0B	81398C33
-2F0C	81398C34
-2F0D	81398C35
-2F0E	81398C36
-2F0F	81398C37
-2F10	81398C38
-2F11	81398C39
-2F12	81398D30
-2F13	81398D31
-2F14	81398D32
-2F15	81398D33
-2F16	81398D34
-2F17	81398D35
-2F18	81398D36
-2F19	81398D37
-2F1A	81398D38
-2F1B	81398D39
-2F1C	81398E30
-2F1D	81398E31
-2F1E	81398E32
-2F1F	81398E33
-2F20	81398E34
-2F21	81398E35
-2F22	81398E36
-2F23	81398E37
-2F24	81398E38
-2F25	81398E39
-2F26	81398F30
-2F27	81398F31
-2F28	81398F32
-2F29	81398F33
-2F2A	81398F34
-2F2B	81398F35
-2F2C	81398F36
-2F2D	81398F37
-2F2E	81398F38
-2F2F	81398F39
-2F30	81399030
-2F31	81399031
-2F32	81399032
-2F33	81399033
-2F34	81399034
-2F35	81399035
-2F36	81399036
-2F37	81399037
-2F38	81399038
-2F39	81399039
-2F3A	81399130
-2F3B	81399131
-2F3C	81399132
-2F3D	81399133
-2F3E	81399134
-2F3F	81399135
-2F40	81399136
-2F41	81399137
-2F42	81399138
-2F43	81399139
-2F44	81399230
-2F45	81399231
-2F46	81399232
-2F47	81399233
-2F48	81399234
-2F49	81399235
-2F4A	81399236
-2F4B	81399237
-2F4C	81399238
-2F4D	81399239
-2F4E	81399330
-2F4F	81399331
-2F50	81399332
-2F51	81399333
-2F52	81399334
-2F53	81399335
-2F54	81399336
-2F55	81399337
-2F56	81399338
-2F57	81399339
-2F58	81399430
-2F59	81399431
-2F5A	81399432
-2F5B	81399433
-2F5C	81399434
-2F5D	81399435
-2F5E	81399436
-2F5F	81399437
-2F60	81399438
-2F61	81399439
-2F62	81399530
-2F63	81399531
-2F64	81399532
-2F65	81399533
-2F66	81399534
-2F67	81399535
-2F68	81399536
-2F69	81399537
-2F6A	81399538
-2F6B	81399539
-2F6C	81399630
-2F6D	81399631
-2F6E	81399632
-2F6F	81399633
-2F70	81399634
-2F71	81399635
-2F72	81399636
-2F73	81399637
-2F74	81399638
-2F75	81399639
-2F76	81399730
-2F77	81399731
-2F78	81399732
-2F79	81399733
-2F7A	81399734
-2F7B	81399735
-2F7C	81399736
-2F7D	81399737
-2F7E	81399738
-2F7F	81399739
-2F80	81399830
-2F81	81399831
-2F82	81399832
-2F83	81399833
-2F84	81399834
-2F85	81399835
-2F86	81399836
-2F87	81399837
-2F88	81399838
-2F89	81399839
-2F8A	81399930
-2F8B	81399931
-2F8C	81399932
-2F8D	81399933
-2F8E	81399934
-2F8F	81399935
-2F90	81399936
-2F91	81399937
-2F92	81399938
-2F93	81399939
-2F94	81399A30
-2F95	81399A31
-2F96	81399A32
-2F97	81399A33
-2F98	81399A34
-2F99	81399A35
-2F9A	81399A36
-2F9B	81399A37
-2F9C	81399A38
-2F9D	81399A39
-2F9E	81399B30
-2F9F	81399B31
-2FA0	81399B32
-2FA1	81399B33
-2FA2	81399B34
-2FA3	81399B35
-2FA4	81399B36
-2FA5	81399B37
-2FA6	81399B38
-2FA7	81399B39
-2FA8	81399C30
-2FA9	81399C31
-2FAA	81399C32
-2FAB	81399C33
-2FAC	81399C34
-2FAD	81399C35
-2FAE	81399C36
-2FAF	81399C37
-2FB0	81399C38
-2FB1	81399C39
-2FB2	81399D30
-2FB3	81399D31
-2FB4	81399D32
-2FB5	81399D33
-2FB6	81399D34
-2FB7	81399D35
-2FB8	81399D36
-2FB9	81399D37
-2FBA	81399D38
-2FBB	81399D39
-2FBC	81399E30
-2FBD	81399E31
-2FBE	81399E32
-2FBF	81399E33
-2FC0	81399E34
-2FC1	81399E35
-2FC2	81399E36
-2FC3	81399E37
-2FC4	81399E38
-2FC5	81399E39
-2FC6	81399F30
-2FC7	81399F31
-2FC8	81399F32
-2FC9	81399F33
-2FCA	81399F34
-2FCB	81399F35
-2FCC	81399F36
-2FCD	81399F37
-2FCE	81399F38
-2FCF	81399F39
-2FD0	8139A030
-2FD1	8139A031
-2FD2	8139A032
-2FD3	8139A033
-2FD4	8139A034
-2FD5	8139A035
-2FD6	8139A036
-2FD7	8139A037
-2FD8	8139A038
-2FD9	8139A039
-2FDA	8139A130
-2FDB	8139A131
-2FDC	8139A132
-2FDD	8139A133
-2FDE	8139A134
-2FDF	8139A135
-2FE0	8139A136
-2FE1	8139A137
-2FE2	8139A138
-2FE3	8139A139
-2FE4	8139A230
-2FE5	8139A231
-2FE6	8139A232
-2FE7	8139A233
-2FE8	8139A234
-2FE9	8139A235
-2FEA	8139A236
-2FEB	8139A237
-2FEC	8139A238
-2FED	8139A239
-2FEE	8139A330
-2FEF	8139A331
-2FF0	A98A
-2FF1	A98B
-2FF2	A98C
-2FF3	A98D
-2FF4	A98E
-2FF5	A98F
-2FF6	A990
-2FF7	A991
-2FF8	A992
-2FF9	A993
-2FFA	A994
-2FFB	A995
-2FFC	8139A332
-2FFD	8139A333
-2FFE	8139A334
-2FFF	8139A335
-3000	A1A1
-3001	A1A2
-3002	A1A3
-3003	A1A8
-3004	8139A336
-3005	A1A9
-3006	A965
-3007	A996
-3008	A1B4
-3009	A1B5
-300A	A1B6
-300B	A1B7
-300C	A1B8
-300D	A1B9
-300E	A1BA
-300F	A1BB
-3010	A1BE
-3011	A1BF
-3012	A893
-3013	A1FE
-3014	A1B2
-3015	A1B3
-3016	A1BC
-3017	A1BD
-3018	8139A337
-3019	8139A338
-301A	8139A339
-301B	8139A430
-301C	8139A431
-301D	A894
-301E	A895
-301F	8139A432
-3020	8139A433
-3021	A940
-3022	A941
-3023	A942
-3024	A943
-3025	A944
-3026	A945
-3027	A946
-3028	A947
-3029	A948
-302A	8139A434
-302B	8139A435
-302C	8139A436
-302D	8139A437
-302E	8139A438
-302F	8139A439
-3030	8139A530
-3031	8139A531
-3032	8139A532
-3033	8139A533
-3034	8139A534
-3035	8139A535
-3036	8139A536
-3037	8139A537
-3038	8139A538
-3039	8139A539
-303A	8139A630
-303B	8139A631
-303C	8139A632
-303D	8139A633
-303E	A989
-303F	8139A634
-3040	8139A635
-3041	A4A1
-3042	A4A2
-3043	A4A3
-3044	A4A4
-3045	A4A5
-3046	A4A6
-3047	A4A7
-3048	A4A8
-3049	A4A9
-304A	A4AA
-304B	A4AB
-304C	A4AC
-304D	A4AD
-304E	A4AE
-304F	A4AF
-3050	A4B0
-3051	A4B1
-3052	A4B2
-3053	A4B3
-3054	A4B4
-3055	A4B5
-3056	A4B6
-3057	A4B7
-3058	A4B8
-3059	A4B9
-305A	A4BA
-305B	A4BB
-305C	A4BC
-305D	A4BD
-305E	A4BE
-305F	A4BF
-3060	A4C0
-3061	A4C1
-3062	A4C2
-3063	A4C3
-3064	A4C4
-3065	A4C5
-3066	A4C6
-3067	A4C7
-3068	A4C8
-3069	A4C9
-306A	A4CA
-306B	A4CB
-306C	A4CC
-306D	A4CD
-306E	A4CE
-306F	A4CF
-3070	A4D0
-3071	A4D1
-3072	A4D2
-3073	A4D3
-3074	A4D4
-3075	A4D5
-3076	A4D6
-3077	A4D7
-3078	A4D8
-3079	A4D9
-307A	A4DA
-307B	A4DB
-307C	A4DC
-307D	A4DD
-307E	A4DE
-307F	A4DF
-3080	A4E0
-3081	A4E1
-3082	A4E2
-3083	A4E3
-3084	A4E4
-3085	A4E5
-3086	A4E6
-3087	A4E7
-3088	A4E8
-3089	A4E9
-308A	A4EA
-308B	A4EB
-308C	A4EC
-308D	A4ED
-308E	A4EE
-308F	A4EF
-3090	A4F0
-3091	A4F1
-3092	A4F2
-3093	A4F3
-3094	8139A636
-3095	8139A637
-3096	8139A638
-3097	8139A639
-3098	8139A730
-3099	8139A731
-309A	8139A732
-309B	A961
-309C	A962
-309D	A966
-309E	A967
-309F	8139A733
-30A0	8139A734
-30A1	A5A1
-30A2	A5A2
-30A3	A5A3
-30A4	A5A4
-30A5	A5A5
-30A6	A5A6
-30A7	A5A7
-30A8	A5A8
-30A9	A5A9
-30AA	A5AA
-30AB	A5AB
-30AC	A5AC
-30AD	A5AD
-30AE	A5AE
-30AF	A5AF
-30B0	A5B0
-30B1	A5B1
-30B2	A5B2
-30B3	A5B3
-30B4	A5B4
-30B5	A5B5
-30B6	A5B6
-30B7	A5B7
-30B8	A5B8
-30B9	A5B9
-30BA	A5BA
-30BB	A5BB
-30BC	A5BC
-30BD	A5BD
-30BE	A5BE
-30BF	A5BF
-30C0	A5C0
-30C1	A5C1
-30C2	A5C2
-30C3	A5C3
-30C4	A5C4
-30C5	A5C5
-30C6	A5C6
-30C7	A5C7
-30C8	A5C8
-30C9	A5C9
-30CA	A5CA
-30CB	A5CB
-30CC	A5CC
-30CD	A5CD
-30CE	A5CE
-30CF	A5CF
-30D0	A5D0
-30D1	A5D1
-30D2	A5D2
-30D3	A5D3
-30D4	A5D4
-30D5	A5D5
-30D6	A5D6
-30D7	A5D7
-30D8	A5D8
-30D9	A5D9
-30DA	A5DA
-30DB	A5DB
-30DC	A5DC
-30DD	A5DD
-30DE	A5DE
-30DF	A5DF
-30E0	A5E0
-30E1	A5E1
-30E2	A5E2
-30E3	A5E3
-30E4	A5E4
-30E5	A5E5
-30E6	A5E6
-30E7	A5E7
-30E8	A5E8
-30E9	A5E9
-30EA	A5EA
-30EB	A5EB
-30EC	A5EC
-30ED	A5ED
-30EE	A5EE
-30EF	A5EF
-30F0	A5F0
-30F1	A5F1
-30F2	A5F2
-30F3	A5F3
-30F4	A5F4
-30F5	A5F5
-30F6	A5F6
-30F7	8139A735
-30F8	8139A736
-30F9	8139A737
-30FA	8139A738
-30FB	8139A739
-30FC	A960
-30FD	A963
-30FE	A964
-30FF	8139A830
-3100	8139A831
-3101	8139A832
-3102	8139A833
-3103	8139A834
-3104	8139A835
-3105	A8C5
-3106	A8C6
-3107	A8C7
-3108	A8C8
-3109	A8C9
-310A	A8CA
-310B	A8CB
-310C	A8CC
-310D	A8CD
-310E	A8CE
-310F	A8CF
-3110	A8D0
-3111	A8D1
-3112	A8D2
-3113	A8D3
-3114	A8D4
-3115	A8D5
-3116	A8D6
-3117	A8D7
-3118	A8D8
-3119	A8D9
-311A	A8DA
-311B	A8DB
-311C	A8DC
-311D	A8DD
-311E	A8DE
-311F	A8DF
-3120	A8E0
-3121	A8E1
-3122	A8E2
-3123	A8E3
-3124	A8E4
-3125	A8E5
-3126	A8E6
-3127	A8E7
-3128	A8E8
-3129	A8E9
-312A	8139A836
-312B	8139A837
-312C	8139A838
-312D	8139A839
-312E	8139A930
-312F	8139A931
-3130	8139A932
-3131	8139A933
-3132	8139A934
-3133	8139A935
-3134	8139A936
-3135	8139A937
-3136	8139A938
-3137	8139A939
-3138	8139AA30
-3139	8139AA31
-313A	8139AA32
-313B	8139AA33
-313C	8139AA34
-313D	8139AA35
-313E	8139AA36
-313F	8139AA37
-3140	8139AA38
-3141	8139AA39
-3142	8139AB30
-3143	8139AB31
-3144	8139AB32
-3145	8139AB33
-3146	8139AB34
-3147	8139AB35
-3148	8139AB36
-3149	8139AB37
-314A	8139AB38
-314B	8139AB39
-314C	8139AC30
-314D	8139AC31
-314E	8139AC32
-314F	8139AC33
-3150	8139AC34
-3151	8139AC35
-3152	8139AC36
-3153	8139AC37
-3154	8139AC38
-3155	8139AC39
-3156	8139AD30
-3157	8139AD31
-3158	8139AD32
-3159	8139AD33
-315A	8139AD34
-315B	8139AD35
-315C	8139AD36
-315D	8139AD37
-315E	8139AD38
-315F	8139AD39
-3160	8139AE30
-3161	8139AE31
-3162	8139AE32
-3163	8139AE33
-3164	8139AE34
-3165	8139AE35
-3166	8139AE36
-3167	8139AE37
-3168	8139AE38
-3169	8139AE39
-316A	8139AF30
-316B	8139AF31
-316C	8139AF32
-316D	8139AF33
-316E	8139AF34
-316F	8139AF35
-3170	8139AF36
-3171	8139AF37
-3172	8139AF38
-3173	8139AF39
-3174	8139B030
-3175	8139B031
-3176	8139B032
-3177	8139B033
-3178	8139B034
-3179	8139B035
-317A	8139B036
-317B	8139B037
-317C	8139B038
-317D	8139B039
-317E	8139B130
-317F	8139B131
-3180	8139B132
-3181	8139B133
-3182	8139B134
-3183	8139B135
-3184	8139B136
-3185	8139B137
-3186	8139B138
-3187	8139B139
-3188	8139B230
-3189	8139B231
-318A	8139B232
-318B	8139B233
-318C	8139B234
-318D	8139B235
-318E	8139B236
-318F	8139B237
-3190	8139B238
-3191	8139B239
-3192	8139B330
-3193	8139B331
-3194	8139B332
-3195	8139B333
-3196	8139B334
-3197	8139B335
-3198	8139B336
-3199	8139B337
-319A	8139B338
-319B	8139B339
-319C	8139B430
-319D	8139B431
-319E	8139B432
-319F	8139B433
-31A0	8139B434
-31A1	8139B435
-31A2	8139B436
-31A3	8139B437
-31A4	8139B438
-31A5	8139B439
-31A6	8139B530
-31A7	8139B531
-31A8	8139B532
-31A9	8139B533
-31AA	8139B534
-31AB	8139B535
-31AC	8139B536
-31AD	8139B537
-31AE	8139B538
-31AF	8139B539
-31B0	8139B630
-31B1	8139B631
-31B2	8139B632
-31B3	8139B633
-31B4	8139B634
-31B5	8139B635
-31B6	8139B636
-31B7	8139B637
-31B8	8139B638
-31B9	8139B639
-31BA	8139B730
-31BB	8139B731
-31BC	8139B732
-31BD	8139B733
-31BE	8139B734
-31BF	8139B735
-31C0	8139B736
-31C1	8139B737
-31C2	8139B738
-31C3	8139B739
-31C4	8139B830
-31C5	8139B831
-31C6	8139B832
-31C7	8139B833
-31C8	8139B834
-31C9	8139B835
-31CA	8139B836
-31CB	8139B837
-31CC	8139B838
-31CD	8139B839
-31CE	8139B930
-31CF	8139B931
-31D0	8139B932
-31D1	8139B933
-31D2	8139B934
-31D3	8139B935
-31D4	8139B936
-31D5	8139B937
-31D6	8139B938
-31D7	8139B939
-31D8	8139BA30
-31D9	8139BA31
-31DA	8139BA32
-31DB	8139BA33
-31DC	8139BA34
-31DD	8139BA35
-31DE	8139BA36
-31DF	8139BA37
-31E0	8139BA38
-31E1	8139BA39
-31E2	8139BB30
-31E3	8139BB31
-31E4	8139BB32
-31E5	8139BB33
-31E6	8139BB34
-31E7	8139BB35
-31E8	8139BB36
-31E9	8139BB37
-31EA	8139BB38
-31EB	8139BB39
-31EC	8139BC30
-31ED	8139BC31
-31EE	8139BC32
-31EF	8139BC33
-31F0	8139BC34
-31F1	8139BC35
-31F2	8139BC36
-31F3	8139BC37
-31F4	8139BC38
-31F5	8139BC39
-31F6	8139BD30
-31F7	8139BD31
-31F8	8139BD32
-31F9	8139BD33
-31FA	8139BD34
-31FB	8139BD35
-31FC	8139BD36
-31FD	8139BD37
-31FE	8139BD38
-31FF	8139BD39
-3200	8139BE30
-3201	8139BE31
-3202	8139BE32
-3203	8139BE33
-3204	8139BE34
-3205	8139BE35
-3206	8139BE36
-3207	8139BE37
-3208	8139BE38
-3209	8139BE39
-320A	8139BF30
-320B	8139BF31
-320C	8139BF32
-320D	8139BF33
-320E	8139BF34
-320F	8139BF35
-3210	8139BF36
-3211	8139BF37
-3212	8139BF38
-3213	8139BF39
-3214	8139C030
-3215	8139C031
-3216	8139C032
-3217	8139C033
-3218	8139C034
-3219	8139C035
-321A	8139C036
-321B	8139C037
-321C	8139C038
-321D	8139C039
-321E	8139C130
-321F	8139C131
-3220	A2E5
-3221	A2E6
-3222	A2E7
-3223	A2E8
-3224	A2E9
-3225	A2EA
-3226	A2EB
-3227	A2EC
-3228	A2ED
-3229	A2EE
-322A	8139C132
-322B	8139C133
-322C	8139C134
-322D	8139C135
-322E	8139C136
-322F	8139C137
-3230	8139C138
-3231	A95A
-3232	8139C139
-3233	8139C230
-3234	8139C231
-3235	8139C232
-3236	8139C233
-3237	8139C234
-3238	8139C235
-3239	8139C236
-323A	8139C237
-323B	8139C238
-323C	8139C239
-323D	8139C330
-323E	8139C331
-323F	8139C332
-3240	8139C333
-3241	8139C334
-3242	8139C335
-3243	8139C336
-3244	8139C337
-3245	8139C338
-3246	8139C339
-3247	8139C430
-3248	8139C431
-3249	8139C432
-324A	8139C433
-324B	8139C434
-324C	8139C435
-324D	8139C436
-324E	8139C437
-324F	8139C438
-3250	8139C439
-3251	8139C530
-3252	8139C531
-3253	8139C532
-3254	8139C533
-3255	8139C534
-3256	8139C535
-3257	8139C536
-3258	8139C537
-3259	8139C538
-325A	8139C539
-325B	8139C630
-325C	8139C631
-325D	8139C632
-325E	8139C633
-325F	8139C634
-3260	8139C635
-3261	8139C636
-3262	8139C637
-3263	8139C638
-3264	8139C639
-3265	8139C730
-3266	8139C731
-3267	8139C732
-3268	8139C733
-3269	8139C734
-326A	8139C735
-326B	8139C736
-326C	8139C737
-326D	8139C738
-326E	8139C739
-326F	8139C830
-3270	8139C831
-3271	8139C832
-3272	8139C833
-3273	8139C834
-3274	8139C835
-3275	8139C836
-3276	8139C837
-3277	8139C838
-3278	8139C839
-3279	8139C930
-327A	8139C931
-327B	8139C932
-327C	8139C933
-327D	8139C934
-327E	8139C935
-327F	8139C936
-3280	8139C937
-3281	8139C938
-3282	8139C939
-3283	8139CA30
-3284	8139CA31
-3285	8139CA32
-3286	8139CA33
-3287	8139CA34
-3288	8139CA35
-3289	8139CA36
-328A	8139CA37
-328B	8139CA38
-328C	8139CA39
-328D	8139CB30
-328E	8139CB31
-328F	8139CB32
-3290	8139CB33
-3291	8139CB34
-3292	8139CB35
-3293	8139CB36
-3294	8139CB37
-3295	8139CB38
-3296	8139CB39
-3297	8139CC30
-3298	8139CC31
-3299	8139CC32
-329A	8139CC33
-329B	8139CC34
-329C	8139CC35
-329D	8139CC36
-329E	8139CC37
-329F	8139CC38
-32A0	8139CC39
-32A1	8139CD30
-32A2	8139CD31
-32A3	A949
-32A4	8139CD32
-32A5	8139CD33
-32A6	8139CD34
-32A7	8139CD35
-32A8	8139CD36
-32A9	8139CD37
-32AA	8139CD38
-32AB	8139CD39
-32AC	8139CE30
-32AD	8139CE31
-32AE	8139CE32
-32AF	8139CE33
-32B0	8139CE34
-32B1	8139CE35
-32B2	8139CE36
-32B3	8139CE37
-32B4	8139CE38
-32B5	8139CE39
-32B6	8139CF30
-32B7	8139CF31
-32B8	8139CF32
-32B9	8139CF33
-32BA	8139CF34
-32BB	8139CF35
-32BC	8139CF36
-32BD	8139CF37
-32BE	8139CF38
-32BF	8139CF39
-32C0	8139D030
-32C1	8139D031
-32C2	8139D032
-32C3	8139D033
-32C4	8139D034
-32C5	8139D035
-32C6	8139D036
-32C7	8139D037
-32C8	8139D038
-32C9	8139D039
-32CA	8139D130
-32CB	8139D131
-32CC	8139D132
-32CD	8139D133
-32CE	8139D134
-32CF	8139D135
-32D0	8139D136
-32D1	8139D137
-32D2	8139D138
-32D3	8139D139
-32D4	8139D230
-32D5	8139D231
-32D6	8139D232
-32D7	8139D233
-32D8	8139D234
-32D9	8139D235
-32DA	8139D236
-32DB	8139D237
-32DC	8139D238
-32DD	8139D239
-32DE	8139D330
-32DF	8139D331
-32E0	8139D332
-32E1	8139D333
-32E2	8139D334
-32E3	8139D335
-32E4	8139D336
-32E5	8139D337
-32E6	8139D338
-32E7	8139D339
-32E8	8139D430
-32E9	8139D431
-32EA	8139D432
-32EB	8139D433
-32EC	8139D434
-32ED	8139D435
-32EE	8139D436
-32EF	8139D437
-32F0	8139D438
-32F1	8139D439
-32F2	8139D530
-32F3	8139D531
-32F4	8139D532
-32F5	8139D533
-32F6	8139D534
-32F7	8139D535
-32F8	8139D536
-32F9	8139D537
-32FA	8139D538
-32FB	8139D539
-32FC	8139D630
-32FD	8139D631
-32FE	8139D632
-32FF	8139D633
-3300	8139D634
-3301	8139D635
-3302	8139D636
-3303	8139D637
-3304	8139D638
-3305	8139D639
-3306	8139D730
-3307	8139D731
-3308	8139D732
-3309	8139D733
-330A	8139D734
-330B	8139D735
-330C	8139D736
-330D	8139D737
-330E	8139D738
-330F	8139D739
-3310	8139D830
-3311	8139D831
-3312	8139D832
-3313	8139D833
-3314	8139D834
-3315	8139D835
-3316	8139D836
-3317	8139D837
-3318	8139D838
-3319	8139D839
-331A	8139D930
-331B	8139D931
-331C	8139D932
-331D	8139D933
-331E	8139D934
-331F	8139D935
-3320	8139D936
-3321	8139D937
-3322	8139D938
-3323	8139D939
-3324	8139DA30
-3325	8139DA31
-3326	8139DA32
-3327	8139DA33
-3328	8139DA34
-3329	8139DA35
-332A	8139DA36
-332B	8139DA37
-332C	8139DA38
-332D	8139DA39
-332E	8139DB30
-332F	8139DB31
-3330	8139DB32
-3331	8139DB33
-3332	8139DB34
-3333	8139DB35
-3334	8139DB36
-3335	8139DB37
-3336	8139DB38
-3337	8139DB39
-3338	8139DC30
-3339	8139DC31
-333A	8139DC32
-333B	8139DC33
-333C	8139DC34
-333D	8139DC35
-333E	8139DC36
-333F	8139DC37
-3340	8139DC38
-3341	8139DC39
-3342	8139DD30
-3343	8139DD31
-3344	8139DD32
-3345	8139DD33
-3346	8139DD34
-3347	8139DD35
-3348	8139DD36
-3349	8139DD37
-334A	8139DD38
-334B	8139DD39
-334C	8139DE30
-334D	8139DE31
-334E	8139DE32
-334F	8139DE33
-3350	8139DE34
-3351	8139DE35
-3352	8139DE36
-3353	8139DE37
-3354	8139DE38
-3355	8139DE39
-3356	8139DF30
-3357	8139DF31
-3358	8139DF32
-3359	8139DF33
-335A	8139DF34
-335B	8139DF35
-335C	8139DF36
-335D	8139DF37
-335E	8139DF38
-335F	8139DF39
-3360	8139E030
-3361	8139E031
-3362	8139E032
-3363	8139E033
-3364	8139E034
-3365	8139E035
-3366	8139E036
-3367	8139E037
-3368	8139E038
-3369	8139E039
-336A	8139E130
-336B	8139E131
-336C	8139E132
-336D	8139E133
-336E	8139E134
-336F	8139E135
-3370	8139E136
-3371	8139E137
-3372	8139E138
-3373	8139E139
-3374	8139E230
-3375	8139E231
-3376	8139E232
-3377	8139E233
-3378	8139E234
-3379	8139E235
-337A	8139E236
-337B	8139E237
-337C	8139E238
-337D	8139E239
-337E	8139E330
-337F	8139E331
-3380	8139E332
-3381	8139E333
-3382	8139E334
-3383	8139E335
-3384	8139E336
-3385	8139E337
-3386	8139E338
-3387	8139E339
-3388	8139E430
-3389	8139E431
-338A	8139E432
-338B	8139E433
-338C	8139E434
-338D	8139E435
-338E	A94A
-338F	A94B
-3390	8139E436
-3391	8139E437
-3392	8139E438
-3393	8139E439
-3394	8139E530
-3395	8139E531
-3396	8139E532
-3397	8139E533
-3398	8139E534
-3399	8139E535
-339A	8139E536
-339B	8139E537
-339C	A94C
-339D	A94D
-339E	A94E
-339F	8139E538
-33A0	8139E539
-33A1	A94F
-33A2	8139E630
-33A3	8139E631
-33A4	8139E632
-33A5	8139E633
-33A6	8139E634
-33A7	8139E635
-33A8	8139E636
-33A9	8139E637
-33AA	8139E638
-33AB	8139E639
-33AC	8139E730
-33AD	8139E731
-33AE	8139E732
-33AF	8139E733
-33B0	8139E734
-33B1	8139E735
-33B2	8139E736
-33B3	8139E737
-33B4	8139E738
-33B5	8139E739
-33B6	8139E830
-33B7	8139E831
-33B8	8139E832
-33B9	8139E833
-33BA	8139E834
-33BB	8139E835
-33BC	8139E836
-33BD	8139E837
-33BE	8139E838
-33BF	8139E839
-33C0	8139E930
-33C1	8139E931
-33C2	8139E932
-33C3	8139E933
-33C4	A950
-33C5	8139E934
-33C6	8139E935
-33C7	8139E936
-33C8	8139E937
-33C9	8139E938
-33CA	8139E939
-33CB	8139EA30
-33CC	8139EA31
-33CD	8139EA32
-33CE	A951
-33CF	8139EA33
-33D0	8139EA34
-33D1	A952
-33D2	A953
-33D3	8139EA35
-33D4	8139EA36
-33D5	A954
-33D6	8139EA37
-33D7	8139EA38
-33D8	8139EA39
-33D9	8139EB30
-33DA	8139EB31
-33DB	8139EB32
-33DC	8139EB33
-33DD	8139EB34
-33DE	8139EB35
-33DF	8139EB36
-33E0	8139EB37
-33E1	8139EB38
-33E2	8139EB39
-33E3	8139EC30
-33E4	8139EC31
-33E5	8139EC32
-33E6	8139EC33
-33E7	8139EC34
-33E8	8139EC35
-33E9	8139EC36
-33EA	8139EC37
-33EB	8139EC38
-33EC	8139EC39
-33ED	8139ED30
-33EE	8139ED31
-33EF	8139ED32
-33F0	8139ED33
-33F1	8139ED34
-33F2	8139ED35
-33F3	8139ED36
-33F4	8139ED37
-33F5	8139ED38
-33F6	8139ED39
-33F7	8139EE30
-33F8	8139EE31
-33F9	8139EE32
-33FA	8139EE33
-33FB	8139EE34
-33FC	8139EE35
-33FD	8139EE36
-33FE	8139EE37
-33FF	8139EE38
-3400	8139EE39
-3401	8139EF30
-3402	8139EF31
-3403	8139EF32
-3404	8139EF33
-3405	8139EF34
-3406	8139EF35
-3407	8139EF36
-3408	8139EF37
-3409	8139EF38
-340A	8139EF39
-340B	8139F030
-340C	8139F031
-340D	8139F032
-340E	8139F033
-340F	8139F034
-3410	8139F035
-3411	8139F036
-3412	8139F037
-3413	8139F038
-3414	8139F039
-3415	8139F130
-3416	8139F131
-3417	8139F132
-3418	8139F133
-3419	8139F134
-341A	8139F135
-341B	8139F136
-341C	8139F137
-341D	8139F138
-341E	8139F139
-341F	8139F230
-3420	8139F231
-3421	8139F232
-3422	8139F233
-3423	8139F234
-3424	8139F235
-3425	8139F236
-3426	8139F237
-3427	8139F238
-3428	8139F239
-3429	8139F330
-342A	8139F331
-342B	8139F332
-342C	8139F333
-342D	8139F334
-342E	8139F335
-342F	8139F336
-3430	8139F337
-3431	8139F338
-3432	8139F339
-3433	8139F430
-3434	8139F431
-3435	8139F432
-3436	8139F433
-3437	8139F434
-3438	8139F435
-3439	8139F436
-343A	8139F437
-343B	8139F438
-343C	8139F439
-343D	8139F530
-343E	8139F531
-343F	8139F532
-3440	8139F533
-3441	8139F534
-3442	8139F535
-3443	8139F536
-3444	8139F537
-3445	8139F538
-3446	8139F539
-3447	FE56
-3448	8139F630
-3449	8139F631
-344A	8139F632
-344B	8139F633
-344C	8139F634
-344D	8139F635
-344E	8139F636
-344F	8139F637
-3450	8139F638
-3451	8139F639
-3452	8139F730
-3453	8139F731
-3454	8139F732
-3455	8139F733
-3456	8139F734
-3457	8139F735
-3458	8139F736
-3459	8139F737
-345A	8139F738
-345B	8139F739
-345C	8139F830
-345D	8139F831
-345E	8139F832
-345F	8139F833
-3460	8139F834
-3461	8139F835
-3462	8139F836
-3463	8139F837
-3464	8139F838
-3465	8139F839
-3466	8139F930
-3467	8139F931
-3468	8139F932
-3469	8139F933
-346A	8139F934
-346B	8139F935
-346C	8139F936
-346D	8139F937
-346E	8139F938
-346F	8139F939
-3470	8139FA30
-3471	8139FA31
-3472	8139FA32
-3473	FE55
-3474	8139FA33
-3475	8139FA34
-3476	8139FA35
-3477	8139FA36
-3478	8139FA37
-3479	8139FA38
-347A	8139FA39
-347B	8139FB30
-347C	8139FB31
-347D	8139FB32
-347E	8139FB33
-347F	8139FB34
-3480	8139FB35
-3481	8139FB36
-3482	8139FB37
-3483	8139FB38
-3484	8139FB39
-3485	8139FC30
-3486	8139FC31
-3487	8139FC32
-3488	8139FC33
-3489	8139FC34
-348A	8139FC35
-348B	8139FC36
-348C	8139FC37
-348D	8139FC38
-348E	8139FC39
-348F	8139FD30
-3490	8139FD31
-3491	8139FD32
-3492	8139FD33
-3493	8139FD34
-3494	8139FD35
-3495	8139FD36
-3496	8139FD37
-3497	8139FD38
-3498	8139FD39
-3499	8139FE30
-349A	8139FE31
-349B	8139FE32
-349C	8139FE33
-349D	8139FE34
-349E	8139FE35
-349F	8139FE36
-34A0	8139FE37
-34A1	8139FE38
-34A2	8139FE39
-34A3	82308130
-34A4	82308131
-34A5	82308132
-34A6	82308133
-34A7	82308134
-34A8	82308135
-34A9	82308136
-34AA	82308137
-34AB	82308138
-34AC	82308139
-34AD	82308230
-34AE	82308231
-34AF	82308232
-34B0	82308233
-34B1	82308234
-34B2	82308235
-34B3	82308236
-34B4	82308237
-34B5	82308238
-34B6	82308239
-34B7	82308330
-34B8	82308331
-34B9	82308332
-34BA	82308333
-34BB	82308334
-34BC	82308335
-34BD	82308336
-34BE	82308337
-34BF	82308338
-34C0	82308339
-34C1	82308430
-34C2	82308431
-34C3	82308432
-34C4	82308433
-34C5	82308434
-34C6	82308435
-34C7	82308436
-34C8	82308437
-34C9	82308438
-34CA	82308439
-34CB	82308530
-34CC	82308531
-34CD	82308532
-34CE	82308533
-34CF	82308534
-34D0	82308535
-34D1	82308536
-34D2	82308537
-34D3	82308538
-34D4	82308539
-34D5	82308630
-34D6	82308631
-34D7	82308632
-34D8	82308633
-34D9	82308634
-34DA	82308635
-34DB	82308636
-34DC	82308637
-34DD	82308638
-34DE	82308639
-34DF	82308730
-34E0	82308731
-34E1	82308732
-34E2	82308733
-34E3	82308734
-34E4	82308735
-34E5	82308736
-34E6	82308737
-34E7	82308738
-34E8	82308739
-34E9	82308830
-34EA	82308831
-34EB	82308832
-34EC	82308833
-34ED	82308834
-34EE	82308835
-34EF	82308836
-34F0	82308837
-34F1	82308838
-34F2	82308839
-34F3	82308930
-34F4	82308931
-34F5	82308932
-34F6	82308933
-34F7	82308934
-34F8	82308935
-34F9	82308936
-34FA	82308937
-34FB	82308938
-34FC	82308939
-34FD	82308A30
-34FE	82308A31
-34FF	82308A32
-3500	82308A33
-3501	82308A34
-3502	82308A35
-3503	82308A36
-3504	82308A37
-3505	82308A38
-3506	82308A39
-3507	82308B30
-3508	82308B31
-3509	82308B32
-350A	82308B33
-350B	82308B34
-350C	82308B35
-350D	82308B36
-350E	82308B37
-350F	82308B38
-3510	82308B39
-3511	82308C30
-3512	82308C31
-3513	82308C32
-3514	82308C33
-3515	82308C34
-3516	82308C35
-3517	82308C36
-3518	82308C37
-3519	82308C38
-351A	82308C39
-351B	82308D30
-351C	82308D31
-351D	82308D32
-351E	82308D33
-351F	82308D34
-3520	82308D35
-3521	82308D36
-3522	82308D37
-3523	82308D38
-3524	82308D39
-3525	82308E30
-3526	82308E31
-3527	82308E32
-3528	82308E33
-3529	82308E34
-352A	82308E35
-352B	82308E36
-352C	82308E37
-352D	82308E38
-352E	82308E39
-352F	82308F30
-3530	82308F31
-3531	82308F32
-3532	82308F33
-3533	82308F34
-3534	82308F35
-3535	82308F36
-3536	82308F37
-3537	82308F38
-3538	82308F39
-3539	82309030
-353A	82309031
-353B	82309032
-353C	82309033
-353D	82309034
-353E	82309035
-353F	82309036
-3540	82309037
-3541	82309038
-3542	82309039
-3543	82309130
-3544	82309131
-3545	82309132
-3546	82309133
-3547	82309134
-3548	82309135
-3549	82309136
-354A	82309137
-354B	82309138
-354C	82309139
-354D	82309230
-354E	82309231
-354F	82309232
-3550	82309233
-3551	82309234
-3552	82309235
-3553	82309236
-3554	82309237
-3555	82309238
-3556	82309239
-3557	82309330
-3558	82309331
-3559	82309332
-355A	82309333
-355B	82309334
-355C	82309335
-355D	82309336
-355E	82309337
-355F	82309338
-3560	82309339
-3561	82309430
-3562	82309431
-3563	82309432
-3564	82309433
-3565	82309434
-3566	82309435
-3567	82309436
-3568	82309437
-3569	82309438
-356A	82309439
-356B	82309530
-356C	82309531
-356D	82309532
-356E	82309533
-356F	82309534
-3570	82309535
-3571	82309536
-3572	82309537
-3573	82309538
-3574	82309539
-3575	82309630
-3576	82309631
-3577	82309632
-3578	82309633
-3579	82309634
-357A	82309635
-357B	82309636
-357C	82309637
-357D	82309638
-357E	82309639
-357F	82309730
-3580	82309731
-3581	82309732
-3582	82309733
-3583	82309734
-3584	82309735
-3585	82309736
-3586	82309737
-3587	82309738
-3588	82309739
-3589	82309830
-358A	82309831
-358B	82309832
-358C	82309833
-358D	82309834
-358E	82309835
-358F	82309836
-3590	82309837
-3591	82309838
-3592	82309839
-3593	82309930
-3594	82309931
-3595	82309932
-3596	82309933
-3597	82309934
-3598	82309935
-3599	82309936
-359A	82309937
-359B	82309938
-359C	82309939
-359D	82309A30
-359E	FE5A
-359F	82309A31
-35A0	82309A32
-35A1	82309A33
-35A2	82309A34
-35A3	82309A35
-35A4	82309A36
-35A5	82309A37
-35A6	82309A38
-35A7	82309A39
-35A8	82309B30
-35A9	82309B31
-35AA	82309B32
-35AB	82309B33
-35AC	82309B34
-35AD	82309B35
-35AE	82309B36
-35AF	82309B37
-35B0	82309B38
-35B1	82309B39
-35B2	82309C30
-35B3	82309C31
-35B4	82309C32
-35B5	82309C33
-35B6	82309C34
-35B7	82309C35
-35B8	82309C36
-35B9	82309C37
-35BA	82309C38
-35BB	82309C39
-35BC	82309D30
-35BD	82309D31
-35BE	82309D32
-35BF	82309D33
-35C0	82309D34
-35C1	82309D35
-35C2	82309D36
-35C3	82309D37
-35C4	82309D38
-35C5	82309D39
-35C6	82309E30
-35C7	82309E31
-35C8	82309E32
-35C9	82309E33
-35CA	82309E34
-35CB	82309E35
-35CC	82309E36
-35CD	82309E37
-35CE	82309E38
-35CF	82309E39
-35D0	82309F30
-35D1	82309F31
-35D2	82309F32
-35D3	82309F33
-35D4	82309F34
-35D5	82309F35
-35D6	82309F36
-35D7	82309F37
-35D8	82309F38
-35D9	82309F39
-35DA	8230A030
-35DB	8230A031
-35DC	8230A032
-35DD	8230A033
-35DE	8230A034
-35DF	8230A035
-35E0	8230A036
-35E1	8230A037
-35E2	8230A038
-35E3	8230A039
-35E4	8230A130
-35E5	8230A131
-35E6	8230A132
-35E7	8230A133
-35E8	8230A134
-35E9	8230A135
-35EA	8230A136
-35EB	8230A137
-35EC	8230A138
-35ED	8230A139
-35EE	8230A230
-35EF	8230A231
-35F0	8230A232
-35F1	8230A233
-35F2	8230A234
-35F3	8230A235
-35F4	8230A236
-35F5	8230A237
-35F6	8230A238
-35F7	8230A239
-35F8	8230A330
-35F9	8230A331
-35FA	8230A332
-35FB	8230A333
-35FC	8230A334
-35FD	8230A335
-35FE	8230A336
-35FF	8230A337
-3600	8230A338
-3601	8230A339
-3602	8230A430
-3603	8230A431
-3604	8230A432
-3605	8230A433
-3606	8230A434
-3607	8230A435
-3608	8230A436
-3609	8230A437
-360A	8230A438
-360B	8230A439
-360C	8230A530
-360D	8230A531
-360E	FE5C
-360F	8230A532
-3610	8230A533
-3611	8230A534
-3612	8230A535
-3613	8230A536
-3614	8230A537
-3615	8230A538
-3616	8230A539
-3617	8230A630
-3618	8230A631
-3619	8230A632
-361A	FE5B
-361B	8230A633
-361C	8230A634
-361D	8230A635
-361E	8230A636
-361F	8230A637
-3620	8230A638
-3621	8230A639
-3622	8230A730
-3623	8230A731
-3624	8230A732
-3625	8230A733
-3626	8230A734
-3627	8230A735
-3628	8230A736
-3629	8230A737
-362A	8230A738
-362B	8230A739
-362C	8230A830
-362D	8230A831
-362E	8230A832
-362F	8230A833
-3630	8230A834
-3631	8230A835
-3632	8230A836
-3633	8230A837
-3634	8230A838
-3635	8230A839
-3636	8230A930
-3637	8230A931
-3638	8230A932
-3639	8230A933
-363A	8230A934
-363B	8230A935
-363C	8230A936
-363D	8230A937
-363E	8230A938
-363F	8230A939
-3640	8230AA30
-3641	8230AA31
-3642	8230AA32
-3643	8230AA33
-3644	8230AA34
-3645	8230AA35
-3646	8230AA36
-3647	8230AA37
-3648	8230AA38
-3649	8230AA39
-364A	8230AB30
-364B	8230AB31
-364C	8230AB32
-364D	8230AB33
-364E	8230AB34
-364F	8230AB35
-3650	8230AB36
-3651	8230AB37
-3652	8230AB38
-3653	8230AB39
-3654	8230AC30
-3655	8230AC31
-3656	8230AC32
-3657	8230AC33
-3658	8230AC34
-3659	8230AC35
-365A	8230AC36
-365B	8230AC37
-365C	8230AC38
-365D	8230AC39
-365E	8230AD30
-365F	8230AD31
-3660	8230AD32
-3661	8230AD33
-3662	8230AD34
-3663	8230AD35
-3664	8230AD36
-3665	8230AD37
-3666	8230AD38
-3667	8230AD39
-3668	8230AE30
-3669	8230AE31
-366A	8230AE32
-366B	8230AE33
-366C	8230AE34
-366D	8230AE35
-366E	8230AE36
-366F	8230AE37
-3670	8230AE38
-3671	8230AE39
-3672	8230AF30
-3673	8230AF31
-3674	8230AF32
-3675	8230AF33
-3676	8230AF34
-3677	8230AF35
-3678	8230AF36
-3679	8230AF37
-367A	8230AF38
-367B	8230AF39
-367C	8230B030
-367D	8230B031
-367E	8230B032
-367F	8230B033
-3680	8230B034
-3681	8230B035
-3682	8230B036
-3683	8230B037
-3684	8230B038
-3685	8230B039
-3686	8230B130
-3687	8230B131
-3688	8230B132
-3689	8230B133
-368A	8230B134
-368B	8230B135
-368C	8230B136
-368D	8230B137
-368E	8230B138
-368F	8230B139
-3690	8230B230
-3691	8230B231
-3692	8230B232
-3693	8230B233
-3694	8230B234
-3695	8230B235
-3696	8230B236
-3697	8230B237
-3698	8230B238
-3699	8230B239
-369A	8230B330
-369B	8230B331
-369C	8230B332
-369D	8230B333
-369E	8230B334
-369F	8230B335
-36A0	8230B336
-36A1	8230B337
-36A2	8230B338
-36A3	8230B339
-36A4	8230B430
-36A5	8230B431
-36A6	8230B432
-36A7	8230B433
-36A8	8230B434
-36A9	8230B435
-36AA	8230B436
-36AB	8230B437
-36AC	8230B438
-36AD	8230B439
-36AE	8230B530
-36AF	8230B531
-36B0	8230B532
-36B1	8230B533
-36B2	8230B534
-36B3	8230B535
-36B4	8230B536
-36B5	8230B537
-36B6	8230B538
-36B7	8230B539
-36B8	8230B630
-36B9	8230B631
-36BA	8230B632
-36BB	8230B633
-36BC	8230B634
-36BD	8230B635
-36BE	8230B636
-36BF	8230B637
-36C0	8230B638
-36C1	8230B639
-36C2	8230B730
-36C3	8230B731
-36C4	8230B732
-36C5	8230B733
-36C6	8230B734
-36C7	8230B735
-36C8	8230B736
-36C9	8230B737
-36CA	8230B738
-36CB	8230B739
-36CC	8230B830
-36CD	8230B831
-36CE	8230B832
-36CF	8230B833
-36D0	8230B834
-36D1	8230B835
-36D2	8230B836
-36D3	8230B837
-36D4	8230B838
-36D5	8230B839
-36D6	8230B930
-36D7	8230B931
-36D8	8230B932
-36D9	8230B933
-36DA	8230B934
-36DB	8230B935
-36DC	8230B936
-36DD	8230B937
-36DE	8230B938
-36DF	8230B939
-36E0	8230BA30
-36E1	8230BA31
-36E2	8230BA32
-36E3	8230BA33
-36E4	8230BA34
-36E5	8230BA35
-36E6	8230BA36
-36E7	8230BA37
-36E8	8230BA38
-36E9	8230BA39
-36EA	8230BB30
-36EB	8230BB31
-36EC	8230BB32
-36ED	8230BB33
-36EE	8230BB34
-36EF	8230BB35
-36F0	8230BB36
-36F1	8230BB37
-36F2	8230BB38
-36F3	8230BB39
-36F4	8230BC30
-36F5	8230BC31
-36F6	8230BC32
-36F7	8230BC33
-36F8	8230BC34
-36F9	8230BC35
-36FA	8230BC36
-36FB	8230BC37
-36FC	8230BC38
-36FD	8230BC39
-36FE	8230BD30
-36FF	8230BD31
-3700	8230BD32
-3701	8230BD33
-3702	8230BD34
-3703	8230BD35
-3704	8230BD36
-3705	8230BD37
-3706	8230BD38
-3707	8230BD39
-3708	8230BE30
-3709	8230BE31
-370A	8230BE32
-370B	8230BE33
-370C	8230BE34
-370D	8230BE35
-370E	8230BE36
-370F	8230BE37
-3710	8230BE38
-3711	8230BE39
-3712	8230BF30
-3713	8230BF31
-3714	8230BF32
-3715	8230BF33
-3716	8230BF34
-3717	8230BF35
-3718	8230BF36
-3719	8230BF37
-371A	8230BF38
-371B	8230BF39
-371C	8230C030
-371D	8230C031
-371E	8230C032
-371F	8230C033
-3720	8230C034
-3721	8230C035
-3722	8230C036
-3723	8230C037
-3724	8230C038
-3725	8230C039
-3726	8230C130
-3727	8230C131
-3728	8230C132
-3729	8230C133
-372A	8230C134
-372B	8230C135
-372C	8230C136
-372D	8230C137
-372E	8230C138
-372F	8230C139
-3730	8230C230
-3731	8230C231
-3732	8230C232
-3733	8230C233
-3734	8230C234
-3735	8230C235
-3736	8230C236
-3737	8230C237
-3738	8230C238
-3739	8230C239
-373A	8230C330
-373B	8230C331
-373C	8230C332
-373D	8230C333
-373E	8230C334
-373F	8230C335
-3740	8230C336
-3741	8230C337
-3742	8230C338
-3743	8230C339
-3744	8230C430
-3745	8230C431
-3746	8230C432
-3747	8230C433
-3748	8230C434
-3749	8230C435
-374A	8230C436
-374B	8230C437
-374C	8230C438
-374D	8230C439
-374E	8230C530
-374F	8230C531
-3750	8230C532
-3751	8230C533
-3752	8230C534
-3753	8230C535
-3754	8230C536
-3755	8230C537
-3756	8230C538
-3757	8230C539
-3758	8230C630
-3759	8230C631
-375A	8230C632
-375B	8230C633
-375C	8230C634
-375D	8230C635
-375E	8230C636
-375F	8230C637
-3760	8230C638
-3761	8230C639
-3762	8230C730
-3763	8230C731
-3764	8230C732
-3765	8230C733
-3766	8230C734
-3767	8230C735
-3768	8230C736
-3769	8230C737
-376A	8230C738
-376B	8230C739
-376C	8230C830
-376D	8230C831
-376E	8230C832
-376F	8230C833
-3770	8230C834
-3771	8230C835
-3772	8230C836
-3773	8230C837
-3774	8230C838
-3775	8230C839
-3776	8230C930
-3777	8230C931
-3778	8230C932
-3779	8230C933
-377A	8230C934
-377B	8230C935
-377C	8230C936
-377D	8230C937
-377E	8230C938
-377F	8230C939
-3780	8230CA30
-3781	8230CA31
-3782	8230CA32
-3783	8230CA33
-3784	8230CA34
-3785	8230CA35
-3786	8230CA36
-3787	8230CA37
-3788	8230CA38
-3789	8230CA39
-378A	8230CB30
-378B	8230CB31
-378C	8230CB32
-378D	8230CB33
-378E	8230CB34
-378F	8230CB35
-3790	8230CB36
-3791	8230CB37
-3792	8230CB38
-3793	8230CB39
-3794	8230CC30
-3795	8230CC31
-3796	8230CC32
-3797	8230CC33
-3798	8230CC34
-3799	8230CC35
-379A	8230CC36
-379B	8230CC37
-379C	8230CC38
-379D	8230CC39
-379E	8230CD30
-379F	8230CD31
-37A0	8230CD32
-37A1	8230CD33
-37A2	8230CD34
-37A3	8230CD35
-37A4	8230CD36
-37A5	8230CD37
-37A6	8230CD38
-37A7	8230CD39
-37A8	8230CE30
-37A9	8230CE31
-37AA	8230CE32
-37AB	8230CE33
-37AC	8230CE34
-37AD	8230CE35
-37AE	8230CE36
-37AF	8230CE37
-37B0	8230CE38
-37B1	8230CE39
-37B2	8230CF30
-37B3	8230CF31
-37B4	8230CF32
-37B5	8230CF33
-37B6	8230CF34
-37B7	8230CF35
-37B8	8230CF36
-37B9	8230CF37
-37BA	8230CF38
-37BB	8230CF39
-37BC	8230D030
-37BD	8230D031
-37BE	8230D032
-37BF	8230D033
-37C0	8230D034
-37C1	8230D035
-37C2	8230D036
-37C3	8230D037
-37C4	8230D038
-37C5	8230D039
-37C6	8230D130
-37C7	8230D131
-37C8	8230D132
-37C9	8230D133
-37CA	8230D134
-37CB	8230D135
-37CC	8230D136
-37CD	8230D137
-37CE	8230D138
-37CF	8230D139
-37D0	8230D230
-37D1	8230D231
-37D2	8230D232
-37D3	8230D233
-37D4	8230D234
-37D5	8230D235
-37D6	8230D236
-37D7	8230D237
-37D8	8230D238
-37D9	8230D239
-37DA	8230D330
-37DB	8230D331
-37DC	8230D332
-37DD	8230D333
-37DE	8230D334
-37DF	8230D335
-37E0	8230D336
-37E1	8230D337
-37E2	8230D338
-37E3	8230D339
-37E4	8230D430
-37E5	8230D431
-37E6	8230D432
-37E7	8230D433
-37E8	8230D434
-37E9	8230D435
-37EA	8230D436
-37EB	8230D437
-37EC	8230D438
-37ED	8230D439
-37EE	8230D530
-37EF	8230D531
-37F0	8230D532
-37F1	8230D533
-37F2	8230D534
-37F3	8230D535
-37F4	8230D536
-37F5	8230D537
-37F6	8230D538
-37F7	8230D539
-37F8	8230D630
-37F9	8230D631
-37FA	8230D632
-37FB	8230D633
-37FC	8230D634
-37FD	8230D635
-37FE	8230D636
-37FF	8230D637
-3800	8230D638
-3801	8230D639
-3802	8230D730
-3803	8230D731
-3804	8230D732
-3805	8230D733
-3806	8230D734
-3807	8230D735
-3808	8230D736
-3809	8230D737
-380A	8230D738
-380B	8230D739
-380C	8230D830
-380D	8230D831
-380E	8230D832
-380F	8230D833
-3810	8230D834
-3811	8230D835
-3812	8230D836
-3813	8230D837
-3814	8230D838
-3815	8230D839
-3816	8230D930
-3817	8230D931
-3818	8230D932
-3819	8230D933
-381A	8230D934
-381B	8230D935
-381C	8230D936
-381D	8230D937
-381E	8230D938
-381F	8230D939
-3820	8230DA30
-3821	8230DA31
-3822	8230DA32
-3823	8230DA33
-3824	8230DA34
-3825	8230DA35
-3826	8230DA36
-3827	8230DA37
-3828	8230DA38
-3829	8230DA39
-382A	8230DB30
-382B	8230DB31
-382C	8230DB32
-382D	8230DB33
-382E	8230DB34
-382F	8230DB35
-3830	8230DB36
-3831	8230DB37
-3832	8230DB38
-3833	8230DB39
-3834	8230DC30
-3835	8230DC31
-3836	8230DC32
-3837	8230DC33
-3838	8230DC34
-3839	8230DC35
-383A	8230DC36
-383B	8230DC37
-383C	8230DC38
-383D	8230DC39
-383E	8230DD30
-383F	8230DD31
-3840	8230DD32
-3841	8230DD33
-3842	8230DD34
-3843	8230DD35
-3844	8230DD36
-3845	8230DD37
-3846	8230DD38
-3847	8230DD39
-3848	8230DE30
-3849	8230DE31
-384A	8230DE32
-384B	8230DE33
-384C	8230DE34
-384D	8230DE35
-384E	8230DE36
-384F	8230DE37
-3850	8230DE38
-3851	8230DE39
-3852	8230DF30
-3853	8230DF31
-3854	8230DF32
-3855	8230DF33
-3856	8230DF34
-3857	8230DF35
-3858	8230DF36
-3859	8230DF37
-385A	8230DF38
-385B	8230DF39
-385C	8230E030
-385D	8230E031
-385E	8230E032
-385F	8230E033
-3860	8230E034
-3861	8230E035
-3862	8230E036
-3863	8230E037
-3864	8230E038
-3865	8230E039
-3866	8230E130
-3867	8230E131
-3868	8230E132
-3869	8230E133
-386A	8230E134
-386B	8230E135
-386C	8230E136
-386D	8230E137
-386E	8230E138
-386F	8230E139
-3870	8230E230
-3871	8230E231
-3872	8230E232
-3873	8230E233
-3874	8230E234
-3875	8230E235
-3876	8230E236
-3877	8230E237
-3878	8230E238
-3879	8230E239
-387A	8230E330
-387B	8230E331
-387C	8230E332
-387D	8230E333
-387E	8230E334
-387F	8230E335
-3880	8230E336
-3881	8230E337
-3882	8230E338
-3883	8230E339
-3884	8230E430
-3885	8230E431
-3886	8230E432
-3887	8230E433
-3888	8230E434
-3889	8230E435
-388A	8230E436
-388B	8230E437
-388C	8230E438
-388D	8230E439
-388E	8230E530
-388F	8230E531
-3890	8230E532
-3891	8230E533
-3892	8230E534
-3893	8230E535
-3894	8230E536
-3895	8230E537
-3896	8230E538
-3897	8230E539
-3898	8230E630
-3899	8230E631
-389A	8230E632
-389B	8230E633
-389C	8230E634
-389D	8230E635
-389E	8230E636
-389F	8230E637
-38A0	8230E638
-38A1	8230E639
-38A2	8230E730
-38A3	8230E731
-38A4	8230E732
-38A5	8230E733
-38A6	8230E734
-38A7	8230E735
-38A8	8230E736
-38A9	8230E737
-38AA	8230E738
-38AB	8230E739
-38AC	8230E830
-38AD	8230E831
-38AE	8230E832
-38AF	8230E833
-38B0	8230E834
-38B1	8230E835
-38B2	8230E836
-38B3	8230E837
-38B4	8230E838
-38B5	8230E839
-38B6	8230E930
-38B7	8230E931
-38B8	8230E932
-38B9	8230E933
-38BA	8230E934
-38BB	8230E935
-38BC	8230E936
-38BD	8230E937
-38BE	8230E938
-38BF	8230E939
-38C0	8230EA30
-38C1	8230EA31
-38C2	8230EA32
-38C3	8230EA33
-38C4	8230EA34
-38C5	8230EA35
-38C6	8230EA36
-38C7	8230EA37
-38C8	8230EA38
-38C9	8230EA39
-38CA	8230EB30
-38CB	8230EB31
-38CC	8230EB32
-38CD	8230EB33
-38CE	8230EB34
-38CF	8230EB35
-38D0	8230EB36
-38D1	8230EB37
-38D2	8230EB38
-38D3	8230EB39
-38D4	8230EC30
-38D5	8230EC31
-38D6	8230EC32
-38D7	8230EC33
-38D8	8230EC34
-38D9	8230EC35
-38DA	8230EC36
-38DB	8230EC37
-38DC	8230EC38
-38DD	8230EC39
-38DE	8230ED30
-38DF	8230ED31
-38E0	8230ED32
-38E1	8230ED33
-38E2	8230ED34
-38E3	8230ED35
-38E4	8230ED36
-38E5	8230ED37
-38E6	8230ED38
-38E7	8230ED39
-38E8	8230EE30
-38E9	8230EE31
-38EA	8230EE32
-38EB	8230EE33
-38EC	8230EE34
-38ED	8230EE35
-38EE	8230EE36
-38EF	8230EE37
-38F0	8230EE38
-38F1	8230EE39
-38F2	8230EF30
-38F3	8230EF31
-38F4	8230EF32
-38F5	8230EF33
-38F6	8230EF34
-38F7	8230EF35
-38F8	8230EF36
-38F9	8230EF37
-38FA	8230EF38
-38FB	8230EF39
-38FC	8230F030
-38FD	8230F031
-38FE	8230F032
-38FF	8230F033
-3900	8230F034
-3901	8230F035
-3902	8230F036
-3903	8230F037
-3904	8230F038
-3905	8230F039
-3906	8230F130
-3907	8230F131
-3908	8230F132
-3909	8230F133
-390A	8230F134
-390B	8230F135
-390C	8230F136
-390D	8230F137
-390E	8230F138
-390F	8230F139
-3910	8230F230
-3911	8230F231
-3912	8230F232
-3913	8230F233
-3914	8230F234
-3915	8230F235
-3916	8230F236
-3917	8230F237
-3918	FE60
-3919	8230F238
-391A	8230F239
-391B	8230F330
-391C	8230F331
-391D	8230F332
-391E	8230F333
-391F	8230F334
-3920	8230F335
-3921	8230F336
-3922	8230F337
-3923	8230F338
-3924	8230F339
-3925	8230F430
-3926	8230F431
-3927	8230F432
-3928	8230F433
-3929	8230F434
-392A	8230F435
-392B	8230F436
-392C	8230F437
-392D	8230F438
-392E	8230F439
-392F	8230F530
-3930	8230F531
-3931	8230F532
-3932	8230F533
-3933	8230F534
-3934	8230F535
-3935	8230F536
-3936	8230F537
-3937	8230F538
-3938	8230F539
-3939	8230F630
-393A	8230F631
-393B	8230F632
-393C	8230F633
-393D	8230F634
-393E	8230F635
-393F	8230F636
-3940	8230F637
-3941	8230F638
-3942	8230F639
-3943	8230F730
-3944	8230F731
-3945	8230F732
-3946	8230F733
-3947	8230F734
-3948	8230F735
-3949	8230F736
-394A	8230F737
-394B	8230F738
-394C	8230F739
-394D	8230F830
-394E	8230F831
-394F	8230F832
-3950	8230F833
-3951	8230F834
-3952	8230F835
-3953	8230F836
-3954	8230F837
-3955	8230F838
-3956	8230F839
-3957	8230F930
-3958	8230F931
-3959	8230F932
-395A	8230F933
-395B	8230F934
-395C	8230F935
-395D	8230F936
-395E	8230F937
-395F	8230F938
-3960	8230F939
-3961	8230FA30
-3962	8230FA31
-3963	8230FA32
-3964	8230FA33
-3965	8230FA34
-3966	8230FA35
-3967	8230FA36
-3968	8230FA37
-3969	8230FA38
-396A	8230FA39
-396B	8230FB30
-396C	8230FB31
-396D	8230FB32
-396E	FE5F
-396F	8230FB33
-3970	8230FB34
-3971	8230FB35
-3972	8230FB36
-3973	8230FB37
-3974	8230FB38
-3975	8230FB39
-3976	8230FC30
-3977	8230FC31
-3978	8230FC32
-3979	8230FC33
-397A	8230FC34
-397B	8230FC35
-397C	8230FC36
-397D	8230FC37
-397E	8230FC38
-397F	8230FC39
-3980	8230FD30
-3981	8230FD31
-3982	8230FD32
-3983	8230FD33
-3984	8230FD34
-3985	8230FD35
-3986	8230FD36
-3987	8230FD37
-3988	8230FD38
-3989	8230FD39
-398A	8230FE30
-398B	8230FE31
-398C	8230FE32
-398D	8230FE33
-398E	8230FE34
-398F	8230FE35
-3990	8230FE36
-3991	8230FE37
-3992	8230FE38
-3993	8230FE39
-3994	82318130
-3995	82318131
-3996	82318132
-3997	82318133
-3998	82318134
-3999	82318135
-399A	82318136
-399B	82318137
-399C	82318138
-399D	82318139
-399E	82318230
-399F	82318231
-39A0	82318232
-39A1	82318233
-39A2	82318234
-39A3	82318235
-39A4	82318236
-39A5	82318237
-39A6	82318238
-39A7	82318239
-39A8	82318330
-39A9	82318331
-39AA	82318332
-39AB	82318333
-39AC	82318334
-39AD	82318335
-39AE	82318336
-39AF	82318337
-39B0	82318338
-39B1	82318339
-39B2	82318430
-39B3	82318431
-39B4	82318432
-39B5	82318433
-39B6	82318434
-39B7	82318435
-39B8	82318436
-39B9	82318437
-39BA	82318438
-39BB	82318439
-39BC	82318530
-39BD	82318531
-39BE	82318532
-39BF	82318533
-39C0	82318534
-39C1	82318535
-39C2	82318536
-39C3	82318537
-39C4	82318538
-39C5	82318539
-39C6	82318630
-39C7	82318631
-39C8	82318632
-39C9	82318633
-39CA	82318634
-39CB	82318635
-39CC	82318636
-39CD	82318637
-39CE	82318638
-39CF	FE62
-39D0	FE65
-39D1	82318639
-39D2	82318730
-39D3	82318731
-39D4	82318732
-39D5	82318733
-39D6	82318734
-39D7	82318735
-39D8	82318736
-39D9	82318737
-39DA	82318738
-39DB	82318739
-39DC	82318830
-39DD	82318831
-39DE	82318832
-39DF	FE63
-39E0	82318833
-39E1	82318834
-39E2	82318835
-39E3	82318836
-39E4	82318837
-39E5	82318838
-39E6	82318839
-39E7	82318930
-39E8	82318931
-39E9	82318932
-39EA	82318933
-39EB	82318934
-39EC	82318935
-39ED	82318936
-39EE	82318937
-39EF	82318938
-39F0	82318939
-39F1	82318A30
-39F2	82318A31
-39F3	82318A32
-39F4	82318A33
-39F5	82318A34
-39F6	82318A35
-39F7	82318A36
-39F8	82318A37
-39F9	82318A38
-39FA	82318A39
-39FB	82318B30
-39FC	82318B31
-39FD	82318B32
-39FE	82318B33
-39FF	82318B34
-3A00	82318B35
-3A01	82318B36
-3A02	82318B37
-3A03	82318B38
-3A04	82318B39
-3A05	82318C30
-3A06	82318C31
-3A07	82318C32
-3A08	82318C33
-3A09	82318C34
-3A0A	82318C35
-3A0B	82318C36
-3A0C	82318C37
-3A0D	82318C38
-3A0E	82318C39
-3A0F	82318D30
-3A10	82318D31
-3A11	82318D32
-3A12	82318D33
-3A13	82318D34
-3A14	82318D35
-3A15	82318D36
-3A16	82318D37
-3A17	82318D38
-3A18	82318D39
-3A19	82318E30
-3A1A	82318E31
-3A1B	82318E32
-3A1C	82318E33
-3A1D	82318E34
-3A1E	82318E35
-3A1F	82318E36
-3A20	82318E37
-3A21	82318E38
-3A22	82318E39
-3A23	82318F30
-3A24	82318F31
-3A25	82318F32
-3A26	82318F33
-3A27	82318F34
-3A28	82318F35
-3A29	82318F36
-3A2A	82318F37
-3A2B	82318F38
-3A2C	82318F39
-3A2D	82319030
-3A2E	82319031
-3A2F	82319032
-3A30	82319033
-3A31	82319034
-3A32	82319035
-3A33	82319036
-3A34	82319037
-3A35	82319038
-3A36	82319039
-3A37	82319130
-3A38	82319131
-3A39	82319132
-3A3A	82319133
-3A3B	82319134
-3A3C	82319135
-3A3D	82319136
-3A3E	82319137
-3A3F	82319138
-3A40	82319139
-3A41	82319230
-3A42	82319231
-3A43	82319232
-3A44	82319233
-3A45	82319234
-3A46	82319235
-3A47	82319236
-3A48	82319237
-3A49	82319238
-3A4A	82319239
-3A4B	82319330
-3A4C	82319331
-3A4D	82319332
-3A4E	82319333
-3A4F	82319334
-3A50	82319335
-3A51	82319336
-3A52	82319337
-3A53	82319338
-3A54	82319339
-3A55	82319430
-3A56	82319431
-3A57	82319432
-3A58	82319433
-3A59	82319434
-3A5A	82319435
-3A5B	82319436
-3A5C	82319437
-3A5D	82319438
-3A5E	82319439
-3A5F	82319530
-3A60	82319531
-3A61	82319532
-3A62	82319533
-3A63	82319534
-3A64	82319535
-3A65	82319536
-3A66	82319537
-3A67	82319538
-3A68	82319539
-3A69	82319630
-3A6A	82319631
-3A6B	82319632
-3A6C	82319633
-3A6D	82319634
-3A6E	82319635
-3A6F	82319636
-3A70	82319637
-3A71	82319638
-3A72	82319639
-3A73	FE64
-3A74	82319730
-3A75	82319731
-3A76	82319732
-3A77	82319733
-3A78	82319734
-3A79	82319735
-3A7A	82319736
-3A7B	82319737
-3A7C	82319738
-3A7D	82319739
-3A7E	82319830
-3A7F	82319831
-3A80	82319832
-3A81	82319833
-3A82	82319834
-3A83	82319835
-3A84	82319836
-3A85	82319837
-3A86	82319838
-3A87	82319839
-3A88	82319930
-3A89	82319931
-3A8A	82319932
-3A8B	82319933
-3A8C	82319934
-3A8D	82319935
-3A8E	82319936
-3A8F	82319937
-3A90	82319938
-3A91	82319939
-3A92	82319A30
-3A93	82319A31
-3A94	82319A32
-3A95	82319A33
-3A96	82319A34
-3A97	82319A35
-3A98	82319A36
-3A99	82319A37
-3A9A	82319A38
-3A9B	82319A39
-3A9C	82319B30
-3A9D	82319B31
-3A9E	82319B32
-3A9F	82319B33
-3AA0	82319B34
-3AA1	82319B35
-3AA2	82319B36
-3AA3	82319B37
-3AA4	82319B38
-3AA5	82319B39
-3AA6	82319C30
-3AA7	82319C31
-3AA8	82319C32
-3AA9	82319C33
-3AAA	82319C34
-3AAB	82319C35
-3AAC	82319C36
-3AAD	82319C37
-3AAE	82319C38
-3AAF	82319C39
-3AB0	82319D30
-3AB1	82319D31
-3AB2	82319D32
-3AB3	82319D33
-3AB4	82319D34
-3AB5	82319D35
-3AB6	82319D36
-3AB7	82319D37
-3AB8	82319D38
-3AB9	82319D39
-3ABA	82319E30
-3ABB	82319E31
-3ABC	82319E32
-3ABD	82319E33
-3ABE	82319E34
-3ABF	82319E35
-3AC0	82319E36
-3AC1	82319E37
-3AC2	82319E38
-3AC3	82319E39
-3AC4	82319F30
-3AC5	82319F31
-3AC6	82319F32
-3AC7	82319F33
-3AC8	82319F34
-3AC9	82319F35
-3ACA	82319F36
-3ACB	82319F37
-3ACC	82319F38
-3ACD	82319F39
-3ACE	8231A030
-3ACF	8231A031
-3AD0	8231A032
-3AD1	8231A033
-3AD2	8231A034
-3AD3	8231A035
-3AD4	8231A036
-3AD5	8231A037
-3AD6	8231A038
-3AD7	8231A039
-3AD8	8231A130
-3AD9	8231A131
-3ADA	8231A132
-3ADB	8231A133
-3ADC	8231A134
-3ADD	8231A135
-3ADE	8231A136
-3ADF	8231A137
-3AE0	8231A138
-3AE1	8231A139
-3AE2	8231A230
-3AE3	8231A231
-3AE4	8231A232
-3AE5	8231A233
-3AE6	8231A234
-3AE7	8231A235
-3AE8	8231A236
-3AE9	8231A237
-3AEA	8231A238
-3AEB	8231A239
-3AEC	8231A330
-3AED	8231A331
-3AEE	8231A332
-3AEF	8231A333
-3AF0	8231A334
-3AF1	8231A335
-3AF2	8231A336
-3AF3	8231A337
-3AF4	8231A338
-3AF5	8231A339
-3AF6	8231A430
-3AF7	8231A431
-3AF8	8231A432
-3AF9	8231A433
-3AFA	8231A434
-3AFB	8231A435
-3AFC	8231A436
-3AFD	8231A437
-3AFE	8231A438
-3AFF	8231A439
-3B00	8231A530
-3B01	8231A531
-3B02	8231A532
-3B03	8231A533
-3B04	8231A534
-3B05	8231A535
-3B06	8231A536
-3B07	8231A537
-3B08	8231A538
-3B09	8231A539
-3B0A	8231A630
-3B0B	8231A631
-3B0C	8231A632
-3B0D	8231A633
-3B0E	8231A634
-3B0F	8231A635
-3B10	8231A636
-3B11	8231A637
-3B12	8231A638
-3B13	8231A639
-3B14	8231A730
-3B15	8231A731
-3B16	8231A732
-3B17	8231A733
-3B18	8231A734
-3B19	8231A735
-3B1A	8231A736
-3B1B	8231A737
-3B1C	8231A738
-3B1D	8231A739
-3B1E	8231A830
-3B1F	8231A831
-3B20	8231A832
-3B21	8231A833
-3B22	8231A834
-3B23	8231A835
-3B24	8231A836
-3B25	8231A837
-3B26	8231A838
-3B27	8231A839
-3B28	8231A930
-3B29	8231A931
-3B2A	8231A932
-3B2B	8231A933
-3B2C	8231A934
-3B2D	8231A935
-3B2E	8231A936
-3B2F	8231A937
-3B30	8231A938
-3B31	8231A939
-3B32	8231AA30
-3B33	8231AA31
-3B34	8231AA32
-3B35	8231AA33
-3B36	8231AA34
-3B37	8231AA35
-3B38	8231AA36
-3B39	8231AA37
-3B3A	8231AA38
-3B3B	8231AA39
-3B3C	8231AB30
-3B3D	8231AB31
-3B3E	8231AB32
-3B3F	8231AB33
-3B40	8231AB34
-3B41	8231AB35
-3B42	8231AB36
-3B43	8231AB37
-3B44	8231AB38
-3B45	8231AB39
-3B46	8231AC30
-3B47	8231AC31
-3B48	8231AC32
-3B49	8231AC33
-3B4A	8231AC34
-3B4B	8231AC35
-3B4C	8231AC36
-3B4D	8231AC37
-3B4E	FE68
-3B4F	8231AC38
-3B50	8231AC39
-3B51	8231AD30
-3B52	8231AD31
-3B53	8231AD32
-3B54	8231AD33
-3B55	8231AD34
-3B56	8231AD35
-3B57	8231AD36
-3B58	8231AD37
-3B59	8231AD38
-3B5A	8231AD39
-3B5B	8231AE30
-3B5C	8231AE31
-3B5D	8231AE32
-3B5E	8231AE33
-3B5F	8231AE34
-3B60	8231AE35
-3B61	8231AE36
-3B62	8231AE37
-3B63	8231AE38
-3B64	8231AE39
-3B65	8231AF30
-3B66	8231AF31
-3B67	8231AF32
-3B68	8231AF33
-3B69	8231AF34
-3B6A	8231AF35
-3B6B	8231AF36
-3B6C	8231AF37
-3B6D	8231AF38
-3B6E	8231AF39
-3B6F	8231B030
-3B70	8231B031
-3B71	8231B032
-3B72	8231B033
-3B73	8231B034
-3B74	8231B035
-3B75	8231B036
-3B76	8231B037
-3B77	8231B038
-3B78	8231B039
-3B79	8231B130
-3B7A	8231B131
-3B7B	8231B132
-3B7C	8231B133
-3B7D	8231B134
-3B7E	8231B135
-3B7F	8231B136
-3B80	8231B137
-3B81	8231B138
-3B82	8231B139
-3B83	8231B230
-3B84	8231B231
-3B85	8231B232
-3B86	8231B233
-3B87	8231B234
-3B88	8231B235
-3B89	8231B236
-3B8A	8231B237
-3B8B	8231B238
-3B8C	8231B239
-3B8D	8231B330
-3B8E	8231B331
-3B8F	8231B332
-3B90	8231B333
-3B91	8231B334
-3B92	8231B335
-3B93	8231B336
-3B94	8231B337
-3B95	8231B338
-3B96	8231B339
-3B97	8231B430
-3B98	8231B431
-3B99	8231B432
-3B9A	8231B433
-3B9B	8231B434
-3B9C	8231B435
-3B9D	8231B436
-3B9E	8231B437
-3B9F	8231B438
-3BA0	8231B439
-3BA1	8231B530
-3BA2	8231B531
-3BA3	8231B532
-3BA4	8231B533
-3BA5	8231B534
-3BA6	8231B535
-3BA7	8231B536
-3BA8	8231B537
-3BA9	8231B538
-3BAA	8231B539
-3BAB	8231B630
-3BAC	8231B631
-3BAD	8231B632
-3BAE	8231B633
-3BAF	8231B634
-3BB0	8231B635
-3BB1	8231B636
-3BB2	8231B637
-3BB3	8231B638
-3BB4	8231B639
-3BB5	8231B730
-3BB6	8231B731
-3BB7	8231B732
-3BB8	8231B733
-3BB9	8231B734
-3BBA	8231B735
-3BBB	8231B736
-3BBC	8231B737
-3BBD	8231B738
-3BBE	8231B739
-3BBF	8231B830
-3BC0	8231B831
-3BC1	8231B832
-3BC2	8231B833
-3BC3	8231B834
-3BC4	8231B835
-3BC5	8231B836
-3BC6	8231B837
-3BC7	8231B838
-3BC8	8231B839
-3BC9	8231B930
-3BCA	8231B931
-3BCB	8231B932
-3BCC	8231B933
-3BCD	8231B934
-3BCE	8231B935
-3BCF	8231B936
-3BD0	8231B937
-3BD1	8231B938
-3BD2	8231B939
-3BD3	8231BA30
-3BD4	8231BA31
-3BD5	8231BA32
-3BD6	8231BA33
-3BD7	8231BA34
-3BD8	8231BA35
-3BD9	8231BA36
-3BDA	8231BA37
-3BDB	8231BA38
-3BDC	8231BA39
-3BDD	8231BB30
-3BDE	8231BB31
-3BDF	8231BB32
-3BE0	8231BB33
-3BE1	8231BB34
-3BE2	8231BB35
-3BE3	8231BB36
-3BE4	8231BB37
-3BE5	8231BB38
-3BE6	8231BB39
-3BE7	8231BC30
-3BE8	8231BC31
-3BE9	8231BC32
-3BEA	8231BC33
-3BEB	8231BC34
-3BEC	8231BC35
-3BED	8231BC36
-3BEE	8231BC37
-3BEF	8231BC38
-3BF0	8231BC39
-3BF1	8231BD30
-3BF2	8231BD31
-3BF3	8231BD32
-3BF4	8231BD33
-3BF5	8231BD34
-3BF6	8231BD35
-3BF7	8231BD36
-3BF8	8231BD37
-3BF9	8231BD38
-3BFA	8231BD39
-3BFB	8231BE30
-3BFC	8231BE31
-3BFD	8231BE32
-3BFE	8231BE33
-3BFF	8231BE34
-3C00	8231BE35
-3C01	8231BE36
-3C02	8231BE37
-3C03	8231BE38
-3C04	8231BE39
-3C05	8231BF30
-3C06	8231BF31
-3C07	8231BF32
-3C08	8231BF33
-3C09	8231BF34
-3C0A	8231BF35
-3C0B	8231BF36
-3C0C	8231BF37
-3C0D	8231BF38
-3C0E	8231BF39
-3C0F	8231C030
-3C10	8231C031
-3C11	8231C032
-3C12	8231C033
-3C13	8231C034
-3C14	8231C035
-3C15	8231C036
-3C16	8231C037
-3C17	8231C038
-3C18	8231C039
-3C19	8231C130
-3C1A	8231C131
-3C1B	8231C132
-3C1C	8231C133
-3C1D	8231C134
-3C1E	8231C135
-3C1F	8231C136
-3C20	8231C137
-3C21	8231C138
-3C22	8231C139
-3C23	8231C230
-3C24	8231C231
-3C25	8231C232
-3C26	8231C233
-3C27	8231C234
-3C28	8231C235
-3C29	8231C236
-3C2A	8231C237
-3C2B	8231C238
-3C2C	8231C239
-3C2D	8231C330
-3C2E	8231C331
-3C2F	8231C332
-3C30	8231C333
-3C31	8231C334
-3C32	8231C335
-3C33	8231C336
-3C34	8231C337
-3C35	8231C338
-3C36	8231C339
-3C37	8231C430
-3C38	8231C431
-3C39	8231C432
-3C3A	8231C433
-3C3B	8231C434
-3C3C	8231C435
-3C3D	8231C436
-3C3E	8231C437
-3C3F	8231C438
-3C40	8231C439
-3C41	8231C530
-3C42	8231C531
-3C43	8231C532
-3C44	8231C533
-3C45	8231C534
-3C46	8231C535
-3C47	8231C536
-3C48	8231C537
-3C49	8231C538
-3C4A	8231C539
-3C4B	8231C630
-3C4C	8231C631
-3C4D	8231C632
-3C4E	8231C633
-3C4F	8231C634
-3C50	8231C635
-3C51	8231C636
-3C52	8231C637
-3C53	8231C638
-3C54	8231C639
-3C55	8231C730
-3C56	8231C731
-3C57	8231C732
-3C58	8231C733
-3C59	8231C734
-3C5A	8231C735
-3C5B	8231C736
-3C5C	8231C737
-3C5D	8231C738
-3C5E	8231C739
-3C5F	8231C830
-3C60	8231C831
-3C61	8231C832
-3C62	8231C833
-3C63	8231C834
-3C64	8231C835
-3C65	8231C836
-3C66	8231C837
-3C67	8231C838
-3C68	8231C839
-3C69	8231C930
-3C6A	8231C931
-3C6B	8231C932
-3C6C	8231C933
-3C6D	8231C934
-3C6E	FE69
-3C6F	8231C935
-3C70	8231C936
-3C71	8231C937
-3C72	8231C938
-3C73	8231C939
-3C74	8231CA30
-3C75	8231CA31
-3C76	8231CA32
-3C77	8231CA33
-3C78	8231CA34
-3C79	8231CA35
-3C7A	8231CA36
-3C7B	8231CA37
-3C7C	8231CA38
-3C7D	8231CA39
-3C7E	8231CB30
-3C7F	8231CB31
-3C80	8231CB32
-3C81	8231CB33
-3C82	8231CB34
-3C83	8231CB35
-3C84	8231CB36
-3C85	8231CB37
-3C86	8231CB38
-3C87	8231CB39
-3C88	8231CC30
-3C89	8231CC31
-3C8A	8231CC32
-3C8B	8231CC33
-3C8C	8231CC34
-3C8D	8231CC35
-3C8E	8231CC36
-3C8F	8231CC37
-3C90	8231CC38
-3C91	8231CC39
-3C92	8231CD30
-3C93	8231CD31
-3C94	8231CD32
-3C95	8231CD33
-3C96	8231CD34
-3C97	8231CD35
-3C98	8231CD36
-3C99	8231CD37
-3C9A	8231CD38
-3C9B	8231CD39
-3C9C	8231CE30
-3C9D	8231CE31
-3C9E	8231CE32
-3C9F	8231CE33
-3CA0	8231CE34
-3CA1	8231CE35
-3CA2	8231CE36
-3CA3	8231CE37
-3CA4	8231CE38
-3CA5	8231CE39
-3CA6	8231CF30
-3CA7	8231CF31
-3CA8	8231CF32
-3CA9	8231CF33
-3CAA	8231CF34
-3CAB	8231CF35
-3CAC	8231CF36
-3CAD	8231CF37
-3CAE	8231CF38
-3CAF	8231CF39
-3CB0	8231D030
-3CB1	8231D031
-3CB2	8231D032
-3CB3	8231D033
-3CB4	8231D034
-3CB5	8231D035
-3CB6	8231D036
-3CB7	8231D037
-3CB8	8231D038
-3CB9	8231D039
-3CBA	8231D130
-3CBB	8231D131
-3CBC	8231D132
-3CBD	8231D133
-3CBE	8231D134
-3CBF	8231D135
-3CC0	8231D136
-3CC1	8231D137
-3CC2	8231D138
-3CC3	8231D139
-3CC4	8231D230
-3CC5	8231D231
-3CC6	8231D232
-3CC7	8231D233
-3CC8	8231D234
-3CC9	8231D235
-3CCA	8231D236
-3CCB	8231D237
-3CCC	8231D238
-3CCD	8231D239
-3CCE	8231D330
-3CCF	8231D331
-3CD0	8231D332
-3CD1	8231D333
-3CD2	8231D334
-3CD3	8231D335
-3CD4	8231D336
-3CD5	8231D337
-3CD6	8231D338
-3CD7	8231D339
-3CD8	8231D430
-3CD9	8231D431
-3CDA	8231D432
-3CDB	8231D433
-3CDC	8231D434
-3CDD	8231D435
-3CDE	8231D436
-3CDF	8231D437
-3CE0	FE6A
-3CE1	8231D438
-3CE2	8231D439
-3CE3	8231D530
-3CE4	8231D531
-3CE5	8231D532
-3CE6	8231D533
-3CE7	8231D534
-3CE8	8231D535
-3CE9	8231D536
-3CEA	8231D537
-3CEB	8231D538
-3CEC	8231D539
-3CED	8231D630
-3CEE	8231D631
-3CEF	8231D632
-3CF0	8231D633
-3CF1	8231D634
-3CF2	8231D635
-3CF3	8231D636
-3CF4	8231D637
-3CF5	8231D638
-3CF6	8231D639
-3CF7	8231D730
-3CF8	8231D731
-3CF9	8231D732
-3CFA	8231D733
-3CFB	8231D734
-3CFC	8231D735
-3CFD	8231D736
-3CFE	8231D737
-3CFF	8231D738
-3D00	8231D739
-3D01	8231D830
-3D02	8231D831
-3D03	8231D832
-3D04	8231D833
-3D05	8231D834
-3D06	8231D835
-3D07	8231D836
-3D08	8231D837
-3D09	8231D838
-3D0A	8231D839
-3D0B	8231D930
-3D0C	8231D931
-3D0D	8231D932
-3D0E	8231D933
-3D0F	8231D934
-3D10	8231D935
-3D11	8231D936
-3D12	8231D937
-3D13	8231D938
-3D14	8231D939
-3D15	8231DA30
-3D16	8231DA31
-3D17	8231DA32
-3D18	8231DA33
-3D19	8231DA34
-3D1A	8231DA35
-3D1B	8231DA36
-3D1C	8231DA37
-3D1D	8231DA38
-3D1E	8231DA39
-3D1F	8231DB30
-3D20	8231DB31
-3D21	8231DB32
-3D22	8231DB33
-3D23	8231DB34
-3D24	8231DB35
-3D25	8231DB36
-3D26	8231DB37
-3D27	8231DB38
-3D28	8231DB39
-3D29	8231DC30
-3D2A	8231DC31
-3D2B	8231DC32
-3D2C	8231DC33
-3D2D	8231DC34
-3D2E	8231DC35
-3D2F	8231DC36
-3D30	8231DC37
-3D31	8231DC38
-3D32	8231DC39
-3D33	8231DD30
-3D34	8231DD31
-3D35	8231DD32
-3D36	8231DD33
-3D37	8231DD34
-3D38	8231DD35
-3D39	8231DD36
-3D3A	8231DD37
-3D3B	8231DD38
-3D3C	8231DD39
-3D3D	8231DE30
-3D3E	8231DE31
-3D3F	8231DE32
-3D40	8231DE33
-3D41	8231DE34
-3D42	8231DE35
-3D43	8231DE36
-3D44	8231DE37
-3D45	8231DE38
-3D46	8231DE39
-3D47	8231DF30
-3D48	8231DF31
-3D49	8231DF32
-3D4A	8231DF33
-3D4B	8231DF34
-3D4C	8231DF35
-3D4D	8231DF36
-3D4E	8231DF37
-3D4F	8231DF38
-3D50	8231DF39
-3D51	8231E030
-3D52	8231E031
-3D53	8231E032
-3D54	8231E033
-3D55	8231E034
-3D56	8231E035
-3D57	8231E036
-3D58	8231E037
-3D59	8231E038
-3D5A	8231E039
-3D5B	8231E130
-3D5C	8231E131
-3D5D	8231E132
-3D5E	8231E133
-3D5F	8231E134
-3D60	8231E135
-3D61	8231E136
-3D62	8231E137
-3D63	8231E138
-3D64	8231E139
-3D65	8231E230
-3D66	8231E231
-3D67	8231E232
-3D68	8231E233
-3D69	8231E234
-3D6A	8231E235
-3D6B	8231E236
-3D6C	8231E237
-3D6D	8231E238
-3D6E	8231E239
-3D6F	8231E330
-3D70	8231E331
-3D71	8231E332
-3D72	8231E333
-3D73	8231E334
-3D74	8231E335
-3D75	8231E336
-3D76	8231E337
-3D77	8231E338
-3D78	8231E339
-3D79	8231E430
-3D7A	8231E431
-3D7B	8231E432
-3D7C	8231E433
-3D7D	8231E434
-3D7E	8231E435
-3D7F	8231E436
-3D80	8231E437
-3D81	8231E438
-3D82	8231E439
-3D83	8231E530
-3D84	8231E531
-3D85	8231E532
-3D86	8231E533
-3D87	8231E534
-3D88	8231E535
-3D89	8231E536
-3D8A	8231E537
-3D8B	8231E538
-3D8C	8231E539
-3D8D	8231E630
-3D8E	8231E631
-3D8F	8231E632
-3D90	8231E633
-3D91	8231E634
-3D92	8231E635
-3D93	8231E636
-3D94	8231E637
-3D95	8231E638
-3D96	8231E639
-3D97	8231E730
-3D98	8231E731
-3D99	8231E732
-3D9A	8231E733
-3D9B	8231E734
-3D9C	8231E735
-3D9D	8231E736
-3D9E	8231E737
-3D9F	8231E738
-3DA0	8231E739
-3DA1	8231E830
-3DA2	8231E831
-3DA3	8231E832
-3DA4	8231E833
-3DA5	8231E834
-3DA6	8231E835
-3DA7	8231E836
-3DA8	8231E837
-3DA9	8231E838
-3DAA	8231E839
-3DAB	8231E930
-3DAC	8231E931
-3DAD	8231E932
-3DAE	8231E933
-3DAF	8231E934
-3DB0	8231E935
-3DB1	8231E936
-3DB2	8231E937
-3DB3	8231E938
-3DB4	8231E939
-3DB5	8231EA30
-3DB6	8231EA31
-3DB7	8231EA32
-3DB8	8231EA33
-3DB9	8231EA34
-3DBA	8231EA35
-3DBB	8231EA36
-3DBC	8231EA37
-3DBD	8231EA38
-3DBE	8231EA39
-3DBF	8231EB30
-3DC0	8231EB31
-3DC1	8231EB32
-3DC2	8231EB33
-3DC3	8231EB34
-3DC4	8231EB35
-3DC5	8231EB36
-3DC6	8231EB37
-3DC7	8231EB38
-3DC8	8231EB39
-3DC9	8231EC30
-3DCA	8231EC31
-3DCB	8231EC32
-3DCC	8231EC33
-3DCD	8231EC34
-3DCE	8231EC35
-3DCF	8231EC36
-3DD0	8231EC37
-3DD1	8231EC38
-3DD2	8231EC39
-3DD3	8231ED30
-3DD4	8231ED31
-3DD5	8231ED32
-3DD6	8231ED33
-3DD7	8231ED34
-3DD8	8231ED35
-3DD9	8231ED36
-3DDA	8231ED37
-3DDB	8231ED38
-3DDC	8231ED39
-3DDD	8231EE30
-3DDE	8231EE31
-3DDF	8231EE32
-3DE0	8231EE33
-3DE1	8231EE34
-3DE2	8231EE35
-3DE3	8231EE36
-3DE4	8231EE37
-3DE5	8231EE38
-3DE6	8231EE39
-3DE7	8231EF30
-3DE8	8231EF31
-3DE9	8231EF32
-3DEA	8231EF33
-3DEB	8231EF34
-3DEC	8231EF35
-3DED	8231EF36
-3DEE	8231EF37
-3DEF	8231EF38
-3DF0	8231EF39
-3DF1	8231F030
-3DF2	8231F031
-3DF3	8231F032
-3DF4	8231F033
-3DF5	8231F034
-3DF6	8231F035
-3DF7	8231F036
-3DF8	8231F037
-3DF9	8231F038
-3DFA	8231F039
-3DFB	8231F130
-3DFC	8231F131
-3DFD	8231F132
-3DFE	8231F133
-3DFF	8231F134
-3E00	8231F135
-3E01	8231F136
-3E02	8231F137
-3E03	8231F138
-3E04	8231F139
-3E05	8231F230
-3E06	8231F231
-3E07	8231F232
-3E08	8231F233
-3E09	8231F234
-3E0A	8231F235
-3E0B	8231F236
-3E0C	8231F237
-3E0D	8231F238
-3E0E	8231F239
-3E0F	8231F330
-3E10	8231F331
-3E11	8231F332
-3E12	8231F333
-3E13	8231F334
-3E14	8231F335
-3E15	8231F336
-3E16	8231F337
-3E17	8231F338
-3E18	8231F339
-3E19	8231F430
-3E1A	8231F431
-3E1B	8231F432
-3E1C	8231F433
-3E1D	8231F434
-3E1E	8231F435
-3E1F	8231F436
-3E20	8231F437
-3E21	8231F438
-3E22	8231F439
-3E23	8231F530
-3E24	8231F531
-3E25	8231F532
-3E26	8231F533
-3E27	8231F534
-3E28	8231F535
-3E29	8231F536
-3E2A	8231F537
-3E2B	8231F538
-3E2C	8231F539
-3E2D	8231F630
-3E2E	8231F631
-3E2F	8231F632
-3E30	8231F633
-3E31	8231F634
-3E32	8231F635
-3E33	8231F636
-3E34	8231F637
-3E35	8231F638
-3E36	8231F639
-3E37	8231F730
-3E38	8231F731
-3E39	8231F732
-3E3A	8231F733
-3E3B	8231F734
-3E3C	8231F735
-3E3D	8231F736
-3E3E	8231F737
-3E3F	8231F738
-3E40	8231F739
-3E41	8231F830
-3E42	8231F831
-3E43	8231F832
-3E44	8231F833
-3E45	8231F834
-3E46	8231F835
-3E47	8231F836
-3E48	8231F837
-3E49	8231F838
-3E4A	8231F839
-3E4B	8231F930
-3E4C	8231F931
-3E4D	8231F932
-3E4E	8231F933
-3E4F	8231F934
-3E50	8231F935
-3E51	8231F936
-3E52	8231F937
-3E53	8231F938
-3E54	8231F939
-3E55	8231FA30
-3E56	8231FA31
-3E57	8231FA32
-3E58	8231FA33
-3E59	8231FA34
-3E5A	8231FA35
-3E5B	8231FA36
-3E5C	8231FA37
-3E5D	8231FA38
-3E5E	8231FA39
-3E5F	8231FB30
-3E60	8231FB31
-3E61	8231FB32
-3E62	8231FB33
-3E63	8231FB34
-3E64	8231FB35
-3E65	8231FB36
-3E66	8231FB37
-3E67	8231FB38
-3E68	8231FB39
-3E69	8231FC30
-3E6A	8231FC31
-3E6B	8231FC32
-3E6C	8231FC33
-3E6D	8231FC34
-3E6E	8231FC35
-3E6F	8231FC36
-3E70	8231FC37
-3E71	8231FC38
-3E72	8231FC39
-3E73	8231FD30
-3E74	8231FD31
-3E75	8231FD32
-3E76	8231FD33
-3E77	8231FD34
-3E78	8231FD35
-3E79	8231FD36
-3E7A	8231FD37
-3E7B	8231FD38
-3E7C	8231FD39
-3E7D	8231FE30
-3E7E	8231FE31
-3E7F	8231FE32
-3E80	8231FE33
-3E81	8231FE34
-3E82	8231FE35
-3E83	8231FE36
-3E84	8231FE37
-3E85	8231FE38
-3E86	8231FE39
-3E87	82328130
-3E88	82328131
-3E89	82328132
-3E8A	82328133
-3E8B	82328134
-3E8C	82328135
-3E8D	82328136
-3E8E	82328137
-3E8F	82328138
-3E90	82328139
-3E91	82328230
-3E92	82328231
-3E93	82328232
-3E94	82328233
-3E95	82328234
-3E96	82328235
-3E97	82328236
-3E98	82328237
-3E99	82328238
-3E9A	82328239
-3E9B	82328330
-3E9C	82328331
-3E9D	82328332
-3E9E	82328333
-3E9F	82328334
-3EA0	82328335
-3EA1	82328336
-3EA2	82328337
-3EA3	82328338
-3EA4	82328339
-3EA5	82328430
-3EA6	82328431
-3EA7	82328432
-3EA8	82328433
-3EA9	82328434
-3EAA	82328435
-3EAB	82328436
-3EAC	82328437
-3EAD	82328438
-3EAE	82328439
-3EAF	82328530
-3EB0	82328531
-3EB1	82328532
-3EB2	82328533
-3EB3	82328534
-3EB4	82328535
-3EB5	82328536
-3EB6	82328537
-3EB7	82328538
-3EB8	82328539
-3EB9	82328630
-3EBA	82328631
-3EBB	82328632
-3EBC	82328633
-3EBD	82328634
-3EBE	82328635
-3EBF	82328636
-3EC0	82328637
-3EC1	82328638
-3EC2	82328639
-3EC3	82328730
-3EC4	82328731
-3EC5	82328732
-3EC6	82328733
-3EC7	82328734
-3EC8	82328735
-3EC9	82328736
-3ECA	82328737
-3ECB	82328738
-3ECC	82328739
-3ECD	82328830
-3ECE	82328831
-3ECF	82328832
-3ED0	82328833
-3ED1	82328834
-3ED2	82328835
-3ED3	82328836
-3ED4	82328837
-3ED5	82328838
-3ED6	82328839
-3ED7	82328930
-3ED8	82328931
-3ED9	82328932
-3EDA	82328933
-3EDB	82328934
-3EDC	82328935
-3EDD	82328936
-3EDE	82328937
-3EDF	82328938
-3EE0	82328939
-3EE1	82328A30
-3EE2	82328A31
-3EE3	82328A32
-3EE4	82328A33
-3EE5	82328A34
-3EE6	82328A35
-3EE7	82328A36
-3EE8	82328A37
-3EE9	82328A38
-3EEA	82328A39
-3EEB	82328B30
-3EEC	82328B31
-3EED	82328B32
-3EEE	82328B33
-3EEF	82328B34
-3EF0	82328B35
-3EF1	82328B36
-3EF2	82328B37
-3EF3	82328B38
-3EF4	82328B39
-3EF5	82328C30
-3EF6	82328C31
-3EF7	82328C32
-3EF8	82328C33
-3EF9	82328C34
-3EFA	82328C35
-3EFB	82328C36
-3EFC	82328C37
-3EFD	82328C38
-3EFE	82328C39
-3EFF	82328D30
-3F00	82328D31
-3F01	82328D32
-3F02	82328D33
-3F03	82328D34
-3F04	82328D35
-3F05	82328D36
-3F06	82328D37
-3F07	82328D38
-3F08	82328D39
-3F09	82328E30
-3F0A	82328E31
-3F0B	82328E32
-3F0C	82328E33
-3F0D	82328E34
-3F0E	82328E35
-3F0F	82328E36
-3F10	82328E37
-3F11	82328E38
-3F12	82328E39
-3F13	82328F30
-3F14	82328F31
-3F15	82328F32
-3F16	82328F33
-3F17	82328F34
-3F18	82328F35
-3F19	82328F36
-3F1A	82328F37
-3F1B	82328F38
-3F1C	82328F39
-3F1D	82329030
-3F1E	82329031
-3F1F	82329032
-3F20	82329033
-3F21	82329034
-3F22	82329035
-3F23	82329036
-3F24	82329037
-3F25	82329038
-3F26	82329039
-3F27	82329130
-3F28	82329131
-3F29	82329132
-3F2A	82329133
-3F2B	82329134
-3F2C	82329135
-3F2D	82329136
-3F2E	82329137
-3F2F	82329138
-3F30	82329139
-3F31	82329230
-3F32	82329231
-3F33	82329232
-3F34	82329233
-3F35	82329234
-3F36	82329235
-3F37	82329236
-3F38	82329237
-3F39	82329238
-3F3A	82329239
-3F3B	82329330
-3F3C	82329331
-3F3D	82329332
-3F3E	82329333
-3F3F	82329334
-3F40	82329335
-3F41	82329336
-3F42	82329337
-3F43	82329338
-3F44	82329339
-3F45	82329430
-3F46	82329431
-3F47	82329432
-3F48	82329433
-3F49	82329434
-3F4A	82329435
-3F4B	82329436
-3F4C	82329437
-3F4D	82329438
-3F4E	82329439
-3F4F	82329530
-3F50	82329531
-3F51	82329532
-3F52	82329533
-3F53	82329534
-3F54	82329535
-3F55	82329536
-3F56	82329537
-3F57	82329538
-3F58	82329539
-3F59	82329630
-3F5A	82329631
-3F5B	82329632
-3F5C	82329633
-3F5D	82329634
-3F5E	82329635
-3F5F	82329636
-3F60	82329637
-3F61	82329638
-3F62	82329639
-3F63	82329730
-3F64	82329731
-3F65	82329732
-3F66	82329733
-3F67	82329734
-3F68	82329735
-3F69	82329736
-3F6A	82329737
-3F6B	82329738
-3F6C	82329739
-3F6D	82329830
-3F6E	82329831
-3F6F	82329832
-3F70	82329833
-3F71	82329834
-3F72	82329835
-3F73	82329836
-3F74	82329837
-3F75	82329838
-3F76	82329839
-3F77	82329930
-3F78	82329931
-3F79	82329932
-3F7A	82329933
-3F7B	82329934
-3F7C	82329935
-3F7D	82329936
-3F7E	82329937
-3F7F	82329938
-3F80	82329939
-3F81	82329A30
-3F82	82329A31
-3F83	82329A32
-3F84	82329A33
-3F85	82329A34
-3F86	82329A35
-3F87	82329A36
-3F88	82329A37
-3F89	82329A38
-3F8A	82329A39
-3F8B	82329B30
-3F8C	82329B31
-3F8D	82329B32
-3F8E	82329B33
-3F8F	82329B34
-3F90	82329B35
-3F91	82329B36
-3F92	82329B37
-3F93	82329B38
-3F94	82329B39
-3F95	82329C30
-3F96	82329C31
-3F97	82329C32
-3F98	82329C33
-3F99	82329C34
-3F9A	82329C35
-3F9B	82329C36
-3F9C	82329C37
-3F9D	82329C38
-3F9E	82329C39
-3F9F	82329D30
-3FA0	82329D31
-3FA1	82329D32
-3FA2	82329D33
-3FA3	82329D34
-3FA4	82329D35
-3FA5	82329D36
-3FA6	82329D37
-3FA7	82329D38
-3FA8	82329D39
-3FA9	82329E30
-3FAA	82329E31
-3FAB	82329E32
-3FAC	82329E33
-3FAD	82329E34
-3FAE	82329E35
-3FAF	82329E36
-3FB0	82329E37
-3FB1	82329E38
-3FB2	82329E39
-3FB3	82329F30
-3FB4	82329F31
-3FB5	82329F32
-3FB6	82329F33
-3FB7	82329F34
-3FB8	82329F35
-3FB9	82329F36
-3FBA	82329F37
-3FBB	82329F38
-3FBC	82329F39
-3FBD	8232A030
-3FBE	8232A031
-3FBF	8232A032
-3FC0	8232A033
-3FC1	8232A034
-3FC2	8232A035
-3FC3	8232A036
-3FC4	8232A037
-3FC5	8232A038
-3FC6	8232A039
-3FC7	8232A130
-3FC8	8232A131
-3FC9	8232A132
-3FCA	8232A133
-3FCB	8232A134
-3FCC	8232A135
-3FCD	8232A136
-3FCE	8232A137
-3FCF	8232A138
-3FD0	8232A139
-3FD1	8232A230
-3FD2	8232A231
-3FD3	8232A232
-3FD4	8232A233
-3FD5	8232A234
-3FD6	8232A235
-3FD7	8232A236
-3FD8	8232A237
-3FD9	8232A238
-3FDA	8232A239
-3FDB	8232A330
-3FDC	8232A331
-3FDD	8232A332
-3FDE	8232A333
-3FDF	8232A334
-3FE0	8232A335
-3FE1	8232A336
-3FE2	8232A337
-3FE3	8232A338
-3FE4	8232A339
-3FE5	8232A430
-3FE6	8232A431
-3FE7	8232A432
-3FE8	8232A433
-3FE9	8232A434
-3FEA	8232A435
-3FEB	8232A436
-3FEC	8232A437
-3FED	8232A438
-3FEE	8232A439
-3FEF	8232A530
-3FF0	8232A531
-3FF1	8232A532
-3FF2	8232A533
-3FF3	8232A534
-3FF4	8232A535
-3FF5	8232A536
-3FF6	8232A537
-3FF7	8232A538
-3FF8	8232A539
-3FF9	8232A630
-3FFA	8232A631
-3FFB	8232A632
-3FFC	8232A633
-3FFD	8232A634
-3FFE	8232A635
-3FFF	8232A636
-4000	8232A637
-4001	8232A638
-4002	8232A639
-4003	8232A730
-4004	8232A731
-4005	8232A732
-4006	8232A733
-4007	8232A734
-4008	8232A735
-4009	8232A736
-400A	8232A737
-400B	8232A738
-400C	8232A739
-400D	8232A830
-400E	8232A831
-400F	8232A832
-4010	8232A833
-4011	8232A834
-4012	8232A835
-4013	8232A836
-4014	8232A837
-4015	8232A838
-4016	8232A839
-4017	8232A930
-4018	8232A931
-4019	8232A932
-401A	8232A933
-401B	8232A934
-401C	8232A935
-401D	8232A936
-401E	8232A937
-401F	8232A938
-4020	8232A939
-4021	8232AA30
-4022	8232AA31
-4023	8232AA32
-4024	8232AA33
-4025	8232AA34
-4026	8232AA35
-4027	8232AA36
-4028	8232AA37
-4029	8232AA38
-402A	8232AA39
-402B	8232AB30
-402C	8232AB31
-402D	8232AB32
-402E	8232AB33
-402F	8232AB34
-4030	8232AB35
-4031	8232AB36
-4032	8232AB37
-4033	8232AB38
-4034	8232AB39
-4035	8232AC30
-4036	8232AC31
-4037	8232AC32
-4038	8232AC33
-4039	8232AC34
-403A	8232AC35
-403B	8232AC36
-403C	8232AC37
-403D	8232AC38
-403E	8232AC39
-403F	8232AD30
-4040	8232AD31
-4041	8232AD32
-4042	8232AD33
-4043	8232AD34
-4044	8232AD35
-4045	8232AD36
-4046	8232AD37
-4047	8232AD38
-4048	8232AD39
-4049	8232AE30
-404A	8232AE31
-404B	8232AE32
-404C	8232AE33
-404D	8232AE34
-404E	8232AE35
-404F	8232AE36
-4050	8232AE37
-4051	8232AE38
-4052	8232AE39
-4053	8232AF30
-4054	8232AF31
-4055	8232AF32
-4056	FE6F
-4057	8232AF33
-4058	8232AF34
-4059	8232AF35
-405A	8232AF36
-405B	8232AF37
-405C	8232AF38
-405D	8232AF39
-405E	8232B030
-405F	8232B031
-4060	8232B032
-4061	8232B033
-4062	8232B034
-4063	8232B035
-4064	8232B036
-4065	8232B037
-4066	8232B038
-4067	8232B039
-4068	8232B130
-4069	8232B131
-406A	8232B132
-406B	8232B133
-406C	8232B134
-406D	8232B135
-406E	8232B136
-406F	8232B137
-4070	8232B138
-4071	8232B139
-4072	8232B230
-4073	8232B231
-4074	8232B232
-4075	8232B233
-4076	8232B234
-4077	8232B235
-4078	8232B236
-4079	8232B237
-407A	8232B238
-407B	8232B239
-407C	8232B330
-407D	8232B331
-407E	8232B332
-407F	8232B333
-4080	8232B334
-4081	8232B335
-4082	8232B336
-4083	8232B337
-4084	8232B338
-4085	8232B339
-4086	8232B430
-4087	8232B431
-4088	8232B432
-4089	8232B433
-408A	8232B434
-408B	8232B435
-408C	8232B436
-408D	8232B437
-408E	8232B438
-408F	8232B439
-4090	8232B530
-4091	8232B531
-4092	8232B532
-4093	8232B533
-4094	8232B534
-4095	8232B535
-4096	8232B536
-4097	8232B537
-4098	8232B538
-4099	8232B539
-409A	8232B630
-409B	8232B631
-409C	8232B632
-409D	8232B633
-409E	8232B634
-409F	8232B635
-40A0	8232B636
-40A1	8232B637
-40A2	8232B638
-40A3	8232B639
-40A4	8232B730
-40A5	8232B731
-40A6	8232B732
-40A7	8232B733
-40A8	8232B734
-40A9	8232B735
-40AA	8232B736
-40AB	8232B737
-40AC	8232B738
-40AD	8232B739
-40AE	8232B830
-40AF	8232B831
-40B0	8232B832
-40B1	8232B833
-40B2	8232B834
-40B3	8232B835
-40B4	8232B836
-40B5	8232B837
-40B6	8232B838
-40B7	8232B839
-40B8	8232B930
-40B9	8232B931
-40BA	8232B932
-40BB	8232B933
-40BC	8232B934
-40BD	8232B935
-40BE	8232B936
-40BF	8232B937
-40C0	8232B938
-40C1	8232B939
-40C2	8232BA30
-40C3	8232BA31
-40C4	8232BA32
-40C5	8232BA33
-40C6	8232BA34
-40C7	8232BA35
-40C8	8232BA36
-40C9	8232BA37
-40CA	8232BA38
-40CB	8232BA39
-40CC	8232BB30
-40CD	8232BB31
-40CE	8232BB32
-40CF	8232BB33
-40D0	8232BB34
-40D1	8232BB35
-40D2	8232BB36
-40D3	8232BB37
-40D4	8232BB38
-40D5	8232BB39
-40D6	8232BC30
-40D7	8232BC31
-40D8	8232BC32
-40D9	8232BC33
-40DA	8232BC34
-40DB	8232BC35
-40DC	8232BC36
-40DD	8232BC37
-40DE	8232BC38
-40DF	8232BC39
-40E0	8232BD30
-40E1	8232BD31
-40E2	8232BD32
-40E3	8232BD33
-40E4	8232BD34
-40E5	8232BD35
-40E6	8232BD36
-40E7	8232BD37
-40E8	8232BD38
-40E9	8232BD39
-40EA	8232BE30
-40EB	8232BE31
-40EC	8232BE32
-40ED	8232BE33
-40EE	8232BE34
-40EF	8232BE35
-40F0	8232BE36
-40F1	8232BE37
-40F2	8232BE38
-40F3	8232BE39
-40F4	8232BF30
-40F5	8232BF31
-40F6	8232BF32
-40F7	8232BF33
-40F8	8232BF34
-40F9	8232BF35
-40FA	8232BF36
-40FB	8232BF37
-40FC	8232BF38
-40FD	8232BF39
-40FE	8232C030
-40FF	8232C031
-4100	8232C032
-4101	8232C033
-4102	8232C034
-4103	8232C035
-4104	8232C036
-4105	8232C037
-4106	8232C038
-4107	8232C039
-4108	8232C130
-4109	8232C131
-410A	8232C132
-410B	8232C133
-410C	8232C134
-410D	8232C135
-410E	8232C136
-410F	8232C137
-4110	8232C138
-4111	8232C139
-4112	8232C230
-4113	8232C231
-4114	8232C232
-4115	8232C233
-4116	8232C234
-4117	8232C235
-4118	8232C236
-4119	8232C237
-411A	8232C238
-411B	8232C239
-411C	8232C330
-411D	8232C331
-411E	8232C332
-411F	8232C333
-4120	8232C334
-4121	8232C335
-4122	8232C336
-4123	8232C337
-4124	8232C338
-4125	8232C339
-4126	8232C430
-4127	8232C431
-4128	8232C432
-4129	8232C433
-412A	8232C434
-412B	8232C435
-412C	8232C436
-412D	8232C437
-412E	8232C438
-412F	8232C439
-4130	8232C530
-4131	8232C531
-4132	8232C532
-4133	8232C533
-4134	8232C534
-4135	8232C535
-4136	8232C536
-4137	8232C537
-4138	8232C538
-4139	8232C539
-413A	8232C630
-413B	8232C631
-413C	8232C632
-413D	8232C633
-413E	8232C634
-413F	8232C635
-4140	8232C636
-4141	8232C637
-4142	8232C638
-4143	8232C639
-4144	8232C730
-4145	8232C731
-4146	8232C732
-4147	8232C733
-4148	8232C734
-4149	8232C735
-414A	8232C736
-414B	8232C737
-414C	8232C738
-414D	8232C739
-414E	8232C830
-414F	8232C831
-4150	8232C832
-4151	8232C833
-4152	8232C834
-4153	8232C835
-4154	8232C836
-4155	8232C837
-4156	8232C838
-4157	8232C839
-4158	8232C930
-4159	8232C931
-415A	8232C932
-415B	8232C933
-415C	8232C934
-415D	8232C935
-415E	8232C936
-415F	FE70
-4160	8232C937
-4161	8232C938
-4162	8232C939
-4163	8232CA30
-4164	8232CA31
-4165	8232CA32
-4166	8232CA33
-4167	8232CA34
-4168	8232CA35
-4169	8232CA36
-416A	8232CA37
-416B	8232CA38
-416C	8232CA39
-416D	8232CB30
-416E	8232CB31
-416F	8232CB32
-4170	8232CB33
-4171	8232CB34
-4172	8232CB35
-4173	8232CB36
-4174	8232CB37
-4175	8232CB38
-4176	8232CB39
-4177	8232CC30
-4178	8232CC31
-4179	8232CC32
-417A	8232CC33
-417B	8232CC34
-417C	8232CC35
-417D	8232CC36
-417E	8232CC37
-417F	8232CC38
-4180	8232CC39
-4181	8232CD30
-4182	8232CD31
-4183	8232CD32
-4184	8232CD33
-4185	8232CD34
-4186	8232CD35
-4187	8232CD36
-4188	8232CD37
-4189	8232CD38
-418A	8232CD39
-418B	8232CE30
-418C	8232CE31
-418D	8232CE32
-418E	8232CE33
-418F	8232CE34
-4190	8232CE35
-4191	8232CE36
-4192	8232CE37
-4193	8232CE38
-4194	8232CE39
-4195	8232CF30
-4196	8232CF31
-4197	8232CF32
-4198	8232CF33
-4199	8232CF34
-419A	8232CF35
-419B	8232CF36
-419C	8232CF37
-419D	8232CF38
-419E	8232CF39
-419F	8232D030
-41A0	8232D031
-41A1	8232D032
-41A2	8232D033
-41A3	8232D034
-41A4	8232D035
-41A5	8232D036
-41A6	8232D037
-41A7	8232D038
-41A8	8232D039
-41A9	8232D130
-41AA	8232D131
-41AB	8232D132
-41AC	8232D133
-41AD	8232D134
-41AE	8232D135
-41AF	8232D136
-41B0	8232D137
-41B1	8232D138
-41B2	8232D139
-41B3	8232D230
-41B4	8232D231
-41B5	8232D232
-41B6	8232D233
-41B7	8232D234
-41B8	8232D235
-41B9	8232D236
-41BA	8232D237
-41BB	8232D238
-41BC	8232D239
-41BD	8232D330
-41BE	8232D331
-41BF	8232D332
-41C0	8232D333
-41C1	8232D334
-41C2	8232D335
-41C3	8232D336
-41C4	8232D337
-41C5	8232D338
-41C6	8232D339
-41C7	8232D430
-41C8	8232D431
-41C9	8232D432
-41CA	8232D433
-41CB	8232D434
-41CC	8232D435
-41CD	8232D436
-41CE	8232D437
-41CF	8232D438
-41D0	8232D439
-41D1	8232D530
-41D2	8232D531
-41D3	8232D532
-41D4	8232D533
-41D5	8232D534
-41D6	8232D535
-41D7	8232D536
-41D8	8232D537
-41D9	8232D538
-41DA	8232D539
-41DB	8232D630
-41DC	8232D631
-41DD	8232D632
-41DE	8232D633
-41DF	8232D634
-41E0	8232D635
-41E1	8232D636
-41E2	8232D637
-41E3	8232D638
-41E4	8232D639
-41E5	8232D730
-41E6	8232D731
-41E7	8232D732
-41E8	8232D733
-41E9	8232D734
-41EA	8232D735
-41EB	8232D736
-41EC	8232D737
-41ED	8232D738
-41EE	8232D739
-41EF	8232D830
-41F0	8232D831
-41F1	8232D832
-41F2	8232D833
-41F3	8232D834
-41F4	8232D835
-41F5	8232D836
-41F6	8232D837
-41F7	8232D838
-41F8	8232D839
-41F9	8232D930
-41FA	8232D931
-41FB	8232D932
-41FC	8232D933
-41FD	8232D934
-41FE	8232D935
-41FF	8232D936
-4200	8232D937
-4201	8232D938
-4202	8232D939
-4203	8232DA30
-4204	8232DA31
-4205	8232DA32
-4206	8232DA33
-4207	8232DA34
-4208	8232DA35
-4209	8232DA36
-420A	8232DA37
-420B	8232DA38
-420C	8232DA39
-420D	8232DB30
-420E	8232DB31
-420F	8232DB32
-4210	8232DB33
-4211	8232DB34
-4212	8232DB35
-4213	8232DB36
-4214	8232DB37
-4215	8232DB38
-4216	8232DB39
-4217	8232DC30
-4218	8232DC31
-4219	8232DC32
-421A	8232DC33
-421B	8232DC34
-421C	8232DC35
-421D	8232DC36
-421E	8232DC37
-421F	8232DC38
-4220	8232DC39
-4221	8232DD30
-4222	8232DD31
-4223	8232DD32
-4224	8232DD33
-4225	8232DD34
-4226	8232DD35
-4227	8232DD36
-4228	8232DD37
-4229	8232DD38
-422A	8232DD39
-422B	8232DE30
-422C	8232DE31
-422D	8232DE32
-422E	8232DE33
-422F	8232DE34
-4230	8232DE35
-4231	8232DE36
-4232	8232DE37
-4233	8232DE38
-4234	8232DE39
-4235	8232DF30
-4236	8232DF31
-4237	8232DF32
-4238	8232DF33
-4239	8232DF34
-423A	8232DF35
-423B	8232DF36
-423C	8232DF37
-423D	8232DF38
-423E	8232DF39
-423F	8232E030
-4240	8232E031
-4241	8232E032
-4242	8232E033
-4243	8232E034
-4244	8232E035
-4245	8232E036
-4246	8232E037
-4247	8232E038
-4248	8232E039
-4249	8232E130
-424A	8232E131
-424B	8232E132
-424C	8232E133
-424D	8232E134
-424E	8232E135
-424F	8232E136
-4250	8232E137
-4251	8232E138
-4252	8232E139
-4253	8232E230
-4254	8232E231
-4255	8232E232
-4256	8232E233
-4257	8232E234
-4258	8232E235
-4259	8232E236
-425A	8232E237
-425B	8232E238
-425C	8232E239
-425D	8232E330
-425E	8232E331
-425F	8232E332
-4260	8232E333
-4261	8232E334
-4262	8232E335
-4263	8232E336
-4264	8232E337
-4265	8232E338
-4266	8232E339
-4267	8232E430
-4268	8232E431
-4269	8232E432
-426A	8232E433
-426B	8232E434
-426C	8232E435
-426D	8232E436
-426E	8232E437
-426F	8232E438
-4270	8232E439
-4271	8232E530
-4272	8232E531
-4273	8232E532
-4274	8232E533
-4275	8232E534
-4276	8232E535
-4277	8232E536
-4278	8232E537
-4279	8232E538
-427A	8232E539
-427B	8232E630
-427C	8232E631
-427D	8232E632
-427E	8232E633
-427F	8232E634
-4280	8232E635
-4281	8232E636
-4282	8232E637
-4283	8232E638
-4284	8232E639
-4285	8232E730
-4286	8232E731
-4287	8232E732
-4288	8232E733
-4289	8232E734
-428A	8232E735
-428B	8232E736
-428C	8232E737
-428D	8232E738
-428E	8232E739
-428F	8232E830
-4290	8232E831
-4291	8232E832
-4292	8232E833
-4293	8232E834
-4294	8232E835
-4295	8232E836
-4296	8232E837
-4297	8232E838
-4298	8232E839
-4299	8232E930
-429A	8232E931
-429B	8232E932
-429C	8232E933
-429D	8232E934
-429E	8232E935
-429F	8232E936
-42A0	8232E937
-42A1	8232E938
-42A2	8232E939
-42A3	8232EA30
-42A4	8232EA31
-42A5	8232EA32
-42A6	8232EA33
-42A7	8232EA34
-42A8	8232EA35
-42A9	8232EA36
-42AA	8232EA37
-42AB	8232EA38
-42AC	8232EA39
-42AD	8232EB30
-42AE	8232EB31
-42AF	8232EB32
-42B0	8232EB33
-42B1	8232EB34
-42B2	8232EB35
-42B3	8232EB36
-42B4	8232EB37
-42B5	8232EB38
-42B6	8232EB39
-42B7	8232EC30
-42B8	8232EC31
-42B9	8232EC32
-42BA	8232EC33
-42BB	8232EC34
-42BC	8232EC35
-42BD	8232EC36
-42BE	8232EC37
-42BF	8232EC38
-42C0	8232EC39
-42C1	8232ED30
-42C2	8232ED31
-42C3	8232ED32
-42C4	8232ED33
-42C5	8232ED34
-42C6	8232ED35
-42C7	8232ED36
-42C8	8232ED37
-42C9	8232ED38
-42CA	8232ED39
-42CB	8232EE30
-42CC	8232EE31
-42CD	8232EE32
-42CE	8232EE33
-42CF	8232EE34
-42D0	8232EE35
-42D1	8232EE36
-42D2	8232EE37
-42D3	8232EE38
-42D4	8232EE39
-42D5	8232EF30
-42D6	8232EF31
-42D7	8232EF32
-42D8	8232EF33
-42D9	8232EF34
-42DA	8232EF35
-42DB	8232EF36
-42DC	8232EF37
-42DD	8232EF38
-42DE	8232EF39
-42DF	8232F030
-42E0	8232F031
-42E1	8232F032
-42E2	8232F033
-42E3	8232F034
-42E4	8232F035
-42E5	8232F036
-42E6	8232F037
-42E7	8232F038
-42E8	8232F039
-42E9	8232F130
-42EA	8232F131
-42EB	8232F132
-42EC	8232F133
-42ED	8232F134
-42EE	8232F135
-42EF	8232F136
-42F0	8232F137
-42F1	8232F138
-42F2	8232F139
-42F3	8232F230
-42F4	8232F231
-42F5	8232F232
-42F6	8232F233
-42F7	8232F234
-42F8	8232F235
-42F9	8232F236
-42FA	8232F237
-42FB	8232F238
-42FC	8232F239
-42FD	8232F330
-42FE	8232F331
-42FF	8232F332
-4300	8232F333
-4301	8232F334
-4302	8232F335
-4303	8232F336
-4304	8232F337
-4305	8232F338
-4306	8232F339
-4307	8232F430
-4308	8232F431
-4309	8232F432
-430A	8232F433
-430B	8232F434
-430C	8232F435
-430D	8232F436
-430E	8232F437
-430F	8232F438
-4310	8232F439
-4311	8232F530
-4312	8232F531
-4313	8232F532
-4314	8232F533
-4315	8232F534
-4316	8232F535
-4317	8232F536
-4318	8232F537
-4319	8232F538
-431A	8232F539
-431B	8232F630
-431C	8232F631
-431D	8232F632
-431E	8232F633
-431F	8232F634
-4320	8232F635
-4321	8232F636
-4322	8232F637
-4323	8232F638
-4324	8232F639
-4325	8232F730
-4326	8232F731
-4327	8232F732
-4328	8232F733
-4329	8232F734
-432A	8232F735
-432B	8232F736
-432C	8232F737
-432D	8232F738
-432E	8232F739
-432F	8232F830
-4330	8232F831
-4331	8232F832
-4332	8232F833
-4333	8232F834
-4334	8232F835
-4335	8232F836
-4336	8232F837
-4337	FE72
-4338	8232F838
-4339	8232F839
-433A	8232F930
-433B	8232F931
-433C	8232F932
-433D	8232F933
-433E	8232F934
-433F	8232F935
-4340	8232F936
-4341	8232F937
-4342	8232F938
-4343	8232F939
-4344	8232FA30
-4345	8232FA31
-4346	8232FA32
-4347	8232FA33
-4348	8232FA34
-4349	8232FA35
-434A	8232FA36
-434B	8232FA37
-434C	8232FA38
-434D	8232FA39
-434E	8232FB30
-434F	8232FB31
-4350	8232FB32
-4351	8232FB33
-4352	8232FB34
-4353	8232FB35
-4354	8232FB36
-4355	8232FB37
-4356	8232FB38
-4357	8232FB39
-4358	8232FC30
-4359	8232FC31
-435A	8232FC32
-435B	8232FC33
-435C	8232FC34
-435D	8232FC35
-435E	8232FC36
-435F	8232FC37
-4360	8232FC38
-4361	8232FC39
-4362	8232FD30
-4363	8232FD31
-4364	8232FD32
-4365	8232FD33
-4366	8232FD34
-4367	8232FD35
-4368	8232FD36
-4369	8232FD37
-436A	8232FD38
-436B	8232FD39
-436C	8232FE30
-436D	8232FE31
-436E	8232FE32
-436F	8232FE33
-4370	8232FE34
-4371	8232FE35
-4372	8232FE36
-4373	8232FE37
-4374	8232FE38
-4375	8232FE39
-4376	82338130
-4377	82338131
-4378	82338132
-4379	82338133
-437A	82338134
-437B	82338135
-437C	82338136
-437D	82338137
-437E	82338138
-437F	82338139
-4380	82338230
-4381	82338231
-4382	82338232
-4383	82338233
-4384	82338234
-4385	82338235
-4386	82338236
-4387	82338237
-4388	82338238
-4389	82338239
-438A	82338330
-438B	82338331
-438C	82338332
-438D	82338333
-438E	82338334
-438F	82338335
-4390	82338336
-4391	82338337
-4392	82338338
-4393	82338339
-4394	82338430
-4395	82338431
-4396	82338432
-4397	82338433
-4398	82338434
-4399	82338435
-439A	82338436
-439B	82338437
-439C	82338438
-439D	82338439
-439E	82338530
-439F	82338531
-43A0	82338532
-43A1	82338533
-43A2	82338534
-43A3	82338535
-43A4	82338536
-43A5	82338537
-43A6	82338538
-43A7	82338539
-43A8	82338630
-43A9	82338631
-43AA	82338632
-43AB	82338633
-43AC	FE78
-43AD	82338634
-43AE	82338635
-43AF	82338636
-43B0	82338637
-43B1	FE77
-43B2	82338638
-43B3	82338639
-43B4	82338730
-43B5	82338731
-43B6	82338732
-43B7	82338733
-43B8	82338734
-43B9	82338735
-43BA	82338736
-43BB	82338737
-43BC	82338738
-43BD	82338739
-43BE	82338830
-43BF	82338831
-43C0	82338832
-43C1	82338833
-43C2	82338834
-43C3	82338835
-43C4	82338836
-43C5	82338837
-43C6	82338838
-43C7	82338839
-43C8	82338930
-43C9	82338931
-43CA	82338932
-43CB	82338933
-43CC	82338934
-43CD	82338935
-43CE	82338936
-43CF	82338937
-43D0	82338938
-43D1	82338939
-43D2	82338A30
-43D3	82338A31
-43D4	82338A32
-43D5	82338A33
-43D6	82338A34
-43D7	82338A35
-43D8	82338A36
-43D9	82338A37
-43DA	82338A38
-43DB	82338A39
-43DC	82338B30
-43DD	FE7A
-43DE	82338B31
-43DF	82338B32
-43E0	82338B33
-43E1	82338B34
-43E2	82338B35
-43E3	82338B36
-43E4	82338B37
-43E5	82338B38
-43E6	82338B39
-43E7	82338C30
-43E8	82338C31
-43E9	82338C32
-43EA	82338C33
-43EB	82338C34
-43EC	82338C35
-43ED	82338C36
-43EE	82338C37
-43EF	82338C38
-43F0	82338C39
-43F1	82338D30
-43F2	82338D31
-43F3	82338D32
-43F4	82338D33
-43F5	82338D34
-43F6	82338D35
-43F7	82338D36
-43F8	82338D37
-43F9	82338D38
-43FA	82338D39
-43FB	82338E30
-43FC	82338E31
-43FD	82338E32
-43FE	82338E33
-43FF	82338E34
-4400	82338E35
-4401	82338E36
-4402	82338E37
-4403	82338E38
-4404	82338E39
-4405	82338F30
-4406	82338F31
-4407	82338F32
-4408	82338F33
-4409	82338F34
-440A	82338F35
-440B	82338F36
-440C	82338F37
-440D	82338F38
-440E	82338F39
-440F	82339030
-4410	82339031
-4411	82339032
-4412	82339033
-4413	82339034
-4414	82339035
-4415	82339036
-4416	82339037
-4417	82339038
-4418	82339039
-4419	82339130
-441A	82339131
-441B	82339132
-441C	82339133
-441D	82339134
-441E	82339135
-441F	82339136
-4420	82339137
-4421	82339138
-4422	82339139
-4423	82339230
-4424	82339231
-4425	82339232
-4426	82339233
-4427	82339234
-4428	82339235
-4429	82339236
-442A	82339237
-442B	82339238
-442C	82339239
-442D	82339330
-442E	82339331
-442F	82339332
-4430	82339333
-4431	82339334
-4432	82339335
-4433	82339336
-4434	82339337
-4435	82339338
-4436	82339339
-4437	82339430
-4438	82339431
-4439	82339432
-443A	82339433
-443B	82339434
-443C	82339435
-443D	82339436
-443E	82339437
-443F	82339438
-4440	82339439
-4441	82339530
-4442	82339531
-4443	82339532
-4444	82339533
-4445	82339534
-4446	82339535
-4447	82339536
-4448	82339537
-4449	82339538
-444A	82339539
-444B	82339630
-444C	82339631
-444D	82339632
-444E	82339633
-444F	82339634
-4450	82339635
-4451	82339636
-4452	82339637
-4453	82339638
-4454	82339639
-4455	82339730
-4456	82339731
-4457	82339732
-4458	82339733
-4459	82339734
-445A	82339735
-445B	82339736
-445C	82339737
-445D	82339738
-445E	82339739
-445F	82339830
-4460	82339831
-4461	82339832
-4462	82339833
-4463	82339834
-4464	82339835
-4465	82339836
-4466	82339837
-4467	82339838
-4468	82339839
-4469	82339930
-446A	82339931
-446B	82339932
-446C	82339933
-446D	82339934
-446E	82339935
-446F	82339936
-4470	82339937
-4471	82339938
-4472	82339939
-4473	82339A30
-4474	82339A31
-4475	82339A32
-4476	82339A33
-4477	82339A34
-4478	82339A35
-4479	82339A36
-447A	82339A37
-447B	82339A38
-447C	82339A39
-447D	82339B30
-447E	82339B31
-447F	82339B32
-4480	82339B33
-4481	82339B34
-4482	82339B35
-4483	82339B36
-4484	82339B37
-4485	82339B38
-4486	82339B39
-4487	82339C30
-4488	82339C31
-4489	82339C32
-448A	82339C33
-448B	82339C34
-448C	82339C35
-448D	82339C36
-448E	82339C37
-448F	82339C38
-4490	82339C39
-4491	82339D30
-4492	82339D31
-4493	82339D32
-4494	82339D33
-4495	82339D34
-4496	82339D35
-4497	82339D36
-4498	82339D37
-4499	82339D38
-449A	82339D39
-449B	82339E30
-449C	82339E31
-449D	82339E32
-449E	82339E33
-449F	82339E34
-44A0	82339E35
-44A1	82339E36
-44A2	82339E37
-44A3	82339E38
-44A4	82339E39
-44A5	82339F30
-44A6	82339F31
-44A7	82339F32
-44A8	82339F33
-44A9	82339F34
-44AA	82339F35
-44AB	82339F36
-44AC	82339F37
-44AD	82339F38
-44AE	82339F39
-44AF	8233A030
-44B0	8233A031
-44B1	8233A032
-44B2	8233A033
-44B3	8233A034
-44B4	8233A035
-44B5	8233A036
-44B6	8233A037
-44B7	8233A038
-44B8	8233A039
-44B9	8233A130
-44BA	8233A131
-44BB	8233A132
-44BC	8233A133
-44BD	8233A134
-44BE	8233A135
-44BF	8233A136
-44C0	8233A137
-44C1	8233A138
-44C2	8233A139
-44C3	8233A230
-44C4	8233A231
-44C5	8233A232
-44C6	8233A233
-44C7	8233A234
-44C8	8233A235
-44C9	8233A236
-44CA	8233A237
-44CB	8233A238
-44CC	8233A239
-44CD	8233A330
-44CE	8233A331
-44CF	8233A332
-44D0	8233A333
-44D1	8233A334
-44D2	8233A335
-44D3	8233A336
-44D4	8233A337
-44D5	8233A338
-44D6	FE7B
-44D7	8233A339
-44D8	8233A430
-44D9	8233A431
-44DA	8233A432
-44DB	8233A433
-44DC	8233A434
-44DD	8233A435
-44DE	8233A436
-44DF	8233A437
-44E0	8233A438
-44E1	8233A439
-44E2	8233A530
-44E3	8233A531
-44E4	8233A532
-44E5	8233A533
-44E6	8233A534
-44E7	8233A535
-44E8	8233A536
-44E9	8233A537
-44EA	8233A538
-44EB	8233A539
-44EC	8233A630
-44ED	8233A631
-44EE	8233A632
-44EF	8233A633
-44F0	8233A634
-44F1	8233A635
-44F2	8233A636
-44F3	8233A637
-44F4	8233A638
-44F5	8233A639
-44F6	8233A730
-44F7	8233A731
-44F8	8233A732
-44F9	8233A733
-44FA	8233A734
-44FB	8233A735
-44FC	8233A736
-44FD	8233A737
-44FE	8233A738
-44FF	8233A739
-4500	8233A830
-4501	8233A831
-4502	8233A832
-4503	8233A833
-4504	8233A834
-4505	8233A835
-4506	8233A836
-4507	8233A837
-4508	8233A838
-4509	8233A839
-450A	8233A930
-450B	8233A931
-450C	8233A932
-450D	8233A933
-450E	8233A934
-450F	8233A935
-4510	8233A936
-4511	8233A937
-4512	8233A938
-4513	8233A939
-4514	8233AA30
-4515	8233AA31
-4516	8233AA32
-4517	8233AA33
-4518	8233AA34
-4519	8233AA35
-451A	8233AA36
-451B	8233AA37
-451C	8233AA38
-451D	8233AA39
-451E	8233AB30
-451F	8233AB31
-4520	8233AB32
-4521	8233AB33
-4522	8233AB34
-4523	8233AB35
-4524	8233AB36
-4525	8233AB37
-4526	8233AB38
-4527	8233AB39
-4528	8233AC30
-4529	8233AC31
-452A	8233AC32
-452B	8233AC33
-452C	8233AC34
-452D	8233AC35
-452E	8233AC36
-452F	8233AC37
-4530	8233AC38
-4531	8233AC39
-4532	8233AD30
-4533	8233AD31
-4534	8233AD32
-4535	8233AD33
-4536	8233AD34
-4537	8233AD35
-4538	8233AD36
-4539	8233AD37
-453A	8233AD38
-453B	8233AD39
-453C	8233AE30
-453D	8233AE31
-453E	8233AE32
-453F	8233AE33
-4540	8233AE34
-4541	8233AE35
-4542	8233AE36
-4543	8233AE37
-4544	8233AE38
-4545	8233AE39
-4546	8233AF30
-4547	8233AF31
-4548	8233AF32
-4549	8233AF33
-454A	8233AF34
-454B	8233AF35
-454C	8233AF36
-454D	8233AF37
-454E	8233AF38
-454F	8233AF39
-4550	8233B030
-4551	8233B031
-4552	8233B032
-4553	8233B033
-4554	8233B034
-4555	8233B035
-4556	8233B036
-4557	8233B037
-4558	8233B038
-4559	8233B039
-455A	8233B130
-455B	8233B131
-455C	8233B132
-455D	8233B133
-455E	8233B134
-455F	8233B135
-4560	8233B136
-4561	8233B137
-4562	8233B138
-4563	8233B139
-4564	8233B230
-4565	8233B231
-4566	8233B232
-4567	8233B233
-4568	8233B234
-4569	8233B235
-456A	8233B236
-456B	8233B237
-456C	8233B238
-456D	8233B239
-456E	8233B330
-456F	8233B331
-4570	8233B332
-4571	8233B333
-4572	8233B334
-4573	8233B335
-4574	8233B336
-4575	8233B337
-4576	8233B338
-4577	8233B339
-4578	8233B430
-4579	8233B431
-457A	8233B432
-457B	8233B433
-457C	8233B434
-457D	8233B435
-457E	8233B436
-457F	8233B437
-4580	8233B438
-4581	8233B439
-4582	8233B530
-4583	8233B531
-4584	8233B532
-4585	8233B533
-4586	8233B534
-4587	8233B535
-4588	8233B536
-4589	8233B537
-458A	8233B538
-458B	8233B539
-458C	8233B630
-458D	8233B631
-458E	8233B632
-458F	8233B633
-4590	8233B634
-4591	8233B635
-4592	8233B636
-4593	8233B637
-4594	8233B638
-4595	8233B639
-4596	8233B730
-4597	8233B731
-4598	8233B732
-4599	8233B733
-459A	8233B734
-459B	8233B735
-459C	8233B736
-459D	8233B737
-459E	8233B738
-459F	8233B739
-45A0	8233B830
-45A1	8233B831
-45A2	8233B832
-45A3	8233B833
-45A4	8233B834
-45A5	8233B835
-45A6	8233B836
-45A7	8233B837
-45A8	8233B838
-45A9	8233B839
-45AA	8233B930
-45AB	8233B931
-45AC	8233B932
-45AD	8233B933
-45AE	8233B934
-45AF	8233B935
-45B0	8233B936
-45B1	8233B937
-45B2	8233B938
-45B3	8233B939
-45B4	8233BA30
-45B5	8233BA31
-45B6	8233BA32
-45B7	8233BA33
-45B8	8233BA34
-45B9	8233BA35
-45BA	8233BA36
-45BB	8233BA37
-45BC	8233BA38
-45BD	8233BA39
-45BE	8233BB30
-45BF	8233BB31
-45C0	8233BB32
-45C1	8233BB33
-45C2	8233BB34
-45C3	8233BB35
-45C4	8233BB36
-45C5	8233BB37
-45C6	8233BB38
-45C7	8233BB39
-45C8	8233BC30
-45C9	8233BC31
-45CA	8233BC32
-45CB	8233BC33
-45CC	8233BC34
-45CD	8233BC35
-45CE	8233BC36
-45CF	8233BC37
-45D0	8233BC38
-45D1	8233BC39
-45D2	8233BD30
-45D3	8233BD31
-45D4	8233BD32
-45D5	8233BD33
-45D6	8233BD34
-45D7	8233BD35
-45D8	8233BD36
-45D9	8233BD37
-45DA	8233BD38
-45DB	8233BD39
-45DC	8233BE30
-45DD	8233BE31
-45DE	8233BE32
-45DF	8233BE33
-45E0	8233BE34
-45E1	8233BE35
-45E2	8233BE36
-45E3	8233BE37
-45E4	8233BE38
-45E5	8233BE39
-45E6	8233BF30
-45E7	8233BF31
-45E8	8233BF32
-45E9	8233BF33
-45EA	8233BF34
-45EB	8233BF35
-45EC	8233BF36
-45ED	8233BF37
-45EE	8233BF38
-45EF	8233BF39
-45F0	8233C030
-45F1	8233C031
-45F2	8233C032
-45F3	8233C033
-45F4	8233C034
-45F5	8233C035
-45F6	8233C036
-45F7	8233C037
-45F8	8233C038
-45F9	8233C039
-45FA	8233C130
-45FB	8233C131
-45FC	8233C132
-45FD	8233C133
-45FE	8233C134
-45FF	8233C135
-4600	8233C136
-4601	8233C137
-4602	8233C138
-4603	8233C139
-4604	8233C230
-4605	8233C231
-4606	8233C232
-4607	8233C233
-4608	8233C234
-4609	8233C235
-460A	8233C236
-460B	8233C237
-460C	8233C238
-460D	8233C239
-460E	8233C330
-460F	8233C331
-4610	8233C332
-4611	8233C333
-4612	8233C334
-4613	8233C335
-4614	8233C336
-4615	8233C337
-4616	8233C338
-4617	8233C339
-4618	8233C430
-4619	8233C431
-461A	8233C432
-461B	8233C433
-461C	8233C434
-461D	8233C435
-461E	8233C436
-461F	8233C437
-4620	8233C438
-4621	8233C439
-4622	8233C530
-4623	8233C531
-4624	8233C532
-4625	8233C533
-4626	8233C534
-4627	8233C535
-4628	8233C536
-4629	8233C537
-462A	8233C538
-462B	8233C539
-462C	8233C630
-462D	8233C631
-462E	8233C632
-462F	8233C633
-4630	8233C634
-4631	8233C635
-4632	8233C636
-4633	8233C637
-4634	8233C638
-4635	8233C639
-4636	8233C730
-4637	8233C731
-4638	8233C732
-4639	8233C733
-463A	8233C734
-463B	8233C735
-463C	8233C736
-463D	8233C737
-463E	8233C738
-463F	8233C739
-4640	8233C830
-4641	8233C831
-4642	8233C832
-4643	8233C833
-4644	8233C834
-4645	8233C835
-4646	8233C836
-4647	8233C837
-4648	8233C838
-4649	8233C839
-464A	8233C930
-464B	8233C931
-464C	FE7D
-464D	8233C932
-464E	8233C933
-464F	8233C934
-4650	8233C935
-4651	8233C936
-4652	8233C937
-4653	8233C938
-4654	8233C939
-4655	8233CA30
-4656	8233CA31
-4657	8233CA32
-4658	8233CA33
-4659	8233CA34
-465A	8233CA35
-465B	8233CA36
-465C	8233CA37
-465D	8233CA38
-465E	8233CA39
-465F	8233CB30
-4660	8233CB31
-4661	FE7C
-4662	8233CB32
-4663	8233CB33
-4664	8233CB34
-4665	8233CB35
-4666	8233CB36
-4667	8233CB37
-4668	8233CB38
-4669	8233CB39
-466A	8233CC30
-466B	8233CC31
-466C	8233CC32
-466D	8233CC33
-466E	8233CC34
-466F	8233CC35
-4670	8233CC36
-4671	8233CC37
-4672	8233CC38
-4673	8233CC39
-4674	8233CD30
-4675	8233CD31
-4676	8233CD32
-4677	8233CD33
-4678	8233CD34
-4679	8233CD35
-467A	8233CD36
-467B	8233CD37
-467C	8233CD38
-467D	8233CD39
-467E	8233CE30
-467F	8233CE31
-4680	8233CE32
-4681	8233CE33
-4682	8233CE34
-4683	8233CE35
-4684	8233CE36
-4685	8233CE37
-4686	8233CE38
-4687	8233CE39
-4688	8233CF30
-4689	8233CF31
-468A	8233CF32
-468B	8233CF33
-468C	8233CF34
-468D	8233CF35
-468E	8233CF36
-468F	8233CF37
-4690	8233CF38
-4691	8233CF39
-4692	8233D030
-4693	8233D031
-4694	8233D032
-4695	8233D033
-4696	8233D034
-4697	8233D035
-4698	8233D036
-4699	8233D037
-469A	8233D038
-469B	8233D039
-469C	8233D130
-469D	8233D131
-469E	8233D132
-469F	8233D133
-46A0	8233D134
-46A1	8233D135
-46A2	8233D136
-46A3	8233D137
-46A4	8233D138
-46A5	8233D139
-46A6	8233D230
-46A7	8233D231
-46A8	8233D232
-46A9	8233D233
-46AA	8233D234
-46AB	8233D235
-46AC	8233D236
-46AD	8233D237
-46AE	8233D238
-46AF	8233D239
-46B0	8233D330
-46B1	8233D331
-46B2	8233D332
-46B3	8233D333
-46B4	8233D334
-46B5	8233D335
-46B6	8233D336
-46B7	8233D337
-46B8	8233D338
-46B9	8233D339
-46BA	8233D430
-46BB	8233D431
-46BC	8233D432
-46BD	8233D433
-46BE	8233D434
-46BF	8233D435
-46C0	8233D436
-46C1	8233D437
-46C2	8233D438
-46C3	8233D439
-46C4	8233D530
-46C5	8233D531
-46C6	8233D532
-46C7	8233D533
-46C8	8233D534
-46C9	8233D535
-46CA	8233D536
-46CB	8233D537
-46CC	8233D538
-46CD	8233D539
-46CE	8233D630
-46CF	8233D631
-46D0	8233D632
-46D1	8233D633
-46D2	8233D634
-46D3	8233D635
-46D4	8233D636
-46D5	8233D637
-46D6	8233D638
-46D7	8233D639
-46D8	8233D730
-46D9	8233D731
-46DA	8233D732
-46DB	8233D733
-46DC	8233D734
-46DD	8233D735
-46DE	8233D736
-46DF	8233D737
-46E0	8233D738
-46E1	8233D739
-46E2	8233D830
-46E3	8233D831
-46E4	8233D832
-46E5	8233D833
-46E6	8233D834
-46E7	8233D835
-46E8	8233D836
-46E9	8233D837
-46EA	8233D838
-46EB	8233D839
-46EC	8233D930
-46ED	8233D931
-46EE	8233D932
-46EF	8233D933
-46F0	8233D934
-46F1	8233D935
-46F2	8233D936
-46F3	8233D937
-46F4	8233D938
-46F5	8233D939
-46F6	8233DA30
-46F7	8233DA31
-46F8	8233DA32
-46F9	8233DA33
-46FA	8233DA34
-46FB	8233DA35
-46FC	8233DA36
-46FD	8233DA37
-46FE	8233DA38
-46FF	8233DA39
-4700	8233DB30
-4701	8233DB31
-4702	8233DB32
-4703	8233DB33
-4704	8233DB34
-4705	8233DB35
-4706	8233DB36
-4707	8233DB37
-4708	8233DB38
-4709	8233DB39
-470A	8233DC30
-470B	8233DC31
-470C	8233DC32
-470D	8233DC33
-470E	8233DC34
-470F	8233DC35
-4710	8233DC36
-4711	8233DC37
-4712	8233DC38
-4713	8233DC39
-4714	8233DD30
-4715	8233DD31
-4716	8233DD32
-4717	8233DD33
-4718	8233DD34
-4719	8233DD35
-471A	8233DD36
-471B	8233DD37
-471C	8233DD38
-471D	8233DD39
-471E	8233DE30
-471F	8233DE31
-4720	8233DE32
-4721	8233DE33
-4722	8233DE34
-4723	FE80
-4724	8233DE35
-4725	8233DE36
-4726	8233DE37
-4727	8233DE38
-4728	8233DE39
-4729	FE81
-472A	8233DF30
-472B	8233DF31
-472C	8233DF32
-472D	8233DF33
-472E	8233DF34
-472F	8233DF35
-4730	8233DF36
-4731	8233DF37
-4732	8233DF38
-4733	8233DF39
-4734	8233E030
-4735	8233E031
-4736	8233E032
-4737	8233E033
-4738	8233E034
-4739	8233E035
-473A	8233E036
-473B	8233E037
-473C	8233E038
-473D	8233E039
-473E	8233E130
-473F	8233E131
-4740	8233E132
-4741	8233E133
-4742	8233E134
-4743	8233E135
-4744	8233E136
-4745	8233E137
-4746	8233E138
-4747	8233E139
-4748	8233E230
-4749	8233E231
-474A	8233E232
-474B	8233E233
-474C	8233E234
-474D	8233E235
-474E	8233E236
-474F	8233E237
-4750	8233E238
-4751	8233E239
-4752	8233E330
-4753	8233E331
-4754	8233E332
-4755	8233E333
-4756	8233E334
-4757	8233E335
-4758	8233E336
-4759	8233E337
-475A	8233E338
-475B	8233E339
-475C	8233E430
-475D	8233E431
-475E	8233E432
-475F	8233E433
-4760	8233E434
-4761	8233E435
-4762	8233E436
-4763	8233E437
-4764	8233E438
-4765	8233E439
-4766	8233E530
-4767	8233E531
-4768	8233E532
-4769	8233E533
-476A	8233E534
-476B	8233E535
-476C	8233E536
-476D	8233E537
-476E	8233E538
-476F	8233E539
-4770	8233E630
-4771	8233E631
-4772	8233E632
-4773	8233E633
-4774	8233E634
-4775	8233E635
-4776	8233E636
-4777	8233E637
-4778	8233E638
-4779	8233E639
-477A	8233E730
-477B	8233E731
-477C	FE82
-477D	8233E732
-477E	8233E733
-477F	8233E734
-4780	8233E735
-4781	8233E736
-4782	8233E737
-4783	8233E738
-4784	8233E739
-4785	8233E830
-4786	8233E831
-4787	8233E832
-4788	8233E833
-4789	8233E834
-478A	8233E835
-478B	8233E836
-478C	8233E837
-478D	FE83
-478E	8233E838
-478F	8233E839
-4790	8233E930
-4791	8233E931
-4792	8233E932
-4793	8233E933
-4794	8233E934
-4795	8233E935
-4796	8233E936
-4797	8233E937
-4798	8233E938
-4799	8233E939
-479A	8233EA30
-479B	8233EA31
-479C	8233EA32
-479D	8233EA33
-479E	8233EA34
-479F	8233EA35
-47A0	8233EA36
-47A1	8233EA37
-47A2	8233EA38
-47A3	8233EA39
-47A4	8233EB30
-47A5	8233EB31
-47A6	8233EB32
-47A7	8233EB33
-47A8	8233EB34
-47A9	8233EB35
-47AA	8233EB36
-47AB	8233EB37
-47AC	8233EB38
-47AD	8233EB39
-47AE	8233EC30
-47AF	8233EC31
-47B0	8233EC32
-47B1	8233EC33
-47B2	8233EC34
-47B3	8233EC35
-47B4	8233EC36
-47B5	8233EC37
-47B6	8233EC38
-47B7	8233EC39
-47B8	8233ED30
-47B9	8233ED31
-47BA	8233ED32
-47BB	8233ED33
-47BC	8233ED34
-47BD	8233ED35
-47BE	8233ED36
-47BF	8233ED37
-47C0	8233ED38
-47C1	8233ED39
-47C2	8233EE30
-47C3	8233EE31
-47C4	8233EE32
-47C5	8233EE33
-47C6	8233EE34
-47C7	8233EE35
-47C8	8233EE36
-47C9	8233EE37
-47CA	8233EE38
-47CB	8233EE39
-47CC	8233EF30
-47CD	8233EF31
-47CE	8233EF32
-47CF	8233EF33
-47D0	8233EF34
-47D1	8233EF35
-47D2	8233EF36
-47D3	8233EF37
-47D4	8233EF38
-47D5	8233EF39
-47D6	8233F030
-47D7	8233F031
-47D8	8233F032
-47D9	8233F033
-47DA	8233F034
-47DB	8233F035
-47DC	8233F036
-47DD	8233F037
-47DE	8233F038
-47DF	8233F039
-47E0	8233F130
-47E1	8233F131
-47E2	8233F132
-47E3	8233F133
-47E4	8233F134
-47E5	8233F135
-47E6	8233F136
-47E7	8233F137
-47E8	8233F138
-47E9	8233F139
-47EA	8233F230
-47EB	8233F231
-47EC	8233F232
-47ED	8233F233
-47EE	8233F234
-47EF	8233F235
-47F0	8233F236
-47F1	8233F237
-47F2	8233F238
-47F3	8233F239
-47F4	8233F330
-47F5	8233F331
-47F6	8233F332
-47F7	8233F333
-47F8	8233F334
-47F9	8233F335
-47FA	8233F336
-47FB	8233F337
-47FC	8233F338
-47FD	8233F339
-47FE	8233F430
-47FF	8233F431
-4800	8233F432
-4801	8233F433
-4802	8233F434
-4803	8233F435
-4804	8233F436
-4805	8233F437
-4806	8233F438
-4807	8233F439
-4808	8233F530
-4809	8233F531
-480A	8233F532
-480B	8233F533
-480C	8233F534
-480D	8233F535
-480E	8233F536
-480F	8233F537
-4810	8233F538
-4811	8233F539
-4812	8233F630
-4813	8233F631
-4814	8233F632
-4815	8233F633
-4816	8233F634
-4817	8233F635
-4818	8233F636
-4819	8233F637
-481A	8233F638
-481B	8233F639
-481C	8233F730
-481D	8233F731
-481E	8233F732
-481F	8233F733
-4820	8233F734
-4821	8233F735
-4822	8233F736
-4823	8233F737
-4824	8233F738
-4825	8233F739
-4826	8233F830
-4827	8233F831
-4828	8233F832
-4829	8233F833
-482A	8233F834
-482B	8233F835
-482C	8233F836
-482D	8233F837
-482E	8233F838
-482F	8233F839
-4830	8233F930
-4831	8233F931
-4832	8233F932
-4833	8233F933
-4834	8233F934
-4835	8233F935
-4836	8233F936
-4837	8233F937
-4838	8233F938
-4839	8233F939
-483A	8233FA30
-483B	8233FA31
-483C	8233FA32
-483D	8233FA33
-483E	8233FA34
-483F	8233FA35
-4840	8233FA36
-4841	8233FA37
-4842	8233FA38
-4843	8233FA39
-4844	8233FB30
-4845	8233FB31
-4846	8233FB32
-4847	8233FB33
-4848	8233FB34
-4849	8233FB35
-484A	8233FB36
-484B	8233FB37
-484C	8233FB38
-484D	8233FB39
-484E	8233FC30
-484F	8233FC31
-4850	8233FC32
-4851	8233FC33
-4852	8233FC34
-4853	8233FC35
-4854	8233FC36
-4855	8233FC37
-4856	8233FC38
-4857	8233FC39
-4858	8233FD30
-4859	8233FD31
-485A	8233FD32
-485B	8233FD33
-485C	8233FD34
-485D	8233FD35
-485E	8233FD36
-485F	8233FD37
-4860	8233FD38
-4861	8233FD39
-4862	8233FE30
-4863	8233FE31
-4864	8233FE32
-4865	8233FE33
-4866	8233FE34
-4867	8233FE35
-4868	8233FE36
-4869	8233FE37
-486A	8233FE38
-486B	8233FE39
-486C	82348130
-486D	82348131
-486E	82348132
-486F	82348133
-4870	82348134
-4871	82348135
-4872	82348136
-4873	82348137
-4874	82348138
-4875	82348139
-4876	82348230
-4877	82348231
-4878	82348232
-4879	82348233
-487A	82348234
-487B	82348235
-487C	82348236
-487D	82348237
-487E	82348238
-487F	82348239
-4880	82348330
-4881	82348331
-4882	82348332
-4883	82348333
-4884	82348334
-4885	82348335
-4886	82348336
-4887	82348337
-4888	82348338
-4889	82348339
-488A	82348430
-488B	82348431
-488C	82348432
-488D	82348433
-488E	82348434
-488F	82348435
-4890	82348436
-4891	82348437
-4892	82348438
-4893	82348439
-4894	82348530
-4895	82348531
-4896	82348532
-4897	82348533
-4898	82348534
-4899	82348535
-489A	82348536
-489B	82348537
-489C	82348538
-489D	82348539
-489E	82348630
-489F	82348631
-48A0	82348632
-48A1	82348633
-48A2	82348634
-48A3	82348635
-48A4	82348636
-48A5	82348637
-48A6	82348638
-48A7	82348639
-48A8	82348730
-48A9	82348731
-48AA	82348732
-48AB	82348733
-48AC	82348734
-48AD	82348735
-48AE	82348736
-48AF	82348737
-48B0	82348738
-48B1	82348739
-48B2	82348830
-48B3	82348831
-48B4	82348832
-48B5	82348833
-48B6	82348834
-48B7	82348835
-48B8	82348836
-48B9	82348837
-48BA	82348838
-48BB	82348839
-48BC	82348930
-48BD	82348931
-48BE	82348932
-48BF	82348933
-48C0	82348934
-48C1	82348935
-48C2	82348936
-48C3	82348937
-48C4	82348938
-48C5	82348939
-48C6	82348A30
-48C7	82348A31
-48C8	82348A32
-48C9	82348A33
-48CA	82348A34
-48CB	82348A35
-48CC	82348A36
-48CD	82348A37
-48CE	82348A38
-48CF	82348A39
-48D0	82348B30
-48D1	82348B31
-48D2	82348B32
-48D3	82348B33
-48D4	82348B34
-48D5	82348B35
-48D6	82348B36
-48D7	82348B37
-48D8	82348B38
-48D9	82348B39
-48DA	82348C30
-48DB	82348C31
-48DC	82348C32
-48DD	82348C33
-48DE	82348C34
-48DF	82348C35
-48E0	82348C36
-48E1	82348C37
-48E2	82348C38
-48E3	82348C39
-48E4	82348D30
-48E5	82348D31
-48E6	82348D32
-48E7	82348D33
-48E8	82348D34
-48E9	82348D35
-48EA	82348D36
-48EB	82348D37
-48EC	82348D38
-48ED	82348D39
-48EE	82348E30
-48EF	82348E31
-48F0	82348E32
-48F1	82348E33
-48F2	82348E34
-48F3	82348E35
-48F4	82348E36
-48F5	82348E37
-48F6	82348E38
-48F7	82348E39
-48F8	82348F30
-48F9	82348F31
-48FA	82348F32
-48FB	82348F33
-48FC	82348F34
-48FD	82348F35
-48FE	82348F36
-48FF	82348F37
-4900	82348F38
-4901	82348F39
-4902	82349030
-4903	82349031
-4904	82349032
-4905	82349033
-4906	82349034
-4907	82349035
-4908	82349036
-4909	82349037
-490A	82349038
-490B	82349039
-490C	82349130
-490D	82349131
-490E	82349132
-490F	82349133
-4910	82349134
-4911	82349135
-4912	82349136
-4913	82349137
-4914	82349138
-4915	82349139
-4916	82349230
-4917	82349231
-4918	82349232
-4919	82349233
-491A	82349234
-491B	82349235
-491C	82349236
-491D	82349237
-491E	82349238
-491F	82349239
-4920	82349330
-4921	82349331
-4922	82349332
-4923	82349333
-4924	82349334
-4925	82349335
-4926	82349336
-4927	82349337
-4928	82349338
-4929	82349339
-492A	82349430
-492B	82349431
-492C	82349432
-492D	82349433
-492E	82349434
-492F	82349435
-4930	82349436
-4931	82349437
-4932	82349438
-4933	82349439
-4934	82349530
-4935	82349531
-4936	82349532
-4937	82349533
-4938	82349534
-4939	82349535
-493A	82349536
-493B	82349537
-493C	82349538
-493D	82349539
-493E	82349630
-493F	82349631
-4940	82349632
-4941	82349633
-4942	82349634
-4943	82349635
-4944	82349636
-4945	82349637
-4946	82349638
-4947	FE85
-4948	82349639
-4949	82349730
-494A	82349731
-494B	82349732
-494C	82349733
-494D	82349734
-494E	82349735
-494F	82349736
-4950	82349737
-4951	82349738
-4952	82349739
-4953	82349830
-4954	82349831
-4955	82349832
-4956	82349833
-4957	82349834
-4958	82349835
-4959	82349836
-495A	82349837
-495B	82349838
-495C	82349839
-495D	82349930
-495E	82349931
-495F	82349932
-4960	82349933
-4961	82349934
-4962	82349935
-4963	82349936
-4964	82349937
-4965	82349938
-4966	82349939
-4967	82349A30
-4968	82349A31
-4969	82349A32
-496A	82349A33
-496B	82349A34
-496C	82349A35
-496D	82349A36
-496E	82349A37
-496F	82349A38
-4970	82349A39
-4971	82349B30
-4972	82349B31
-4973	82349B32
-4974	82349B33
-4975	82349B34
-4976	82349B35
-4977	82349B36
-4978	82349B37
-4979	82349B38
-497A	FE86
-497B	82349B39
-497C	82349C30
-497D	FE87
-497E	82349C31
-497F	82349C32
-4980	82349C33
-4981	82349C34
-4982	FE88
-4983	FE89
-4984	82349C35
-4985	FE8A
-4986	FE8B
-4987	82349C36
-4988	82349C37
-4989	82349C38
-498A	82349C39
-498B	82349D30
-498C	82349D31
-498D	82349D32
-498E	82349D33
-498F	82349D34
-4990	82349D35
-4991	82349D36
-4992	82349D37
-4993	82349D38
-4994	82349D39
-4995	82349E30
-4996	82349E31
-4997	82349E32
-4998	82349E33
-4999	82349E34
-499A	82349E35
-499B	FE8D
-499C	82349E36
-499D	82349E37
-499E	82349E38
-499F	FE8C
-49A0	82349E39
-49A1	82349F30
-49A2	82349F31
-49A3	82349F32
-49A4	82349F33
-49A5	82349F34
-49A6	82349F35
-49A7	82349F36
-49A8	82349F37
-49A9	82349F38
-49AA	82349F39
-49AB	8234A030
-49AC	8234A031
-49AD	8234A032
-49AE	8234A033
-49AF	8234A034
-49B0	8234A035
-49B1	8234A036
-49B2	8234A037
-49B3	8234A038
-49B4	8234A039
-49B5	8234A130
-49B6	FE8F
-49B7	FE8E
-49B8	8234A131
-49B9	8234A132
-49BA	8234A133
-49BB	8234A134
-49BC	8234A135
-49BD	8234A136
-49BE	8234A137
-49BF	8234A138
-49C0	8234A139
-49C1	8234A230
-49C2	8234A231
-49C3	8234A232
-49C4	8234A233
-49C5	8234A234
-49C6	8234A235
-49C7	8234A236
-49C8	8234A237
-49C9	8234A238
-49CA	8234A239
-49CB	8234A330
-49CC	8234A331
-49CD	8234A332
-49CE	8234A333
-49CF	8234A334
-49D0	8234A335
-49D1	8234A336
-49D2	8234A337
-49D3	8234A338
-49D4	8234A339
-49D5	8234A430
-49D6	8234A431
-49D7	8234A432
-49D8	8234A433
-49D9	8234A434
-49DA	8234A435
-49DB	8234A436
-49DC	8234A437
-49DD	8234A438
-49DE	8234A439
-49DF	8234A530
-49E0	8234A531
-49E1	8234A532
-49E2	8234A533
-49E3	8234A534
-49E4	8234A535
-49E5	8234A536
-49E6	8234A537
-49E7	8234A538
-49E8	8234A539
-49E9	8234A630
-49EA	8234A631
-49EB	8234A632
-49EC	8234A633
-49ED	8234A634
-49EE	8234A635
-49EF	8234A636
-49F0	8234A637
-49F1	8234A638
-49F2	8234A639
-49F3	8234A730
-49F4	8234A731
-49F5	8234A732
-49F6	8234A733
-49F7	8234A734
-49F8	8234A735
-49F9	8234A736
-49FA	8234A737
-49FB	8234A738
-49FC	8234A739
-49FD	8234A830
-49FE	8234A831
-49FF	8234A832
-4A00	8234A833
-4A01	8234A834
-4A02	8234A835
-4A03	8234A836
-4A04	8234A837
-4A05	8234A838
-4A06	8234A839
-4A07	8234A930
-4A08	8234A931
-4A09	8234A932
-4A0A	8234A933
-4A0B	8234A934
-4A0C	8234A935
-4A0D	8234A936
-4A0E	8234A937
-4A0F	8234A938
-4A10	8234A939
-4A11	8234AA30
-4A12	8234AA31
-4A13	8234AA32
-4A14	8234AA33
-4A15	8234AA34
-4A16	8234AA35
-4A17	8234AA36
-4A18	8234AA37
-4A19	8234AA38
-4A1A	8234AA39
-4A1B	8234AB30
-4A1C	8234AB31
-4A1D	8234AB32
-4A1E	8234AB33
-4A1F	8234AB34
-4A20	8234AB35
-4A21	8234AB36
-4A22	8234AB37
-4A23	8234AB38
-4A24	8234AB39
-4A25	8234AC30
-4A26	8234AC31
-4A27	8234AC32
-4A28	8234AC33
-4A29	8234AC34
-4A2A	8234AC35
-4A2B	8234AC36
-4A2C	8234AC37
-4A2D	8234AC38
-4A2E	8234AC39
-4A2F	8234AD30
-4A30	8234AD31
-4A31	8234AD32
-4A32	8234AD33
-4A33	8234AD34
-4A34	8234AD35
-4A35	8234AD36
-4A36	8234AD37
-4A37	8234AD38
-4A38	8234AD39
-4A39	8234AE30
-4A3A	8234AE31
-4A3B	8234AE32
-4A3C	8234AE33
-4A3D	8234AE34
-4A3E	8234AE35
-4A3F	8234AE36
-4A40	8234AE37
-4A41	8234AE38
-4A42	8234AE39
-4A43	8234AF30
-4A44	8234AF31
-4A45	8234AF32
-4A46	8234AF33
-4A47	8234AF34
-4A48	8234AF35
-4A49	8234AF36
-4A4A	8234AF37
-4A4B	8234AF38
-4A4C	8234AF39
-4A4D	8234B030
-4A4E	8234B031
-4A4F	8234B032
-4A50	8234B033
-4A51	8234B034
-4A52	8234B035
-4A53	8234B036
-4A54	8234B037
-4A55	8234B038
-4A56	8234B039
-4A57	8234B130
-4A58	8234B131
-4A59	8234B132
-4A5A	8234B133
-4A5B	8234B134
-4A5C	8234B135
-4A5D	8234B136
-4A5E	8234B137
-4A5F	8234B138
-4A60	8234B139
-4A61	8234B230
-4A62	8234B231
-4A63	8234B232
-4A64	8234B233
-4A65	8234B234
-4A66	8234B235
-4A67	8234B236
-4A68	8234B237
-4A69	8234B238
-4A6A	8234B239
-4A6B	8234B330
-4A6C	8234B331
-4A6D	8234B332
-4A6E	8234B333
-4A6F	8234B334
-4A70	8234B335
-4A71	8234B336
-4A72	8234B337
-4A73	8234B338
-4A74	8234B339
-4A75	8234B430
-4A76	8234B431
-4A77	8234B432
-4A78	8234B433
-4A79	8234B434
-4A7A	8234B435
-4A7B	8234B436
-4A7C	8234B437
-4A7D	8234B438
-4A7E	8234B439
-4A7F	8234B530
-4A80	8234B531
-4A81	8234B532
-4A82	8234B533
-4A83	8234B534
-4A84	8234B535
-4A85	8234B536
-4A86	8234B537
-4A87	8234B538
-4A88	8234B539
-4A89	8234B630
-4A8A	8234B631
-4A8B	8234B632
-4A8C	8234B633
-4A8D	8234B634
-4A8E	8234B635
-4A8F	8234B636
-4A90	8234B637
-4A91	8234B638
-4A92	8234B639
-4A93	8234B730
-4A94	8234B731
-4A95	8234B732
-4A96	8234B733
-4A97	8234B734
-4A98	8234B735
-4A99	8234B736
-4A9A	8234B737
-4A9B	8234B738
-4A9C	8234B739
-4A9D	8234B830
-4A9E	8234B831
-4A9F	8234B832
-4AA0	8234B833
-4AA1	8234B834
-4AA2	8234B835
-4AA3	8234B836
-4AA4	8234B837
-4AA5	8234B838
-4AA6	8234B839
-4AA7	8234B930
-4AA8	8234B931
-4AA9	8234B932
-4AAA	8234B933
-4AAB	8234B934
-4AAC	8234B935
-4AAD	8234B936
-4AAE	8234B937
-4AAF	8234B938
-4AB0	8234B939
-4AB1	8234BA30
-4AB2	8234BA31
-4AB3	8234BA32
-4AB4	8234BA33
-4AB5	8234BA34
-4AB6	8234BA35
-4AB7	8234BA36
-4AB8	8234BA37
-4AB9	8234BA38
-4ABA	8234BA39
-4ABB	8234BB30
-4ABC	8234BB31
-4ABD	8234BB32
-4ABE	8234BB33
-4ABF	8234BB34
-4AC0	8234BB35
-4AC1	8234BB36
-4AC2	8234BB37
-4AC3	8234BB38
-4AC4	8234BB39
-4AC5	8234BC30
-4AC6	8234BC31
-4AC7	8234BC32
-4AC8	8234BC33
-4AC9	8234BC34
-4ACA	8234BC35
-4ACB	8234BC36
-4ACC	8234BC37
-4ACD	8234BC38
-4ACE	8234BC39
-4ACF	8234BD30
-4AD0	8234BD31
-4AD1	8234BD32
-4AD2	8234BD33
-4AD3	8234BD34
-4AD4	8234BD35
-4AD5	8234BD36
-4AD6	8234BD37
-4AD7	8234BD38
-4AD8	8234BD39
-4AD9	8234BE30
-4ADA	8234BE31
-4ADB	8234BE32
-4ADC	8234BE33
-4ADD	8234BE34
-4ADE	8234BE35
-4ADF	8234BE36
-4AE0	8234BE37
-4AE1	8234BE38
-4AE2	8234BE39
-4AE3	8234BF30
-4AE4	8234BF31
-4AE5	8234BF32
-4AE6	8234BF33
-4AE7	8234BF34
-4AE8	8234BF35
-4AE9	8234BF36
-4AEA	8234BF37
-4AEB	8234BF38
-4AEC	8234BF39
-4AED	8234C030
-4AEE	8234C031
-4AEF	8234C032
-4AF0	8234C033
-4AF1	8234C034
-4AF2	8234C035
-4AF3	8234C036
-4AF4	8234C037
-4AF5	8234C038
-4AF6	8234C039
-4AF7	8234C130
-4AF8	8234C131
-4AF9	8234C132
-4AFA	8234C133
-4AFB	8234C134
-4AFC	8234C135
-4AFD	8234C136
-4AFE	8234C137
-4AFF	8234C138
-4B00	8234C139
-4B01	8234C230
-4B02	8234C231
-4B03	8234C232
-4B04	8234C233
-4B05	8234C234
-4B06	8234C235
-4B07	8234C236
-4B08	8234C237
-4B09	8234C238
-4B0A	8234C239
-4B0B	8234C330
-4B0C	8234C331
-4B0D	8234C332
-4B0E	8234C333
-4B0F	8234C334
-4B10	8234C335
-4B11	8234C336
-4B12	8234C337
-4B13	8234C338
-4B14	8234C339
-4B15	8234C430
-4B16	8234C431
-4B17	8234C432
-4B18	8234C433
-4B19	8234C434
-4B1A	8234C435
-4B1B	8234C436
-4B1C	8234C437
-4B1D	8234C438
-4B1E	8234C439
-4B1F	8234C530
-4B20	8234C531
-4B21	8234C532
-4B22	8234C533
-4B23	8234C534
-4B24	8234C535
-4B25	8234C536
-4B26	8234C537
-4B27	8234C538
-4B28	8234C539
-4B29	8234C630
-4B2A	8234C631
-4B2B	8234C632
-4B2C	8234C633
-4B2D	8234C634
-4B2E	8234C635
-4B2F	8234C636
-4B30	8234C637
-4B31	8234C638
-4B32	8234C639
-4B33	8234C730
-4B34	8234C731
-4B35	8234C732
-4B36	8234C733
-4B37	8234C734
-4B38	8234C735
-4B39	8234C736
-4B3A	8234C737
-4B3B	8234C738
-4B3C	8234C739
-4B3D	8234C830
-4B3E	8234C831
-4B3F	8234C832
-4B40	8234C833
-4B41	8234C834
-4B42	8234C835
-4B43	8234C836
-4B44	8234C837
-4B45	8234C838
-4B46	8234C839
-4B47	8234C930
-4B48	8234C931
-4B49	8234C932
-4B4A	8234C933
-4B4B	8234C934
-4B4C	8234C935
-4B4D	8234C936
-4B4E	8234C937
-4B4F	8234C938
-4B50	8234C939
-4B51	8234CA30
-4B52	8234CA31
-4B53	8234CA32
-4B54	8234CA33
-4B55	8234CA34
-4B56	8234CA35
-4B57	8234CA36
-4B58	8234CA37
-4B59	8234CA38
-4B5A	8234CA39
-4B5B	8234CB30
-4B5C	8234CB31
-4B5D	8234CB32
-4B5E	8234CB33
-4B5F	8234CB34
-4B60	8234CB35
-4B61	8234CB36
-4B62	8234CB37
-4B63	8234CB38
-4B64	8234CB39
-4B65	8234CC30
-4B66	8234CC31
-4B67	8234CC32
-4B68	8234CC33
-4B69	8234CC34
-4B6A	8234CC35
-4B6B	8234CC36
-4B6C	8234CC37
-4B6D	8234CC38
-4B6E	8234CC39
-4B6F	8234CD30
-4B70	8234CD31
-4B71	8234CD32
-4B72	8234CD33
-4B73	8234CD34
-4B74	8234CD35
-4B75	8234CD36
-4B76	8234CD37
-4B77	8234CD38
-4B78	8234CD39
-4B79	8234CE30
-4B7A	8234CE31
-4B7B	8234CE32
-4B7C	8234CE33
-4B7D	8234CE34
-4B7E	8234CE35
-4B7F	8234CE36
-4B80	8234CE37
-4B81	8234CE38
-4B82	8234CE39
-4B83	8234CF30
-4B84	8234CF31
-4B85	8234CF32
-4B86	8234CF33
-4B87	8234CF34
-4B88	8234CF35
-4B89	8234CF36
-4B8A	8234CF37
-4B8B	8234CF38
-4B8C	8234CF39
-4B8D	8234D030
-4B8E	8234D031
-4B8F	8234D032
-4B90	8234D033
-4B91	8234D034
-4B92	8234D035
-4B93	8234D036
-4B94	8234D037
-4B95	8234D038
-4B96	8234D039
-4B97	8234D130
-4B98	8234D131
-4B99	8234D132
-4B9A	8234D133
-4B9B	8234D134
-4B9C	8234D135
-4B9D	8234D136
-4B9E	8234D137
-4B9F	8234D138
-4BA0	8234D139
-4BA1	8234D230
-4BA2	8234D231
-4BA3	8234D232
-4BA4	8234D233
-4BA5	8234D234
-4BA6	8234D235
-4BA7	8234D236
-4BA8	8234D237
-4BA9	8234D238
-4BAA	8234D239
-4BAB	8234D330
-4BAC	8234D331
-4BAD	8234D332
-4BAE	8234D333
-4BAF	8234D334
-4BB0	8234D335
-4BB1	8234D336
-4BB2	8234D337
-4BB3	8234D338
-4BB4	8234D339
-4BB5	8234D430
-4BB6	8234D431
-4BB7	8234D432
-4BB8	8234D433
-4BB9	8234D434
-4BBA	8234D435
-4BBB	8234D436
-4BBC	8234D437
-4BBD	8234D438
-4BBE	8234D439
-4BBF	8234D530
-4BC0	8234D531
-4BC1	8234D532
-4BC2	8234D533
-4BC3	8234D534
-4BC4	8234D535
-4BC5	8234D536
-4BC6	8234D537
-4BC7	8234D538
-4BC8	8234D539
-4BC9	8234D630
-4BCA	8234D631
-4BCB	8234D632
-4BCC	8234D633
-4BCD	8234D634
-4BCE	8234D635
-4BCF	8234D636
-4BD0	8234D637
-4BD1	8234D638
-4BD2	8234D639
-4BD3	8234D730
-4BD4	8234D731
-4BD5	8234D732
-4BD6	8234D733
-4BD7	8234D734
-4BD8	8234D735
-4BD9	8234D736
-4BDA	8234D737
-4BDB	8234D738
-4BDC	8234D739
-4BDD	8234D830
-4BDE	8234D831
-4BDF	8234D832
-4BE0	8234D833
-4BE1	8234D834
-4BE2	8234D835
-4BE3	8234D836
-4BE4	8234D837
-4BE5	8234D838
-4BE6	8234D839
-4BE7	8234D930
-4BE8	8234D931
-4BE9	8234D932
-4BEA	8234D933
-4BEB	8234D934
-4BEC	8234D935
-4BED	8234D936
-4BEE	8234D937
-4BEF	8234D938
-4BF0	8234D939
-4BF1	8234DA30
-4BF2	8234DA31
-4BF3	8234DA32
-4BF4	8234DA33
-4BF5	8234DA34
-4BF6	8234DA35
-4BF7	8234DA36
-4BF8	8234DA37
-4BF9	8234DA38
-4BFA	8234DA39
-4BFB	8234DB30
-4BFC	8234DB31
-4BFD	8234DB32
-4BFE	8234DB33
-4BFF	8234DB34
-4C00	8234DB35
-4C01	8234DB36
-4C02	8234DB37
-4C03	8234DB38
-4C04	8234DB39
-4C05	8234DC30
-4C06	8234DC31
-4C07	8234DC32
-4C08	8234DC33
-4C09	8234DC34
-4C0A	8234DC35
-4C0B	8234DC36
-4C0C	8234DC37
-4C0D	8234DC38
-4C0E	8234DC39
-4C0F	8234DD30
-4C10	8234DD31
-4C11	8234DD32
-4C12	8234DD33
-4C13	8234DD34
-4C14	8234DD35
-4C15	8234DD36
-4C16	8234DD37
-4C17	8234DD38
-4C18	8234DD39
-4C19	8234DE30
-4C1A	8234DE31
-4C1B	8234DE32
-4C1C	8234DE33
-4C1D	8234DE34
-4C1E	8234DE35
-4C1F	8234DE36
-4C20	8234DE37
-4C21	8234DE38
-4C22	8234DE39
-4C23	8234DF30
-4C24	8234DF31
-4C25	8234DF32
-4C26	8234DF33
-4C27	8234DF34
-4C28	8234DF35
-4C29	8234DF36
-4C2A	8234DF37
-4C2B	8234DF38
-4C2C	8234DF39
-4C2D	8234E030
-4C2E	8234E031
-4C2F	8234E032
-4C30	8234E033
-4C31	8234E034
-4C32	8234E035
-4C33	8234E036
-4C34	8234E037
-4C35	8234E038
-4C36	8234E039
-4C37	8234E130
-4C38	8234E131
-4C39	8234E132
-4C3A	8234E133
-4C3B	8234E134
-4C3C	8234E135
-4C3D	8234E136
-4C3E	8234E137
-4C3F	8234E138
-4C40	8234E139
-4C41	8234E230
-4C42	8234E231
-4C43	8234E232
-4C44	8234E233
-4C45	8234E234
-4C46	8234E235
-4C47	8234E236
-4C48	8234E237
-4C49	8234E238
-4C4A	8234E239
-4C4B	8234E330
-4C4C	8234E331
-4C4D	8234E332
-4C4E	8234E333
-4C4F	8234E334
-4C50	8234E335
-4C51	8234E336
-4C52	8234E337
-4C53	8234E338
-4C54	8234E339
-4C55	8234E430
-4C56	8234E431
-4C57	8234E432
-4C58	8234E433
-4C59	8234E434
-4C5A	8234E435
-4C5B	8234E436
-4C5C	8234E437
-4C5D	8234E438
-4C5E	8234E439
-4C5F	8234E530
-4C60	8234E531
-4C61	8234E532
-4C62	8234E533
-4C63	8234E534
-4C64	8234E535
-4C65	8234E536
-4C66	8234E537
-4C67	8234E538
-4C68	8234E539
-4C69	8234E630
-4C6A	8234E631
-4C6B	8234E632
-4C6C	8234E633
-4C6D	8234E634
-4C6E	8234E635
-4C6F	8234E636
-4C70	8234E637
-4C71	8234E638
-4C72	8234E639
-4C73	8234E730
-4C74	8234E731
-4C75	8234E732
-4C76	8234E733
-4C77	FE96
-4C78	8234E734
-4C79	8234E735
-4C7A	8234E736
-4C7B	8234E737
-4C7C	8234E738
-4C7D	8234E739
-4C7E	8234E830
-4C7F	8234E831
-4C80	8234E832
-4C81	8234E833
-4C82	8234E834
-4C83	8234E835
-4C84	8234E836
-4C85	8234E837
-4C86	8234E838
-4C87	8234E839
-4C88	8234E930
-4C89	8234E931
-4C8A	8234E932
-4C8B	8234E933
-4C8C	8234E934
-4C8D	8234E935
-4C8E	8234E936
-4C8F	8234E937
-4C90	8234E938
-4C91	8234E939
-4C92	8234EA30
-4C93	8234EA31
-4C94	8234EA32
-4C95	8234EA33
-4C96	8234EA34
-4C97	8234EA35
-4C98	8234EA36
-4C99	8234EA37
-4C9A	8234EA38
-4C9B	8234EA39
-4C9C	8234EB30
-4C9D	8234EB31
-4C9E	8234EB32
-4C9F	FE93
-4CA0	FE94
-4CA1	FE95
-4CA2	FE97
-4CA3	FE92
-4CA4	8234EB33
-4CA5	8234EB34
-4CA6	8234EB35
-4CA7	8234EB36
-4CA8	8234EB37
-4CA9	8234EB38
-4CAA	8234EB39
-4CAB	8234EC30
-4CAC	8234EC31
-4CAD	8234EC32
-4CAE	8234EC33
-4CAF	8234EC34
-4CB0	8234EC35
-4CB1	8234EC36
-4CB2	8234EC37
-4CB3	8234EC38
-4CB4	8234EC39
-4CB5	8234ED30
-4CB6	8234ED31
-4CB7	8234ED32
-4CB8	8234ED33
-4CB9	8234ED34
-4CBA	8234ED35
-4CBB	8234ED36
-4CBC	8234ED37
-4CBD	8234ED38
-4CBE	8234ED39
-4CBF	8234EE30
-4CC0	8234EE31
-4CC1	8234EE32
-4CC2	8234EE33
-4CC3	8234EE34
-4CC4	8234EE35
-4CC5	8234EE36
-4CC6	8234EE37
-4CC7	8234EE38
-4CC8	8234EE39
-4CC9	8234EF30
-4CCA	8234EF31
-4CCB	8234EF32
-4CCC	8234EF33
-4CCD	8234EF34
-4CCE	8234EF35
-4CCF	8234EF36
-4CD0	8234EF37
-4CD1	8234EF38
-4CD2	8234EF39
-4CD3	8234F030
-4CD4	8234F031
-4CD5	8234F032
-4CD6	8234F033
-4CD7	8234F034
-4CD8	8234F035
-4CD9	8234F036
-4CDA	8234F037
-4CDB	8234F038
-4CDC	8234F039
-4CDD	8234F130
-4CDE	8234F131
-4CDF	8234F132
-4CE0	8234F133
-4CE1	8234F134
-4CE2	8234F135
-4CE3	8234F136
-4CE4	8234F137
-4CE5	8234F138
-4CE6	8234F139
-4CE7	8234F230
-4CE8	8234F231
-4CE9	8234F232
-4CEA	8234F233
-4CEB	8234F234
-4CEC	8234F235
-4CED	8234F236
-4CEE	8234F237
-4CEF	8234F238
-4CF0	8234F239
-4CF1	8234F330
-4CF2	8234F331
-4CF3	8234F332
-4CF4	8234F333
-4CF5	8234F334
-4CF6	8234F335
-4CF7	8234F336
-4CF8	8234F337
-4CF9	8234F338
-4CFA	8234F339
-4CFB	8234F430
-4CFC	8234F431
-4CFD	8234F432
-4CFE	8234F433
-4CFF	8234F434
-4D00	8234F435
-4D01	8234F436
-4D02	8234F437
-4D03	8234F438
-4D04	8234F439
-4D05	8234F530
-4D06	8234F531
-4D07	8234F532
-4D08	8234F533
-4D09	8234F534
-4D0A	8234F535
-4D0B	8234F536
-4D0C	8234F537
-4D0D	8234F538
-4D0E	8234F539
-4D0F	8234F630
-4D10	8234F631
-4D11	8234F632
-4D12	8234F633
-4D13	FE98
-4D14	FE99
-4D15	FE9A
-4D16	FE9B
-4D17	FE9C
-4D18	FE9D
-4D19	FE9E
-4D1A	8234F634
-4D1B	8234F635
-4D1C	8234F636
-4D1D	8234F637
-4D1E	8234F638
-4D1F	8234F639
-4D20	8234F730
-4D21	8234F731
-4D22	8234F732
-4D23	8234F733
-4D24	8234F734
-4D25	8234F735
-4D26	8234F736
-4D27	8234F737
-4D28	8234F738
-4D29	8234F739
-4D2A	8234F830
-4D2B	8234F831
-4D2C	8234F832
-4D2D	8234F833
-4D2E	8234F834
-4D2F	8234F835
-4D30	8234F836
-4D31	8234F837
-4D32	8234F838
-4D33	8234F839
-4D34	8234F930
-4D35	8234F931
-4D36	8234F932
-4D37	8234F933
-4D38	8234F934
-4D39	8234F935
-4D3A	8234F936
-4D3B	8234F937
-4D3C	8234F938
-4D3D	8234F939
-4D3E	8234FA30
-4D3F	8234FA31
-4D40	8234FA32
-4D41	8234FA33
-4D42	8234FA34
-4D43	8234FA35
-4D44	8234FA36
-4D45	8234FA37
-4D46	8234FA38
-4D47	8234FA39
-4D48	8234FB30
-4D49	8234FB31
-4D4A	8234FB32
-4D4B	8234FB33
-4D4C	8234FB34
-4D4D	8234FB35
-4D4E	8234FB36
-4D4F	8234FB37
-4D50	8234FB38
-4D51	8234FB39
-4D52	8234FC30
-4D53	8234FC31
-4D54	8234FC32
-4D55	8234FC33
-4D56	8234FC34
-4D57	8234FC35
-4D58	8234FC36
-4D59	8234FC37
-4D5A	8234FC38
-4D5B	8234FC39
-4D5C	8234FD30
-4D5D	8234FD31
-4D5E	8234FD32
-4D5F	8234FD33
-4D60	8234FD34
-4D61	8234FD35
-4D62	8234FD36
-4D63	8234FD37
-4D64	8234FD38
-4D65	8234FD39
-4D66	8234FE30
-4D67	8234FE31
-4D68	8234FE32
-4D69	8234FE33
-4D6A	8234FE34
-4D6B	8234FE35
-4D6C	8234FE36
-4D6D	8234FE37
-4D6E	8234FE38
-4D6F	8234FE39
-4D70	82358130
-4D71	82358131
-4D72	82358132
-4D73	82358133
-4D74	82358134
-4D75	82358135
-4D76	82358136
-4D77	82358137
-4D78	82358138
-4D79	82358139
-4D7A	82358230
-4D7B	82358231
-4D7C	82358232
-4D7D	82358233
-4D7E	82358234
-4D7F	82358235
-4D80	82358236
-4D81	82358237
-4D82	82358238
-4D83	82358239
-4D84	82358330
-4D85	82358331
-4D86	82358332
-4D87	82358333
-4D88	82358334
-4D89	82358335
-4D8A	82358336
-4D8B	82358337
-4D8C	82358338
-4D8D	82358339
-4D8E	82358430
-4D8F	82358431
-4D90	82358432
-4D91	82358433
-4D92	82358434
-4D93	82358435
-4D94	82358436
-4D95	82358437
-4D96	82358438
-4D97	82358439
-4D98	82358530
-4D99	82358531
-4D9A	82358532
-4D9B	82358533
-4D9C	82358534
-4D9D	82358535
-4D9E	82358536
-4D9F	82358537
-4DA0	82358538
-4DA1	82358539
-4DA2	82358630
-4DA3	82358631
-4DA4	82358632
-4DA5	82358633
-4DA6	82358634
-4DA7	82358635
-4DA8	82358636
-4DA9	82358637
-4DAA	82358638
-4DAB	82358639
-4DAC	82358730
-4DAD	82358731
-4DAE	FE9F
-4DAF	82358732
-4DB0	82358733
-4DB1	82358734
-4DB2	82358735
-4DB3	82358736
-4DB4	82358737
-4DB5	82358738
-4DB6	82358739
-4DB7	82358830
-4DB8	82358831
-4DB9	82358832
-4DBA	82358833
-4DBB	82358834
-4DBC	82358835
-4DBD	82358836
-4DBE	82358837
-4DBF	82358838
-4DC0	82358839
-4DC1	82358930
-4DC2	82358931
-4DC3	82358932
-4DC4	82358933
-4DC5	82358934
-4DC6	82358935
-4DC7	82358936
-4DC8	82358937
-4DC9	82358938
-4DCA	82358939
-4DCB	82358A30
-4DCC	82358A31
-4DCD	82358A32
-4DCE	82358A33
-4DCF	82358A34
-4DD0	82358A35
-4DD1	82358A36
-4DD2	82358A37
-4DD3	82358A38
-4DD4	82358A39
-4DD5	82358B30
-4DD6	82358B31
-4DD7	82358B32
-4DD8	82358B33
-4DD9	82358B34
-4DDA	82358B35
-4DDB	82358B36
-4DDC	82358B37
-4DDD	82358B38
-4DDE	82358B39
-4DDF	82358C30
-4DE0	82358C31
-4DE1	82358C32
-4DE2	82358C33
-4DE3	82358C34
-4DE4	82358C35
-4DE5	82358C36
-4DE6	82358C37
-4DE7	82358C38
-4DE8	82358C39
-4DE9	82358D30
-4DEA	82358D31
-4DEB	82358D32
-4DEC	82358D33
-4DED	82358D34
-4DEE	82358D35
-4DEF	82358D36
-4DF0	82358D37
-4DF1	82358D38
-4DF2	82358D39
-4DF3	82358E30
-4DF4	82358E31
-4DF5	82358E32
-4DF6	82358E33
-4DF7	82358E34
-4DF8	82358E35
-4DF9	82358E36
-4DFA	82358E37
-4DFB	82358E38
-4DFC	82358E39
-4DFD	82358F30
-4DFE	82358F31
-4DFF	82358F32
-4E00	D2BB
-4E01	B6A1
-4E02	8140
-4E03	C6DF
-4E04	8141
-4E05	8142
-4E06	8143
-4E07	CDF2
-4E08	D5C9
-4E09	C8FD
-4E0A	C9CF
-4E0B	CFC2
-4E0C	D8A2
-4E0D	B2BB
-4E0E	D3EB
-4E0F	8144
-4E10	D8A4
-4E11	B3F3
-4E12	8145
-4E13	D7A8
-4E14	C7D2
-4E15	D8A7
-4E16	CAC0
-4E17	8146
-4E18	C7F0
-4E19	B1FB
-4E1A	D2B5
-4E1B	B4D4
-4E1C	B6AB
-4E1D	CBBF
-4E1E	D8A9
-4E1F	8147
-4E20	8148
-4E21	8149
-4E22	B6AA
-4E23	814A
-4E24	C1BD
-4E25	D1CF
-4E26	814B
-4E27	C9A5
-4E28	D8AD
-4E29	814C
-4E2A	B8F6
-4E2B	D1BE
-4E2C	E3DC
-4E2D	D6D0
-4E2E	814D
-4E2F	814E
-4E30	B7E1
-4E31	814F
-4E32	B4AE
-4E33	8150
-4E34	C1D9
-4E35	8151
-4E36	D8BC
-4E37	8152
-4E38	CDE8
-4E39	B5A4
-4E3A	CEAA
-4E3B	D6F7
-4E3C	8153
-4E3D	C0F6
-4E3E	BED9
-4E3F	D8AF
-4E40	8154
-4E41	8155
-4E42	8156
-4E43	C4CB
-4E44	8157
-4E45	BEC3
-4E46	8158
-4E47	D8B1
-4E48	C3B4
-4E49	D2E5
-4E4A	8159
-4E4B	D6AE
-4E4C	CEDA
-4E4D	D5A7
-4E4E	BAF5
-4E4F	B7A6
-4E50	C0D6
-4E51	815A
-4E52	C6B9
-4E53	C5D2
-4E54	C7C7
-4E55	815B
-4E56	B9D4
-4E57	815C
-4E58	B3CB
-4E59	D2D2
-4E5A	815D
-4E5B	815E
-4E5C	D8BF
-4E5D	BEC5
-4E5E	C6F2
-4E5F	D2B2
-4E60	CFB0
-4E61	CFE7
-4E62	815F
-4E63	8160
-4E64	8161
-4E65	8162
-4E66	CAE9
-4E67	8163
-4E68	8164
-4E69	D8C0
-4E6A	8165
-4E6B	8166
-4E6C	8167
-4E6D	8168
-4E6E	8169
-4E6F	816A
-4E70	C2F2
-4E71	C2D2
-4E72	816B
-4E73	C8E9
-4E74	816C
-4E75	816D
-4E76	816E
-4E77	816F
-4E78	8170
-4E79	8171
-4E7A	8172
-4E7B	8173
-4E7C	8174
-4E7D	8175
-4E7E	C7AC
-4E7F	8176
-4E80	8177
-4E81	8178
-4E82	8179
-4E83	817A
-4E84	817B
-4E85	817C
-4E86	C1CB
-4E87	817D
-4E88	D3E8
-4E89	D5F9
-4E8A	817E
-4E8B	CAC2
-4E8C	B6FE
-4E8D	D8A1
-4E8E	D3DA
-4E8F	BFF7
-4E90	8180
-4E91	D4C6
-4E92	BBA5
-4E93	D8C1
-4E94	CEE5
-4E95	BEAE
-4E96	8181
-4E97	8182
-4E98	D8A8
-4E99	8183
-4E9A	D1C7
-4E9B	D0A9
-4E9C	8184
-4E9D	8185
-4E9E	8186
-4E9F	D8BD
-4EA0	D9EF
-4EA1	CDF6
-4EA2	BFBA
-4EA3	8187
-4EA4	BDBB
-4EA5	BAA5
-4EA6	D2E0
-4EA7	B2FA
-4EA8	BAE0
-4EA9	C4B6
-4EAA	8188
-4EAB	CFED
-4EAC	BEA9
-4EAD	CDA4
-4EAE	C1C1
-4EAF	8189
-4EB0	818A
-4EB1	818B
-4EB2	C7D7
-4EB3	D9F1
-4EB4	818C
-4EB5	D9F4
-4EB6	818D
-4EB7	818E
-4EB8	818F
-4EB9	8190
-4EBA	C8CB
-4EBB	D8E9
-4EBC	8191
-4EBD	8192
-4EBE	8193
-4EBF	D2DA
-4EC0	CAB2
-4EC1	C8CA
-4EC2	D8EC
-4EC3	D8EA
-4EC4	D8C6
-4EC5	BDF6
-4EC6	C6CD
-4EC7	B3F0
-4EC8	8194
-4EC9	D8EB
-4ECA	BDF1
-4ECB	BDE9
-4ECC	8195
-4ECD	C8D4
-4ECE	B4D3
-4ECF	8196
-4ED0	8197
-4ED1	C2D8
-4ED2	8198
-4ED3	B2D6
-4ED4	D7D0
-4ED5	CACB
-4ED6	CBFB
-4ED7	D5CC
-4ED8	B8B6
-4ED9	CFC9
-4EDA	8199
-4EDB	819A
-4EDC	819B
-4EDD	D9DA
-4EDE	D8F0
-4EDF	C7AA
-4EE0	819C
-4EE1	D8EE
-4EE2	819D
-4EE3	B4FA
-4EE4	C1EE
-4EE5	D2D4
-4EE6	819E
-4EE7	819F
-4EE8	D8ED
-4EE9	81A0
-4EEA	D2C7
-4EEB	D8EF
-4EEC	C3C7
-4EED	81A1
-4EEE	81A2
-4EEF	81A3
-4EF0	D1F6
-4EF1	81A4
-4EF2	D6D9
-4EF3	D8F2
-4EF4	81A5
-4EF5	D8F5
-4EF6	BCFE
-4EF7	BCDB
-4EF8	81A6
-4EF9	81A7
-4EFA	81A8
-4EFB	C8CE
-4EFC	81A9
-4EFD	B7DD
-4EFE	81AA
-4EFF	B7C2
-4F00	81AB
-4F01	C6F3
-4F02	81AC
-4F03	81AD
-4F04	81AE
-4F05	81AF
-4F06	81B0
-4F07	81B1
-4F08	81B2
-4F09	D8F8
-4F0A	D2C1
-4F0B	81B3
-4F0C	81B4
-4F0D	CEE9
-4F0E	BCBF
-4F0F	B7FC
-4F10	B7A5
-4F11	D0DD
-4F12	81B5
-4F13	81B6
-4F14	81B7
-4F15	81B8
-4F16	81B9
-4F17	D6DA
-4F18	D3C5
-4F19	BBEF
-4F1A	BBE1
-4F1B	D8F1
-4F1C	81BA
-4F1D	81BB
-4F1E	C9A1
-4F1F	CEB0
-4F20	B4AB
-4F21	81BC
-4F22	D8F3
-4F23	81BD
-4F24	C9CB
-4F25	D8F6
-4F26	C2D7
-4F27	D8F7
-4F28	81BE
-4F29	81BF
-4F2A	CEB1
-4F2B	D8F9
-4F2C	81C0
-4F2D	81C1
-4F2E	81C2
-4F2F	B2AE
-4F30	B9C0
-4F31	81C3
-4F32	D9A3
-4F33	81C4
-4F34	B0E9
-4F35	81C5
-4F36	C1E6
-4F37	81C6
-4F38	C9EC
-4F39	81C7
-4F3A	CBC5
-4F3B	81C8
-4F3C	CBC6
-4F3D	D9A4
-4F3E	81C9
-4F3F	81CA
-4F40	81CB
-4F41	81CC
-4F42	81CD
-4F43	B5E8
-4F44	81CE
-4F45	81CF
-4F46	B5AB
-4F47	81D0
-4F48	81D1
-4F49	81D2
-4F4A	81D3
-4F4B	81D4
-4F4C	81D5
-4F4D	CEBB
-4F4E	B5CD
-4F4F	D7A1
-4F50	D7F4
-4F51	D3D3
-4F52	81D6
-4F53	CCE5
-4F54	81D7
-4F55	BACE
-4F56	81D8
-4F57	D9A2
-4F58	D9DC
-4F59	D3E0
-4F5A	D8FD
-4F5B	B7F0
-4F5C	D7F7
-4F5D	D8FE
-4F5E	D8FA
-4F5F	D9A1
-4F60	C4E3
-4F61	81D9
-4F62	81DA
-4F63	D3B6
-4F64	D8F4
-4F65	D9DD
-4F66	81DB
-4F67	D8FB
-4F68	81DC
-4F69	C5E5
-4F6A	81DD
-4F6B	81DE
-4F6C	C0D0
-4F6D	81DF
-4F6E	81E0
-4F6F	D1F0
-4F70	B0DB
-4F71	81E1
-4F72	81E2
-4F73	BCD1
-4F74	D9A6
-4F75	81E3
-4F76	D9A5
-4F77	81E4
-4F78	81E5
-4F79	81E6
-4F7A	81E7
-4F7B	D9AC
-4F7C	D9AE
-4F7D	81E8
-4F7E	D9AB
-4F7F	CAB9
-4F80	81E9
-4F81	81EA
-4F82	81EB
-4F83	D9A9
-4F84	D6B6
-4F85	81EC
-4F86	81ED
-4F87	81EE
-4F88	B3DE
-4F89	D9A8
-4F8A	81EF
-4F8B	C0FD
-4F8C	81F0
-4F8D	CACC
-4F8E	81F1
-4F8F	D9AA
-4F90	81F2
-4F91	D9A7
-4F92	81F3
-4F93	81F4
-4F94	D9B0
-4F95	81F5
-4F96	81F6
-4F97	B6B1
-4F98	81F7
-4F99	81F8
-4F9A	81F9
-4F9B	B9A9
-4F9C	81FA
-4F9D	D2C0
-4F9E	81FB
-4F9F	81FC
-4FA0	CFC0
-4FA1	81FD
-4FA2	81FE
-4FA3	C2C2
-4FA4	8240
-4FA5	BDC4
-4FA6	D5EC
-4FA7	B2E0
-4FA8	C7C8
-4FA9	BFEB
-4FAA	D9AD
-4FAB	8241
-4FAC	D9AF
-4FAD	8242
-4FAE	CEEA
-4FAF	BAEE
-4FB0	8243
-4FB1	8244
-4FB2	8245
-4FB3	8246
-4FB4	8247
-4FB5	C7D6
-4FB6	8248
-4FB7	8249
-4FB8	824A
-4FB9	824B
-4FBA	824C
-4FBB	824D
-4FBC	824E
-4FBD	824F
-4FBE	8250
-4FBF	B1E3
-4FC0	8251
-4FC1	8252
-4FC2	8253
-4FC3	B4D9
-4FC4	B6ED
-4FC5	D9B4
-4FC6	8254
-4FC7	8255
-4FC8	8256
-4FC9	8257
-4FCA	BFA1
-4FCB	8258
-4FCC	8259
-4FCD	825A
-4FCE	D9DE
-4FCF	C7CE
-4FD0	C0FE
-4FD1	D9B8
-4FD2	825B
-4FD3	825C
-4FD4	825D
-4FD5	825E
-4FD6	825F
-4FD7	CBD7
-4FD8	B7FD
-4FD9	8260
-4FDA	D9B5
-4FDB	8261
-4FDC	D9B7
-4FDD	B1A3
-4FDE	D3E1
-4FDF	D9B9
-4FE0	8262
-4FE1	D0C5
-4FE2	8263
-4FE3	D9B6
-4FE4	8264
-4FE5	8265
-4FE6	D9B1
-4FE7	8266
-4FE8	D9B2
-4FE9	C1A9
-4FEA	D9B3
-4FEB	8267
-4FEC	8268
-4FED	BCF3
-4FEE	D0DE
-4FEF	B8A9
-4FF0	8269
-4FF1	BEE3
-4FF2	826A
-4FF3	D9BD
-4FF4	826B
-4FF5	826C
-4FF6	826D
-4FF7	826E
-4FF8	D9BA
-4FF9	826F
-4FFA	B0B3
-4FFB	8270
-4FFC	8271
-4FFD	8272
-4FFE	D9C2
-4FFF	8273
-5000	8274
-5001	8275
-5002	8276
-5003	8277
-5004	8278
-5005	8279
-5006	827A
-5007	827B
-5008	827C
-5009	827D
-500A	827E
-500B	8280
-500C	D9C4
-500D	B1B6
-500E	8281
-500F	D9BF
-5010	8282
-5011	8283
-5012	B5B9
-5013	8284
-5014	BEF3
-5015	8285
-5016	8286
-5017	8287
-5018	CCC8
-5019	BAF2
-501A	D2D0
-501B	8288
-501C	D9C3
-501D	8289
-501E	828A
-501F	BDE8
-5020	828B
-5021	B3AB
-5022	828C
-5023	828D
-5024	828E
-5025	D9C5
-5026	BEEB
-5027	828F
-5028	D9C6
-5029	D9BB
-502A	C4DF
-502B	8290
-502C	D9BE
-502D	D9C1
-502E	D9C0
-502F	8291
-5030	8292
-5031	8293
-5032	8294
-5033	8295
-5034	8296
-5035	8297
-5036	8298
-5037	8299
-5038	829A
-5039	829B
-503A	D5AE
-503B	829C
-503C	D6B5
-503D	829D
-503E	C7E3
-503F	829E
-5040	829F
-5041	82A0
-5042	82A1
-5043	D9C8
-5044	82A2
-5045	82A3
-5046	82A4
-5047	BCD9
-5048	D9CA
-5049	82A5
-504A	82A6
-504B	82A7
-504C	D9BC
-504D	82A8
-504E	D9CB
-504F	C6AB
-5050	82A9
-5051	82AA
-5052	82AB
-5053	82AC
-5054	82AD
-5055	D9C9
-5056	82AE
-5057	82AF
-5058	82B0
-5059	82B1
-505A	D7F6
-505B	82B2
-505C	CDA3
-505D	82B3
-505E	82B4
-505F	82B5
-5060	82B6
-5061	82B7
-5062	82B8
-5063	82B9
-5064	82BA
-5065	BDA1
-5066	82BB
-5067	82BC
-5068	82BD
-5069	82BE
-506A	82BF
-506B	82C0
-506C	D9CC
-506D	82C1
-506E	82C2
-506F	82C3
-5070	82C4
-5071	82C5
-5072	82C6
-5073	82C7
-5074	82C8
-5075	82C9
-5076	C5BC
-5077	CDB5
-5078	82CA
-5079	82CB
-507A	82CC
-507B	D9CD
-507C	82CD
-507D	82CE
-507E	D9C7
-507F	B3A5
-5080	BFFE
-5081	82CF
-5082	82D0
-5083	82D1
-5084	82D2
-5085	B8B5
-5086	82D3
-5087	82D4
-5088	C0FC
-5089	82D5
-508A	82D6
-508B	82D7
-508C	82D8
-508D	B0F8
-508E	82D9
-508F	82DA
-5090	82DB
-5091	82DC
-5092	82DD
-5093	82DE
-5094	82DF
-5095	82E0
-5096	82E1
-5097	82E2
-5098	82E3
-5099	82E4
-509A	82E5
-509B	82E6
-509C	82E7
-509D	82E8
-509E	82E9
-509F	82EA
-50A0	82EB
-50A1	82EC
-50A2	82ED
-50A3	B4F6
-50A4	82EE
-50A5	D9CE
-50A6	82EF
-50A7	D9CF
-50A8	B4A2
-50A9	D9D0
-50AA	82F0
-50AB	82F1
-50AC	B4DF
-50AD	82F2
-50AE	82F3
-50AF	82F4
-50B0	82F5
-50B1	82F6
-50B2	B0C1
-50B3	82F7
-50B4	82F8
-50B5	82F9
-50B6	82FA
-50B7	82FB
-50B8	82FC
-50B9	82FD
-50BA	D9D1
-50BB	C9B5
-50BC	82FE
-50BD	8340
-50BE	8341
-50BF	8342
-50C0	8343
-50C1	8344
-50C2	8345
-50C3	8346
-50C4	8347
-50C5	8348
-50C6	8349
-50C7	834A
-50C8	834B
-50C9	834C
-50CA	834D
-50CB	834E
-50CC	834F
-50CD	8350
-50CE	8351
-50CF	CFF1
-50D0	8352
-50D1	8353
-50D2	8354
-50D3	8355
-50D4	8356
-50D5	8357
-50D6	D9D2
-50D7	8358
-50D8	8359
-50D9	835A
-50DA	C1C5
-50DB	835B
-50DC	835C
-50DD	835D
-50DE	835E
-50DF	835F
-50E0	8360
-50E1	8361
-50E2	8362
-50E3	8363
-50E4	8364
-50E5	8365
-50E6	D9D6
-50E7	C9AE
-50E8	8366
-50E9	8367
-50EA	8368
-50EB	8369
-50EC	D9D5
-50ED	D9D4
-50EE	D9D7
-50EF	836A
-50F0	836B
-50F1	836C
-50F2	836D
-50F3	CBDB
-50F4	836E
-50F5	BDA9
-50F6	836F
-50F7	8370
-50F8	8371
-50F9	8372
-50FA	8373
-50FB	C6A7
-50FC	8374
-50FD	8375
-50FE	8376
-50FF	8377
-5100	8378
-5101	8379
-5102	837A
-5103	837B
-5104	837C
-5105	837D
-5106	D9D3
-5107	D9D8
-5108	837E
-5109	8380
-510A	8381
-510B	D9D9
-510C	8382
-510D	8383
-510E	8384
-510F	8385
-5110	8386
-5111	8387
-5112	C8E5
-5113	8388
-5114	8389
-5115	838A
-5116	838B
-5117	838C
-5118	838D
-5119	838E
-511A	838F
-511B	8390
-511C	8391
-511D	8392
-511E	8393
-511F	8394
-5120	8395
-5121	C0DC
-5122	8396
-5123	8397
-5124	8398
-5125	8399
-5126	839A
-5127	839B
-5128	839C
-5129	839D
-512A	839E
-512B	839F
-512C	83A0
-512D	83A1
-512E	83A2
-512F	83A3
-5130	83A4
-5131	83A5
-5132	83A6
-5133	83A7
-5134	83A8
-5135	83A9
-5136	83AA
-5137	83AB
-5138	83AC
-5139	83AD
-513A	83AE
-513B	83AF
-513C	83B0
-513D	83B1
-513E	83B2
-513F	B6F9
-5140	D8A3
-5141	D4CA
-5142	83B3
-5143	D4AA
-5144	D0D6
-5145	B3E4
-5146	D5D7
-5147	83B4
-5148	CFC8
-5149	B9E2
-514A	83B5
-514B	BFCB
-514C	83B6
-514D	C3E2
-514E	83B7
-514F	83B8
-5150	83B9
-5151	B6D2
-5152	83BA
-5153	83BB
-5154	CDC3
-5155	D9EE
-5156	D9F0
-5157	83BC
-5158	83BD
-5159	83BE
-515A	B5B3
-515B	83BF
-515C	B6B5
-515D	83C0
-515E	83C1
-515F	83C2
-5160	83C3
-5161	83C4
-5162	BEA4
-5163	83C5
-5164	83C6
-5165	C8EB
-5166	83C7
-5167	83C8
-5168	C8AB
-5169	83C9
-516A	83CA
-516B	B0CB
-516C	B9AB
-516D	C1F9
-516E	D9E2
-516F	83CB
-5170	C0BC
-5171	B9B2
-5172	83CC
-5173	B9D8
-5174	D0CB
-5175	B1F8
-5176	C6E4
-5177	BEDF
-5178	B5E4
-5179	D7C8
-517A	83CD
-517B	D1F8
-517C	BCE6
-517D	CADE
-517E	83CE
-517F	83CF
-5180	BCBD
-5181	D9E6
-5182	D8E7
-5183	83D0
-5184	83D1
-5185	C4DA
-5186	83D2
-5187	83D3
-5188	B8D4
-5189	C8BD
-518A	83D4
-518B	83D5
-518C	B2E1
-518D	D4D9
-518E	83D6
-518F	83D7
-5190	83D8
-5191	83D9
-5192	C3B0
-5193	83DA
-5194	83DB
-5195	C3E1
-5196	DAA2
-5197	C8DF
-5198	83DC
-5199	D0B4
-519A	83DD
-519B	BEFC
-519C	C5A9
-519D	83DE
-519E	83DF
-519F	83E0
-51A0	B9DA
-51A1	83E1
-51A2	DAA3
-51A3	83E2
-51A4	D4A9
-51A5	DAA4
-51A6	83E3
-51A7	83E4
-51A8	83E5
-51A9	83E6
-51AA	83E7
-51AB	D9FB
-51AC	B6AC
-51AD	83E8
-51AE	83E9
-51AF	B7EB
-51B0	B1F9
-51B1	D9FC
-51B2	B3E5
-51B3	BEF6
-51B4	83EA
-51B5	BFF6
-51B6	D2B1
-51B7	C0E4
-51B8	83EB
-51B9	83EC
-51BA	83ED
-51BB	B6B3
-51BC	D9FE
-51BD	D9FD
-51BE	83EE
-51BF	83EF
-51C0	BEBB
-51C1	83F0
-51C2	83F1
-51C3	83F2
-51C4	C6E0
-51C5	83F3
-51C6	D7BC
-51C7	DAA1
-51C8	83F4
-51C9	C1B9
-51CA	83F5
-51CB	B5F2
-51CC	C1E8
-51CD	83F6
-51CE	83F7
-51CF	BCF5
-51D0	83F8
-51D1	B4D5
-51D2	83F9
-51D3	83FA
-51D4	83FB
-51D5	83FC
-51D6	83FD
-51D7	83FE
-51D8	8440
-51D9	8441
-51DA	8442
-51DB	C1DD
-51DC	8443
-51DD	C4FD
-51DE	8444
-51DF	8445
-51E0	BCB8
-51E1	B7B2
-51E2	8446
-51E3	8447
-51E4	B7EF
-51E5	8448
-51E6	8449
-51E7	844A
-51E8	844B
-51E9	844C
-51EA	844D
-51EB	D9EC
-51EC	844E
-51ED	C6BE
-51EE	844F
-51EF	BFAD
-51F0	BBCB
-51F1	8450
-51F2	8451
-51F3	B5CA
-51F4	8452
-51F5	DBC9
-51F6	D0D7
-51F7	8453
-51F8	CDB9
-51F9	B0BC
-51FA	B3F6
-51FB	BBF7
-51FC	DBCA
-51FD	BAAF
-51FE	8454
-51FF	D4E4
-5200	B5B6
-5201	B5F3
-5202	D8D6
-5203	C8D0
-5204	8455
-5205	8456
-5206	B7D6
-5207	C7D0
-5208	D8D7
-5209	8457
-520A	BFAF
-520B	8458
-520C	8459
-520D	DBBB
-520E	D8D8
-520F	845A
-5210	845B
-5211	D0CC
-5212	BBAE
-5213	845C
-5214	845D
-5215	845E
-5216	EBBE
-5217	C1D0
-5218	C1F5
-5219	D4F2
-521A	B8D5
-521B	B4B4
-521C	845F
-521D	B3F5
-521E	8460
-521F	8461
-5220	C9BE
-5221	8462
-5222	8463
-5223	8464
-5224	C5D0
-5225	8465
-5226	8466
-5227	8467
-5228	C5D9
-5229	C0FB
-522A	8468
-522B	B1F0
-522C	8469
-522D	D8D9
-522E	B9CE
-522F	846A
-5230	B5BD
-5231	846B
-5232	846C
-5233	D8DA
-5234	846D
-5235	846E
-5236	D6C6
-5237	CBA2
-5238	C8AF
-5239	C9B2
-523A	B4CC
-523B	BFCC
-523C	846F
-523D	B9F4
-523E	8470
-523F	D8DB
-5240	D8DC
-5241	B6E7
-5242	BCC1
-5243	CCEA
-5244	8471
-5245	8472
-5246	8473
-5247	8474
-5248	8475
-5249	8476
-524A	CFF7
-524B	8477
-524C	D8DD
-524D	C7B0
-524E	8478
-524F	8479
-5250	B9D0
-5251	BDA3
-5252	847A
-5253	847B
-5254	CCDE
-5255	847C
-5256	C6CA
-5257	847D
-5258	847E
-5259	8480
-525A	8481
-525B	8482
-525C	D8E0
-525D	8483
-525E	D8DE
-525F	8484
-5260	8485
-5261	D8DF
-5262	8486
-5263	8487
-5264	8488
-5265	B0FE
-5266	8489
-5267	BEE7
-5268	848A
-5269	CAA3
-526A	BCF4
-526B	848B
-526C	848C
-526D	848D
-526E	848E
-526F	B8B1
-5270	848F
-5271	8490
-5272	B8EE
-5273	8491
-5274	8492
-5275	8493
-5276	8494
-5277	8495
-5278	8496
-5279	8497
-527A	8498
-527B	8499
-527C	849A
-527D	D8E2
-527E	849B
-527F	BDCB
-5280	849C
-5281	D8E4
-5282	D8E3
-5283	849D
-5284	849E
-5285	849F
-5286	84A0
-5287	84A1
-5288	C5FC
-5289	84A2
-528A	84A3
-528B	84A4
-528C	84A5
-528D	84A6
-528E	84A7
-528F	84A8
-5290	D8E5
-5291	84A9
-5292	84AA
-5293	D8E6
-5294	84AB
-5295	84AC
-5296	84AD
-5297	84AE
-5298	84AF
-5299	84B0
-529A	84B1
-529B	C1A6
-529C	84B2
-529D	C8B0
-529E	B0EC
-529F	B9A6
-52A0	BCD3
-52A1	CEF1
-52A2	DBBD
-52A3	C1D3
-52A4	84B3
-52A5	84B4
-52A6	84B5
-52A7	84B6
-52A8	B6AF
-52A9	D6FA
-52AA	C5AC
-52AB	BDD9
-52AC	DBBE
-52AD	DBBF
-52AE	84B7
-52AF	84B8
-52B0	84B9
-52B1	C0F8
-52B2	BEA2
-52B3	C0CD
-52B4	84BA
-52B5	84BB
-52B6	84BC
-52B7	84BD
-52B8	84BE
-52B9	84BF
-52BA	84C0
-52BB	84C1
-52BC	84C2
-52BD	84C3
-52BE	DBC0
-52BF	CAC6
-52C0	84C4
-52C1	84C5
-52C2	84C6
-52C3	B2AA
-52C4	84C7
-52C5	84C8
-52C6	84C9
-52C7	D3C2
-52C8	84CA
-52C9	C3E3
-52CA	84CB
-52CB	D1AB
-52CC	84CC
-52CD	84CD
-52CE	84CE
-52CF	84CF
-52D0	DBC2
-52D1	84D0
-52D2	C0D5
-52D3	84D1
-52D4	84D2
-52D5	84D3
-52D6	DBC3
-52D7	84D4
-52D8	BFB1
-52D9	84D5
-52DA	84D6
-52DB	84D7
-52DC	84D8
-52DD	84D9
-52DE	84DA
-52DF	C4BC
-52E0	84DB
-52E1	84DC
-52E2	84DD
-52E3	84DE
-52E4	C7DA
-52E5	84DF
-52E6	84E0
-52E7	84E1
-52E8	84E2
-52E9	84E3
-52EA	84E4
-52EB	84E5
-52EC	84E6
-52ED	84E7
-52EE	84E8
-52EF	84E9
-52F0	DBC4
-52F1	84EA
-52F2	84EB
-52F3	84EC
-52F4	84ED
-52F5	84EE
-52F6	84EF
-52F7	84F0
-52F8	84F1
-52F9	D9E8
-52FA	C9D7
-52FB	84F2
-52FC	84F3
-52FD	84F4
-52FE	B9B4
-52FF	CEF0
-5300	D4C8
-5301	84F5
-5302	84F6
-5303	84F7
-5304	84F8
-5305	B0FC
-5306	B4D2
-5307	84F9
-5308	D0D9
-5309	84FA
-530A	84FB
-530B	84FC
-530C	84FD
-530D	D9E9
-530E	84FE
-530F	DECB
-5310	D9EB
-5311	8540
-5312	8541
-5313	8542
-5314	8543
-5315	D8B0
-5316	BBAF
-5317	B1B1
-5318	8544
-5319	B3D7
-531A	D8CE
-531B	8545
-531C	8546
-531D	D4D1
-531E	8547
-531F	8548
-5320	BDB3
-5321	BFEF
-5322	8549
-5323	CFBB
-5324	854A
-5325	854B
-5326	D8D0
-5327	854C
-5328	854D
-5329	854E
-532A	B7CB
-532B	854F
-532C	8550
-532D	8551
-532E	D8D1
-532F	8552
-5330	8553
-5331	8554
-5332	8555
-5333	8556
-5334	8557
-5335	8558
-5336	8559
-5337	855A
-5338	855B
-5339	C6A5
-533A	C7F8
-533B	D2BD
-533C	855C
-533D	855D
-533E	D8D2
-533F	C4E4
-5340	855E
-5341	CAAE
-5342	855F
-5343	C7A7
-5344	8560
-5345	D8A6
-5346	8561
-5347	C9FD
-5348	CEE7
-5349	BBDC
-534A	B0EB
-534B	8562
-534C	8563
-534D	8564
-534E	BBAA
-534F	D0AD
-5350	8565
-5351	B1B0
-5352	D7E4
-5353	D7BF
-5354	8566
-5355	B5A5
-5356	C2F4
-5357	C4CF
-5358	8567
-5359	8568
-535A	B2A9
-535B	8569
-535C	B2B7
-535D	856A
-535E	B1E5
-535F	DFB2
-5360	D5BC
-5361	BFA8
-5362	C2AC
-5363	D8D5
-5364	C2B1
-5365	856B
-5366	D8D4
-5367	CED4
-5368	856C
-5369	DAE0
-536A	856D
-536B	CEC0
-536C	856E
-536D	856F
-536E	D8B4
-536F	C3AE
-5370	D3A1
-5371	CEA3
-5372	8570
-5373	BCB4
-5374	C8B4
-5375	C2D1
-5376	8571
-5377	BEED
-5378	D0B6
-5379	8572
-537A	DAE1
-537B	8573
-537C	8574
-537D	8575
-537E	8576
-537F	C7E4
-5380	8577
-5381	8578
-5382	B3A7
-5383	8579
-5384	B6F2
-5385	CCFC
-5386	C0FA
-5387	857A
-5388	857B
-5389	C0F7
-538A	857C
-538B	D1B9
-538C	D1E1
-538D	D8C7
-538E	857D
-538F	857E
-5390	8580
-5391	8581
-5392	8582
-5393	8583
-5394	8584
-5395	B2DE
-5396	8585
-5397	8586
-5398	C0E5
-5399	8587
-539A	BAF1
-539B	8588
-539C	8589
-539D	D8C8
-539E	858A
-539F	D4AD
-53A0	858B
-53A1	858C
-53A2	CFE1
-53A3	D8C9
-53A4	858D
-53A5	D8CA
-53A6	CFC3
-53A7	858E
-53A8	B3F8
-53A9	BEC7
-53AA	858F
-53AB	8590
-53AC	8591
-53AD	8592
-53AE	D8CB
-53AF	8593
-53B0	8594
-53B1	8595
-53B2	8596
-53B3	8597
-53B4	8598
-53B5	8599
-53B6	DBCC
-53B7	859A
-53B8	859B
-53B9	859C
-53BA	859D
-53BB	C8A5
-53BC	859E
-53BD	859F
-53BE	85A0
-53BF	CFD8
-53C0	85A1
-53C1	C8FE
-53C2	B2CE
-53C3	85A2
-53C4	85A3
-53C5	85A4
-53C6	85A5
-53C7	85A6
-53C8	D3D6
-53C9	B2E6
-53CA	BCB0
-53CB	D3D1
-53CC	CBAB
-53CD	B7B4
-53CE	85A7
-53CF	85A8
-53D0	85A9
-53D1	B7A2
-53D2	85AA
-53D3	85AB
-53D4	CAE5
-53D5	85AC
-53D6	C8A1
-53D7	CADC
-53D8	B1E4
-53D9	D0F0
-53DA	85AD
-53DB	C5D1
-53DC	85AE
-53DD	85AF
-53DE	85B0
-53DF	DBC5
-53E0	B5FE
-53E1	85B1
-53E2	85B2
-53E3	BFDA
-53E4	B9C5
-53E5	BEE4
-53E6	C1ED
-53E7	85B3
-53E8	DFB6
-53E9	DFB5
-53EA	D6BB
-53EB	BDD0
-53EC	D5D9
-53ED	B0C8
-53EE	B6A3
-53EF	BFC9
-53F0	CCA8
-53F1	DFB3
-53F2	CAB7
-53F3	D3D2
-53F4	85B4
-53F5	D8CF
-53F6	D2B6
-53F7	BAC5
-53F8	CBBE
-53F9	CCBE
-53FA	85B5
-53FB	DFB7
-53FC	B5F0
-53FD	DFB4
-53FE	85B6
-53FF	85B7
-5400	85B8
-5401	D3F5
-5402	85B9
-5403	B3D4
-5404	B8F7
-5405	85BA
-5406	DFBA
-5407	85BB
-5408	BACF
-5409	BCAA
-540A	B5F5
-540B	85BC
-540C	CDAC
-540D	C3FB
-540E	BAF3
-540F	C0F4
-5410	CDC2
-5411	CFF2
-5412	DFB8
-5413	CFC5
-5414	85BD
-5415	C2C0
-5416	DFB9
-5417	C2F0
-5418	85BE
-5419	85BF
-541A	85C0
-541B	BEFD
-541C	85C1
-541D	C1DF
-541E	CDCC
-541F	D2F7
-5420	B7CD
-5421	DFC1
-5422	85C2
-5423	DFC4
-5424	85C3
-5425	85C4
-5426	B7F1
-5427	B0C9
-5428	B6D6
-5429	B7D4
-542A	85C5
-542B	BAAC
-542C	CCFD
-542D	BFD4
-542E	CBB1
-542F	C6F4
-5430	85C6
-5431	D6A8
-5432	DFC5
-5433	85C7
-5434	CEE2
-5435	B3B3
-5436	85C8
-5437	85C9
-5438	CEFC
-5439	B4B5
-543A	85CA
-543B	CEC7
-543C	BAF0
-543D	85CB
-543E	CEE1
-543F	85CC
-5440	D1BD
-5441	85CD
-5442	85CE
-5443	DFC0
-5444	85CF
-5445	85D0
-5446	B4F4
-5447	85D1
-5448	B3CA
-5449	85D2
-544A	B8E6
-544B	DFBB
-544C	85D3
-544D	85D4
-544E	85D5
-544F	85D6
-5450	C4C5
-5451	85D7
-5452	DFBC
-5453	DFBD
-5454	DFBE
-5455	C5BB
-5456	DFBF
-5457	DFC2
-5458	D4B1
-5459	DFC3
-545A	85D8
-545B	C7BA
-545C	CED8
-545D	85D9
-545E	85DA
-545F	85DB
-5460	85DC
-5461	85DD
-5462	C4D8
-5463	85DE
-5464	DFCA
-5465	85DF
-5466	DFCF
-5467	85E0
-5468	D6DC
-5469	85E1
-546A	85E2
-546B	85E3
-546C	85E4
-546D	85E5
-546E	85E6
-546F	85E7
-5470	85E8
-5471	DFC9
-5472	DFDA
-5473	CEB6
-5474	85E9
-5475	BAC7
-5476	DFCE
-5477	DFC8
-5478	C5DE
-5479	85EA
-547A	85EB
-547B	C9EB
-547C	BAF4
-547D	C3FC
-547E	85EC
-547F	85ED
-5480	BED7
-5481	85EE
-5482	DFC6
-5483	85EF
-5484	DFCD
-5485	85F0
-5486	C5D8
-5487	85F1
-5488	85F2
-5489	85F3
-548A	85F4
-548B	D5A6
-548C	BACD
-548D	85F5
-548E	BECC
-548F	D3BD
-5490	B8C0
-5491	85F6
-5492	D6E4
-5493	85F7
-5494	DFC7
-5495	B9BE
-5496	BFA7
-5497	85F8
-5498	85F9
-5499	C1FC
-549A	DFCB
-549B	DFCC
-549C	85FA
-549D	DFD0
-549E	85FB
-549F	85FC
-54A0	85FD
-54A1	85FE
-54A2	8640
-54A3	DFDB
-54A4	DFE5
-54A5	8641
-54A6	DFD7
-54A7	DFD6
-54A8	D7C9
-54A9	DFE3
-54AA	DFE4
-54AB	E5EB
-54AC	D2A7
-54AD	DFD2
-54AE	8642
-54AF	BFA9
-54B0	8643
-54B1	D4DB
-54B2	8644
-54B3	BFC8
-54B4	DFD4
-54B5	8645
-54B6	8646
-54B7	8647
-54B8	CFCC
-54B9	8648
-54BA	8649
-54BB	DFDD
-54BC	864A
-54BD	D1CA
-54BE	864B
-54BF	DFDE
-54C0	B0A7
-54C1	C6B7
-54C2	DFD3
-54C3	864C
-54C4	BAE5
-54C5	864D
-54C6	B6DF
-54C7	CDDB
-54C8	B9FE
-54C9	D4D5
-54CA	864E
-54CB	864F
-54CC	DFDF
-54CD	CFEC
-54CE	B0A5
-54CF	DFE7
-54D0	DFD1
-54D1	D1C6
-54D2	DFD5
-54D3	DFD8
-54D4	DFD9
-54D5	DFDC
-54D6	8650
-54D7	BBA9
-54D8	8651
-54D9	DFE0
-54DA	DFE1
-54DB	8652
-54DC	DFE2
-54DD	DFE6
-54DE	DFE8
-54DF	D3B4
-54E0	8653
-54E1	8654
-54E2	8655
-54E3	8656
-54E4	8657
-54E5	B8E7
-54E6	C5B6
-54E7	DFEA
-54E8	C9DA
-54E9	C1A8
-54EA	C4C4
-54EB	8658
-54EC	8659
-54ED	BFDE
-54EE	CFF8
-54EF	865A
-54F0	865B
-54F1	865C
-54F2	D5DC
-54F3	DFEE
-54F4	865D
-54F5	865E
-54F6	865F
-54F7	8660
-54F8	8661
-54F9	8662
-54FA	B2B8
-54FB	8663
-54FC	BADF
-54FD	DFEC
-54FE	8664
-54FF	DBC1
-5500	8665
-5501	D1E4
-5502	8666
-5503	8667
-5504	8668
-5505	8669
-5506	CBF4
-5507	B4BD
-5508	866A
-5509	B0A6
-550A	866B
-550B	866C
-550C	866D
-550D	866E
-550E	866F
-550F	DFF1
-5510	CCC6
-5511	DFF2
-5512	8670
-5513	8671
-5514	DFED
-5515	8672
-5516	8673
-5517	8674
-5518	8675
-5519	8676
-551A	8677
-551B	DFE9
-551C	8678
-551D	8679
-551E	867A
-551F	867B
-5520	DFEB
-5521	867C
-5522	DFEF
-5523	DFF0
-5524	BBBD
-5525	867D
-5526	867E
-5527	DFF3
-5528	8680
-5529	8681
-552A	DFF4
-552B	8682
-552C	BBA3
-552D	8683
-552E	CADB
-552F	CEA8
-5530	E0A7
-5531	B3AA
-5532	8684
-5533	E0A6
-5534	8685
-5535	8686
-5536	8687
-5537	E0A1
-5538	8688
-5539	8689
-553A	868A
-553B	868B
-553C	DFFE
-553D	868C
-553E	CDD9
-553F	DFFC
-5540	868D
-5541	DFFA
-5542	868E
-5543	BFD0
-5544	D7C4
-5545	868F
-5546	C9CC
-5547	8690
-5548	8691
-5549	DFF8
-554A	B0A1
-554B	8692
-554C	8693
-554D	8694
-554E	8695
-554F	8696
-5550	DFFD
-5551	8697
-5552	8698
-5553	8699
-5554	869A
-5555	DFFB
-5556	E0A2
-5557	869B
-5558	869C
-5559	869D
-555A	869E
-555B	869F
-555C	E0A8
-555D	86A0
-555E	86A1
-555F	86A2
-5560	86A3
-5561	B7C8
-5562	86A4
-5563	86A5
-5564	C6A1
-5565	C9B6
-5566	C0B2
-5567	DFF5
-5568	86A6
-5569	86A7
-556A	C5BE
-556B	86A8
-556C	D8C4
-556D	DFF9
-556E	C4F6
-556F	86A9
-5570	86AA
-5571	86AB
-5572	86AC
-5573	86AD
-5574	86AE
-5575	E0A3
-5576	E0A4
-5577	E0A5
-5578	D0A5
-5579	86AF
-557A	86B0
-557B	E0B4
-557C	CCE4
-557D	86B1
-557E	E0B1
-557F	86B2
-5580	BFA6
-5581	E0AF
-5582	CEB9
-5583	E0AB
-5584	C9C6
-5585	86B3
-5586	86B4
-5587	C0AE
-5588	E0AE
-5589	BAED
-558A	BAB0
-558B	E0A9
-558C	86B5
-558D	86B6
-558E	86B7
-558F	DFF6
-5590	86B8
-5591	E0B3
-5592	86B9
-5593	86BA
-5594	E0B8
-5595	86BB
-5596	86BC
-5597	86BD
-5598	B4AD
-5599	E0B9
-559A	86BE
-559B	86BF
-559C	CFB2
-559D	BAC8
-559E	86C0
-559F	E0B0
-55A0	86C1
-55A1	86C2
-55A2	86C3
-55A3	86C4
-55A4	86C5
-55A5	86C6
-55A6	86C7
-55A7	D0FA
-55A8	86C8
-55A9	86C9
-55AA	86CA
-55AB	86CB
-55AC	86CC
-55AD	86CD
-55AE	86CE
-55AF	86CF
-55B0	86D0
-55B1	E0AC
-55B2	86D1
-55B3	D4FB
-55B4	86D2
-55B5	DFF7
-55B6	86D3
-55B7	C5E7
-55B8	86D4
-55B9	E0AD
-55BA	86D5
-55BB	D3F7
-55BC	86D6
-55BD	E0B6
-55BE	E0B7
-55BF	86D7
-55C0	86D8
-55C1	86D9
-55C2	86DA
-55C3	86DB
-55C4	E0C4
-55C5	D0E1
-55C6	86DC
-55C7	86DD
-55C8	86DE
-55C9	E0BC
-55CA	86DF
-55CB	86E0
-55CC	E0C9
-55CD	E0CA
-55CE	86E1
-55CF	86E2
-55D0	86E3
-55D1	E0BE
-55D2	E0AA
-55D3	C9A4
-55D4	E0C1
-55D5	86E4
-55D6	E0B2
-55D7	86E5
-55D8	86E6
-55D9	86E7
-55DA	86E8
-55DB	86E9
-55DC	CAC8
-55DD	E0C3
-55DE	86EA
-55DF	E0B5
-55E0	86EB
-55E1	CECB
-55E2	86EC
-55E3	CBC3
-55E4	E0CD
-55E5	E0C6
-55E6	E0C2
-55E7	86ED
-55E8	E0CB
-55E9	86EE
-55EA	E0BA
-55EB	E0BF
-55EC	E0C0
-55ED	86EF
-55EE	86F0
-55EF	E0C5
-55F0	86F1
-55F1	86F2
-55F2	E0C7
-55F3	E0C8
-55F4	86F3
-55F5	E0CC
-55F6	86F4
-55F7	E0BB
-55F8	86F5
-55F9	86F6
-55FA	86F7
-55FB	86F8
-55FC	86F9
-55FD	CBD4
-55FE	E0D5
-55FF	86FA
-5600	E0D6
-5601	E0D2
-5602	86FB
-5603	86FC
-5604	86FD
-5605	86FE
-5606	8740
-5607	8741
-5608	E0D0
-5609	BCCE
-560A	8742
-560B	8743
-560C	E0D1
-560D	8744
-560E	B8C2
-560F	D8C5
-5610	8745
-5611	8746
-5612	8747
-5613	8748
-5614	8749
-5615	874A
-5616	874B
-5617	874C
-5618	D0EA
-5619	874D
-561A	874E
-561B	C2EF
-561C	874F
-561D	8750
-561E	E0CF
-561F	E0BD
-5620	8751
-5621	8752
-5622	8753
-5623	E0D4
-5624	E0D3
-5625	8754
-5626	8755
-5627	E0D7
-5628	8756
-5629	8757
-562A	8758
-562B	8759
-562C	E0DC
-562D	E0D8
-562E	875A
-562F	875B
-5630	875C
-5631	D6F6
-5632	B3B0
-5633	875D
-5634	D7EC
-5635	875E
-5636	CBBB
-5637	875F
-5638	8760
-5639	E0DA
-563A	8761
-563B	CEFB
-563C	8762
-563D	8763
-563E	8764
-563F	BAD9
-5640	8765
-5641	8766
-5642	8767
-5643	8768
-5644	8769
-5645	876A
-5646	876B
-5647	876C
-5648	876D
-5649	876E
-564A	876F
-564B	8770
-564C	E0E1
-564D	E0DD
-564E	D2AD
-564F	8771
-5650	8772
-5651	8773
-5652	8774
-5653	8775
-5654	E0E2
-5655	8776
-5656	8777
-5657	E0DB
-5658	E0D9
-5659	E0DF
-565A	8778
-565B	8779
-565C	E0E0
-565D	877A
-565E	877B
-565F	877C
-5660	877D
-5661	877E
-5662	E0DE
-5663	8780
-5664	E0E4
-5665	8781
-5666	8782
-5667	8783
-5668	C6F7
-5669	D8AC
-566A	D4EB
-566B	E0E6
-566C	CAC9
-566D	8784
-566E	8785
-566F	8786
-5670	8787
-5671	E0E5
-5672	8788
-5673	8789
-5674	878A
-5675	878B
-5676	B8C1
-5677	878C
-5678	878D
-5679	878E
-567A	878F
-567B	E0E7
-567C	E0E8
-567D	8790
-567E	8791
-567F	8792
-5680	8793
-5681	8794
-5682	8795
-5683	8796
-5684	8797
-5685	E0E9
-5686	E0E3
-5687	8798
-5688	8799
-5689	879A
-568A	879B
-568B	879C
-568C	879D
-568D	879E
-568E	BABF
-568F	CCE7
-5690	879F
-5691	87A0
-5692	87A1
-5693	E0EA
-5694	87A2
-5695	87A3
-5696	87A4
-5697	87A5
-5698	87A6
-5699	87A7
-569A	87A8
-569B	87A9
-569C	87AA
-569D	87AB
-569E	87AC
-569F	87AD
-56A0	87AE
-56A1	87AF
-56A2	87B0
-56A3	CFF9
-56A4	87B1
-56A5	87B2
-56A6	87B3
-56A7	87B4
-56A8	87B5
-56A9	87B6
-56AA	87B7
-56AB	87B8
-56AC	87B9
-56AD	87BA
-56AE	87BB
-56AF	E0EB
-56B0	87BC
-56B1	87BD
-56B2	87BE
-56B3	87BF
-56B4	87C0
-56B5	87C1
-56B6	87C2
-56B7	C8C2
-56B8	87C3
-56B9	87C4
-56BA	87C5
-56BB	87C6
-56BC	BDC0
-56BD	87C7
-56BE	87C8
-56BF	87C9
-56C0	87CA
-56C1	87CB
-56C2	87CC
-56C3	87CD
-56C4	87CE
-56C5	87CF
-56C6	87D0
-56C7	87D1
-56C8	87D2
-56C9	87D3
-56CA	C4D2
-56CB	87D4
-56CC	87D5
-56CD	87D6
-56CE	87D7
-56CF	87D8
-56D0	87D9
-56D1	87DA
-56D2	87DB
-56D3	87DC
-56D4	E0EC
-56D5	87DD
-56D6	87DE
-56D7	E0ED
-56D8	87DF
-56D9	87E0
-56DA	C7F4
-56DB	CBC4
-56DC	87E1
-56DD	E0EE
-56DE	BBD8
-56DF	D8B6
-56E0	D2F2
-56E1	E0EF
-56E2	CDC5
-56E3	87E2
-56E4	B6DA
-56E5	87E3
-56E6	87E4
-56E7	87E5
-56E8	87E6
-56E9	87E7
-56EA	87E8
-56EB	E0F1
-56EC	87E9
-56ED	D4B0
-56EE	87EA
-56EF	87EB
-56F0	C0A7
-56F1	B4D1
-56F2	87EC
-56F3	87ED
-56F4	CEA7
-56F5	E0F0
-56F6	87EE
-56F7	87EF
-56F8	87F0
-56F9	E0F2
-56FA	B9CC
-56FB	87F1
-56FC	87F2
-56FD	B9FA
-56FE	CDBC
-56FF	E0F3
-5700	87F3
-5701	87F4
-5702	87F5
-5703	C6D4
-5704	E0F4
-5705	87F6
-5706	D4B2
-5707	87F7
-5708	C8A6
-5709	E0F6
-570A	E0F5
-570B	87F8
-570C	87F9
-570D	87FA
-570E	87FB
-570F	87FC
-5710	87FD
-5711	87FE
-5712	8840
-5713	8841
-5714	8842
-5715	8843
-5716	8844
-5717	8845
-5718	8846
-5719	8847
-571A	8848
-571B	8849
-571C	E0F7
-571D	884A
-571E	884B
-571F	CDC1
-5720	884C
-5721	884D
-5722	884E
-5723	CAA5
-5724	884F
-5725	8850
-5726	8851
-5727	8852
-5728	D4DA
-5729	DBD7
-572A	DBD9
-572B	8853
-572C	DBD8
-572D	B9E7
-572E	DBDC
-572F	DBDD
-5730	B5D8
-5731	8854
-5732	8855
-5733	DBDA
-5734	8856
-5735	8857
-5736	8858
-5737	8859
-5738	885A
-5739	DBDB
-573A	B3A1
-573B	DBDF
-573C	885B
-573D	885C
-573E	BBF8
-573F	885D
-5740	D6B7
-5741	885E
-5742	DBE0
-5743	885F
-5744	8860
-5745	8861
-5746	8862
-5747	BEF9
-5748	8863
-5749	8864
-574A	B7BB
-574B	8865
-574C	DBD0
-574D	CCAE
-574E	BFB2
-574F	BBB5
-5750	D7F8
-5751	BFD3
-5752	8866
-5753	8867
-5754	8868
-5755	8869
-5756	886A
-5757	BFE9
-5758	886B
-5759	886C
-575A	BCE1
-575B	CCB3
-575C	DBDE
-575D	B0D3
-575E	CEEB
-575F	B7D8
-5760	D7B9
-5761	C6C2
-5762	886D
-5763	886E
-5764	C0A4
-5765	886F
-5766	CCB9
-5767	8870
-5768	DBE7
-5769	DBE1
-576A	C6BA
-576B	DBE3
-576C	8871
-576D	DBE8
-576E	8872
-576F	C5F7
-5770	8873
-5771	8874
-5772	8875
-5773	DBEA
-5774	8876
-5775	8877
-5776	DBE9
-5777	BFC0
-5778	8878
-5779	8879
-577A	887A
-577B	DBE6
-577C	DBE5
-577D	887B
-577E	887C
-577F	887D
-5780	887E
-5781	8880
-5782	B4B9
-5783	C0AC
-5784	C2A2
-5785	DBE2
-5786	DBE4
-5787	8881
-5788	8882
-5789	8883
-578A	8884
-578B	D0CD
-578C	DBED
-578D	8885
-578E	8886
-578F	8887
-5790	8888
-5791	8889
-5792	C0DD
-5793	DBF2
-5794	888A
-5795	888B
-5796	888C
-5797	888D
-5798	888E
-5799	888F
-579A	8890
-579B	B6E2
-579C	8891
-579D	8892
-579E	8893
-579F	8894
-57A0	DBF3
-57A1	DBD2
-57A2	B9B8
-57A3	D4AB
-57A4	DBEC
-57A5	8895
-57A6	BFD1
-57A7	DBF0
-57A8	8896
-57A9	DBD1
-57AA	8897
-57AB	B5E6
-57AC	8898
-57AD	DBEB
-57AE	BFE5
-57AF	8899
-57B0	889A
-57B1	889B
-57B2	DBEE
-57B3	889C
-57B4	DBF1
-57B5	889D
-57B6	889E
-57B7	889F
-57B8	DBF9
-57B9	88A0
-57BA	88A1
-57BB	88A2
-57BC	88A3
-57BD	88A4
-57BE	88A5
-57BF	88A6
-57C0	88A7
-57C1	88A8
-57C2	B9A1
-57C3	B0A3
-57C4	88A9
-57C5	88AA
-57C6	88AB
-57C7	88AC
-57C8	88AD
-57C9	88AE
-57CA	88AF
-57CB	C2F1
-57CC	88B0
-57CD	88B1
-57CE	B3C7
-57CF	DBEF
-57D0	88B2
-57D1	88B3
-57D2	DBF8
-57D3	88B4
-57D4	C6D2
-57D5	DBF4
-57D6	88B5
-57D7	88B6
-57D8	DBF5
-57D9	DBF7
-57DA	DBF6
-57DB	88B7
-57DC	88B8
-57DD	DBFE
-57DE	88B9
-57DF	D3F2
-57E0	B2BA
-57E1	88BA
-57E2	88BB
-57E3	88BC
-57E4	DBFD
-57E5	88BD
-57E6	88BE
-57E7	88BF
-57E8	88C0
-57E9	88C1
-57EA	88C2
-57EB	88C3
-57EC	88C4
-57ED	DCA4
-57EE	88C5
-57EF	DBFB
-57F0	88C6
-57F1	88C7
-57F2	88C8
-57F3	88C9
-57F4	DBFA
-57F5	88CA
-57F6	88CB
-57F7	88CC
-57F8	DBFC
-57F9	C5E0
-57FA	BBF9
-57FB	88CD
-57FC	88CE
-57FD	DCA3
-57FE	88CF
-57FF	88D0
-5800	DCA5
-5801	88D1
-5802	CCC3
-5803	88D2
-5804	88D3
-5805	88D4
-5806	B6D1
-5807	DDC0
-5808	88D5
-5809	88D6
-580A	88D7
-580B	DCA1
-580C	88D8
-580D	DCA2
-580E	88D9
-580F	88DA
-5810	88DB
-5811	C7B5
-5812	88DC
-5813	88DD
-5814	88DE
-5815	B6E9
-5816	88DF
-5817	88E0
-5818	88E1
-5819	DCA7
-581A	88E2
-581B	88E3
-581C	88E4
-581D	88E5
-581E	DCA6
-581F	88E6
-5820	DCA9
-5821	B1A4
-5822	88E7
-5823	88E8
-5824	B5CC
-5825	88E9
-5826	88EA
-5827	88EB
-5828	88EC
-5829	88ED
-582A	BFB0
-582B	88EE
-582C	88EF
-582D	88F0
-582E	88F1
-582F	88F2
-5830	D1DF
-5831	88F3
-5832	88F4
-5833	88F5
-5834	88F6
-5835	B6C2
-5836	88F7
-5837	88F8
-5838	88F9
-5839	88FA
-583A	88FB
-583B	88FC
-583C	88FD
-583D	88FE
-583E	8940
-583F	8941
-5840	8942
-5841	8943
-5842	8944
-5843	8945
-5844	DCA8
-5845	8946
-5846	8947
-5847	8948
-5848	8949
-5849	894A
-584A	894B
-584B	894C
-584C	CBFA
-584D	EBF3
-584E	894D
-584F	894E
-5850	894F
-5851	CBDC
-5852	8950
-5853	8951
-5854	CBFE
-5855	8952
-5856	8953
-5857	8954
-5858	CCC1
-5859	8955
-585A	8956
-585B	8957
-585C	8958
-585D	8959
-585E	C8FB
-585F	895A
-5860	895B
-5861	895C
-5862	895D
-5863	895E
-5864	895F
-5865	DCAA
-5866	8960
-5867	8961
-5868	8962
-5869	8963
-586A	8964
-586B	CCEE
-586C	DCAB
-586D	8965
-586E	8966
-586F	8967
-5870	8968
-5871	8969
-5872	896A
-5873	896B
-5874	896C
-5875	896D
-5876	896E
-5877	896F
-5878	8970
-5879	8971
-587A	8972
-587B	8973
-587C	8974
-587D	8975
-587E	DBD3
-587F	8976
-5880	DCAF
-5881	DCAC
-5882	8977
-5883	BEB3
-5884	8978
-5885	CAFB
-5886	8979
-5887	897A
-5888	897B
-5889	DCAD
-588A	897C
-588B	897D
-588C	897E
-588D	8980
-588E	8981
-588F	8982
-5890	8983
-5891	8984
-5892	C9CA
-5893	C4B9
-5894	8985
-5895	8986
-5896	8987
-5897	8988
-5898	8989
-5899	C7BD
-589A	DCAE
-589B	898A
-589C	898B
-589D	898C
-589E	D4F6
-589F	D0E6
-58A0	898D
-58A1	898E
-58A2	898F
-58A3	8990
-58A4	8991
-58A5	8992
-58A6	8993
-58A7	8994
-58A8	C4AB
-58A9	B6D5
-58AA	8995
-58AB	8996
-58AC	8997
-58AD	8998
-58AE	8999
-58AF	899A
-58B0	899B
-58B1	899C
-58B2	899D
-58B3	899E
-58B4	899F
-58B5	89A0
-58B6	89A1
-58B7	89A2
-58B8	89A3
-58B9	89A4
-58BA	89A5
-58BB	89A6
-58BC	DBD4
-58BD	89A7
-58BE	89A8
-58BF	89A9
-58C0	89AA
-58C1	B1DA
-58C2	89AB
-58C3	89AC
-58C4	89AD
-58C5	DBD5
-58C6	89AE
-58C7	89AF
-58C8	89B0
-58C9	89B1
-58CA	89B2
-58CB	89B3
-58CC	89B4
-58CD	89B5
-58CE	89B6
-58CF	89B7
-58D0	89B8
-58D1	DBD6
-58D2	89B9
-58D3	89BA
-58D4	89BB
-58D5	BABE
-58D6	89BC
-58D7	89BD
-58D8	89BE
-58D9	89BF
-58DA	89C0
-58DB	89C1
-58DC	89C2
-58DD	89C3
-58DE	89C4
-58DF	89C5
-58E0	89C6
-58E1	89C7
-58E2	89C8
-58E3	89C9
-58E4	C8C0
-58E5	89CA
-58E6	89CB
-58E7	89CC
-58E8	89CD
-58E9	89CE
-58EA	89CF
-58EB	CABF
-58EC	C8C9
-58ED	89D0
-58EE	D7B3
-58EF	89D1
-58F0	C9F9
-58F1	89D2
-58F2	89D3
-58F3	BFC7
-58F4	89D4
-58F5	89D5
-58F6	BAF8
-58F7	89D6
-58F8	89D7
-58F9	D2BC
-58FA	89D8
-58FB	89D9
-58FC	89DA
-58FD	89DB
-58FE	89DC
-58FF	89DD
-5900	89DE
-5901	89DF
-5902	E2BA
-5903	89E0
-5904	B4A6
-5905	89E1
-5906	89E2
-5907	B1B8
-5908	89E3
-5909	89E4
-590A	89E5
-590B	89E6
-590C	89E7
-590D	B8B4
-590E	89E8
-590F	CFC4
-5910	89E9
-5911	89EA
-5912	89EB
-5913	89EC
-5914	D9E7
-5915	CFA6
-5916	CDE2
-5917	89ED
-5918	89EE
-5919	D9ED
-591A	B6E0
-591B	89EF
-591C	D2B9
-591D	89F0
-591E	89F1
-591F	B9BB
-5920	89F2
-5921	89F3
-5922	89F4
-5923	89F5
-5924	E2B9
-5925	E2B7
-5926	89F6
-5927	B4F3
-5928	89F7
-5929	CCEC
-592A	CCAB
-592B	B7F2
-592C	89F8
-592D	D8B2
-592E	D1EB
-592F	BABB
-5930	89F9
-5931	CAA7
-5932	89FA
-5933	89FB
-5934	CDB7
-5935	89FC
-5936	89FD
-5937	D2C4
-5938	BFE4
-5939	BCD0
-593A	B6E1
-593B	89FE
-593C	DEC5
-593D	8A40
-593E	8A41
-593F	8A42
-5940	8A43
-5941	DEC6
-5942	DBBC
-5943	8A44
-5944	D1D9
-5945	8A45
-5946	8A46
-5947	C6E6
-5948	C4CE
-5949	B7EE
-594A	8A47
-594B	B7DC
-594C	8A48
-594D	8A49
-594E	BFFC
-594F	D7E0
-5950	8A4A
-5951	C6F5
-5952	8A4B
-5953	8A4C
-5954	B1BC
-5955	DEC8
-5956	BDB1
-5957	CCD7
-5958	DECA
-5959	8A4D
-595A	DEC9
-595B	8A4E
-595C	8A4F
-595D	8A50
-595E	8A51
-595F	8A52
-5960	B5EC
-5961	8A53
-5962	C9DD
-5963	8A54
-5964	8A55
-5965	B0C2
-5966	8A56
-5967	8A57
-5968	8A58
-5969	8A59
-596A	8A5A
-596B	8A5B
-596C	8A5C
-596D	8A5D
-596E	8A5E
-596F	8A5F
-5970	8A60
-5971	8A61
-5972	8A62
-5973	C5AE
-5974	C5AB
-5975	8A63
-5976	C4CC
-5977	8A64
-5978	BCE9
-5979	CBFD
-597A	8A65
-597B	8A66
-597C	8A67
-597D	BAC3
-597E	8A68
-597F	8A69
-5980	8A6A
-5981	E5F9
-5982	C8E7
-5983	E5FA
-5984	CDFD
-5985	8A6B
-5986	D7B1
-5987	B8BE
-5988	C2E8
-5989	8A6C
-598A	C8D1
-598B	8A6D
-598C	8A6E
-598D	E5FB
-598E	8A6F
-598F	8A70
-5990	8A71
-5991	8A72
-5992	B6CA
-5993	BCCB
-5994	8A73
-5995	8A74
-5996	D1FD
-5997	E6A1
-5998	8A75
-5999	C3EE
-599A	8A76
-599B	8A77
-599C	8A78
-599D	8A79
-599E	E6A4
-599F	8A7A
-59A0	8A7B
-59A1	8A7C
-59A2	8A7D
-59A3	E5FE
-59A4	E6A5
-59A5	CDD7
-59A6	8A7E
-59A7	8A80
-59A8	B7C1
-59A9	E5FC
-59AA	E5FD
-59AB	E6A3
-59AC	8A81
-59AD	8A82
-59AE	C4DD
-59AF	E6A8
-59B0	8A83
-59B1	8A84
-59B2	E6A7
-59B3	8A85
-59B4	8A86
-59B5	8A87
-59B6	8A88
-59B7	8A89
-59B8	8A8A
-59B9	C3C3
-59BA	8A8B
-59BB	C6DE
-59BC	8A8C
-59BD	8A8D
-59BE	E6AA
-59BF	8A8E
-59C0	8A8F
-59C1	8A90
-59C2	8A91
-59C3	8A92
-59C4	8A93
-59C5	8A94
-59C6	C4B7
-59C7	8A95
-59C8	8A96
-59C9	8A97
-59CA	E6A2
-59CB	CABC
-59CC	8A98
-59CD	8A99
-59CE	8A9A
-59CF	8A9B
-59D0	BDE3
-59D1	B9C3
-59D2	E6A6
-59D3	D0D5
-59D4	CEAF
-59D5	8A9C
-59D6	8A9D
-59D7	E6A9
-59D8	E6B0
-59D9	8A9E
-59DA	D2A6
-59DB	8A9F
-59DC	BDAA
-59DD	E6AD
-59DE	8AA0
-59DF	8AA1
-59E0	8AA2
-59E1	8AA3
-59E2	8AA4
-59E3	E6AF
-59E4	8AA5
-59E5	C0D1
-59E6	8AA6
-59E7	8AA7
-59E8	D2CC
-59E9	8AA8
-59EA	8AA9
-59EB	8AAA
-59EC	BCA7
-59ED	8AAB
-59EE	8AAC
-59EF	8AAD
-59F0	8AAE
-59F1	8AAF
-59F2	8AB0
-59F3	8AB1
-59F4	8AB2
-59F5	8AB3
-59F6	8AB4
-59F7	8AB5
-59F8	8AB6
-59F9	E6B1
-59FA	8AB7
-59FB	D2F6
-59FC	8AB8
-59FD	8AB9
-59FE	8ABA
-59FF	D7CB
-5A00	8ABB
-5A01	CDFE
-5A02	8ABC
-5A03	CDDE
-5A04	C2A6
-5A05	E6AB
-5A06	E6AC
-5A07	BDBF
-5A08	E6AE
-5A09	E6B3
-5A0A	8ABD
-5A0B	8ABE
-5A0C	E6B2
-5A0D	8ABF
-5A0E	8AC0
-5A0F	8AC1
-5A10	8AC2
-5A11	E6B6
-5A12	8AC3
-5A13	E6B8
-5A14	8AC4
-5A15	8AC5
-5A16	8AC6
-5A17	8AC7
-5A18	C4EF
-5A19	8AC8
-5A1A	8AC9
-5A1B	8ACA
-5A1C	C4C8
-5A1D	8ACB
-5A1E	8ACC
-5A1F	BEEA
-5A20	C9EF
-5A21	8ACD
-5A22	8ACE
-5A23	E6B7
-5A24	8ACF
-5A25	B6F0
-5A26	8AD0
-5A27	8AD1
-5A28	8AD2
-5A29	C3E4
-5A2A	8AD3
-5A2B	8AD4
-5A2C	8AD5
-5A2D	8AD6
-5A2E	8AD7
-5A2F	8AD8
-5A30	8AD9
-5A31	D3E9
-5A32	E6B4
-5A33	8ADA
-5A34	E6B5
-5A35	8ADB
-5A36	C8A2
-5A37	8ADC
-5A38	8ADD
-5A39	8ADE
-5A3A	8ADF
-5A3B	8AE0
-5A3C	E6BD
-5A3D	8AE1
-5A3E	8AE2
-5A3F	8AE3
-5A40	E6B9
-5A41	8AE4
-5A42	8AE5
-5A43	8AE6
-5A44	8AE7
-5A45	8AE8
-5A46	C6C5
-5A47	8AE9
-5A48	8AEA
-5A49	CDF1
-5A4A	E6BB
-5A4B	8AEB
-5A4C	8AEC
-5A4D	8AED
-5A4E	8AEE
-5A4F	8AEF
-5A50	8AF0
-5A51	8AF1
-5A52	8AF2
-5A53	8AF3
-5A54	8AF4
-5A55	E6BC
-5A56	8AF5
-5A57	8AF6
-5A58	8AF7
-5A59	8AF8
-5A5A	BBE9
-5A5B	8AF9
-5A5C	8AFA
-5A5D	8AFB
-5A5E	8AFC
-5A5F	8AFD
-5A60	8AFE
-5A61	8B40
-5A62	E6BE
-5A63	8B41
-5A64	8B42
-5A65	8B43
-5A66	8B44
-5A67	E6BA
-5A68	8B45
-5A69	8B46
-5A6A	C0B7
-5A6B	8B47
-5A6C	8B48
-5A6D	8B49
-5A6E	8B4A
-5A6F	8B4B
-5A70	8B4C
-5A71	8B4D
-5A72	8B4E
-5A73	8B4F
-5A74	D3A4
-5A75	E6BF
-5A76	C9F4
-5A77	E6C3
-5A78	8B50
-5A79	8B51
-5A7A	E6C4
-5A7B	8B52
-5A7C	8B53
-5A7D	8B54
-5A7E	8B55
-5A7F	D0F6
-5A80	8B56
-5A81	8B57
-5A82	8B58
-5A83	8B59
-5A84	8B5A
-5A85	8B5B
-5A86	8B5C
-5A87	8B5D
-5A88	8B5E
-5A89	8B5F
-5A8A	8B60
-5A8B	8B61
-5A8C	8B62
-5A8D	8B63
-5A8E	8B64
-5A8F	8B65
-5A90	8B66
-5A91	8B67
-5A92	C3BD
-5A93	8B68
-5A94	8B69
-5A95	8B6A
-5A96	8B6B
-5A97	8B6C
-5A98	8B6D
-5A99	8B6E
-5A9A	C3C4
-5A9B	E6C2
-5A9C	8B6F
-5A9D	8B70
-5A9E	8B71
-5A9F	8B72
-5AA0	8B73
-5AA1	8B74
-5AA2	8B75
-5AA3	8B76
-5AA4	8B77
-5AA5	8B78
-5AA6	8B79
-5AA7	8B7A
-5AA8	8B7B
-5AA9	8B7C
-5AAA	E6C1
-5AAB	8B7D
-5AAC	8B7E
-5AAD	8B80
-5AAE	8B81
-5AAF	8B82
-5AB0	8B83
-5AB1	8B84
-5AB2	E6C7
-5AB3	CFB1
-5AB4	8B85
-5AB5	EBF4
-5AB6	8B86
-5AB7	8B87
-5AB8	E6CA
-5AB9	8B88
-5ABA	8B89
-5ABB	8B8A
-5ABC	8B8B
-5ABD	8B8C
-5ABE	E6C5
-5ABF	8B8D
-5AC0	8B8E
-5AC1	BCDE
-5AC2	C9A9
-5AC3	8B8F
-5AC4	8B90
-5AC5	8B91
-5AC6	8B92
-5AC7	8B93
-5AC8	8B94
-5AC9	BCB5
-5ACA	8B95
-5ACB	8B96
-5ACC	CFD3
-5ACD	8B97
-5ACE	8B98
-5ACF	8B99
-5AD0	8B9A
-5AD1	8B9B
-5AD2	E6C8
-5AD3	8B9C
-5AD4	E6C9
-5AD5	8B9D
-5AD6	E6CE
-5AD7	8B9E
-5AD8	E6D0
-5AD9	8B9F
-5ADA	8BA0
-5ADB	8BA1
-5ADC	E6D1
-5ADD	8BA2
-5ADE	8BA3
-5ADF	8BA4
-5AE0	E6CB
-5AE1	B5D5
-5AE2	8BA5
-5AE3	E6CC
-5AE4	8BA6
-5AE5	8BA7
-5AE6	E6CF
-5AE7	8BA8
-5AE8	8BA9
-5AE9	C4DB
-5AEA	8BAA
-5AEB	E6C6
-5AEC	8BAB
-5AED	8BAC
-5AEE	8BAD
-5AEF	8BAE
-5AF0	8BAF
-5AF1	E6CD
-5AF2	8BB0
-5AF3	8BB1
-5AF4	8BB2
-5AF5	8BB3
-5AF6	8BB4
-5AF7	8BB5
-5AF8	8BB6
-5AF9	8BB7
-5AFA	8BB8
-5AFB	8BB9
-5AFC	8BBA
-5AFD	8BBB
-5AFE	8BBC
-5AFF	8BBD
-5B00	8BBE
-5B01	8BBF
-5B02	8BC0
-5B03	8BC1
-5B04	8BC2
-5B05	8BC3
-5B06	8BC4
-5B07	8BC5
-5B08	8BC6
-5B09	E6D2
-5B0A	8BC7
-5B0B	8BC8
-5B0C	8BC9
-5B0D	8BCA
-5B0E	8BCB
-5B0F	8BCC
-5B10	8BCD
-5B11	8BCE
-5B12	8BCF
-5B13	8BD0
-5B14	8BD1
-5B15	8BD2
-5B16	E6D4
-5B17	E6D3
-5B18	8BD3
-5B19	8BD4
-5B1A	8BD5
-5B1B	8BD6
-5B1C	8BD7
-5B1D	8BD8
-5B1E	8BD9
-5B1F	8BDA
-5B20	8BDB
-5B21	8BDC
-5B22	8BDD
-5B23	8BDE
-5B24	8BDF
-5B25	8BE0
-5B26	8BE1
-5B27	8BE2
-5B28	8BE3
-5B29	8BE4
-5B2A	8BE5
-5B2B	8BE6
-5B2C	8BE7
-5B2D	8BE8
-5B2E	8BE9
-5B2F	8BEA
-5B30	8BEB
-5B31	8BEC
-5B32	E6D5
-5B33	8BED
-5B34	D9F8
-5B35	8BEE
-5B36	8BEF
-5B37	E6D6
-5B38	8BF0
-5B39	8BF1
-5B3A	8BF2
-5B3B	8BF3
-5B3C	8BF4
-5B3D	8BF5
-5B3E	8BF6
-5B3F	8BF7
-5B40	E6D7
-5B41	8BF8
-5B42	8BF9
-5B43	8BFA
-5B44	8BFB
-5B45	8BFC
-5B46	8BFD
-5B47	8BFE
-5B48	8C40
-5B49	8C41
-5B4A	8C42
-5B4B	8C43
-5B4C	8C44
-5B4D	8C45
-5B4E	8C46
-5B4F	8C47
-5B50	D7D3
-5B51	E6DD
-5B52	8C48
-5B53	E6DE
-5B54	BFD7
-5B55	D4D0
-5B56	8C49
-5B57	D7D6
-5B58	B4E6
-5B59	CBEF
-5B5A	E6DA
-5B5B	D8C3
-5B5C	D7CE
-5B5D	D0A2
-5B5E	8C4A
-5B5F	C3CF
-5B60	8C4B
-5B61	8C4C
-5B62	E6DF
-5B63	BCBE
-5B64	B9C2
-5B65	E6DB
-5B66	D1A7
-5B67	8C4D
-5B68	8C4E
-5B69	BAA2
-5B6A	C2CF
-5B6B	8C4F
-5B6C	D8AB
-5B6D	8C50
-5B6E	8C51
-5B6F	8C52
-5B70	CAEB
-5B71	E5EE
-5B72	8C53
-5B73	E6DC
-5B74	8C54
-5B75	B7F5
-5B76	8C55
-5B77	8C56
-5B78	8C57
-5B79	8C58
-5B7A	C8E6
-5B7B	8C59
-5B7C	8C5A
-5B7D	C4F5
-5B7E	8C5B
-5B7F	8C5C
-5B80	E5B2
-5B81	C4FE
-5B82	8C5D
-5B83	CBFC
-5B84	E5B3
-5B85	D5AC
-5B86	8C5E
-5B87	D3EE
-5B88	CAD8
-5B89	B0B2
-5B8A	8C5F
-5B8B	CBCE
-5B8C	CDEA
-5B8D	8C60
-5B8E	8C61
-5B8F	BAEA
-5B90	8C62
-5B91	8C63
-5B92	8C64
-5B93	E5B5
-5B94	8C65
-5B95	E5B4
-5B96	8C66
-5B97	D7DA
-5B98	B9D9
-5B99	D6E6
-5B9A	B6A8
-5B9B	CDF0
-5B9C	D2CB
-5B9D	B1A6
-5B9E	CAB5
-5B9F	8C67
-5BA0	B3E8
-5BA1	C9F3
-5BA2	BFCD
-5BA3	D0FB
-5BA4	CAD2
-5BA5	E5B6
-5BA6	BBC2
-5BA7	8C68
-5BA8	8C69
-5BA9	8C6A
-5BAA	CFDC
-5BAB	B9AC
-5BAC	8C6B
-5BAD	8C6C
-5BAE	8C6D
-5BAF	8C6E
-5BB0	D4D7
-5BB1	8C6F
-5BB2	8C70
-5BB3	BAA6
-5BB4	D1E7
-5BB5	CFFC
-5BB6	BCD2
-5BB7	8C71
-5BB8	E5B7
-5BB9	C8DD
-5BBA	8C72
-5BBB	8C73
-5BBC	8C74
-5BBD	BFED
-5BBE	B1F6
-5BBF	CBDE
-5BC0	8C75
-5BC1	8C76
-5BC2	BCC5
-5BC3	8C77
-5BC4	BCC4
-5BC5	D2FA
-5BC6	C3DC
-5BC7	BFDC
-5BC8	8C78
-5BC9	8C79
-5BCA	8C7A
-5BCB	8C7B
-5BCC	B8BB
-5BCD	8C7C
-5BCE	8C7D
-5BCF	8C7E
-5BD0	C3C2
-5BD1	8C80
-5BD2	BAAE
-5BD3	D4A2
-5BD4	8C81
-5BD5	8C82
-5BD6	8C83
-5BD7	8C84
-5BD8	8C85
-5BD9	8C86
-5BDA	8C87
-5BDB	8C88
-5BDC	8C89
-5BDD	C7DE
-5BDE	C4AF
-5BDF	B2EC
-5BE0	8C8A
-5BE1	B9D1
-5BE2	8C8B
-5BE3	8C8C
-5BE4	E5BB
-5BE5	C1C8
-5BE6	8C8D
-5BE7	8C8E
-5BE8	D5AF
-5BE9	8C8F
-5BEA	8C90
-5BEB	8C91
-5BEC	8C92
-5BED	8C93
-5BEE	E5BC
-5BEF	8C94
-5BF0	E5BE
-5BF1	8C95
-5BF2	8C96
-5BF3	8C97
-5BF4	8C98
-5BF5	8C99
-5BF6	8C9A
-5BF7	8C9B
-5BF8	B4E7
-5BF9	B6D4
-5BFA	CBC2
-5BFB	D1B0
-5BFC	B5BC
-5BFD	8C9C
-5BFE	8C9D
-5BFF	CAD9
-5C00	8C9E
-5C01	B7E2
-5C02	8C9F
-5C03	8CA0
-5C04	C9E4
-5C05	8CA1
-5C06	BDAB
-5C07	8CA2
-5C08	8CA3
-5C09	CEBE
-5C0A	D7F0
-5C0B	8CA4
-5C0C	8CA5
-5C0D	8CA6
-5C0E	8CA7
-5C0F	D0A1
-5C10	8CA8
-5C11	C9D9
-5C12	8CA9
-5C13	8CAA
-5C14	B6FB
-5C15	E6D8
-5C16	BCE2
-5C17	8CAB
-5C18	B3BE
-5C19	8CAC
-5C1A	C9D0
-5C1B	8CAD
-5C1C	E6D9
-5C1D	B3A2
-5C1E	8CAE
-5C1F	8CAF
-5C20	8CB0
-5C21	8CB1
-5C22	DECC
-5C23	8CB2
-5C24	D3C8
-5C25	DECD
-5C26	8CB3
-5C27	D2A2
-5C28	8CB4
-5C29	8CB5
-5C2A	8CB6
-5C2B	8CB7
-5C2C	DECE
-5C2D	8CB8
-5C2E	8CB9
-5C2F	8CBA
-5C30	8CBB
-5C31	BECD
-5C32	8CBC
-5C33	8CBD
-5C34	DECF
-5C35	8CBE
-5C36	8CBF
-5C37	8CC0
-5C38	CAAC
-5C39	D2FC
-5C3A	B3DF
-5C3B	E5EA
-5C3C	C4E1
-5C3D	BEA1
-5C3E	CEB2
-5C3F	C4F2
-5C40	BED6
-5C41	C6A8
-5C42	B2E3
-5C43	8CC1
-5C44	8CC2
-5C45	BED3
-5C46	8CC3
-5C47	8CC4
-5C48	C7FC
-5C49	CCEB
-5C4A	BDEC
-5C4B	CEDD
-5C4C	8CC5
-5C4D	8CC6
-5C4E	CABA
-5C4F	C6C1
-5C50	E5EC
-5C51	D0BC
-5C52	8CC7
-5C53	8CC8
-5C54	8CC9
-5C55	D5B9
-5C56	8CCA
-5C57	8CCB
-5C58	8CCC
-5C59	E5ED
-5C5A	8CCD
-5C5B	8CCE
-5C5C	8CCF
-5C5D	8CD0
-5C5E	CAF4
-5C5F	8CD1
-5C60	CDC0
-5C61	C2C5
-5C62	8CD2
-5C63	E5EF
-5C64	8CD3
-5C65	C2C4
-5C66	E5F0
-5C67	8CD4
-5C68	8CD5
-5C69	8CD6
-5C6A	8CD7
-5C6B	8CD8
-5C6C	8CD9
-5C6D	8CDA
-5C6E	E5F8
-5C6F	CDCD
-5C70	8CDB
-5C71	C9BD
-5C72	8CDC
-5C73	8CDD
-5C74	8CDE
-5C75	8CDF
-5C76	8CE0
-5C77	8CE1
-5C78	8CE2
-5C79	D2D9
-5C7A	E1A8
-5C7B	8CE3
-5C7C	8CE4
-5C7D	8CE5
-5C7E	8CE6
-5C7F	D3EC
-5C80	8CE7
-5C81	CBEA
-5C82	C6F1
-5C83	8CE8
-5C84	8CE9
-5C85	8CEA
-5C86	8CEB
-5C87	8CEC
-5C88	E1AC
-5C89	8CED
-5C8A	8CEE
-5C8B	8CEF
-5C8C	E1A7
-5C8D	E1A9
-5C8E	8CF0
-5C8F	8CF1
-5C90	E1AA
-5C91	E1AF
-5C92	8CF2
-5C93	8CF3
-5C94	B2ED
-5C95	8CF4
-5C96	E1AB
-5C97	B8DA
-5C98	E1AD
-5C99	E1AE
-5C9A	E1B0
-5C9B	B5BA
-5C9C	E1B1
-5C9D	8CF5
-5C9E	8CF6
-5C9F	8CF7
-5CA0	8CF8
-5CA1	8CF9
-5CA2	E1B3
-5CA3	E1B8
-5CA4	8CFA
-5CA5	8CFB
-5CA6	8CFC
-5CA7	8CFD
-5CA8	8CFE
-5CA9	D1D2
-5CAA	8D40
-5CAB	E1B6
-5CAC	E1B5
-5CAD	C1EB
-5CAE	8D41
-5CAF	8D42
-5CB0	8D43
-5CB1	E1B7
-5CB2	8D44
-5CB3	D4C0
-5CB4	8D45
-5CB5	E1B2
-5CB6	8D46
-5CB7	E1BA
-5CB8	B0B6
-5CB9	8D47
-5CBA	8D48
-5CBB	8D49
-5CBC	8D4A
-5CBD	E1B4
-5CBE	8D4B
-5CBF	BFF9
-5CC0	8D4C
-5CC1	E1B9
-5CC2	8D4D
-5CC3	8D4E
-5CC4	E1BB
-5CC5	8D4F
-5CC6	8D50
-5CC7	8D51
-5CC8	8D52
-5CC9	8D53
-5CCA	8D54
-5CCB	E1BE
-5CCC	8D55
-5CCD	8D56
-5CCE	8D57
-5CCF	8D58
-5CD0	8D59
-5CD1	8D5A
-5CD2	E1BC
-5CD3	8D5B
-5CD4	8D5C
-5CD5	8D5D
-5CD6	8D5E
-5CD7	8D5F
-5CD8	8D60
-5CD9	D6C5
-5CDA	8D61
-5CDB	8D62
-5CDC	8D63
-5CDD	8D64
-5CDE	8D65
-5CDF	8D66
-5CE0	8D67
-5CE1	CFBF
-5CE2	8D68
-5CE3	8D69
-5CE4	E1BD
-5CE5	E1BF
-5CE6	C2CD
-5CE7	8D6A
-5CE8	B6EB
-5CE9	8D6B
-5CEA	D3F8
-5CEB	8D6C
-5CEC	8D6D
-5CED	C7CD
-5CEE	8D6E
-5CEF	8D6F
-5CF0	B7E5
-5CF1	8D70
-5CF2	8D71
-5CF3	8D72
-5CF4	8D73
-5CF5	8D74
-5CF6	8D75
-5CF7	8D76
-5CF8	8D77
-5CF9	8D78
-5CFA	8D79
-5CFB	BEFE
-5CFC	8D7A
-5CFD	8D7B
-5CFE	8D7C
-5CFF	8D7D
-5D00	8D7E
-5D01	8D80
-5D02	E1C0
-5D03	E1C1
-5D04	8D81
-5D05	8D82
-5D06	E1C7
-5D07	B3E7
-5D08	8D83
-5D09	8D84
-5D0A	8D85
-5D0B	8D86
-5D0C	8D87
-5D0D	8D88
-5D0E	C6E9
-5D0F	8D89
-5D10	8D8A
-5D11	8D8B
-5D12	8D8C
-5D13	8D8D
-5D14	B4DE
-5D15	8D8E
-5D16	D1C2
-5D17	8D8F
-5D18	8D90
-5D19	8D91
-5D1A	8D92
-5D1B	E1C8
-5D1C	8D93
-5D1D	8D94
-5D1E	E1C6
-5D1F	8D95
-5D20	8D96
-5D21	8D97
-5D22	8D98
-5D23	8D99
-5D24	E1C5
-5D25	8D9A
-5D26	E1C3
-5D27	E1C2
-5D28	8D9B
-5D29	B1C0
-5D2A	8D9C
-5D2B	8D9D
-5D2C	8D9E
-5D2D	D5B8
-5D2E	E1C4
-5D2F	8D9F
-5D30	8DA0
-5D31	8DA1
-5D32	8DA2
-5D33	8DA3
-5D34	E1CB
-5D35	8DA4
-5D36	8DA5
-5D37	8DA6
-5D38	8DA7
-5D39	8DA8
-5D3A	8DA9
-5D3B	8DAA
-5D3C	8DAB
-5D3D	E1CC
-5D3E	E1CA
-5D3F	8DAC
-5D40	8DAD
-5D41	8DAE
-5D42	8DAF
-5D43	8DB0
-5D44	8DB1
-5D45	8DB2
-5D46	8DB3
-5D47	EFFA
-5D48	8DB4
-5D49	8DB5
-5D4A	E1D3
-5D4B	E1D2
-5D4C	C7B6
-5D4D	8DB6
-5D4E	8DB7
-5D4F	8DB8
-5D50	8DB9
-5D51	8DBA
-5D52	8DBB
-5D53	8DBC
-5D54	8DBD
-5D55	8DBE
-5D56	8DBF
-5D57	8DC0
-5D58	E1C9
-5D59	8DC1
-5D5A	8DC2
-5D5B	E1CE
-5D5C	8DC3
-5D5D	E1D0
-5D5E	8DC4
-5D5F	8DC5
-5D60	8DC6
-5D61	8DC7
-5D62	8DC8
-5D63	8DC9
-5D64	8DCA
-5D65	8DCB
-5D66	8DCC
-5D67	8DCD
-5D68	8DCE
-5D69	E1D4
-5D6A	8DCF
-5D6B	E1D1
-5D6C	E1CD
-5D6D	8DD0
-5D6E	8DD1
-5D6F	E1CF
-5D70	8DD2
-5D71	8DD3
-5D72	8DD4
-5D73	8DD5
-5D74	E1D5
-5D75	8DD6
-5D76	8DD7
-5D77	8DD8
-5D78	8DD9
-5D79	8DDA
-5D7A	8DDB
-5D7B	8DDC
-5D7C	8DDD
-5D7D	8DDE
-5D7E	8DDF
-5D7F	8DE0
-5D80	8DE1
-5D81	8DE2
-5D82	E1D6
-5D83	8DE3
-5D84	8DE4
-5D85	8DE5
-5D86	8DE6
-5D87	8DE7
-5D88	8DE8
-5D89	8DE9
-5D8A	8DEA
-5D8B	8DEB
-5D8C	8DEC
-5D8D	8DED
-5D8E	8DEE
-5D8F	8DEF
-5D90	8DF0
-5D91	8DF1
-5D92	8DF2
-5D93	8DF3
-5D94	8DF4
-5D95	8DF5
-5D96	8DF6
-5D97	8DF7
-5D98	8DF8
-5D99	E1D7
-5D9A	8DF9
-5D9B	8DFA
-5D9C	8DFB
-5D9D	E1D8
-5D9E	8DFC
-5D9F	8DFD
-5DA0	8DFE
-5DA1	8E40
-5DA2	8E41
-5DA3	8E42
-5DA4	8E43
-5DA5	8E44
-5DA6	8E45
-5DA7	8E46
-5DA8	8E47
-5DA9	8E48
-5DAA	8E49
-5DAB	8E4A
-5DAC	8E4B
-5DAD	8E4C
-5DAE	8E4D
-5DAF	8E4E
-5DB0	8E4F
-5DB1	8E50
-5DB2	8E51
-5DB3	8E52
-5DB4	8E53
-5DB5	8E54
-5DB6	8E55
-5DB7	E1DA
-5DB8	8E56
-5DB9	8E57
-5DBA	8E58
-5DBB	8E59
-5DBC	8E5A
-5DBD	8E5B
-5DBE	8E5C
-5DBF	8E5D
-5DC0	8E5E
-5DC1	8E5F
-5DC2	8E60
-5DC3	8E61
-5DC4	8E62
-5DC5	E1DB
-5DC6	8E63
-5DC7	8E64
-5DC8	8E65
-5DC9	8E66
-5DCA	8E67
-5DCB	8E68
-5DCC	8E69
-5DCD	CEA1
-5DCE	8E6A
-5DCF	8E6B
-5DD0	8E6C
-5DD1	8E6D
-5DD2	8E6E
-5DD3	8E6F
-5DD4	8E70
-5DD5	8E71
-5DD6	8E72
-5DD7	8E73
-5DD8	8E74
-5DD9	8E75
-5DDA	8E76
-5DDB	E7DD
-5DDC	8E77
-5DDD	B4A8
-5DDE	D6DD
-5DDF	8E78
-5DE0	8E79
-5DE1	D1B2
-5DE2	B3B2
-5DE3	8E7A
-5DE4	8E7B
-5DE5	B9A4
-5DE6	D7F3
-5DE7	C7C9
-5DE8	BEDE
-5DE9	B9AE
-5DEA	8E7C
-5DEB	CED7
-5DEC	8E7D
-5DED	8E7E
-5DEE	B2EE
-5DEF	DBCF
-5DF0	8E80
-5DF1	BCBA
-5DF2	D2D1
-5DF3	CBC8
-5DF4	B0CD
-5DF5	8E81
-5DF6	8E82
-5DF7	CFEF
-5DF8	8E83
-5DF9	8E84
-5DFA	8E85
-5DFB	8E86
-5DFC	8E87
-5DFD	D9E3
-5DFE	BDED
-5DFF	8E88
-5E00	8E89
-5E01	B1D2
-5E02	CAD0
-5E03	B2BC
-5E04	8E8A
-5E05	CBA7
-5E06	B7AB
-5E07	8E8B
-5E08	CAA6
-5E09	8E8C
-5E0A	8E8D
-5E0B	8E8E
-5E0C	CFA3
-5E0D	8E8F
-5E0E	8E90
-5E0F	E0F8
-5E10	D5CA
-5E11	E0FB
-5E12	8E91
-5E13	8E92
-5E14	E0FA
-5E15	C5C1
-5E16	CCFB
-5E17	8E93
-5E18	C1B1
-5E19	E0F9
-5E1A	D6E3
-5E1B	B2AF
-5E1C	D6C4
-5E1D	B5DB
-5E1E	8E94
-5E1F	8E95
-5E20	8E96
-5E21	8E97
-5E22	8E98
-5E23	8E99
-5E24	8E9A
-5E25	8E9B
-5E26	B4F8
-5E27	D6A1
-5E28	8E9C
-5E29	8E9D
-5E2A	8E9E
-5E2B	8E9F
-5E2C	8EA0
-5E2D	CFAF
-5E2E	B0EF
-5E2F	8EA1
-5E30	8EA2
-5E31	E0FC
-5E32	8EA3
-5E33	8EA4
-5E34	8EA5
-5E35	8EA6
-5E36	8EA7
-5E37	E1A1
-5E38	B3A3
-5E39	8EA8
-5E3A	8EA9
-5E3B	E0FD
-5E3C	E0FE
-5E3D	C3B1
-5E3E	8EAA
-5E3F	8EAB
-5E40	8EAC
-5E41	8EAD
-5E42	C3DD
-5E43	8EAE
-5E44	E1A2
-5E45	B7F9
-5E46	8EAF
-5E47	8EB0
-5E48	8EB1
-5E49	8EB2
-5E4A	8EB3
-5E4B	8EB4
-5E4C	BBCF
-5E4D	8EB5
-5E4E	8EB6
-5E4F	8EB7
-5E50	8EB8
-5E51	8EB9
-5E52	8EBA
-5E53	8EBB
-5E54	E1A3
-5E55	C4BB
-5E56	8EBC
-5E57	8EBD
-5E58	8EBE
-5E59	8EBF
-5E5A	8EC0
-5E5B	E1A4
-5E5C	8EC1
-5E5D	8EC2
-5E5E	E1A5
-5E5F	8EC3
-5E60	8EC4
-5E61	E1A6
-5E62	B4B1
-5E63	8EC5
-5E64	8EC6
-5E65	8EC7
-5E66	8EC8
-5E67	8EC9
-5E68	8ECA
-5E69	8ECB
-5E6A	8ECC
-5E6B	8ECD
-5E6C	8ECE
-5E6D	8ECF
-5E6E	8ED0
-5E6F	8ED1
-5E70	8ED2
-5E71	8ED3
-5E72	B8C9
-5E73	C6BD
-5E74	C4EA
-5E75	8ED4
-5E76	B2A2
-5E77	8ED5
-5E78	D0D2
-5E79	8ED6
-5E7A	E7DB
-5E7B	BBC3
-5E7C	D3D7
-5E7D	D3C4
-5E7E	8ED7
-5E7F	B9E3
-5E80	E2CF
-5E81	8ED8
-5E82	8ED9
-5E83	8EDA
-5E84	D7AF
-5E85	8EDB
-5E86	C7EC
-5E87	B1D3
-5E88	8EDC
-5E89	8EDD
-5E8A	B4B2
-5E8B	E2D1
-5E8C	8EDE
-5E8D	8EDF
-5E8E	8EE0
-5E8F	D0F2
-5E90	C2AE
-5E91	E2D0
-5E92	8EE1
-5E93	BFE2
-5E94	D3A6
-5E95	B5D7
-5E96	E2D2
-5E97	B5EA
-5E98	8EE2
-5E99	C3ED
-5E9A	B8FD
-5E9B	8EE3
-5E9C	B8AE
-5E9D	8EE4
-5E9E	C5D3
-5E9F	B7CF
-5EA0	E2D4
-5EA1	8EE5
-5EA2	8EE6
-5EA3	8EE7
-5EA4	8EE8
-5EA5	E2D3
-5EA6	B6C8
-5EA7	D7F9
-5EA8	8EE9
-5EA9	8EEA
-5EAA	8EEB
-5EAB	8EEC
-5EAC	8EED
-5EAD	CDA5
-5EAE	8EEE
-5EAF	8EEF
-5EB0	8EF0
-5EB1	8EF1
-5EB2	8EF2
-5EB3	E2D8
-5EB4	8EF3
-5EB5	E2D6
-5EB6	CAFC
-5EB7	BFB5
-5EB8	D3B9
-5EB9	E2D5
-5EBA	8EF4
-5EBB	8EF5
-5EBC	8EF6
-5EBD	8EF7
-5EBE	E2D7
-5EBF	8EF8
-5EC0	8EF9
-5EC1	8EFA
-5EC2	8EFB
-5EC3	8EFC
-5EC4	8EFD
-5EC5	8EFE
-5EC6	8F40
-5EC7	8F41
-5EC8	8F42
-5EC9	C1AE
-5ECA	C0C8
-5ECB	8F43
-5ECC	8F44
-5ECD	8F45
-5ECE	8F46
-5ECF	8F47
-5ED0	8F48
-5ED1	E2DB
-5ED2	E2DA
-5ED3	C0AA
-5ED4	8F49
-5ED5	8F4A
-5ED6	C1CE
-5ED7	8F4B
-5ED8	8F4C
-5ED9	8F4D
-5EDA	8F4E
-5EDB	E2DC
-5EDC	8F4F
-5EDD	8F50
-5EDE	8F51
-5EDF	8F52
-5EE0	8F53
-5EE1	8F54
-5EE2	8F55
-5EE3	8F56
-5EE4	8F57
-5EE5	8F58
-5EE6	8F59
-5EE7	8F5A
-5EE8	E2DD
-5EE9	8F5B
-5EEA	E2DE
-5EEB	8F5C
-5EEC	8F5D
-5EED	8F5E
-5EEE	8F5F
-5EEF	8F60
-5EF0	8F61
-5EF1	8F62
-5EF2	8F63
-5EF3	8F64
-5EF4	DBC8
-5EF5	8F65
-5EF6	D1D3
-5EF7	CDA2
-5EF8	8F66
-5EF9	8F67
-5EFA	BDA8
-5EFB	8F68
-5EFC	8F69
-5EFD	8F6A
-5EFE	DEC3
-5EFF	D8A5
-5F00	BFAA
-5F01	DBCD
-5F02	D2EC
-5F03	C6FA
-5F04	C5AA
-5F05	8F6B
-5F06	8F6C
-5F07	8F6D
-5F08	DEC4
-5F09	8F6E
-5F0A	B1D7
-5F0B	DFAE
-5F0C	8F6F
-5F0D	8F70
-5F0E	8F71
-5F0F	CABD
-5F10	8F72
-5F11	DFB1
-5F12	8F73
-5F13	B9AD
-5F14	8F74
-5F15	D2FD
-5F16	8F75
-5F17	B8A5
-5F18	BAEB
-5F19	8F76
-5F1A	8F77
-5F1B	B3DA
-5F1C	8F78
-5F1D	8F79
-5F1E	8F7A
-5F1F	B5DC
-5F20	D5C5
-5F21	8F7B
-5F22	8F7C
-5F23	8F7D
-5F24	8F7E
-5F25	C3D6
-5F26	CFD2
-5F27	BBA1
-5F28	8F80
-5F29	E5F3
-5F2A	E5F2
-5F2B	8F81
-5F2C	8F82
-5F2D	E5F4
-5F2E	8F83
-5F2F	CDE4
-5F30	8F84
-5F31	C8F5
-5F32	8F85
-5F33	8F86
-5F34	8F87
-5F35	8F88
-5F36	8F89
-5F37	8F8A
-5F38	8F8B
-5F39	B5AF
-5F3A	C7BF
-5F3B	8F8C
-5F3C	E5F6
-5F3D	8F8D
-5F3E	8F8E
-5F3F	8F8F
-5F40	ECB0
-5F41	8F90
-5F42	8F91
-5F43	8F92
-5F44	8F93
-5F45	8F94
-5F46	8F95
-5F47	8F96
-5F48	8F97
-5F49	8F98
-5F4A	8F99
-5F4B	8F9A
-5F4C	8F9B
-5F4D	8F9C
-5F4E	8F9D
-5F4F	8F9E
-5F50	E5E6
-5F51	8F9F
-5F52	B9E9
-5F53	B5B1
-5F54	8FA0
-5F55	C2BC
-5F56	E5E8
-5F57	E5E7
-5F58	E5E9
-5F59	8FA1
-5F5A	8FA2
-5F5B	8FA3
-5F5C	8FA4
-5F5D	D2CD
-5F5E	8FA5
-5F5F	8FA6
-5F60	8FA7
-5F61	E1EA
-5F62	D0CE
-5F63	8FA8
-5F64	CDAE
-5F65	8FA9
-5F66	D1E5
-5F67	8FAA
-5F68	8FAB
-5F69	B2CA
-5F6A	B1EB
-5F6B	8FAC
-5F6C	B1F2
-5F6D	C5ED
-5F6E	8FAD
-5F6F	8FAE
-5F70	D5C3
-5F71	D3B0
-5F72	8FAF
-5F73	E1DC
-5F74	8FB0
-5F75	8FB1
-5F76	8FB2
-5F77	E1DD
-5F78	8FB3
-5F79	D2DB
-5F7A	8FB4
-5F7B	B3B9
-5F7C	B1CB
-5F7D	8FB5
-5F7E	8FB6
-5F7F	8FB7
-5F80	CDF9
-5F81	D5F7
-5F82	E1DE
-5F83	8FB8
-5F84	BEB6
-5F85	B4FD
-5F86	8FB9
-5F87	E1DF
-5F88	BADC
-5F89	E1E0
-5F8A	BBB2
-5F8B	C2C9
-5F8C	E1E1
-5F8D	8FBA
-5F8E	8FBB
-5F8F	8FBC
-5F90	D0EC
-5F91	8FBD
-5F92	CDBD
-5F93	8FBE
-5F94	8FBF
-5F95	E1E2
-5F96	8FC0
-5F97	B5C3
-5F98	C5C7
-5F99	E1E3
-5F9A	8FC1
-5F9B	8FC2
-5F9C	E1E4
-5F9D	8FC3
-5F9E	8FC4
-5F9F	8FC5
-5FA0	8FC6
-5FA1	D3F9
-5FA2	8FC7
-5FA3	8FC8
-5FA4	8FC9
-5FA5	8FCA
-5FA6	8FCB
-5FA7	8FCC
-5FA8	E1E5
-5FA9	8FCD
-5FAA	D1AD
-5FAB	8FCE
-5FAC	8FCF
-5FAD	E1E6
-5FAE	CEA2
-5FAF	8FD0
-5FB0	8FD1
-5FB1	8FD2
-5FB2	8FD3
-5FB3	8FD4
-5FB4	8FD5
-5FB5	E1E7
-5FB6	8FD6
-5FB7	B5C2
-5FB8	8FD7
-5FB9	8FD8
-5FBA	8FD9
-5FBB	8FDA
-5FBC	E1E8
-5FBD	BBD5
-5FBE	8FDB
-5FBF	8FDC
-5FC0	8FDD
-5FC1	8FDE
-5FC2	8FDF
-5FC3	D0C4
-5FC4	E2E0
-5FC5	B1D8
-5FC6	D2E4
-5FC7	8FE0
-5FC8	8FE1
-5FC9	E2E1
-5FCA	8FE2
-5FCB	8FE3
-5FCC	BCC9
-5FCD	C8CC
-5FCE	8FE4
-5FCF	E2E3
-5FD0	ECFE
-5FD1	ECFD
-5FD2	DFAF
-5FD3	8FE5
-5FD4	8FE6
-5FD5	8FE7
-5FD6	E2E2
-5FD7	D6BE
-5FD8	CDFC
-5FD9	C3A6
-5FDA	8FE8
-5FDB	8FE9
-5FDC	8FEA
-5FDD	E3C3
-5FDE	8FEB
-5FDF	8FEC
-5FE0	D6D2
-5FE1	E2E7
-5FE2	8FED
-5FE3	8FEE
-5FE4	E2E8
-5FE5	8FEF
-5FE6	8FF0
-5FE7	D3C7
-5FE8	8FF1
-5FE9	8FF2
-5FEA	E2EC
-5FEB	BFEC
-5FEC	8FF3
-5FED	E2ED
-5FEE	E2E5
-5FEF	8FF4
-5FF0	8FF5
-5FF1	B3C0
-5FF2	8FF6
-5FF3	8FF7
-5FF4	8FF8
-5FF5	C4EE
-5FF6	8FF9
-5FF7	8FFA
-5FF8	E2EE
-5FF9	8FFB
-5FFA	8FFC
-5FFB	D0C3
-5FFC	8FFD
-5FFD	BAF6
-5FFE	E2E9
-5FFF	B7DE
-6000	BBB3
-6001	CCAC
-6002	CBCB
-6003	E2E4
-6004	E2E6
-6005	E2EA
-6006	E2EB
-6007	8FFE
-6008	9040
-6009	9041
-600A	E2F7
-600B	9042
-600C	9043
-600D	E2F4
-600E	D4F5
-600F	E2F3
-6010	9044
-6011	9045
-6012	C5AD
-6013	9046
-6014	D5FA
-6015	C5C2
-6016	B2C0
-6017	9047
-6018	9048
-6019	E2EF
-601A	9049
-601B	E2F2
-601C	C1AF
-601D	CBBC
-601E	904A
-601F	904B
-6020	B5A1
-6021	E2F9
-6022	904C
-6023	904D
-6024	904E
-6025	BCB1
-6026	E2F1
-6027	D0D4
-6028	D4B9
-6029	E2F5
-602A	B9D6
-602B	E2F6
-602C	904F
-602D	9050
-602E	9051
-602F	C7D3
-6030	9052
-6031	9053
-6032	9054
-6033	9055
-6034	9056
-6035	E2F0
-6036	9057
-6037	9058
-6038	9059
-6039	905A
-603A	905B
-603B	D7DC
-603C	EDA1
-603D	905C
-603E	905D
-603F	E2F8
-6040	905E
-6041	EDA5
-6042	E2FE
-6043	CAD1
-6044	905F
-6045	9060
-6046	9061
-6047	9062
-6048	9063
-6049	9064
-604A	9065
-604B	C1B5
-604C	9066
-604D	BBD0
-604E	9067
-604F	9068
-6050	BFD6
-6051	9069
-6052	BAE3
-6053	906A
-6054	906B
-6055	CBA1
-6056	906C
-6057	906D
-6058	906E
-6059	EDA6
-605A	EDA3
-605B	906F
-605C	9070
-605D	EDA2
-605E	9071
-605F	9072
-6060	9073
-6061	9074
-6062	BBD6
-6063	EDA7
-6064	D0F4
-6065	9075
-6066	9076
-6067	EDA4
-6068	BADE
-6069	B6F7
-606A	E3A1
-606B	B6B2
-606C	CCF1
-606D	B9A7
-606E	9077
-606F	CFA2
-6070	C7A1
-6071	9078
-6072	9079
-6073	BFD2
-6074	907A
-6075	907B
-6076	B6F1
-6077	907C
-6078	E2FA
-6079	E2FB
-607A	E2FD
-607B	E2FC
-607C	C4D5
-607D	E3A2
-607E	907D
-607F	D3C1
-6080	907E
-6081	9080
-6082	9081
-6083	E3A7
-6084	C7C4
-6085	9082
-6086	9083
-6087	9084
-6088	9085
-6089	CFA4
-608A	9086
-608B	9087
-608C	E3A9
-608D	BAB7
-608E	9088
-608F	9089
-6090	908A
-6091	908B
-6092	E3A8
-6093	908C
-6094	BBDA
-6095	908D
-6096	E3A3
-6097	908E
-6098	908F
-6099	9090
-609A	E3A4
-609B	E3AA
-609C	9091
-609D	E3A6
-609E	9092
-609F	CEF2
-60A0	D3C6
-60A1	9093
-60A2	9094
-60A3	BBBC
-60A4	9095
-60A5	9096
-60A6	D4C3
-60A7	9097
-60A8	C4FA
-60A9	9098
-60AA	9099
-60AB	EDA8
-60AC	D0FC
-60AD	E3A5
-60AE	909A
-60AF	C3F5
-60B0	909B
-60B1	E3AD
-60B2	B1AF
-60B3	909C
-60B4	E3B2
-60B5	909D
-60B6	909E
-60B7	909F
-60B8	BCC2
-60B9	90A0
-60BA	90A1
-60BB	E3AC
-60BC	B5BF
-60BD	90A2
-60BE	90A3
-60BF	90A4
-60C0	90A5
-60C1	90A6
-60C2	90A7
-60C3	90A8
-60C4	90A9
-60C5	C7E9
-60C6	E3B0
-60C7	90AA
-60C8	90AB
-60C9	90AC
-60CA	BEAA
-60CB	CDEF
-60CC	90AD
-60CD	90AE
-60CE	90AF
-60CF	90B0
-60D0	90B1
-60D1	BBF3
-60D2	90B2
-60D3	90B3
-60D4	90B4
-60D5	CCE8
-60D6	90B5
-60D7	90B6
-60D8	E3AF
-60D9	90B7
-60DA	E3B1
-60DB	90B8
-60DC	CFA7
-60DD	E3AE
-60DE	90B9
-60DF	CEA9
-60E0	BBDD
-60E1	90BA
-60E2	90BB
-60E3	90BC
-60E4	90BD
-60E5	90BE
-60E6	B5EB
-60E7	BEE5
-60E8	B2D2
-60E9	B3CD
-60EA	90BF
-60EB	B1B9
-60EC	E3AB
-60ED	B2D1
-60EE	B5AC
-60EF	B9DF
-60F0	B6E8
-60F1	90C0
-60F2	90C1
-60F3	CFEB
-60F4	E3B7
-60F5	90C2
-60F6	BBCC
-60F7	90C3
-60F8	90C4
-60F9	C8C7
-60FA	D0CA
-60FB	90C5
-60FC	90C6
-60FD	90C7
-60FE	90C8
-60FF	90C9
-6100	E3B8
-6101	B3EE
-6102	90CA
-6103	90CB
-6104	90CC
-6105	90CD
-6106	EDA9
-6107	90CE
-6108	D3FA
-6109	D3E4
-610A	90CF
-610B	90D0
-610C	90D1
-610D	EDAA
-610E	E3B9
-610F	D2E2
-6110	90D2
-6111	90D3
-6112	90D4
-6113	90D5
-6114	90D6
-6115	E3B5
-6116	90D7
-6117	90D8
-6118	90D9
-6119	90DA
-611A	D3DE
-611B	90DB
-611C	90DC
-611D	90DD
-611E	90DE
-611F	B8D0
-6120	E3B3
-6121	90DF
-6122	90E0
-6123	E3B6
-6124	B7DF
-6125	90E1
-6126	E3B4
-6127	C0A2
-6128	90E2
-6129	90E3
-612A	90E4
-612B	E3BA
-612C	90E5
-612D	90E6
-612E	90E7
-612F	90E8
-6130	90E9
-6131	90EA
-6132	90EB
-6133	90EC
-6134	90ED
-6135	90EE
-6136	90EF
-6137	90F0
-6138	90F1
-6139	90F2
-613A	90F3
-613B	90F4
-613C	90F5
-613D	90F6
-613E	90F7
-613F	D4B8
-6140	90F8
-6141	90F9
-6142	90FA
-6143	90FB
-6144	90FC
-6145	90FD
-6146	90FE
-6147	9140
-6148	B4C8
-6149	9141
-614A	E3BB
-614B	9142
-614C	BBC5
-614D	9143
-614E	C9F7
-614F	9144
-6150	9145
-6151	C9E5
-6152	9146
-6153	9147
-6154	9148
-6155	C4BD
-6156	9149
-6157	914A
-6158	914B
-6159	914C
-615A	914D
-615B	914E
-615C	914F
-615D	EDAB
-615E	9150
-615F	9151
-6160	9152
-6161	9153
-6162	C2FD
-6163	9154
-6164	9155
-6165	9156
-6166	9157
-6167	BBDB
-6168	BFAE
-6169	9158
-616A	9159
-616B	915A
-616C	915B
-616D	915C
-616E	915D
-616F	915E
-6170	CEBF
-6171	915F
-6172	9160
-6173	9161
-6174	9162
-6175	E3BC
-6176	9163
-6177	BFB6
-6178	9164
-6179	9165
-617A	9166
-617B	9167
-617C	9168
-617D	9169
-617E	916A
-617F	916B
-6180	916C
-6181	916D
-6182	916E
-6183	916F
-6184	9170
-6185	9171
-6186	9172
-6187	9173
-6188	9174
-6189	9175
-618A	9176
-618B	B1EF
-618C	9177
-618D	9178
-618E	D4F7
-618F	9179
-6190	917A
-6191	917B
-6192	917C
-6193	917D
-6194	E3BE
-6195	917E
-6196	9180
-6197	9181
-6198	9182
-6199	9183
-619A	9184
-619B	9185
-619C	9186
-619D	EDAD
-619E	9187
-619F	9188
-61A0	9189
-61A1	918A
-61A2	918B
-61A3	918C
-61A4	918D
-61A5	918E
-61A6	918F
-61A7	E3BF
-61A8	BAA9
-61A9	EDAC
-61AA	9190
-61AB	9191
-61AC	E3BD
-61AD	9192
-61AE	9193
-61AF	9194
-61B0	9195
-61B1	9196
-61B2	9197
-61B3	9198
-61B4	9199
-61B5	919A
-61B6	919B
-61B7	E3C0
-61B8	919C
-61B9	919D
-61BA	919E
-61BB	919F
-61BC	91A0
-61BD	91A1
-61BE	BAB6
-61BF	91A2
-61C0	91A3
-61C1	91A4
-61C2	B6AE
-61C3	91A5
-61C4	91A6
-61C5	91A7
-61C6	91A8
-61C7	91A9
-61C8	D0B8
-61C9	91AA
-61CA	B0C3
-61CB	EDAE
-61CC	91AB
-61CD	91AC
-61CE	91AD
-61CF	91AE
-61D0	91AF
-61D1	EDAF
-61D2	C0C1
-61D3	91B0
-61D4	E3C1
-61D5	91B1
-61D6	91B2
-61D7	91B3
-61D8	91B4
-61D9	91B5
-61DA	91B6
-61DB	91B7
-61DC	91B8
-61DD	91B9
-61DE	91BA
-61DF	91BB
-61E0	91BC
-61E1	91BD
-61E2	91BE
-61E3	91BF
-61E4	91C0
-61E5	91C1
-61E6	C5B3
-61E7	91C2
-61E8	91C3
-61E9	91C4
-61EA	91C5
-61EB	91C6
-61EC	91C7
-61ED	91C8
-61EE	91C9
-61EF	91CA
-61F0	91CB
-61F1	91CC
-61F2	91CD
-61F3	91CE
-61F4	91CF
-61F5	E3C2
-61F6	91D0
-61F7	91D1
-61F8	91D2
-61F9	91D3
-61FA	91D4
-61FB	91D5
-61FC	91D6
-61FD	91D7
-61FE	91D8
-61FF	DCB2
-6200	91D9
-6201	91DA
-6202	91DB
-6203	91DC
-6204	91DD
-6205	91DE
-6206	EDB0
-6207	91DF
-6208	B8EA
-6209	91E0
-620A	CEEC
-620B	EAA7
-620C	D0E7
-620D	CAF9
-620E	C8D6
-620F	CFB7
-6210	B3C9
-6211	CED2
-6212	BDE4
-6213	91E1
-6214	91E2
-6215	E3DE
-6216	BBF2
-6217	EAA8
-6218	D5BD
-6219	91E3
-621A	C6DD
-621B	EAA9
-621C	91E4
-621D	91E5
-621E	91E6
-621F	EAAA
-6220	91E7
-6221	EAAC
-6222	EAAB
-6223	91E8
-6224	EAAE
-6225	EAAD
-6226	91E9
-6227	91EA
-6228	91EB
-6229	91EC
-622A	BDD8
-622B	91ED
-622C	EAAF
-622D	91EE
-622E	C2BE
-622F	91EF
-6230	91F0
-6231	91F1
-6232	91F2
-6233	B4C1
-6234	B4F7
-6235	91F3
-6236	91F4
-6237	BBA7
-6238	91F5
-6239	91F6
-623A	91F7
-623B	91F8
-623C	91F9
-623D	ECE6
-623E	ECE5
-623F	B7BF
-6240	CBF9
-6241	B1E2
-6242	91FA
-6243	ECE7
-6244	91FB
-6245	91FC
-6246	91FD
-6247	C9C8
-6248	ECE8
-6249	ECE9
-624A	91FE
-624B	CAD6
-624C	DED0
-624D	B2C5
-624E	D4FA
-624F	9240
-6250	9241
-6251	C6CB
-6252	B0C7
-6253	B4F2
-6254	C8D3
-6255	9242
-6256	9243
-6257	9244
-6258	CDD0
-6259	9245
-625A	9246
-625B	BFB8
-625C	9247
-625D	9248
-625E	9249
-625F	924A
-6260	924B
-6261	924C
-6262	924D
-6263	BFDB
-6264	924E
-6265	924F
-6266	C7A4
-6267	D6B4
-6268	9250
-6269	C0A9
-626A	DED1
-626B	C9A8
-626C	D1EF
-626D	C5A4
-626E	B0E7
-626F	B3B6
-6270	C8C5
-6271	9251
-6272	9252
-6273	B0E2
-6274	9253
-6275	9254
-6276	B7F6
-6277	9255
-6278	9256
-6279	C5FA
-627A	9257
-627B	9258
-627C	B6F3
-627D	9259
-627E	D5D2
-627F	B3D0
-6280	BCBC
-6281	925A
-6282	925B
-6283	925C
-6284	B3AD
-6285	925D
-6286	925E
-6287	925F
-6288	9260
-6289	BEF1
-628A	B0D1
-628B	9261
-628C	9262
-628D	9263
-628E	9264
-628F	9265
-6290	9266
-6291	D2D6
-6292	CAE3
-6293	D7A5
-6294	9267
-6295	CDB6
-6296	B6B6
-6297	BFB9
-6298	D5DB
-6299	9268
-629A	B8A7
-629B	C5D7
-629C	9269
-629D	926A
-629E	926B
-629F	DED2
-62A0	BFD9
-62A1	C2D5
-62A2	C7C0
-62A3	926C
-62A4	BBA4
-62A5	B1A8
-62A6	926D
-62A7	926E
-62A8	C5EA
-62A9	926F
-62AA	9270
-62AB	C5FB
-62AC	CCA7
-62AD	9271
-62AE	9272
-62AF	9273
-62B0	9274
-62B1	B1A7
-62B2	9275
-62B3	9276
-62B4	9277
-62B5	B5D6
-62B6	9278
-62B7	9279
-62B8	927A
-62B9	C4A8
-62BA	927B
-62BB	DED3
-62BC	D1BA
-62BD	B3E9
-62BE	927C
-62BF	C3F2
-62C0	927D
-62C1	927E
-62C2	B7F7
-62C3	9280
-62C4	D6F4
-62C5	B5A3
-62C6	B2F0
-62C7	C4B4
-62C8	C4E9
-62C9	C0AD
-62CA	DED4
-62CB	9281
-62CC	B0E8
-62CD	C5C4
-62CE	C1E0
-62CF	9282
-62D0	B9D5
-62D1	9283
-62D2	BEDC
-62D3	CDD8
-62D4	B0CE
-62D5	9284
-62D6	CDCF
-62D7	DED6
-62D8	BED0
-62D9	D7BE
-62DA	DED5
-62DB	D5D0
-62DC	B0DD
-62DD	9285
-62DE	9286
-62DF	C4E2
-62E0	9287
-62E1	9288
-62E2	C2A3
-62E3	BCF0
-62E4	9289
-62E5	D3B5
-62E6	C0B9
-62E7	C5A1
-62E8	B2A6
-62E9	D4F1
-62EA	928A
-62EB	928B
-62EC	C0A8
-62ED	CAC3
-62EE	DED7
-62EF	D5FC
-62F0	928C
-62F1	B9B0
-62F2	928D
-62F3	C8AD
-62F4	CBA9
-62F5	928E
-62F6	DED9
-62F7	BFBD
-62F8	928F
-62F9	9290
-62FA	9291
-62FB	9292
-62FC	C6B4
-62FD	D7A7
-62FE	CAB0
-62FF	C4C3
-6300	9293
-6301	B3D6
-6302	B9D2
-6303	9294
-6304	9295
-6305	9296
-6306	9297
-6307	D6B8
-6308	EAFC
-6309	B0B4
-630A	9298
-630B	9299
-630C	929A
-630D	929B
-630E	BFE6
-630F	929C
-6310	929D
-6311	CCF4
-6312	929E
-6313	929F
-6314	92A0
-6315	92A1
-6316	CDDA
-6317	92A2
-6318	92A3
-6319	92A4
-631A	D6BF
-631B	C2CE
-631C	92A5
-631D	CECE
-631E	CCA2
-631F	D0AE
-6320	C4D3
-6321	B5B2
-6322	DED8
-6323	D5F5
-6324	BCB7
-6325	BBD3
-6326	92A6
-6327	92A7
-6328	B0A4
-6329	92A8
-632A	C5B2
-632B	B4EC
-632C	92A9
-632D	92AA
-632E	92AB
-632F	D5F1
-6330	92AC
-6331	92AD
-6332	EAFD
-6333	92AE
-6334	92AF
-6335	92B0
-6336	92B1
-6337	92B2
-6338	92B3
-6339	DEDA
-633A	CDA6
-633B	92B4
-633C	92B5
-633D	CDEC
-633E	92B6
-633F	92B7
-6340	92B8
-6341	92B9
-6342	CEE6
-6343	DEDC
-6344	92BA
-6345	CDB1
-6346	C0A6
-6347	92BB
-6348	92BC
-6349	D7BD
-634A	92BD
-634B	DEDB
-634C	B0C6
-634D	BAB4
-634E	C9D3
-634F	C4F3
-6350	BEE8
-6351	92BE
-6352	92BF
-6353	92C0
-6354	92C1
-6355	B2B6
-6356	92C2
-6357	92C3
-6358	92C4
-6359	92C5
-635A	92C6
-635B	92C7
-635C	92C8
-635D	92C9
-635E	C0CC
-635F	CBF0
-6360	92CA
-6361	BCF1
-6362	BBBB
-6363	B5B7
-6364	92CB
-6365	92CC
-6366	92CD
-6367	C5F5
-6368	92CE
-6369	DEE6
-636A	92CF
-636B	92D0
-636C	92D1
-636D	DEE3
-636E	BEDD
-636F	92D2
-6370	92D3
-6371	DEDF
-6372	92D4
-6373	92D5
-6374	92D6
-6375	92D7
-6376	B4B7
-6377	BDDD
-6378	92D8
-6379	92D9
-637A	DEE0
-637B	C4ED
-637C	92DA
-637D	92DB
-637E	92DC
-637F	92DD
-6380	CFC6
-6381	92DE
-6382	B5E0
-6383	92DF
-6384	92E0
-6385	92E1
-6386	92E2
-6387	B6DE
-6388	CADA
-6389	B5F4
-638A	DEE5
-638B	92E3
-638C	D5C6
-638D	92E4
-638E	DEE1
-638F	CCCD
-6390	C6FE
-6391	92E5
-6392	C5C5
-6393	92E6
-6394	92E7
-6395	92E8
-6396	D2B4
-6397	92E9
-6398	BEF2
-6399	92EA
-639A	92EB
-639B	92EC
-639C	92ED
-639D	92EE
-639E	92EF
-639F	92F0
-63A0	C2D3
-63A1	92F1
-63A2	CCBD
-63A3	B3B8
-63A4	92F2
-63A5	BDD3
-63A6	92F3
-63A7	BFD8
-63A8	CDC6
-63A9	D1DA
-63AA	B4EB
-63AB	92F4
-63AC	DEE4
-63AD	DEDD
-63AE	DEE7
-63AF	92F5
-63B0	EAFE
-63B1	92F6
-63B2	92F7
-63B3	C2B0
-63B4	DEE2
-63B5	92F8
-63B6	92F9
-63B7	D6C0
-63B8	B5A7
-63B9	92FA
-63BA	B2F4
-63BB	92FB
-63BC	DEE8
-63BD	92FC
-63BE	DEF2
-63BF	92FD
-63C0	92FE
-63C1	9340
-63C2	9341
-63C3	9342
-63C4	DEED
-63C5	9343
-63C6	DEF1
-63C7	9344
-63C8	9345
-63C9	C8E0
-63CA	9346
-63CB	9347
-63CC	9348
-63CD	D7E1
-63CE	DEEF
-63CF	C3E8
-63D0	CCE1
-63D1	9349
-63D2	B2E5
-63D3	934A
-63D4	934B
-63D5	934C
-63D6	D2BE
-63D7	934D
-63D8	934E
-63D9	934F
-63DA	9350
-63DB	9351
-63DC	9352
-63DD	9353
-63DE	DEEE
-63DF	9354
-63E0	DEEB
-63E1	CED5
-63E2	9355
-63E3	B4A7
-63E4	9356
-63E5	9357
-63E6	9358
-63E7	9359
-63E8	935A
-63E9	BFAB
-63EA	BEBE
-63EB	935B
-63EC	935C
-63ED	BDD2
-63EE	935D
-63EF	935E
-63F0	935F
-63F1	9360
-63F2	DEE9
-63F3	9361
-63F4	D4AE
-63F5	9362
-63F6	DEDE
-63F7	9363
-63F8	DEEA
-63F9	9364
-63FA	9365
-63FB	9366
-63FC	9367
-63FD	C0BF
-63FE	9368
-63FF	DEEC
-6400	B2F3
-6401	B8E9
-6402	C2A7
-6403	9369
-6404	936A
-6405	BDC1
-6406	936B
-6407	936C
-6408	936D
-6409	936E
-640A	936F
-640B	DEF5
-640C	DEF8
-640D	9370
-640E	9371
-640F	B2AB
-6410	B4A4
-6411	9372
-6412	9373
-6413	B4EA
-6414	C9A6
-6415	9374
-6416	9375
-6417	9376
-6418	9377
-6419	9378
-641A	9379
-641B	DEF6
-641C	CBD1
-641D	937A
-641E	B8E3
-641F	937B
-6420	DEF7
-6421	DEFA
-6422	937C
-6423	937D
-6424	937E
-6425	9380
-6426	DEF9
-6427	9381
-6428	9382
-6429	9383
-642A	CCC2
-642B	9384
-642C	B0E1
-642D	B4EE
-642E	9385
-642F	9386
-6430	9387
-6431	9388
-6432	9389
-6433	938A
-6434	E5BA
-6435	938B
-6436	938C
-6437	938D
-6438	938E
-6439	938F
-643A	D0AF
-643B	9390
-643C	9391
-643D	B2EB
-643E	9392
-643F	EBA1
-6440	9393
-6441	DEF4
-6442	9394
-6443	9395
-6444	C9E3
-6445	DEF3
-6446	B0DA
-6447	D2A1
-6448	B1F7
-6449	9396
-644A	CCAF
-644B	9397
-644C	9398
-644D	9399
-644E	939A
-644F	939B
-6450	939C
-6451	939D
-6452	DEF0
-6453	939E
-6454	CBA4
-6455	939F
-6456	93A0
-6457	93A1
-6458	D5AA
-6459	93A2
-645A	93A3
-645B	93A4
-645C	93A5
-645D	93A6
-645E	DEFB
-645F	93A7
-6460	93A8
-6461	93A9
-6462	93AA
-6463	93AB
-6464	93AC
-6465	93AD
-6466	93AE
-6467	B4DD
-6468	93AF
-6469	C4A6
-646A	93B0
-646B	93B1
-646C	93B2
-646D	DEFD
-646E	93B3
-646F	93B4
-6470	93B5
-6471	93B6
-6472	93B7
-6473	93B8
-6474	93B9
-6475	93BA
-6476	93BB
-6477	93BC
-6478	C3FE
-6479	C4A1
-647A	DFA1
-647B	93BD
-647C	93BE
-647D	93BF
-647E	93C0
-647F	93C1
-6480	93C2
-6481	93C3
-6482	C1CC
-6483	93C4
-6484	DEFC
-6485	BEEF
-6486	93C5
-6487	C6B2
-6488	93C6
-6489	93C7
-648A	93C8
-648B	93C9
-648C	93CA
-648D	93CB
-648E	93CC
-648F	93CD
-6490	93CE
-6491	B3C5
-6492	C8F6
-6493	93CF
-6494	93D0
-6495	CBBA
-6496	DEFE
-6497	93D1
-6498	93D2
-6499	DFA4
-649A	93D3
-649B	93D4
-649C	93D5
-649D	93D6
-649E	D7B2
-649F	93D7
-64A0	93D8
-64A1	93D9
-64A2	93DA
-64A3	93DB
-64A4	B3B7
-64A5	93DC
-64A6	93DD
-64A7	93DE
-64A8	93DF
-64A9	C1C3
-64AA	93E0
-64AB	93E1
-64AC	C7CB
-64AD	B2A5
-64AE	B4E9
-64AF	93E2
-64B0	D7AB
-64B1	93E3
-64B2	93E4
-64B3	93E5
-64B4	93E6
-64B5	C4EC
-64B6	93E7
-64B7	DFA2
-64B8	DFA3
-64B9	93E8
-64BA	DFA5
-64BB	93E9
-64BC	BAB3
-64BD	93EA
-64BE	93EB
-64BF	93EC
-64C0	DFA6
-64C1	93ED
-64C2	C0DE
-64C3	93EE
-64C4	93EF
-64C5	C9C3
-64C6	93F0
-64C7	93F1
-64C8	93F2
-64C9	93F3
-64CA	93F4
-64CB	93F5
-64CC	93F6
-64CD	B2D9
-64CE	C7E6
-64CF	93F7
-64D0	DFA7
-64D1	93F8
-64D2	C7DC
-64D3	93F9
-64D4	93FA
-64D5	93FB
-64D6	93FC
-64D7	DFA8
-64D8	EBA2
-64D9	93FD
-64DA	93FE
-64DB	9440
-64DC	9441
-64DD	9442
-64DE	CBD3
-64DF	9443
-64E0	9444
-64E1	9445
-64E2	DFAA
-64E3	9446
-64E4	DFA9
-64E5	9447
-64E6	B2C1
-64E7	9448
-64E8	9449
-64E9	944A
-64EA	944B
-64EB	944C
-64EC	944D
-64ED	944E
-64EE	944F
-64EF	9450
-64F0	9451
-64F1	9452
-64F2	9453
-64F3	9454
-64F4	9455
-64F5	9456
-64F6	9457
-64F7	9458
-64F8	9459
-64F9	945A
-64FA	945B
-64FB	945C
-64FC	945D
-64FD	945E
-64FE	945F
-64FF	9460
-6500	C5CA
-6501	9461
-6502	9462
-6503	9463
-6504	9464
-6505	9465
-6506	9466
-6507	9467
-6508	9468
-6509	DFAB
-650A	9469
-650B	946A
-650C	946B
-650D	946C
-650E	946D
-650F	946E
-6510	946F
-6511	9470
-6512	D4DC
-6513	9471
-6514	9472
-6515	9473
-6516	9474
-6517	9475
-6518	C8C1
-6519	9476
-651A	9477
-651B	9478
-651C	9479
-651D	947A
-651E	947B
-651F	947C
-6520	947D
-6521	947E
-6522	9480
-6523	9481
-6524	9482
-6525	DFAC
-6526	9483
-6527	9484
-6528	9485
-6529	9486
-652A	9487
-652B	BEF0
-652C	9488
-652D	9489
-652E	DFAD
-652F	D6A7
-6530	948A
-6531	948B
-6532	948C
-6533	948D
-6534	EAB7
-6535	EBB6
-6536	CAD5
-6537	948E
-6538	D8FC
-6539	B8C4
-653A	948F
-653B	B9A5
-653C	9490
-653D	9491
-653E	B7C5
-653F	D5FE
-6540	9492
-6541	9493
-6542	9494
-6543	9495
-6544	9496
-6545	B9CA
-6546	9497
-6547	9498
-6548	D0A7
-6549	F4CD
-654A	9499
-654B	949A
-654C	B5D0
-654D	949B
-654E	949C
-654F	C3F4
-6550	949D
-6551	BEC8
-6552	949E
-6553	949F
-6554	94A0
-6555	EBB7
-6556	B0BD
-6557	94A1
-6558	94A2
-6559	BDCC
-655A	94A3
-655B	C1B2
-655C	94A4
-655D	B1D6
-655E	B3A8
-655F	94A5
-6560	94A6
-6561	94A7
-6562	B8D2
-6563	C9A2
-6564	94A8
-6565	94A9
-6566	B6D8
-6567	94AA
-6568	94AB
-6569	94AC
-656A	94AD
-656B	EBB8
-656C	BEB4
-656D	94AE
-656E	94AF
-656F	94B0
-6570	CAFD
-6571	94B1
-6572	C7C3
-6573	94B2
-6574	D5FB
-6575	94B3
-6576	94B4
-6577	B7F3
-6578	94B5
-6579	94B6
-657A	94B7
-657B	94B8
-657C	94B9
-657D	94BA
-657E	94BB
-657F	94BC
-6580	94BD
-6581	94BE
-6582	94BF
-6583	94C0
-6584	94C1
-6585	94C2
-6586	94C3
-6587	CEC4
-6588	94C4
-6589	94C5
-658A	94C6
-658B	D5AB
-658C	B1F3
-658D	94C7
-658E	94C8
-658F	94C9
-6590	ECB3
-6591	B0DF
-6592	94CA
-6593	ECB5
-6594	94CB
-6595	94CC
-6596	94CD
-6597	B6B7
-6598	94CE
-6599	C1CF
-659A	94CF
-659B	F5FA
-659C	D0B1
-659D	94D0
-659E	94D1
-659F	D5E5
-65A0	94D2
-65A1	CED3
-65A2	94D3
-65A3	94D4
-65A4	BDEF
-65A5	B3E2
-65A6	94D5
-65A7	B8AB
-65A8	94D6
-65A9	D5B6
-65AA	94D7
-65AB	EDBD
-65AC	94D8
-65AD	B6CF
-65AE	94D9
-65AF	CBB9
-65B0	D0C2
-65B1	94DA
-65B2	94DB
-65B3	94DC
-65B4	94DD
-65B5	94DE
-65B6	94DF
-65B7	94E0
-65B8	94E1
-65B9	B7BD
-65BA	94E2
-65BB	94E3
-65BC	ECB6
-65BD	CAA9
-65BE	94E4
-65BF	94E5
-65C0	94E6
-65C1	C5D4
-65C2	94E7
-65C3	ECB9
-65C4	ECB8
-65C5	C2C3
-65C6	ECB7
-65C7	94E8
-65C8	94E9
-65C9	94EA
-65CA	94EB
-65CB	D0FD
-65CC	ECBA
-65CD	94EC
-65CE	ECBB
-65CF	D7E5
-65D0	94ED
-65D1	94EE
-65D2	ECBC
-65D3	94EF
-65D4	94F0
-65D5	94F1
-65D6	ECBD
-65D7	C6EC
-65D8	94F2
-65D9	94F3
-65DA	94F4
-65DB	94F5
-65DC	94F6
-65DD	94F7
-65DE	94F8
-65DF	94F9
-65E0	CEDE
-65E1	94FA
-65E2	BCC8
-65E3	94FB
-65E4	94FC
-65E5	C8D5
-65E6	B5A9
-65E7	BEC9
-65E8	D6BC
-65E9	D4E7
-65EA	94FD
-65EB	94FE
-65EC	D1AE
-65ED	D0F1
-65EE	EAB8
-65EF	EAB9
-65F0	EABA
-65F1	BAB5
-65F2	9540
-65F3	9541
-65F4	9542
-65F5	9543
-65F6	CAB1
-65F7	BFF5
-65F8	9544
-65F9	9545
-65FA	CDFA
-65FB	9546
-65FC	9547
-65FD	9548
-65FE	9549
-65FF	954A
-6600	EAC0
-6601	954B
-6602	B0BA
-6603	EABE
-6604	954C
-6605	954D
-6606	C0A5
-6607	954E
-6608	954F
-6609	9550
-660A	EABB
-660B	9551
-660C	B2FD
-660D	9552
-660E	C3F7
-660F	BBE8
-6610	9553
-6611	9554
-6612	9555
-6613	D2D7
-6614	CEF4
-6615	EABF
-6616	9556
-6617	9557
-6618	9558
-6619	EABC
-661A	9559
-661B	955A
-661C	955B
-661D	EAC3
-661E	955C
-661F	D0C7
-6620	D3B3
-6621	955D
-6622	955E
-6623	955F
-6624	9560
-6625	B4BA
-6626	9561
-6627	C3C1
-6628	D7F2
-6629	9562
-662A	9563
-662B	9564
-662C	9565
-662D	D5D1
-662E	9566
-662F	CAC7
-6630	9567
-6631	EAC5
-6632	9568
-6633	9569
-6634	EAC4
-6635	EAC7
-6636	EAC6
-6637	956A
-6638	956B
-6639	956C
-663A	956D
-663B	956E
-663C	D6E7
-663D	956F
-663E	CFD4
-663F	9570
-6640	9571
-6641	EACB
-6642	9572
-6643	BBCE
-6644	9573
-6645	9574
-6646	9575
-6647	9576
-6648	9577
-6649	9578
-664A	9579
-664B	BDFA
-664C	C9CE
-664D	957A
-664E	957B
-664F	EACC
-6650	957C
-6651	957D
-6652	C9B9
-6653	CFFE
-6654	EACA
-6655	D4CE
-6656	EACD
-6657	EACF
-6658	957E
-6659	9580
-665A	CDED
-665B	9581
-665C	9582
-665D	9583
-665E	9584
-665F	EAC9
-6660	9585
-6661	EACE
-6662	9586
-6663	9587
-6664	CEEE
-6665	9588
-6666	BBDE
-6667	9589
-6668	B3BF
-6669	958A
-666A	958B
-666B	958C
-666C	958D
-666D	958E
-666E	C6D5
-666F	BEB0
-6670	CEFA
-6671	958F
-6672	9590
-6673	9591
-6674	C7E7
-6675	9592
-6676	BEA7
-6677	EAD0
-6678	9593
-6679	9594
-667A	D6C7
-667B	9595
-667C	9596
-667D	9597
-667E	C1C0
-667F	9598
-6680	9599
-6681	959A
-6682	D4DD
-6683	959B
-6684	EAD1
-6685	959C
-6686	959D
-6687	CFBE
-6688	959E
-6689	959F
-668A	95A0
-668B	95A1
-668C	EAD2
-668D	95A2
-668E	95A3
-668F	95A4
-6690	95A5
-6691	CAEE
-6692	95A6
-6693	95A7
-6694	95A8
-6695	95A9
-6696	C5AF
-6697	B0B5
-6698	95AA
-6699	95AB
-669A	95AC
-669B	95AD
-669C	95AE
-669D	EAD4
-669E	95AF
-669F	95B0
-66A0	95B1
-66A1	95B2
-66A2	95B3
-66A3	95B4
-66A4	95B5
-66A5	95B6
-66A6	95B7
-66A7	EAD3
-66A8	F4DF
-66A9	95B8
-66AA	95B9
-66AB	95BA
-66AC	95BB
-66AD	95BC
-66AE	C4BA
-66AF	95BD
-66B0	95BE
-66B1	95BF
-66B2	95C0
-66B3	95C1
-66B4	B1A9
-66B5	95C2
-66B6	95C3
-66B7	95C4
-66B8	95C5
-66B9	E5DF
-66BA	95C6
-66BB	95C7
-66BC	95C8
-66BD	95C9
-66BE	EAD5
-66BF	95CA
-66C0	95CB
-66C1	95CC
-66C2	95CD
-66C3	95CE
-66C4	95CF
-66C5	95D0
-66C6	95D1
-66C7	95D2
-66C8	95D3
-66C9	95D4
-66CA	95D5
-66CB	95D6
-66CC	95D7
-66CD	95D8
-66CE	95D9
-66CF	95DA
-66D0	95DB
-66D1	95DC
-66D2	95DD
-66D3	95DE
-66D4	95DF
-66D5	95E0
-66D6	95E1
-66D7	95E2
-66D8	95E3
-66D9	CAEF
-66DA	95E4
-66DB	EAD6
-66DC	EAD7
-66DD	C6D8
-66DE	95E5
-66DF	95E6
-66E0	95E7
-66E1	95E8
-66E2	95E9
-66E3	95EA
-66E4	95EB
-66E5	95EC
-66E6	EAD8
-66E7	95ED
-66E8	95EE
-66E9	EAD9
-66EA	95EF
-66EB	95F0
-66EC	95F1
-66ED	95F2
-66EE	95F3
-66EF	95F4
-66F0	D4BB
-66F1	95F5
-66F2	C7FA
-66F3	D2B7
-66F4	B8FC
-66F5	95F6
-66F6	95F7
-66F7	EAC2
-66F8	95F8
-66F9	B2DC
-66FA	95F9
-66FB	95FA
-66FC	C2FC
-66FD	95FB
-66FE	D4F8
-66FF	CCE6
-6700	D7EE
-6701	95FC
-6702	95FD
-6703	95FE
-6704	9640
-6705	9641
-6706	9642
-6707	9643
-6708	D4C2
-6709	D3D0
-670A	EBC3
-670B	C5F3
-670C	9644
-670D	B7FE
-670E	9645
-670F	9646
-6710	EBD4
-6711	9647
-6712	9648
-6713	9649
-6714	CBB7
-6715	EBDE
-6716	964A
-6717	C0CA
-6718	964B
-6719	964C
-671A	964D
-671B	CDFB
-671C	964E
-671D	B3AF
-671E	964F
-671F	C6DA
-6720	9650
-6721	9651
-6722	9652
-6723	9653
-6724	9654
-6725	9655
-6726	EBFC
-6727	9656
-6728	C4BE
-6729	9657
-672A	CEB4
-672B	C4A9
-672C	B1BE
-672D	D4FD
-672E	9658
-672F	CAF5
-6730	9659
-6731	D6EC
-6732	965A
-6733	965B
-6734	C6D3
-6735	B6E4
-6736	965C
-6737	965D
-6738	965E
-6739	965F
-673A	BBFA
-673B	9660
-673C	9661
-673D	D0E0
-673E	9662
-673F	9663
-6740	C9B1
-6741	9664
-6742	D4D3
-6743	C8A8
-6744	9665
-6745	9666
-6746	B8CB
-6747	9667
-6748	E8BE
-6749	C9BC
-674A	9668
-674B	9669
-674C	E8BB
-674D	966A
-674E	C0EE
-674F	D0D3
-6750	B2C4
-6751	B4E5
-6752	966B
-6753	E8BC
-6754	966C
-6755	966D
-6756	D5C8
-6757	966E
-6758	966F
-6759	9670
-675A	9671
-675B	9672
-675C	B6C5
-675D	9673
-675E	E8BD
-675F	CAF8
-6760	B8DC
-6761	CCF5
-6762	9674
-6763	9675
-6764	9676
-6765	C0B4
-6766	9677
-6767	9678
-6768	D1EE
-6769	E8BF
-676A	E8C2
-676B	9679
-676C	967A
-676D	BABC
-676E	967B
-676F	B1AD
-6770	BDDC
-6771	967C
-6772	EABD
-6773	E8C3
-6774	967D
-6775	E8C6
-6776	967E
-6777	E8CB
-6778	9680
-6779	9681
-677A	9682
-677B	9683
-677C	E8CC
-677D	9684
-677E	CBC9
-677F	B0E5
-6780	9685
-6781	BCAB
-6782	9686
-6783	9687
-6784	B9B9
-6785	9688
-6786	9689
-6787	E8C1
-6788	968A
-6789	CDF7
-678A	968B
-678B	E8CA
-678C	968C
-678D	968D
-678E	968E
-678F	968F
-6790	CEF6
-6791	9690
-6792	9691
-6793	9692
-6794	9693
-6795	D5ED
-6796	9694
-6797	C1D6
-6798	E8C4
-6799	9695
-679A	C3B6
-679B	9696
-679C	B9FB
-679D	D6A6
-679E	E8C8
-679F	9697
-67A0	9698
-67A1	9699
-67A2	CAE0
-67A3	D4E6
-67A4	969A
-67A5	E8C0
-67A6	969B
-67A7	E8C5
-67A8	E8C7
-67A9	969C
-67AA	C7B9
-67AB	B7E3
-67AC	969D
-67AD	E8C9
-67AE	969E
-67AF	BFDD
-67B0	E8D2
-67B1	969F
-67B2	96A0
-67B3	E8D7
-67B4	96A1
-67B5	E8D5
-67B6	BCDC
-67B7	BCCF
-67B8	E8DB
-67B9	96A2
-67BA	96A3
-67BB	96A4
-67BC	96A5
-67BD	96A6
-67BE	96A7
-67BF	96A8
-67C0	96A9
-67C1	E8DE
-67C2	96AA
-67C3	E8DA
-67C4	B1FA
-67C5	96AB
-67C6	96AC
-67C7	96AD
-67C8	96AE
-67C9	96AF
-67CA	96B0
-67CB	96B1
-67CC	96B2
-67CD	96B3
-67CE	96B4
-67CF	B0D8
-67D0	C4B3
-67D1	B8CC
-67D2	C6E2
-67D3	C8BE
-67D4	C8E1
-67D5	96B5
-67D6	96B6
-67D7	96B7
-67D8	E8CF
-67D9	E8D4
-67DA	E8D6
-67DB	96B8
-67DC	B9F1
-67DD	E8D8
-67DE	D7F5
-67DF	96B9
-67E0	C4FB
-67E1	96BA
-67E2	E8DC
-67E3	96BB
-67E4	96BC
-67E5	B2E9
-67E6	96BD
-67E7	96BE
-67E8	96BF
-67E9	E8D1
-67EA	96C0
-67EB	96C1
-67EC	BCED
-67ED	96C2
-67EE	96C3
-67EF	BFC2
-67F0	E8CD
-67F1	D6F9
-67F2	96C4
-67F3	C1F8
-67F4	B2F1
-67F5	96C5
-67F6	96C6
-67F7	96C7
-67F8	96C8
-67F9	96C9
-67FA	96CA
-67FB	96CB
-67FC	96CC
-67FD	E8DF
-67FE	96CD
-67FF	CAC1
-6800	E8D9
-6801	96CE
-6802	96CF
-6803	96D0
-6804	96D1
-6805	D5A4
-6806	96D2
-6807	B1EA
-6808	D5BB
-6809	E8CE
-680A	E8D0
-680B	B6B0
-680C	E8D3
-680D	96D3
-680E	E8DD
-680F	C0B8
-6810	96D4
-6811	CAF7
-6812	96D5
-6813	CBA8
-6814	96D6
-6815	96D7
-6816	C6DC
-6817	C0F5
-6818	96D8
-6819	96D9
-681A	96DA
-681B	96DB
-681C	96DC
-681D	E8E9
-681E	96DD
-681F	96DE
-6820	96DF
-6821	D0A3
-6822	96E0
-6823	96E1
-6824	96E2
-6825	96E3
-6826	96E4
-6827	96E5
-6828	96E6
-6829	E8F2
-682A	D6EA
-682B	96E7
-682C	96E8
-682D	96E9
-682E	96EA
-682F	96EB
-6830	96EC
-6831	96ED
-6832	E8E0
-6833	E8E1
-6834	96EE
-6835	96EF
-6836	96F0
-6837	D1F9
-6838	BACB
-6839	B8F9
-683A	96F1
-683B	96F2
-683C	B8F1
-683D	D4D4
-683E	E8EF
-683F	96F3
-6840	E8EE
-6841	E8EC
-6842	B9F0
-6843	CCD2
-6844	E8E6
-6845	CEA6
-6846	BFF2
-6847	96F4
-6848	B0B8
-6849	E8F1
-684A	E8F0
-684B	96F5
-684C	D7C0
-684D	96F6
-684E	E8E4
-684F	96F7
-6850	CDA9
-6851	C9A3
-6852	96F8
-6853	BBB8
-6854	BDDB
-6855	E8EA
-6856	96F9
-6857	96FA
-6858	96FB
-6859	96FC
-685A	96FD
-685B	96FE
-685C	9740
-685D	9741
-685E	9742
-685F	9743
-6860	E8E2
-6861	E8E3
-6862	E8E5
-6863	B5B5
-6864	E8E7
-6865	C7C5
-6866	E8EB
-6867	E8ED
-6868	BDB0
-6869	D7AE
-686A	9744
-686B	E8F8
-686C	9745
-686D	9746
-686E	9747
-686F	9748
-6870	9749
-6871	974A
-6872	974B
-6873	974C
-6874	E8F5
-6875	974D
-6876	CDB0
-6877	E8F6
-6878	974E
-6879	974F
-687A	9750
-687B	9751
-687C	9752
-687D	9753
-687E	9754
-687F	9755
-6880	9756
-6881	C1BA
-6882	9757
-6883	E8E8
-6884	9758
-6885	C3B7
-6886	B0F0
-6887	9759
-6888	975A
-6889	975B
-688A	975C
-688B	975D
-688C	975E
-688D	975F
-688E	9760
-688F	E8F4
-6890	9761
-6891	9762
-6892	9763
-6893	E8F7
-6894	9764
-6895	9765
-6896	9766
-6897	B9A3
-6898	9767
-6899	9768
-689A	9769
-689B	976A
-689C	976B
-689D	976C
-689E	976D
-689F	976E
-68A0	976F
-68A1	9770
-68A2	C9D2
-68A3	9771
-68A4	9772
-68A5	9773
-68A6	C3CE
-68A7	CEE0
-68A8	C0E6
-68A9	9774
-68AA	9775
-68AB	9776
-68AC	9777
-68AD	CBF3
-68AE	9778
-68AF	CCDD
-68B0	D0B5
-68B1	9779
-68B2	977A
-68B3	CAE1
-68B4	977B
-68B5	E8F3
-68B6	977C
-68B7	977D
-68B8	977E
-68B9	9780
-68BA	9781
-68BB	9782
-68BC	9783
-68BD	9784
-68BE	9785
-68BF	9786
-68C0	BCEC
-68C1	9787
-68C2	E8F9
-68C3	9788
-68C4	9789
-68C5	978A
-68C6	978B
-68C7	978C
-68C8	978D
-68C9	C3DE
-68CA	978E
-68CB	C6E5
-68CC	978F
-68CD	B9F7
-68CE	9790
-68CF	9791
-68D0	9792
-68D1	9793
-68D2	B0F4
-68D3	9794
-68D4	9795
-68D5	D7D8
-68D6	9796
-68D7	9797
-68D8	BCAC
-68D9	9798
-68DA	C5EF
-68DB	9799
-68DC	979A
-68DD	979B
-68DE	979C
-68DF	979D
-68E0	CCC4
-68E1	979E
-68E2	979F
-68E3	E9A6
-68E4	97A0
-68E5	97A1
-68E6	97A2
-68E7	97A3
-68E8	97A4
-68E9	97A5
-68EA	97A6
-68EB	97A7
-68EC	97A8
-68ED	97A9
-68EE	C9AD
-68EF	97AA
-68F0	E9A2
-68F1	C0E2
-68F2	97AB
-68F3	97AC
-68F4	97AD
-68F5	BFC3
-68F6	97AE
-68F7	97AF
-68F8	97B0
-68F9	E8FE
-68FA	B9D7
-68FB	97B1
-68FC	E8FB
-68FD	97B2
-68FE	97B3
-68FF	97B4
-6900	97B5
-6901	E9A4
-6902	97B6
-6903	97B7
-6904	97B8
-6905	D2CE
-6906	97B9
-6907	97BA
-6908	97BB
-6909	97BC
-690A	97BD
-690B	E9A3
-690C	97BE
-690D	D6B2
-690E	D7B5
-690F	97BF
-6910	E9A7
-6911	97C0
-6912	BDB7
-6913	97C1
-6914	97C2
-6915	97C3
-6916	97C4
-6917	97C5
-6918	97C6
-6919	97C7
-691A	97C8
-691B	97C9
-691C	97CA
-691D	97CB
-691E	97CC
-691F	E8FC
-6920	E8FD
-6921	97CD
-6922	97CE
-6923	97CF
-6924	E9A1
-6925	97D0
-6926	97D1
-6927	97D2
-6928	97D3
-6929	97D4
-692A	97D5
-692B	97D6
-692C	97D7
-692D	CDD6
-692E	97D8
-692F	97D9
-6930	D2AC
-6931	97DA
-6932	97DB
-6933	97DC
-6934	E9B2
-6935	97DD
-6936	97DE
-6937	97DF
-6938	97E0
-6939	E9A9
-693A	97E1
-693B	97E2
-693C	97E3
-693D	B4AA
-693E	97E4
-693F	B4BB
-6940	97E5
-6941	97E6
-6942	E9AB
-6943	97E7
-6944	97E8
-6945	97E9
-6946	97EA
-6947	97EB
-6948	97EC
-6949	97ED
-694A	97EE
-694B	97EF
-694C	97F0
-694D	97F1
-694E	97F2
-694F	97F3
-6950	97F4
-6951	97F5
-6952	97F6
-6953	97F7
-6954	D0A8
-6955	97F8
-6956	97F9
-6957	E9A5
-6958	97FA
-6959	97FB
-695A	B3FE
-695B	97FC
-695C	97FD
-695D	E9AC
-695E	C0E3
-695F	97FE
-6960	E9AA
-6961	9840
-6962	9841
-6963	E9B9
-6964	9842
-6965	9843
-6966	E9B8
-6967	9844
-6968	9845
-6969	9846
-696A	9847
-696B	E9AE
-696C	9848
-696D	9849
-696E	E8FA
-696F	984A
-6970	984B
-6971	E9A8
-6972	984C
-6973	984D
-6974	984E
-6975	984F
-6976	9850
-6977	BFAC
-6978	E9B1
-6979	E9BA
-697A	9851
-697B	9852
-697C	C2A5
-697D	9853
-697E	9854
-697F	9855
-6980	E9AF
-6981	9856
-6982	B8C5
-6983	9857
-6984	E9AD
-6985	9858
-6986	D3DC
-6987	E9B4
-6988	E9B5
-6989	E9B7
-698A	9859
-698B	985A
-698C	985B
-698D	E9C7
-698E	985C
-698F	985D
-6990	985E
-6991	985F
-6992	9860
-6993	9861
-6994	C0C6
-6995	E9C5
-6996	9862
-6997	9863
-6998	E9B0
-6999	9864
-699A	9865
-699B	E9BB
-699C	B0F1
-699D	9866
-699E	9867
-699F	9868
-69A0	9869
-69A1	986A
-69A2	986B
-69A3	986C
-69A4	986D
-69A5	986E
-69A6	986F
-69A7	E9BC
-69A8	D5A5
-69A9	9870
-69AA	9871
-69AB	E9BE
-69AC	9872
-69AD	E9BF
-69AE	9873
-69AF	9874
-69B0	9875
-69B1	E9C1
-69B2	9876
-69B3	9877
-69B4	C1F1
-69B5	9878
-69B6	9879
-69B7	C8B6
-69B8	987A
-69B9	987B
-69BA	987C
-69BB	E9BD
-69BC	987D
-69BD	987E
-69BE	9880
-69BF	9881
-69C0	9882
-69C1	E9C2
-69C2	9883
-69C3	9884
-69C4	9885
-69C5	9886
-69C6	9887
-69C7	9888
-69C8	9889
-69C9	988A
-69CA	E9C3
-69CB	988B
-69CC	E9B3
-69CD	988C
-69CE	E9B6
-69CF	988D
-69D0	BBB1
-69D1	988E
-69D2	988F
-69D3	9890
-69D4	E9C0
-69D5	9891
-69D6	9892
-69D7	9893
-69D8	9894
-69D9	9895
-69DA	9896
-69DB	BCF7
-69DC	9897
-69DD	9898
-69DE	9899
-69DF	E9C4
-69E0	E9C6
-69E1	989A
-69E2	989B
-69E3	989C
-69E4	989D
-69E5	989E
-69E6	989F
-69E7	98A0
-69E8	98A1
-69E9	98A2
-69EA	98A3
-69EB	98A4
-69EC	98A5
-69ED	E9CA
-69EE	98A6
-69EF	98A7
-69F0	98A8
-69F1	98A9
-69F2	E9CE
-69F3	98AA
-69F4	98AB
-69F5	98AC
-69F6	98AD
-69F7	98AE
-69F8	98AF
-69F9	98B0
-69FA	98B1
-69FB	98B2
-69FC	98B3
-69FD	B2DB
-69FE	98B4
-69FF	E9C8
-6A00	98B5
-6A01	98B6
-6A02	98B7
-6A03	98B8
-6A04	98B9
-6A05	98BA
-6A06	98BB
-6A07	98BC
-6A08	98BD
-6A09	98BE
-6A0A	B7AE
-6A0B	98BF
-6A0C	98C0
-6A0D	98C1
-6A0E	98C2
-6A0F	98C3
-6A10	98C4
-6A11	98C5
-6A12	98C6
-6A13	98C7
-6A14	98C8
-6A15	98C9
-6A16	98CA
-6A17	E9CB
-6A18	E9CC
-6A19	98CB
-6A1A	98CC
-6A1B	98CD
-6A1C	98CE
-6A1D	98CF
-6A1E	98D0
-6A1F	D5C1
-6A20	98D1
-6A21	C4A3
-6A22	98D2
-6A23	98D3
-6A24	98D4
-6A25	98D5
-6A26	98D6
-6A27	98D7
-6A28	E9D8
-6A29	98D8
-6A2A	BAE1
-6A2B	98D9
-6A2C	98DA
-6A2D	98DB
-6A2E	98DC
-6A2F	E9C9
-6A30	98DD
-6A31	D3A3
-6A32	98DE
-6A33	98DF
-6A34	98E0
-6A35	E9D4
-6A36	98E1
-6A37	98E2
-6A38	98E3
-6A39	98E4
-6A3A	98E5
-6A3B	98E6
-6A3C	98E7
-6A3D	E9D7
-6A3E	E9D0
-6A3F	98E8
-6A40	98E9
-6A41	98EA
-6A42	98EB
-6A43	98EC
-6A44	E9CF
-6A45	98ED
-6A46	98EE
-6A47	C7C1
-6A48	98EF
-6A49	98F0
-6A4A	98F1
-6A4B	98F2
-6A4C	98F3
-6A4D	98F4
-6A4E	98F5
-6A4F	98F6
-6A50	E9D2
-6A51	98F7
-6A52	98F8
-6A53	98F9
-6A54	98FA
-6A55	98FB
-6A56	98FC
-6A57	98FD
-6A58	E9D9
-6A59	B3C8
-6A5A	98FE
-6A5B	E9D3
-6A5C	9940
-6A5D	9941
-6A5E	9942
-6A5F	9943
-6A60	9944
-6A61	CFF0
-6A62	9945
-6A63	9946
-6A64	9947
-6A65	E9CD
-6A66	9948
-6A67	9949
-6A68	994A
-6A69	994B
-6A6A	994C
-6A6B	994D
-6A6C	994E
-6A6D	994F
-6A6E	9950
-6A6F	9951
-6A70	9952
-6A71	B3F7
-6A72	9953
-6A73	9954
-6A74	9955
-6A75	9956
-6A76	9957
-6A77	9958
-6A78	9959
-6A79	E9D6
-6A7A	995A
-6A7B	995B
-6A7C	E9DA
-6A7D	995C
-6A7E	995D
-6A7F	995E
-6A80	CCB4
-6A81	995F
-6A82	9960
-6A83	9961
-6A84	CFAD
-6A85	9962
-6A86	9963
-6A87	9964
-6A88	9965
-6A89	9966
-6A8A	9967
-6A8B	9968
-6A8C	9969
-6A8D	996A
-6A8E	E9D5
-6A8F	996B
-6A90	E9DC
-6A91	E9DB
-6A92	996C
-6A93	996D
-6A94	996E
-6A95	996F
-6A96	9970
-6A97	E9DE
-6A98	9971
-6A99	9972
-6A9A	9973
-6A9B	9974
-6A9C	9975
-6A9D	9976
-6A9E	9977
-6A9F	9978
-6AA0	E9D1
-6AA1	9979
-6AA2	997A
-6AA3	997B
-6AA4	997C
-6AA5	997D
-6AA6	997E
-6AA7	9980
-6AA8	9981
-6AA9	E9DD
-6AAA	9982
-6AAB	E9DF
-6AAC	C3CA
-6AAD	9983
-6AAE	9984
-6AAF	9985
-6AB0	9986
-6AB1	9987
-6AB2	9988
-6AB3	9989
-6AB4	998A
-6AB5	998B
-6AB6	998C
-6AB7	998D
-6AB8	998E
-6AB9	998F
-6ABA	9990
-6ABB	9991
-6ABC	9992
-6ABD	9993
-6ABE	9994
-6ABF	9995
-6AC0	9996
-6AC1	9997
-6AC2	9998
-6AC3	9999
-6AC4	999A
-6AC5	999B
-6AC6	999C
-6AC7	999D
-6AC8	999E
-6AC9	999F
-6ACA	99A0
-6ACB	99A1
-6ACC	99A2
-6ACD	99A3
-6ACE	99A4
-6ACF	99A5
-6AD0	99A6
-6AD1	99A7
-6AD2	99A8
-6AD3	99A9
-6AD4	99AA
-6AD5	99AB
-6AD6	99AC
-6AD7	99AD
-6AD8	99AE
-6AD9	99AF
-6ADA	99B0
-6ADB	99B1
-6ADC	99B2
-6ADD	99B3
-6ADE	99B4
-6ADF	99B5
-6AE0	99B6
-6AE1	99B7
-6AE2	99B8
-6AE3	99B9
-6AE4	99BA
-6AE5	99BB
-6AE6	99BC
-6AE7	99BD
-6AE8	99BE
-6AE9	99BF
-6AEA	99C0
-6AEB	99C1
-6AEC	99C2
-6AED	99C3
-6AEE	99C4
-6AEF	99C5
-6AF0	99C6
-6AF1	99C7
-6AF2	99C8
-6AF3	99C9
-6AF4	99CA
-6AF5	99CB
-6AF6	99CC
-6AF7	99CD
-6AF8	99CE
-6AF9	99CF
-6AFA	99D0
-6AFB	99D1
-6AFC	99D2
-6AFD	99D3
-6AFE	99D4
-6AFF	99D5
-6B00	99D6
-6B01	99D7
-6B02	99D8
-6B03	99D9
-6B04	99DA
-6B05	99DB
-6B06	99DC
-6B07	99DD
-6B08	99DE
-6B09	99DF
-6B0A	99E0
-6B0B	99E1
-6B0C	99E2
-6B0D	99E3
-6B0E	99E4
-6B0F	99E5
-6B10	99E6
-6B11	99E7
-6B12	99E8
-6B13	99E9
-6B14	99EA
-6B15	99EB
-6B16	99EC
-6B17	99ED
-6B18	99EE
-6B19	99EF
-6B1A	99F0
-6B1B	99F1
-6B1C	99F2
-6B1D	99F3
-6B1E	99F4
-6B1F	99F5
-6B20	C7B7
-6B21	B4CE
-6B22	BBB6
-6B23	D0C0
-6B24	ECA3
-6B25	99F6
-6B26	99F7
-6B27	C5B7
-6B28	99F8
-6B29	99F9
-6B2A	99FA
-6B2B	99FB
-6B2C	99FC
-6B2D	99FD
-6B2E	99FE
-6B2F	9A40
-6B30	9A41
-6B31	9A42
-6B32	D3FB
-6B33	9A43
-6B34	9A44
-6B35	9A45
-6B36	9A46
-6B37	ECA4
-6B38	9A47
-6B39	ECA5
-6B3A	C6DB
-6B3B	9A48
-6B3C	9A49
-6B3D	9A4A
-6B3E	BFEE
-6B3F	9A4B
-6B40	9A4C
-6B41	9A4D
-6B42	9A4E
-6B43	ECA6
-6B44	9A4F
-6B45	9A50
-6B46	ECA7
-6B47	D0AA
-6B48	9A51
-6B49	C7B8
-6B4A	9A52
-6B4B	9A53
-6B4C	B8E8
-6B4D	9A54
-6B4E	9A55
-6B4F	9A56
-6B50	9A57
-6B51	9A58
-6B52	9A59
-6B53	9A5A
-6B54	9A5B
-6B55	9A5C
-6B56	9A5D
-6B57	9A5E
-6B58	9A5F
-6B59	ECA8
-6B5A	9A60
-6B5B	9A61
-6B5C	9A62
-6B5D	9A63
-6B5E	9A64
-6B5F	9A65
-6B60	9A66
-6B61	9A67
-6B62	D6B9
-6B63	D5FD
-6B64	B4CB
-6B65	B2BD
-6B66	CEE4
-6B67	C6E7
-6B68	9A68
-6B69	9A69
-6B6A	CDE1
-6B6B	9A6A
-6B6C	9A6B
-6B6D	9A6C
-6B6E	9A6D
-6B6F	9A6E
-6B70	9A6F
-6B71	9A70
-6B72	9A71
-6B73	9A72
-6B74	9A73
-6B75	9A74
-6B76	9A75
-6B77	9A76
-6B78	9A77
-6B79	B4F5
-6B7A	9A78
-6B7B	CBC0
-6B7C	BCDF
-6B7D	9A79
-6B7E	9A7A
-6B7F	9A7B
-6B80	9A7C
-6B81	E9E2
-6B82	E9E3
-6B83	D1EA
-6B84	E9E5
-6B85	9A7D
-6B86	B4F9
-6B87	E9E4
-6B88	9A7E
-6B89	D1B3
-6B8A	CAE2
-6B8B	B2D0
-6B8C	9A80
-6B8D	E9E8
-6B8E	9A81
-6B8F	9A82
-6B90	9A83
-6B91	9A84
-6B92	E9E6
-6B93	E9E7
-6B94	9A85
-6B95	9A86
-6B96	D6B3
-6B97	9A87
-6B98	9A88
-6B99	9A89
-6B9A	E9E9
-6B9B	E9EA
-6B9C	9A8A
-6B9D	9A8B
-6B9E	9A8C
-6B9F	9A8D
-6BA0	9A8E
-6BA1	E9EB
-6BA2	9A8F
-6BA3	9A90
-6BA4	9A91
-6BA5	9A92
-6BA6	9A93
-6BA7	9A94
-6BA8	9A95
-6BA9	9A96
-6BAA	E9EC
-6BAB	9A97
-6BAC	9A98
-6BAD	9A99
-6BAE	9A9A
-6BAF	9A9B
-6BB0	9A9C
-6BB1	9A9D
-6BB2	9A9E
-6BB3	ECAF
-6BB4	C5B9
-6BB5	B6CE
-6BB6	9A9F
-6BB7	D2F3
-6BB8	9AA0
-6BB9	9AA1
-6BBA	9AA2
-6BBB	9AA3
-6BBC	9AA4
-6BBD	9AA5
-6BBE	9AA6
-6BBF	B5EE
-6BC0	9AA7
-6BC1	BBD9
-6BC2	ECB1
-6BC3	9AA8
-6BC4	9AA9
-6BC5	D2E3
-6BC6	9AAA
-6BC7	9AAB
-6BC8	9AAC
-6BC9	9AAD
-6BCA	9AAE
-6BCB	CEE3
-6BCC	9AAF
-6BCD	C4B8
-6BCE	9AB0
-6BCF	C3BF
-6BD0	9AB1
-6BD1	9AB2
-6BD2	B6BE
-6BD3	D8B9
-6BD4	B1C8
-6BD5	B1CF
-6BD6	B1D1
-6BD7	C5FE
-6BD8	9AB3
-6BD9	B1D0
-6BDA	9AB4
-6BDB	C3AB
-6BDC	9AB5
-6BDD	9AB6
-6BDE	9AB7
-6BDF	9AB8
-6BE0	9AB9
-6BE1	D5B1
-6BE2	9ABA
-6BE3	9ABB
-6BE4	9ABC
-6BE5	9ABD
-6BE6	9ABE
-6BE7	9ABF
-6BE8	9AC0
-6BE9	9AC1
-6BEA	EBA4
-6BEB	BAC1
-6BEC	9AC2
-6BED	9AC3
-6BEE	9AC4
-6BEF	CCBA
-6BF0	9AC5
-6BF1	9AC6
-6BF2	9AC7
-6BF3	EBA5
-6BF4	9AC8
-6BF5	EBA7
-6BF6	9AC9
-6BF7	9ACA
-6BF8	9ACB
-6BF9	EBA8
-6BFA	9ACC
-6BFB	9ACD
-6BFC	9ACE
-6BFD	EBA6
-6BFE	9ACF
-6BFF	9AD0
-6C00	9AD1
-6C01	9AD2
-6C02	9AD3
-6C03	9AD4
-6C04	9AD5
-6C05	EBA9
-6C06	EBAB
-6C07	EBAA
-6C08	9AD6
-6C09	9AD7
-6C0A	9AD8
-6C0B	9AD9
-6C0C	9ADA
-6C0D	EBAC
-6C0E	9ADB
-6C0F	CACF
-6C10	D8B5
-6C11	C3F1
-6C12	9ADC
-6C13	C3A5
-6C14	C6F8
-6C15	EBAD
-6C16	C4CA
-6C17	9ADD
-6C18	EBAE
-6C19	EBAF
-6C1A	EBB0
-6C1B	B7D5
-6C1C	9ADE
-6C1D	9ADF
-6C1E	9AE0
-6C1F	B7FA
-6C20	9AE1
-6C21	EBB1
-6C22	C7E2
-6C23	9AE2
-6C24	EBB3
-6C25	9AE3
-6C26	BAA4
-6C27	D1F5
-6C28	B0B1
-6C29	EBB2
-6C2A	EBB4
-6C2B	9AE4
-6C2C	9AE5
-6C2D	9AE6
-6C2E	B5AA
-6C2F	C2C8
-6C30	C7E8
-6C31	9AE7
-6C32	EBB5
-6C33	9AE8
-6C34	CBAE
-6C35	E3DF
-6C36	9AE9
-6C37	9AEA
-6C38	D3C0
-6C39	9AEB
-6C3A	9AEC
-6C3B	9AED
-6C3C	9AEE
-6C3D	D9DB
-6C3E	9AEF
-6C3F	9AF0
-6C40	CDA1
-6C41	D6AD
-6C42	C7F3
-6C43	9AF1
-6C44	9AF2
-6C45	9AF3
-6C46	D9E0
-6C47	BBE3
-6C48	9AF4
-6C49	BABA
-6C4A	E3E2
-6C4B	9AF5
-6C4C	9AF6
-6C4D	9AF7
-6C4E	9AF8
-6C4F	9AF9
-6C50	CFAB
-6C51	9AFA
-6C52	9AFB
-6C53	9AFC
-6C54	E3E0
-6C55	C9C7
-6C56	9AFD
-6C57	BAB9
-6C58	9AFE
-6C59	9B40
-6C5A	9B41
-6C5B	D1B4
-6C5C	E3E1
-6C5D	C8EA
-6C5E	B9AF
-6C5F	BDAD
-6C60	B3D8
-6C61	CEDB
-6C62	9B42
-6C63	9B43
-6C64	CCC0
-6C65	9B44
-6C66	9B45
-6C67	9B46
-6C68	E3E8
-6C69	E3E9
-6C6A	CDF4
-6C6B	9B47
-6C6C	9B48
-6C6D	9B49
-6C6E	9B4A
-6C6F	9B4B
-6C70	CCAD
-6C71	9B4C
-6C72	BCB3
-6C73	9B4D
-6C74	E3EA
-6C75	9B4E
-6C76	E3EB
-6C77	9B4F
-6C78	9B50
-6C79	D0DA
-6C7A	9B51
-6C7B	9B52
-6C7C	9B53
-6C7D	C6FB
-6C7E	B7DA
-6C7F	9B54
-6C80	9B55
-6C81	C7DF
-6C82	D2CA
-6C83	CED6
-6C84	9B56
-6C85	E3E4
-6C86	E3EC
-6C87	9B57
-6C88	C9F2
-6C89	B3C1
-6C8A	9B58
-6C8B	9B59
-6C8C	E3E7
-6C8D	9B5A
-6C8E	9B5B
-6C8F	C6E3
-6C90	E3E5
-6C91	9B5C
-6C92	9B5D
-6C93	EDB3
-6C94	E3E6
-6C95	9B5E
-6C96	9B5F
-6C97	9B60
-6C98	9B61
-6C99	C9B3
-6C9A	9B62
-6C9B	C5E6
-6C9C	9B63
-6C9D	9B64
-6C9E	9B65
-6C9F	B9B5
-6CA0	9B66
-6CA1	C3BB
-6CA2	9B67
-6CA3	E3E3
-6CA4	C5BD
-6CA5	C1A4
-6CA6	C2D9
-6CA7	B2D7
-6CA8	9B68
-6CA9	E3ED
-6CAA	BBA6
-6CAB	C4AD
-6CAC	9B69
-6CAD	E3F0
-6CAE	BEDA
-6CAF	9B6A
-6CB0	9B6B
-6CB1	E3FB
-6CB2	E3F5
-6CB3	BAD3
-6CB4	9B6C
-6CB5	9B6D
-6CB6	9B6E
-6CB7	9B6F
-6CB8	B7D0
-6CB9	D3CD
-6CBA	9B70
-6CBB	D6CE
-6CBC	D5D3
-6CBD	B9C1
-6CBE	D5B4
-6CBF	D1D8
-6CC0	9B71
-6CC1	9B72
-6CC2	9B73
-6CC3	9B74
-6CC4	D0B9
-6CC5	C7F6
-6CC6	9B75
-6CC7	9B76
-6CC8	9B77
-6CC9	C8AA
-6CCA	B2B4
-6CCB	9B78
-6CCC	C3DA
-6CCD	9B79
-6CCE	9B7A
-6CCF	9B7B
-6CD0	E3EE
-6CD1	9B7C
-6CD2	9B7D
-6CD3	E3FC
-6CD4	E3EF
-6CD5	B7A8
-6CD6	E3F7
-6CD7	E3F4
-6CD8	9B7E
-6CD9	9B80
-6CDA	9B81
-6CDB	B7BA
-6CDC	9B82
-6CDD	9B83
-6CDE	C5A2
-6CDF	9B84
-6CE0	E3F6
-6CE1	C5DD
-6CE2	B2A8
-6CE3	C6FC
-6CE4	9B85
-6CE5	C4E0
-6CE6	9B86
-6CE7	9B87
-6CE8	D7A2
-6CE9	9B88
-6CEA	C0E1
-6CEB	E3F9
-6CEC	9B89
-6CED	9B8A
-6CEE	E3FA
-6CEF	E3FD
-6CF0	CCA9
-6CF1	E3F3
-6CF2	9B8B
-6CF3	D3BE
-6CF4	9B8C
-6CF5	B1C3
-6CF6	EDB4
-6CF7	E3F1
-6CF8	E3F2
-6CF9	9B8D
-6CFA	E3F8
-6CFB	D0BA
-6CFC	C6C3
-6CFD	D4F3
-6CFE	E3FE
-6CFF	9B8E
-6D00	9B8F
-6D01	BDE0
-6D02	9B90
-6D03	9B91
-6D04	E4A7
-6D05	9B92
-6D06	9B93
-6D07	E4A6
-6D08	9B94
-6D09	9B95
-6D0A	9B96
-6D0B	D1F3
-6D0C	E4A3
-6D0D	9B97
-6D0E	E4A9
-6D0F	9B98
-6D10	9B99
-6D11	9B9A
-6D12	C8F7
-6D13	9B9B
-6D14	9B9C
-6D15	9B9D
-6D16	9B9E
-6D17	CFB4
-6D18	9B9F
-6D19	E4A8
-6D1A	E4AE
-6D1B	C2E5
-6D1C	9BA0
-6D1D	9BA1
-6D1E	B6B4
-6D1F	9BA2
-6D20	9BA3
-6D21	9BA4
-6D22	9BA5
-6D23	9BA6
-6D24	9BA7
-6D25	BDF2
-6D26	9BA8
-6D27	E4A2
-6D28	9BA9
-6D29	9BAA
-6D2A	BAE9
-6D2B	E4AA
-6D2C	9BAB
-6D2D	9BAC
-6D2E	E4AC
-6D2F	9BAD
-6D30	9BAE
-6D31	B6FD
-6D32	D6DE
-6D33	E4B2
-6D34	9BAF
-6D35	E4AD
-6D36	9BB0
-6D37	9BB1
-6D38	9BB2
-6D39	E4A1
-6D3A	9BB3
-6D3B	BBEE
-6D3C	CDDD
-6D3D	C7A2
-6D3E	C5C9
-6D3F	9BB4
-6D40	9BB5
-6D41	C1F7
-6D42	9BB6
-6D43	E4A4
-6D44	9BB7
-6D45	C7B3
-6D46	BDAC
-6D47	BDBD
-6D48	E4A5
-6D49	9BB8
-6D4A	D7C7
-6D4B	B2E2
-6D4C	9BB9
-6D4D	E4AB
-6D4E	BCC3
-6D4F	E4AF
-6D50	9BBA
-6D51	BBEB
-6D52	E4B0
-6D53	C5A8
-6D54	E4B1
-6D55	9BBB
-6D56	9BBC
-6D57	9BBD
-6D58	9BBE
-6D59	D5E3
-6D5A	BFA3
-6D5B	9BBF
-6D5C	E4BA
-6D5D	9BC0
-6D5E	E4B7
-6D5F	9BC1
-6D60	E4BB
-6D61	9BC2
-6D62	9BC3
-6D63	E4BD
-6D64	9BC4
-6D65	9BC5
-6D66	C6D6
-6D67	9BC6
-6D68	9BC7
-6D69	BAC6
-6D6A	C0CB
-6D6B	9BC8
-6D6C	9BC9
-6D6D	9BCA
-6D6E	B8A1
-6D6F	E4B4
-6D70	9BCB
-6D71	9BCC
-6D72	9BCD
-6D73	9BCE
-6D74	D4A1
-6D75	9BCF
-6D76	9BD0
-6D77	BAA3
-6D78	BDFE
-6D79	9BD1
-6D7A	9BD2
-6D7B	9BD3
-6D7C	E4BC
-6D7D	9BD4
-6D7E	9BD5
-6D7F	9BD6
-6D80	9BD7
-6D81	9BD8
-6D82	CDBF
-6D83	9BD9
-6D84	9BDA
-6D85	C4F9
-6D86	9BDB
-6D87	9BDC
-6D88	CFFB
-6D89	C9E6
-6D8A	9BDD
-6D8B	9BDE
-6D8C	D3BF
-6D8D	9BDF
-6D8E	CFD1
-6D8F	9BE0
-6D90	9BE1
-6D91	E4B3
-6D92	9BE2
-6D93	E4B8
-6D94	E4B9
-6D95	CCE9
-6D96	9BE3
-6D97	9BE4
-6D98	9BE5
-6D99	9BE6
-6D9A	9BE7
-6D9B	CCCE
-6D9C	9BE8
-6D9D	C0D4
-6D9E	E4B5
-6D9F	C1B0
-6DA0	E4B6
-6DA1	CED0
-6DA2	9BE9
-6DA3	BBC1
-6DA4	B5D3
-6DA5	9BEA
-6DA6	C8F3
-6DA7	BDA7
-6DA8	D5C7
-6DA9	C9AC
-6DAA	B8A2
-6DAB	E4CA
-6DAC	9BEB
-6DAD	9BEC
-6DAE	E4CC
-6DAF	D1C4
-6DB0	9BED
-6DB1	9BEE
-6DB2	D2BA
-6DB3	9BEF
-6DB4	9BF0
-6DB5	BAAD
-6DB6	9BF1
-6DB7	9BF2
-6DB8	BAD4
-6DB9	9BF3
-6DBA	9BF4
-6DBB	9BF5
-6DBC	9BF6
-6DBD	9BF7
-6DBE	9BF8
-6DBF	E4C3
-6DC0	B5ED
-6DC1	9BF9
-6DC2	9BFA
-6DC3	9BFB
-6DC4	D7CD
-6DC5	E4C0
-6DC6	CFFD
-6DC7	E4BF
-6DC8	9BFC
-6DC9	9BFD
-6DCA	9BFE
-6DCB	C1DC
-6DCC	CCCA
-6DCD	9C40
-6DCE	9C41
-6DCF	9C42
-6DD0	9C43
-6DD1	CAE7
-6DD2	9C44
-6DD3	9C45
-6DD4	9C46
-6DD5	9C47
-6DD6	C4D7
-6DD7	9C48
-6DD8	CCD4
-6DD9	E4C8
-6DDA	9C49
-6DDB	9C4A
-6DDC	9C4B
-6DDD	E4C7
-6DDE	E4C1
-6DDF	9C4C
-6DE0	E4C4
-6DE1	B5AD
-6DE2	9C4D
-6DE3	9C4E
-6DE4	D3D9
-6DE5	9C4F
-6DE6	E4C6
-6DE7	9C50
-6DE8	9C51
-6DE9	9C52
-6DEA	9C53
-6DEB	D2F9
-6DEC	B4E3
-6DED	9C54
-6DEE	BBB4
-6DEF	9C55
-6DF0	9C56
-6DF1	C9EE
-6DF2	9C57
-6DF3	B4BE
-6DF4	9C58
-6DF5	9C59
-6DF6	9C5A
-6DF7	BBEC
-6DF8	9C5B
-6DF9	D1CD
-6DFA	9C5C
-6DFB	CCED
-6DFC	EDB5
-6DFD	9C5D
-6DFE	9C5E
-6DFF	9C5F
-6E00	9C60
-6E01	9C61
-6E02	9C62
-6E03	9C63
-6E04	9C64
-6E05	C7E5
-6E06	9C65
-6E07	9C66
-6E08	9C67
-6E09	9C68
-6E0A	D4A8
-6E0B	9C69
-6E0C	E4CB
-6E0D	D7D5
-6E0E	E4C2
-6E0F	9C6A
-6E10	BDA5
-6E11	E4C5
-6E12	9C6B
-6E13	9C6C
-6E14	D3E6
-6E15	9C6D
-6E16	E4C9
-6E17	C9F8
-6E18	9C6E
-6E19	9C6F
-6E1A	E4BE
-6E1B	9C70
-6E1C	9C71
-6E1D	D3E5
-6E1E	9C72
-6E1F	9C73
-6E20	C7FE
-6E21	B6C9
-6E22	9C74
-6E23	D4FC
-6E24	B2B3
-6E25	E4D7
-6E26	9C75
-6E27	9C76
-6E28	9C77
-6E29	CEC2
-6E2A	9C78
-6E2B	E4CD
-6E2C	9C79
-6E2D	CEBC
-6E2E	9C7A
-6E2F	B8DB
-6E30	9C7B
-6E31	9C7C
-6E32	E4D6
-6E33	9C7D
-6E34	BFCA
-6E35	9C7E
-6E36	9C80
-6E37	9C81
-6E38	D3CE
-6E39	9C82
-6E3A	C3EC
-6E3B	9C83
-6E3C	9C84
-6E3D	9C85
-6E3E	9C86
-6E3F	9C87
-6E40	9C88
-6E41	9C89
-6E42	9C8A
-6E43	C5C8
-6E44	E4D8
-6E45	9C8B
-6E46	9C8C
-6E47	9C8D
-6E48	9C8E
-6E49	9C8F
-6E4A	9C90
-6E4B	9C91
-6E4C	9C92
-6E4D	CDC4
-6E4E	E4CF
-6E4F	9C93
-6E50	9C94
-6E51	9C95
-6E52	9C96
-6E53	E4D4
-6E54	E4D5
-6E55	9C97
-6E56	BAFE
-6E57	9C98
-6E58	CFE6
-6E59	9C99
-6E5A	9C9A
-6E5B	D5BF
-6E5C	9C9B
-6E5D	9C9C
-6E5E	9C9D
-6E5F	E4D2
-6E60	9C9E
-6E61	9C9F
-6E62	9CA0
-6E63	9CA1
-6E64	9CA2
-6E65	9CA3
-6E66	9CA4
-6E67	9CA5
-6E68	9CA6
-6E69	9CA7
-6E6A	9CA8
-6E6B	E4D0
-6E6C	9CA9
-6E6D	9CAA
-6E6E	E4CE
-6E6F	9CAB
-6E70	9CAC
-6E71	9CAD
-6E72	9CAE
-6E73	9CAF
-6E74	9CB0
-6E75	9CB1
-6E76	9CB2
-6E77	9CB3
-6E78	9CB4
-6E79	9CB5
-6E7A	9CB6
-6E7B	9CB7
-6E7C	9CB8
-6E7D	9CB9
-6E7E	CDE5
-6E7F	CAAA
-6E80	9CBA
-6E81	9CBB
-6E82	9CBC
-6E83	C0A3
-6E84	9CBD
-6E85	BDA6
-6E86	E4D3
-6E87	9CBE
-6E88	9CBF
-6E89	B8C8
-6E8A	9CC0
-6E8B	9CC1
-6E8C	9CC2
-6E8D	9CC3
-6E8E	9CC4
-6E8F	E4E7
-6E90	D4B4
-6E91	9CC5
-6E92	9CC6
-6E93	9CC7
-6E94	9CC8
-6E95	9CC9
-6E96	9CCA
-6E97	9CCB
-6E98	E4DB
-6E99	9CCC
-6E9A	9CCD
-6E9B	9CCE
-6E9C	C1EF
-6E9D	9CCF
-6E9E	9CD0
-6E9F	E4E9
-6EA0	9CD1
-6EA1	9CD2
-6EA2	D2E7
-6EA3	9CD3
-6EA4	9CD4
-6EA5	E4DF
-6EA6	9CD5
-6EA7	E4E0
-6EA8	9CD6
-6EA9	9CD7
-6EAA	CFAA
-6EAB	9CD8
-6EAC	9CD9
-6EAD	9CDA
-6EAE	9CDB
-6EAF	CBDD
-6EB0	9CDC
-6EB1	E4DA
-6EB2	E4D1
-6EB3	9CDD
-6EB4	E4E5
-6EB5	9CDE
-6EB6	C8DC
-6EB7	E4E3
-6EB8	9CDF
-6EB9	9CE0
-6EBA	C4E7
-6EBB	E4E2
-6EBC	9CE1
-6EBD	E4E1
-6EBE	9CE2
-6EBF	9CE3
-6EC0	9CE4
-6EC1	B3FC
-6EC2	E4E8
-6EC3	9CE5
-6EC4	9CE6
-6EC5	9CE7
-6EC6	9CE8
-6EC7	B5E1
-6EC8	9CE9
-6EC9	9CEA
-6ECA	9CEB
-6ECB	D7CC
-6ECC	9CEC
-6ECD	9CED
-6ECE	9CEE
-6ECF	E4E6
-6ED0	9CEF
-6ED1	BBAC
-6ED2	9CF0
-6ED3	D7D2
-6ED4	CCCF
-6ED5	EBF8
-6ED6	9CF1
-6ED7	E4E4
-6ED8	9CF2
-6ED9	9CF3
-6EDA	B9F6
-6EDB	9CF4
-6EDC	9CF5
-6EDD	9CF6
-6EDE	D6CD
-6EDF	E4D9
-6EE0	E4DC
-6EE1	C2FA
-6EE2	E4DE
-6EE3	9CF7
-6EE4	C2CB
-6EE5	C0C4
-6EE6	C2D0
-6EE7	9CF8
-6EE8	B1F5
-6EE9	CCB2
-6EEA	9CF9
-6EEB	9CFA
-6EEC	9CFB
-6EED	9CFC
-6EEE	9CFD
-6EEF	9CFE
-6EF0	9D40
-6EF1	9D41
-6EF2	9D42
-6EF3	9D43
-6EF4	B5CE
-6EF5	9D44
-6EF6	9D45
-6EF7	9D46
-6EF8	9D47
-6EF9	E4EF
-6EFA	9D48
-6EFB	9D49
-6EFC	9D4A
-6EFD	9D4B
-6EFE	9D4C
-6EFF	9D4D
-6F00	9D4E
-6F01	9D4F
-6F02	C6AF
-6F03	9D50
-6F04	9D51
-6F05	9D52
-6F06	C6E1
-6F07	9D53
-6F08	9D54
-6F09	E4F5
-6F0A	9D55
-6F0B	9D56
-6F0C	9D57
-6F0D	9D58
-6F0E	9D59
-6F0F	C2A9
-6F10	9D5A
-6F11	9D5B
-6F12	9D5C
-6F13	C0EC
-6F14	D1DD
-6F15	E4EE
-6F16	9D5D
-6F17	9D5E
-6F18	9D5F
-6F19	9D60
-6F1A	9D61
-6F1B	9D62
-6F1C	9D63
-6F1D	9D64
-6F1E	9D65
-6F1F	9D66
-6F20	C4AE
-6F21	9D67
-6F22	9D68
-6F23	9D69
-6F24	E4ED
-6F25	9D6A
-6F26	9D6B
-6F27	9D6C
-6F28	9D6D
-6F29	E4F6
-6F2A	E4F4
-6F2B	C2FE
-6F2C	9D6E
-6F2D	E4DD
-6F2E	9D6F
-6F2F	E4F0
-6F30	9D70
-6F31	CAFE
-6F32	9D71
-6F33	D5C4
-6F34	9D72
-6F35	9D73
-6F36	E4F1
-6F37	9D74
-6F38	9D75
-6F39	9D76
-6F3A	9D77
-6F3B	9D78
-6F3C	9D79
-6F3D	9D7A
-6F3E	D1FA
-6F3F	9D7B
-6F40	9D7C
-6F41	9D7D
-6F42	9D7E
-6F43	9D80
-6F44	9D81
-6F45	9D82
-6F46	E4EB
-6F47	E4EC
-6F48	9D83
-6F49	9D84
-6F4A	9D85
-6F4B	E4F2
-6F4C	9D86
-6F4D	CEAB
-6F4E	9D87
-6F4F	9D88
-6F50	9D89
-6F51	9D8A
-6F52	9D8B
-6F53	9D8C
-6F54	9D8D
-6F55	9D8E
-6F56	9D8F
-6F57	9D90
-6F58	C5CB
-6F59	9D91
-6F5A	9D92
-6F5B	9D93
-6F5C	C7B1
-6F5D	9D94
-6F5E	C2BA
-6F5F	9D95
-6F60	9D96
-6F61	9D97
-6F62	E4EA
-6F63	9D98
-6F64	9D99
-6F65	9D9A
-6F66	C1CA
-6F67	9D9B
-6F68	9D9C
-6F69	9D9D
-6F6A	9D9E
-6F6B	9D9F
-6F6C	9DA0
-6F6D	CCB6
-6F6E	B3B1
-6F6F	9DA1
-6F70	9DA2
-6F71	9DA3
-6F72	E4FB
-6F73	9DA4
-6F74	E4F3
-6F75	9DA5
-6F76	9DA6
-6F77	9DA7
-6F78	E4FA
-6F79	9DA8
-6F7A	E4FD
-6F7B	9DA9
-6F7C	E4FC
-6F7D	9DAA
-6F7E	9DAB
-6F7F	9DAC
-6F80	9DAD
-6F81	9DAE
-6F82	9DAF
-6F83	9DB0
-6F84	B3CE
-6F85	9DB1
-6F86	9DB2
-6F87	9DB3
-6F88	B3BA
-6F89	E4F7
-6F8A	9DB4
-6F8B	9DB5
-6F8C	E4F9
-6F8D	E4F8
-6F8E	C5EC
-6F8F	9DB6
-6F90	9DB7
-6F91	9DB8
-6F92	9DB9
-6F93	9DBA
-6F94	9DBB
-6F95	9DBC
-6F96	9DBD
-6F97	9DBE
-6F98	9DBF
-6F99	9DC0
-6F9A	9DC1
-6F9B	9DC2
-6F9C	C0BD
-6F9D	9DC3
-6F9E	9DC4
-6F9F	9DC5
-6FA0	9DC6
-6FA1	D4E8
-6FA2	9DC7
-6FA3	9DC8
-6FA4	9DC9
-6FA5	9DCA
-6FA6	9DCB
-6FA7	E5A2
-6FA8	9DCC
-6FA9	9DCD
-6FAA	9DCE
-6FAB	9DCF
-6FAC	9DD0
-6FAD	9DD1
-6FAE	9DD2
-6FAF	9DD3
-6FB0	9DD4
-6FB1	9DD5
-6FB2	9DD6
-6FB3	B0C4
-6FB4	9DD7
-6FB5	9DD8
-6FB6	E5A4
-6FB7	9DD9
-6FB8	9DDA
-6FB9	E5A3
-6FBA	9DDB
-6FBB	9DDC
-6FBC	9DDD
-6FBD	9DDE
-6FBE	9DDF
-6FBF	9DE0
-6FC0	BCA4
-6FC1	9DE1
-6FC2	E5A5
-6FC3	9DE2
-6FC4	9DE3
-6FC5	9DE4
-6FC6	9DE5
-6FC7	9DE6
-6FC8	9DE7
-6FC9	E5A1
-6FCA	9DE8
-6FCB	9DE9
-6FCC	9DEA
-6FCD	9DEB
-6FCE	9DEC
-6FCF	9DED
-6FD0	9DEE
-6FD1	E4FE
-6FD2	B1F4
-6FD3	9DEF
-6FD4	9DF0
-6FD5	9DF1
-6FD6	9DF2
-6FD7	9DF3
-6FD8	9DF4
-6FD9	9DF5
-6FDA	9DF6
-6FDB	9DF7
-6FDC	9DF8
-6FDD	9DF9
-6FDE	E5A8
-6FDF	9DFA
-6FE0	E5A9
-6FE1	E5A6
-6FE2	9DFB
-6FE3	9DFC
-6FE4	9DFD
-6FE5	9DFE
-6FE6	9E40
-6FE7	9E41
-6FE8	9E42
-6FE9	9E43
-6FEA	9E44
-6FEB	9E45
-6FEC	9E46
-6FED	9E47
-6FEE	E5A7
-6FEF	E5AA
-6FF0	9E48
-6FF1	9E49
-6FF2	9E4A
-6FF3	9E4B
-6FF4	9E4C
-6FF5	9E4D
-6FF6	9E4E
-6FF7	9E4F
-6FF8	9E50
-6FF9	9E51
-6FFA	9E52
-6FFB	9E53
-6FFC	9E54
-6FFD	9E55
-6FFE	9E56
-6FFF	9E57
-7000	9E58
-7001	9E59
-7002	9E5A
-7003	9E5B
-7004	9E5C
-7005	9E5D
-7006	9E5E
-7007	9E5F
-7008	9E60
-7009	9E61
-700A	9E62
-700B	9E63
-700C	9E64
-700D	9E65
-700E	9E66
-700F	9E67
-7010	9E68
-7011	C6D9
-7012	9E69
-7013	9E6A
-7014	9E6B
-7015	9E6C
-7016	9E6D
-7017	9E6E
-7018	9E6F
-7019	9E70
-701A	E5AB
-701B	E5AD
-701C	9E71
-701D	9E72
-701E	9E73
-701F	9E74
-7020	9E75
-7021	9E76
-7022	9E77
-7023	E5AC
-7024	9E78
-7025	9E79
-7026	9E7A
-7027	9E7B
-7028	9E7C
-7029	9E7D
-702A	9E7E
-702B	9E80
-702C	9E81
-702D	9E82
-702E	9E83
-702F	9E84
-7030	9E85
-7031	9E86
-7032	9E87
-7033	9E88
-7034	9E89
-7035	E5AF
-7036	9E8A
-7037	9E8B
-7038	9E8C
-7039	E5AE
-703A	9E8D
-703B	9E8E
-703C	9E8F
-703D	9E90
-703E	9E91
-703F	9E92
-7040	9E93
-7041	9E94
-7042	9E95
-7043	9E96
-7044	9E97
-7045	9E98
-7046	9E99
-7047	9E9A
-7048	9E9B
-7049	9E9C
-704A	9E9D
-704B	9E9E
-704C	B9E0
-704D	9E9F
-704E	9EA0
-704F	E5B0
-7050	9EA1
-7051	9EA2
-7052	9EA3
-7053	9EA4
-7054	9EA5
-7055	9EA6
-7056	9EA7
-7057	9EA8
-7058	9EA9
-7059	9EAA
-705A	9EAB
-705B	9EAC
-705C	9EAD
-705D	9EAE
-705E	E5B1
-705F	9EAF
-7060	9EB0
-7061	9EB1
-7062	9EB2
-7063	9EB3
-7064	9EB4
-7065	9EB5
-7066	9EB6
-7067	9EB7
-7068	9EB8
-7069	9EB9
-706A	9EBA
-706B	BBF0
-706C	ECE1
-706D	C3F0
-706E	9EBB
-706F	B5C6
-7070	BBD2
-7071	9EBC
-7072	9EBD
-7073	9EBE
-7074	9EBF
-7075	C1E9
-7076	D4EE
-7077	9EC0
-7078	BEC4
-7079	9EC1
-707A	9EC2
-707B	9EC3
-707C	D7C6
-707D	9EC4
-707E	D4D6
-707F	B2D3
-7080	ECBE
-7081	9EC5
-7082	9EC6
-7083	9EC7
-7084	9EC8
-7085	EAC1
-7086	9EC9
-7087	9ECA
-7088	9ECB
-7089	C2AF
-708A	B4B6
-708B	9ECC
-708C	9ECD
-708D	9ECE
-708E	D1D7
-708F	9ECF
-7090	9ED0
-7091	9ED1
-7092	B3B4
-7093	9ED2
-7094	C8B2
-7095	BFBB
-7096	ECC0
-7097	9ED3
-7098	9ED4
-7099	D6CB
-709A	9ED5
-709B	9ED6
-709C	ECBF
-709D	ECC1
-709E	9ED7
-709F	9ED8
-70A0	9ED9
-70A1	9EDA
-70A2	9EDB
-70A3	9EDC
-70A4	9EDD
-70A5	9EDE
-70A6	9EDF
-70A7	9EE0
-70A8	9EE1
-70A9	9EE2
-70AA	9EE3
-70AB	ECC5
-70AC	BEE6
-70AD	CCBF
-70AE	C5DA
-70AF	BEBC
-70B0	9EE4
-70B1	ECC6
-70B2	9EE5
-70B3	B1FE
-70B4	9EE6
-70B5	9EE7
-70B6	9EE8
-70B7	ECC4
-70B8	D5A8
-70B9	B5E3
-70BA	9EE9
-70BB	ECC2
-70BC	C1B6
-70BD	B3E3
-70BE	9EEA
-70BF	9EEB
-70C0	ECC3
-70C1	CBB8
-70C2	C0C3
-70C3	CCFE
-70C4	9EEC
-70C5	9EED
-70C6	9EEE
-70C7	9EEF
-70C8	C1D2
-70C9	9EF0
-70CA	ECC8
-70CB	9EF1
-70CC	9EF2
-70CD	9EF3
-70CE	9EF4
-70CF	9EF5
-70D0	9EF6
-70D1	9EF7
-70D2	9EF8
-70D3	9EF9
-70D4	9EFA
-70D5	9EFB
-70D6	9EFC
-70D7	9EFD
-70D8	BAE6
-70D9	C0D3
-70DA	9EFE
-70DB	D6F2
-70DC	9F40
-70DD	9F41
-70DE	9F42
-70DF	D1CC
-70E0	9F43
-70E1	9F44
-70E2	9F45
-70E3	9F46
-70E4	BFBE
-70E5	9F47
-70E6	B7B3
-70E7	C9D5
-70E8	ECC7
-70E9	BBE2
-70EA	9F48
-70EB	CCCC
-70EC	BDFD
-70ED	C8C8
-70EE	9F49
-70EF	CFA9
-70F0	9F4A
-70F1	9F4B
-70F2	9F4C
-70F3	9F4D
-70F4	9F4E
-70F5	9F4F
-70F6	9F50
-70F7	CDE9
-70F8	9F51
-70F9	C5EB
-70FA	9F52
-70FB	9F53
-70FC	9F54
-70FD	B7E9
-70FE	9F55
-70FF	9F56
-7100	9F57
-7101	9F58
-7102	9F59
-7103	9F5A
-7104	9F5B
-7105	9F5C
-7106	9F5D
-7107	9F5E
-7108	9F5F
-7109	D1C9
-710A	BAB8
-710B	9F60
-710C	9F61
-710D	9F62
-710E	9F63
-710F	9F64
-7110	ECC9
-7111	9F65
-7112	9F66
-7113	ECCA
-7114	9F67
-7115	BBC0
-7116	ECCB
-7117	9F68
-7118	ECE2
-7119	B1BA
-711A	B7D9
-711B	9F69
-711C	9F6A
-711D	9F6B
-711E	9F6C
-711F	9F6D
-7120	9F6E
-7121	9F6F
-7122	9F70
-7123	9F71
-7124	9F72
-7125	9F73
-7126	BDB9
-7127	9F74
-7128	9F75
-7129	9F76
-712A	9F77
-712B	9F78
-712C	9F79
-712D	9F7A
-712E	9F7B
-712F	ECCC
-7130	D1E6
-7131	ECCD
-7132	9F7C
-7133	9F7D
-7134	9F7E
-7135	9F80
-7136	C8BB
-7137	9F81
-7138	9F82
-7139	9F83
-713A	9F84
-713B	9F85
-713C	9F86
-713D	9F87
-713E	9F88
-713F	9F89
-7140	9F8A
-7141	9F8B
-7142	9F8C
-7143	9F8D
-7144	9F8E
-7145	ECD1
-7146	9F8F
-7147	9F90
-7148	9F91
-7149	9F92
-714A	ECD3
-714B	9F93
-714C	BBCD
-714D	9F94
-714E	BCE5
-714F	9F95
-7150	9F96
-7151	9F97
-7152	9F98
-7153	9F99
-7154	9F9A
-7155	9F9B
-7156	9F9C
-7157	9F9D
-7158	9F9E
-7159	9F9F
-715A	9FA0
-715B	9FA1
-715C	ECCF
-715D	9FA2
-715E	C9B7
-715F	9FA3
-7160	9FA4
-7161	9FA5
-7162	9FA6
-7163	9FA7
-7164	C3BA
-7165	9FA8
-7166	ECE3
-7167	D5D5
-7168	ECD0
-7169	9FA9
-716A	9FAA
-716B	9FAB
-716C	9FAC
-716D	9FAD
-716E	D6F3
-716F	9FAE
-7170	9FAF
-7171	9FB0
-7172	ECD2
-7173	ECCE
-7174	9FB1
-7175	9FB2
-7176	9FB3
-7177	9FB4
-7178	ECD4
-7179	9FB5
-717A	ECD5
-717B	9FB6
-717C	9FB7
-717D	C9BF
-717E	9FB8
-717F	9FB9
-7180	9FBA
-7181	9FBB
-7182	9FBC
-7183	9FBD
-7184	CFA8
-7185	9FBE
-7186	9FBF
-7187	9FC0
-7188	9FC1
-7189	9FC2
-718A	D0DC
-718B	9FC3
-718C	9FC4
-718D	9FC5
-718E	9FC6
-718F	D1AC
-7190	9FC7
-7191	9FC8
-7192	9FC9
-7193	9FCA
-7194	C8DB
-7195	9FCB
-7196	9FCC
-7197	9FCD
-7198	ECD6
-7199	CEF5
-719A	9FCE
-719B	9FCF
-719C	9FD0
-719D	9FD1
-719E	9FD2
-719F	CAEC
-71A0	ECDA
-71A1	9FD3
-71A2	9FD4
-71A3	9FD5
-71A4	9FD6
-71A5	9FD7
-71A6	9FD8
-71A7	9FD9
-71A8	ECD9
-71A9	9FDA
-71AA	9FDB
-71AB	9FDC
-71AC	B0BE
-71AD	9FDD
-71AE	9FDE
-71AF	9FDF
-71B0	9FE0
-71B1	9FE1
-71B2	9FE2
-71B3	ECD7
-71B4	9FE3
-71B5	ECD8
-71B6	9FE4
-71B7	9FE5
-71B8	9FE6
-71B9	ECE4
-71BA	9FE7
-71BB	9FE8
-71BC	9FE9
-71BD	9FEA
-71BE	9FEB
-71BF	9FEC
-71C0	9FED
-71C1	9FEE
-71C2	9FEF
-71C3	C8BC
-71C4	9FF0
-71C5	9FF1
-71C6	9FF2
-71C7	9FF3
-71C8	9FF4
-71C9	9FF5
-71CA	9FF6
-71CB	9FF7
-71CC	9FF8
-71CD	9FF9
-71CE	C1C7
-71CF	9FFA
-71D0	9FFB
-71D1	9FFC
-71D2	9FFD
-71D3	9FFE
-71D4	ECDC
-71D5	D1E0
-71D6	A040
-71D7	A041
-71D8	A042
-71D9	A043
-71DA	A044
-71DB	A045
-71DC	A046
-71DD	A047
-71DE	A048
-71DF	A049
-71E0	ECDB
-71E1	A04A
-71E2	A04B
-71E3	A04C
-71E4	A04D
-71E5	D4EF
-71E6	A04E
-71E7	ECDD
-71E8	A04F
-71E9	A050
-71EA	A051
-71EB	A052
-71EC	A053
-71ED	A054
-71EE	DBC6
-71EF	A055
-71F0	A056
-71F1	A057
-71F2	A058
-71F3	A059
-71F4	A05A
-71F5	A05B
-71F6	A05C
-71F7	A05D
-71F8	A05E
-71F9	ECDE
-71FA	A05F
-71FB	A060
-71FC	A061
-71FD	A062
-71FE	A063
-71FF	A064
-7200	A065
-7201	A066
-7202	A067
-7203	A068
-7204	A069
-7205	A06A
-7206	B1AC
-7207	A06B
-7208	A06C
-7209	A06D
-720A	A06E
-720B	A06F
-720C	A070
-720D	A071
-720E	A072
-720F	A073
-7210	A074
-7211	A075
-7212	A076
-7213	A077
-7214	A078
-7215	A079
-7216	A07A
-7217	A07B
-7218	A07C
-7219	A07D
-721A	A07E
-721B	A080
-721C	A081
-721D	ECDF
-721E	A082
-721F	A083
-7220	A084
-7221	A085
-7222	A086
-7223	A087
-7224	A088
-7225	A089
-7226	A08A
-7227	A08B
-7228	ECE0
-7229	A08C
-722A	D7A6
-722B	A08D
-722C	C5C0
-722D	A08E
-722E	A08F
-722F	A090
-7230	EBBC
-7231	B0AE
-7232	A091
-7233	A092
-7234	A093
-7235	BEF4
-7236	B8B8
-7237	D2AF
-7238	B0D6
-7239	B5F9
-723A	A094
-723B	D8B3
-723C	A095
-723D	CBAC
-723E	A096
-723F	E3DD
-7240	A097
-7241	A098
-7242	A099
-7243	A09A
-7244	A09B
-7245	A09C
-7246	A09D
-7247	C6AC
-7248	B0E6
-7249	A09E
-724A	A09F
-724B	A0A0
-724C	C5C6
-724D	EBB9
-724E	A0A1
-724F	A0A2
-7250	A0A3
-7251	A0A4
-7252	EBBA
-7253	A0A5
-7254	A0A6
-7255	A0A7
-7256	EBBB
-7257	A0A8
-7258	A0A9
-7259	D1C0
-725A	A0AA
-725B	C5A3
-725C	A0AB
-725D	EAF2
-725E	A0AC
-725F	C4B2
-7260	A0AD
-7261	C4B5
-7262	C0CE
-7263	A0AE
-7264	A0AF
-7265	A0B0
-7266	EAF3
-7267	C4C1
-7268	A0B1
-7269	CEEF
-726A	A0B2
-726B	A0B3
-726C	A0B4
-726D	A0B5
-726E	EAF0
-726F	EAF4
-7270	A0B6
-7271	A0B7
-7272	C9FC
-7273	A0B8
-7274	A0B9
-7275	C7A3
-7276	A0BA
-7277	A0BB
-7278	A0BC
-7279	CCD8
-727A	CEFE
-727B	A0BD
-727C	A0BE
-727D	A0BF
-727E	EAF5
-727F	EAF6
-7280	CFAC
-7281	C0E7
-7282	A0C0
-7283	A0C1
-7284	EAF7
-7285	A0C2
-7286	A0C3
-7287	A0C4
-7288	A0C5
-7289	A0C6
-728A	B6BF
-728B	EAF8
-728C	A0C7
-728D	EAF9
-728E	A0C8
-728F	EAFA
-7290	A0C9
-7291	A0CA
-7292	EAFB
-7293	A0CB
-7294	A0CC
-7295	A0CD
-7296	A0CE
-7297	A0CF
-7298	A0D0
-7299	A0D1
-729A	A0D2
-729B	A0D3
-729C	A0D4
-729D	A0D5
-729E	A0D6
-729F	EAF1
-72A0	A0D7
-72A1	A0D8
-72A2	A0D9
-72A3	A0DA
-72A4	A0DB
-72A5	A0DC
-72A6	A0DD
-72A7	A0DE
-72A8	A0DF
-72A9	A0E0
-72AA	A0E1
-72AB	A0E2
-72AC	C8AE
-72AD	E1EB
-72AE	A0E3
-72AF	B7B8
-72B0	E1EC
-72B1	A0E4
-72B2	A0E5
-72B3	A0E6
-72B4	E1ED
-72B5	A0E7
-72B6	D7B4
-72B7	E1EE
-72B8	E1EF
-72B9	D3CC
-72BA	A0E8
-72BB	A0E9
-72BC	A0EA
-72BD	A0EB
-72BE	A0EC
-72BF	A0ED
-72C0	A0EE
-72C1	E1F1
-72C2	BFF1
-72C3	E1F0
-72C4	B5D2
-72C5	A0EF
-72C6	A0F0
-72C7	A0F1
-72C8	B1B7
-72C9	A0F2
-72CA	A0F3
-72CB	A0F4
-72CC	A0F5
-72CD	E1F3
-72CE	E1F2
-72CF	A0F6
-72D0	BAFC
-72D1	A0F7
-72D2	E1F4
-72D3	A0F8
-72D4	A0F9
-72D5	A0FA
-72D6	A0FB
-72D7	B9B7
-72D8	A0FC
-72D9	BED1
-72DA	A0FD
-72DB	A0FE
-72DC	AA40
-72DD	AA41
-72DE	C4FC
-72DF	AA42
-72E0	BADD
-72E1	BDC6
-72E2	AA43
-72E3	AA44
-72E4	AA45
-72E5	AA46
-72E6	AA47
-72E7	AA48
-72E8	E1F5
-72E9	E1F7
-72EA	AA49
-72EB	AA4A
-72EC	B6C0
-72ED	CFC1
-72EE	CAA8
-72EF	E1F6
-72F0	D5F8
-72F1	D3FC
-72F2	E1F8
-72F3	E1FC
-72F4	E1F9
-72F5	AA4B
-72F6	AA4C
-72F7	E1FA
-72F8	C0EA
-72F9	AA4D
-72FA	E1FE
-72FB	E2A1
-72FC	C0C7
-72FD	AA4E
-72FE	AA4F
-72FF	AA50
-7300	AA51
-7301	E1FB
-7302	AA52
-7303	E1FD
-7304	AA53
-7305	AA54
-7306	AA55
-7307	AA56
-7308	AA57
-7309	AA58
-730A	E2A5
-730B	AA59
-730C	AA5A
-730D	AA5B
-730E	C1D4
-730F	AA5C
-7310	AA5D
-7311	AA5E
-7312	AA5F
-7313	E2A3
-7314	AA60
-7315	E2A8
-7316	B2FE
-7317	E2A2
-7318	AA61
-7319	AA62
-731A	AA63
-731B	C3CD
-731C	B2C2
-731D	E2A7
-731E	E2A6
-731F	AA64
-7320	AA65
-7321	E2A4
-7322	E2A9
-7323	AA66
-7324	AA67
-7325	E2AB
-7326	AA68
-7327	AA69
-7328	AA6A
-7329	D0C9
-732A	D6ED
-732B	C3A8
-732C	E2AC
-732D	AA6B
-732E	CFD7
-732F	AA6C
-7330	AA6D
-7331	E2AE
-7332	AA6E
-7333	AA6F
-7334	BAEF
-7335	AA70
-7336	AA71
-7337	E9E0
-7338	E2AD
-7339	E2AA
-733A	AA72
-733B	AA73
-733C	AA74
-733D	AA75
-733E	BBAB
-733F	D4B3
-7340	AA76
-7341	AA77
-7342	AA78
-7343	AA79
-7344	AA7A
-7345	AA7B
-7346	AA7C
-7347	AA7D
-7348	AA7E
-7349	AA80
-734A	AA81
-734B	AA82
-734C	AA83
-734D	E2B0
-734E	AA84
-734F	AA85
-7350	E2AF
-7351	AA86
-7352	E9E1
-7353	AA87
-7354	AA88
-7355	AA89
-7356	AA8A
-7357	E2B1
-7358	AA8B
-7359	AA8C
-735A	AA8D
-735B	AA8E
-735C	AA8F
-735D	AA90
-735E	AA91
-735F	AA92
-7360	E2B2
-7361	AA93
-7362	AA94
-7363	AA95
-7364	AA96
-7365	AA97
-7366	AA98
-7367	AA99
-7368	AA9A
-7369	AA9B
-736A	AA9C
-736B	AA9D
-736C	E2B3
-736D	CCA1
-736E	AA9E
-736F	E2B4
-7370	AA9F
-7371	AAA0
-7372	AB40
-7373	AB41
-7374	AB42
-7375	AB43
-7376	AB44
-7377	AB45
-7378	AB46
-7379	AB47
-737A	AB48
-737B	AB49
-737C	AB4A
-737D	AB4B
-737E	E2B5
-737F	AB4C
-7380	AB4D
-7381	AB4E
-7382	AB4F
-7383	AB50
-7384	D0FE
-7385	AB51
-7386	AB52
-7387	C2CA
-7388	AB53
-7389	D3F1
-738A	AB54
-738B	CDF5
-738C	AB55
-738D	AB56
-738E	E7E0
-738F	AB57
-7390	AB58
-7391	E7E1
-7392	AB59
-7393	AB5A
-7394	AB5B
-7395	AB5C
-7396	BEC1
-7397	AB5D
-7398	AB5E
-7399	AB5F
-739A	AB60
-739B	C2EA
-739C	AB61
-739D	AB62
-739E	AB63
-739F	E7E4
-73A0	AB64
-73A1	AB65
-73A2	E7E3
-73A3	AB66
-73A4	AB67
-73A5	AB68
-73A6	AB69
-73A7	AB6A
-73A8	AB6B
-73A9	CDE6
-73AA	AB6C
-73AB	C3B5
-73AC	AB6D
-73AD	AB6E
-73AE	E7E2
-73AF	BBB7
-73B0	CFD6
-73B1	AB6F
-73B2	C1E1
-73B3	E7E9
-73B4	AB70
-73B5	AB71
-73B6	AB72
-73B7	E7E8
-73B8	AB73
-73B9	AB74
-73BA	E7F4
-73BB	B2A3
-73BC	AB75
-73BD	AB76
-73BE	AB77
-73BF	AB78
-73C0	E7EA
-73C1	AB79
-73C2	E7E6
-73C3	AB7A
-73C4	AB7B
-73C5	AB7C
-73C6	AB7D
-73C7	AB7E
-73C8	E7EC
-73C9	E7EB
-73CA	C9BA
-73CB	AB80
-73CC	AB81
-73CD	D5E4
-73CE	AB82
-73CF	E7E5
-73D0	B7A9
-73D1	E7E7
-73D2	AB83
-73D3	AB84
-73D4	AB85
-73D5	AB86
-73D6	AB87
-73D7	AB88
-73D8	AB89
-73D9	E7EE
-73DA	AB8A
-73DB	AB8B
-73DC	AB8C
-73DD	AB8D
-73DE	E7F3
-73DF	AB8E
-73E0	D6E9
-73E1	AB8F
-73E2	AB90
-73E3	AB91
-73E4	AB92
-73E5	E7ED
-73E6	AB93
-73E7	E7F2
-73E8	AB94
-73E9	E7F1
-73EA	AB95
-73EB	AB96
-73EC	AB97
-73ED	B0E0
-73EE	AB98
-73EF	AB99
-73F0	AB9A
-73F1	AB9B
-73F2	E7F5
-73F3	AB9C
-73F4	AB9D
-73F5	AB9E
-73F6	AB9F
-73F7	ABA0
-73F8	AC40
-73F9	AC41
-73FA	AC42
-73FB	AC43
-73FC	AC44
-73FD	AC45
-73FE	AC46
-73FF	AC47
-7400	AC48
-7401	AC49
-7402	AC4A
-7403	C7F2
-7404	AC4B
-7405	C0C5
-7406	C0ED
-7407	AC4C
-7408	AC4D
-7409	C1F0
-740A	E7F0
-740B	AC4E
-740C	AC4F
-740D	AC50
-740E	AC51
-740F	E7F6
-7410	CBF6
-7411	AC52
-7412	AC53
-7413	AC54
-7414	AC55
-7415	AC56
-7416	AC57
-7417	AC58
-7418	AC59
-7419	AC5A
-741A	E8A2
-741B	E8A1
-741C	AC5B
-741D	AC5C
-741E	AC5D
-741F	AC5E
-7420	AC5F
-7421	AC60
-7422	D7C1
-7423	AC61
-7424	AC62
-7425	E7FA
-7426	E7F9
-7427	AC63
-7428	E7FB
-7429	AC64
-742A	E7F7
-742B	AC65
-742C	E7FE
-742D	AC66
-742E	E7FD
-742F	AC67
-7430	E7FC
-7431	AC68
-7432	AC69
-7433	C1D5
-7434	C7D9
-7435	C5FD
-7436	C5C3
-7437	AC6A
-7438	AC6B
-7439	AC6C
-743A	AC6D
-743B	AC6E
-743C	C7ED
-743D	AC6F
-743E	AC70
-743F	AC71
-7440	AC72
-7441	E8A3
-7442	AC73
-7443	AC74
-7444	AC75
-7445	AC76
-7446	AC77
-7447	AC78
-7448	AC79
-7449	AC7A
-744A	AC7B
-744B	AC7C
-744C	AC7D
-744D	AC7E
-744E	AC80
-744F	AC81
-7450	AC82
-7451	AC83
-7452	AC84
-7453	AC85
-7454	AC86
-7455	E8A6
-7456	AC87
-7457	E8A5
-7458	AC88
-7459	E8A7
-745A	BAF7
-745B	E7F8
-745C	E8A4
-745D	AC89
-745E	C8F0
-745F	C9AA
-7460	AC8A
-7461	AC8B
-7462	AC8C
-7463	AC8D
-7464	AC8E
-7465	AC8F
-7466	AC90
-7467	AC91
-7468	AC92
-7469	AC93
-746A	AC94
-746B	AC95
-746C	AC96
-746D	E8A9
-746E	AC97
-746F	AC98
-7470	B9E5
-7471	AC99
-7472	AC9A
-7473	AC9B
-7474	AC9C
-7475	AC9D
-7476	D1FE
-7477	E8A8
-7478	AC9E
-7479	AC9F
-747A	ACA0
-747B	AD40
-747C	AD41
-747D	AD42
-747E	E8AA
-747F	AD43
-7480	E8AD
-7481	E8AE
-7482	AD44
-7483	C1A7
-7484	AD45
-7485	AD46
-7486	AD47
-7487	E8AF
-7488	AD48
-7489	AD49
-748A	AD4A
-748B	E8B0
-748C	AD4B
-748D	AD4C
-748E	E8AC
-748F	AD4D
-7490	E8B4
-7491	AD4E
-7492	AD4F
-7493	AD50
-7494	AD51
-7495	AD52
-7496	AD53
-7497	AD54
-7498	AD55
-7499	AD56
-749A	AD57
-749B	AD58
-749C	E8AB
-749D	AD59
-749E	E8B1
-749F	AD5A
-74A0	AD5B
-74A1	AD5C
-74A2	AD5D
-74A3	AD5E
-74A4	AD5F
-74A5	AD60
-74A6	AD61
-74A7	E8B5
-74A8	E8B2
-74A9	E8B3
-74AA	AD62
-74AB	AD63
-74AC	AD64
-74AD	AD65
-74AE	AD66
-74AF	AD67
-74B0	AD68
-74B1	AD69
-74B2	AD6A
-74B3	AD6B
-74B4	AD6C
-74B5	AD6D
-74B6	AD6E
-74B7	AD6F
-74B8	AD70
-74B9	AD71
-74BA	E8B7
-74BB	AD72
-74BC	AD73
-74BD	AD74
-74BE	AD75
-74BF	AD76
-74C0	AD77
-74C1	AD78
-74C2	AD79
-74C3	AD7A
-74C4	AD7B
-74C5	AD7C
-74C6	AD7D
-74C7	AD7E
-74C8	AD80
-74C9	AD81
-74CA	AD82
-74CB	AD83
-74CC	AD84
-74CD	AD85
-74CE	AD86
-74CF	AD87
-74D0	AD88
-74D1	AD89
-74D2	E8B6
-74D3	AD8A
-74D4	AD8B
-74D5	AD8C
-74D6	AD8D
-74D7	AD8E
-74D8	AD8F
-74D9	AD90
-74DA	AD91
-74DB	AD92
-74DC	B9CF
-74DD	AD93
-74DE	F0AC
-74DF	AD94
-74E0	F0AD
-74E1	AD95
-74E2	C6B0
-74E3	B0EA
-74E4	C8BF
-74E5	AD96
-74E6	CDDF
-74E7	AD97
-74E8	AD98
-74E9	AD99
-74EA	AD9A
-74EB	AD9B
-74EC	AD9C
-74ED	AD9D
-74EE	CECD
-74EF	EAB1
-74F0	AD9E
-74F1	AD9F
-74F2	ADA0
-74F3	AE40
-74F4	EAB2
-74F5	AE41
-74F6	C6BF
-74F7	B4C9
-74F8	AE42
-74F9	AE43
-74FA	AE44
-74FB	AE45
-74FC	AE46
-74FD	AE47
-74FE	AE48
-74FF	EAB3
-7500	AE49
-7501	AE4A
-7502	AE4B
-7503	AE4C
-7504	D5E7
-7505	AE4D
-7506	AE4E
-7507	AE4F
-7508	AE50
-7509	AE51
-750A	AE52
-750B	AE53
-750C	AE54
-750D	DDF9
-750E	AE55
-750F	EAB4
-7510	AE56
-7511	EAB5
-7512	AE57
-7513	EAB6
-7514	AE58
-7515	AE59
-7516	AE5A
-7517	AE5B
-7518	B8CA
-7519	DFB0
-751A	C9F5
-751B	AE5C
-751C	CCF0
-751D	AE5D
-751E	AE5E
-751F	C9FA
-7520	AE5F
-7521	AE60
-7522	AE61
-7523	AE62
-7524	AE63
-7525	C9FB
-7526	AE64
-7527	AE65
-7528	D3C3
-7529	CBA6
-752A	AE66
-752B	B8A6
-752C	F0AE
-752D	B1C2
-752E	AE67
-752F	E5B8
-7530	CCEF
-7531	D3C9
-7532	BCD7
-7533	C9EA
-7534	AE68
-7535	B5E7
-7536	AE69
-7537	C4D0
-7538	B5E9
-7539	AE6A
-753A	EEAE
-753B	BBAD
-753C	AE6B
-753D	AE6C
-753E	E7DE
-753F	AE6D
-7540	EEAF
-7541	AE6E
-7542	AE6F
-7543	AE70
-7544	AE71
-7545	B3A9
-7546	AE72
-7547	AE73
-7548	EEB2
-7549	AE74
-754A	AE75
-754B	EEB1
-754C	BDE7
-754D	AE76
-754E	EEB0
-754F	CEB7
-7550	AE77
-7551	AE78
-7552	AE79
-7553	AE7A
-7554	C5CF
-7555	AE7B
-7556	AE7C
-7557	AE7D
-7558	AE7E
-7559	C1F4
-755A	DBCE
-755B	EEB3
-755C	D0F3
-755D	AE80
-755E	AE81
-755F	AE82
-7560	AE83
-7561	AE84
-7562	AE85
-7563	AE86
-7564	AE87
-7565	C2D4
-7566	C6E8
-7567	AE88
-7568	AE89
-7569	AE8A
-756A	B7AC
-756B	AE8B
-756C	AE8C
-756D	AE8D
-756E	AE8E
-756F	AE8F
-7570	AE90
-7571	AE91
-7572	EEB4
-7573	AE92
-7574	B3EB
-7575	AE93
-7576	AE94
-7577	AE95
-7578	BBFB
-7579	EEB5
-757A	AE96
-757B	AE97
-757C	AE98
-757D	AE99
-757E	AE9A
-757F	E7DC
-7580	AE9B
-7581	AE9C
-7582	AE9D
-7583	EEB6
-7584	AE9E
-7585	AE9F
-7586	BDAE
-7587	AEA0
-7588	AF40
-7589	AF41
-758A	AF42
-758B	F1E2
-758C	AF43
-758D	AF44
-758E	AF45
-758F	CAE8
-7590	AF46
-7591	D2C9
-7592	F0DA
-7593	AF47
-7594	F0DB
-7595	AF48
-7596	F0DC
-7597	C1C6
-7598	AF49
-7599	B8ED
-759A	BECE
-759B	AF4A
-759C	AF4B
-759D	F0DE
-759E	AF4C
-759F	C5B1
-75A0	F0DD
-75A1	D1F1
-75A2	AF4D
-75A3	F0E0
-75A4	B0CC
-75A5	BDEA
-75A6	AF4E
-75A7	AF4F
-75A8	AF50
-75A9	AF51
-75AA	AF52
-75AB	D2DF
-75AC	F0DF
-75AD	AF53
-75AE	B4AF
-75AF	B7E8
-75B0	F0E6
-75B1	F0E5
-75B2	C6A3
-75B3	F0E1
-75B4	F0E2
-75B5	B4C3
-75B6	AF54
-75B7	AF55
-75B8	F0E3
-75B9	D5EE
-75BA	AF56
-75BB	AF57
-75BC	CCDB
-75BD	BED2
-75BE	BCB2
-75BF	AF58
-75C0	AF59
-75C1	AF5A
-75C2	F0E8
-75C3	F0E7
-75C4	F0E4
-75C5	B2A1
-75C6	AF5B
-75C7	D6A2
-75C8	D3B8
-75C9	BEB7
-75CA	C8AC
-75CB	AF5C
-75CC	AF5D
-75CD	F0EA
-75CE	AF5E
-75CF	AF5F
-75D0	AF60
-75D1	AF61
-75D2	D1F7
-75D3	AF62
-75D4	D6CC
-75D5	BADB
-75D6	F0E9
-75D7	AF63
-75D8	B6BB
-75D9	AF64
-75DA	AF65
-75DB	CDB4
-75DC	AF66
-75DD	AF67
-75DE	C6A6
-75DF	AF68
-75E0	AF69
-75E1	AF6A
-75E2	C1A1
-75E3	F0EB
-75E4	F0EE
-75E5	AF6B
-75E6	F0ED
-75E7	F0F0
-75E8	F0EC
-75E9	AF6C
-75EA	BBBE
-75EB	F0EF
-75EC	AF6D
-75ED	AF6E
-75EE	AF6F
-75EF	AF70
-75F0	CCB5
-75F1	F0F2
-75F2	AF71
-75F3	AF72
-75F4	B3D5
-75F5	AF73
-75F6	AF74
-75F7	AF75
-75F8	AF76
-75F9	B1D4
-75FA	AF77
-75FB	AF78
-75FC	F0F3
-75FD	AF79
-75FE	AF7A
-75FF	F0F4
-7600	F0F6
-7601	B4E1
-7602	AF7B
-7603	F0F1
-7604	AF7C
-7605	F0F7
-7606	AF7D
-7607	AF7E
-7608	AF80
-7609	AF81
-760A	F0FA
-760B	AF82
-760C	F0F8
-760D	AF83
-760E	AF84
-760F	AF85
-7610	F0F5
-7611	AF86
-7612	AF87
-7613	AF88
-7614	AF89
-7615	F0FD
-7616	AF8A
-7617	F0F9
-7618	F0FC
-7619	F0FE
-761A	AF8B
-761B	F1A1
-761C	AF8C
-761D	AF8D
-761E	AF8E
-761F	CEC1
-7620	F1A4
-7621	AF8F
-7622	F1A3
-7623	AF90
-7624	C1F6
-7625	F0FB
-7626	CADD
-7627	AF91
-7628	AF92
-7629	B4F1
-762A	B1F1
-762B	CCB1
-762C	AF93
-762D	F1A6
-762E	AF94
-762F	AF95
-7630	F1A7
-7631	AF96
-7632	AF97
-7633	F1AC
-7634	D5CE
-7635	F1A9
-7636	AF98
-7637	AF99
-7638	C8B3
-7639	AF9A
-763A	AF9B
-763B	AF9C
-763C	F1A2
-763D	AF9D
-763E	F1AB
-763F	F1A8
-7640	F1A5
-7641	AF9E
-7642	AF9F
-7643	F1AA
-7644	AFA0
-7645	B040
-7646	B041
-7647	B042
-7648	B043
-7649	B044
-764A	B045
-764B	B046
-764C	B0A9
-764D	F1AD
-764E	B047
-764F	B048
-7650	B049
-7651	B04A
-7652	B04B
-7653	B04C
-7654	F1AF
-7655	B04D
-7656	F1B1
-7657	B04E
-7658	B04F
-7659	B050
-765A	B051
-765B	B052
-765C	F1B0
-765D	B053
-765E	F1AE
-765F	B054
-7660	B055
-7661	B056
-7662	B057
-7663	D1A2
-7664	B058
-7665	B059
-7666	B05A
-7667	B05B
-7668	B05C
-7669	B05D
-766A	B05E
-766B	F1B2
-766C	B05F
-766D	B060
-766E	B061
-766F	F1B3
-7670	B062
-7671	B063
-7672	B064
-7673	B065
-7674	B066
-7675	B067
-7676	B068
-7677	B069
-7678	B9EF
-7679	B06A
-767A	B06B
-767B	B5C7
-767C	B06C
-767D	B0D7
-767E	B0D9
-767F	B06D
-7680	B06E
-7681	B06F
-7682	D4ED
-7683	B070
-7684	B5C4
-7685	B071
-7686	BDD4
-7687	BBCA
-7688	F0A7
-7689	B072
-768A	B073
-768B	B8DE
-768C	B074
-768D	B075
-768E	F0A8
-768F	B076
-7690	B077
-7691	B0A8
-7692	B078
-7693	F0A9
-7694	B079
-7695	B07A
-7696	CDEE
-7697	B07B
-7698	B07C
-7699	F0AA
-769A	B07D
-769B	B07E
-769C	B080
-769D	B081
-769E	B082
-769F	B083
-76A0	B084
-76A1	B085
-76A2	B086
-76A3	B087
-76A4	F0AB
-76A5	B088
-76A6	B089
-76A7	B08A
-76A8	B08B
-76A9	B08C
-76AA	B08D
-76AB	B08E
-76AC	B08F
-76AD	B090
-76AE	C6A4
-76AF	B091
-76B0	B092
-76B1	D6E5
-76B2	F1E4
-76B3	B093
-76B4	F1E5
-76B5	B094
-76B6	B095
-76B7	B096
-76B8	B097
-76B9	B098
-76BA	B099
-76BB	B09A
-76BC	B09B
-76BD	B09C
-76BE	B09D
-76BF	C3F3
-76C0	B09E
-76C1	B09F
-76C2	D3DB
-76C3	B0A0
-76C4	B140
-76C5	D6D1
-76C6	C5E8
-76C7	B141
-76C8	D3AF
-76C9	B142
-76CA	D2E6
-76CB	B143
-76CC	B144
-76CD	EEC1
-76CE	B0BB
-76CF	D5B5
-76D0	D1CE
-76D1	BCE0
-76D2	BAD0
-76D3	B145
-76D4	BFF8
-76D5	B146
-76D6	B8C7
-76D7	B5C1
-76D8	C5CC
-76D9	B147
-76DA	B148
-76DB	CAA2
-76DC	B149
-76DD	B14A
-76DE	B14B
-76DF	C3CB
-76E0	B14C
-76E1	B14D
-76E2	B14E
-76E3	B14F
-76E4	B150
-76E5	EEC2
-76E6	B151
-76E7	B152
-76E8	B153
-76E9	B154
-76EA	B155
-76EB	B156
-76EC	B157
-76ED	B158
-76EE	C4BF
-76EF	B6A2
-76F0	B159
-76F1	EDEC
-76F2	C3A4
-76F3	B15A
-76F4	D6B1
-76F5	B15B
-76F6	B15C
-76F7	B15D
-76F8	CFE0
-76F9	EDEF
-76FA	B15E
-76FB	B15F
-76FC	C5CE
-76FD	B160
-76FE	B6DC
-76FF	B161
-7700	B162
-7701	CAA1
-7702	B163
-7703	B164
-7704	EDED
-7705	B165
-7706	B166
-7707	EDF0
-7708	EDF1
-7709	C3BC
-770A	B167
-770B	BFB4
-770C	B168
-770D	EDEE
-770E	B169
-770F	B16A
-7710	B16B
-7711	B16C
-7712	B16D
-7713	B16E
-7714	B16F
-7715	B170
-7716	B171
-7717	B172
-7718	B173
-7719	EDF4
-771A	EDF2
-771B	B174
-771C	B175
-771D	B176
-771E	B177
-771F	D5E6
-7720	C3DF
-7721	B178
-7722	EDF3
-7723	B179
-7724	B17A
-7725	B17B
-7726	EDF6
-7727	B17C
-7728	D5A3
-7729	D1A3
-772A	B17D
-772B	B17E
-772C	B180
-772D	EDF5
-772E	B181
-772F	C3D0
-7730	B182
-7731	B183
-7732	B184
-7733	B185
-7734	B186
-7735	EDF7
-7736	BFF4
-7737	BEEC
-7738	EDF8
-7739	B187
-773A	CCF7
-773B	B188
-773C	D1DB
-773D	B189
-773E	B18A
-773F	B18B
-7740	D7C5
-7741	D5F6
-7742	B18C
-7743	EDFC
-7744	B18D
-7745	B18E
-7746	B18F
-7747	EDFB
-7748	B190
-7749	B191
-774A	B192
-774B	B193
-774C	B194
-774D	B195
-774E	B196
-774F	B197
-7750	EDF9
-7751	EDFA
-7752	B198
-7753	B199
-7754	B19A
-7755	B19B
-7756	B19C
-7757	B19D
-7758	B19E
-7759	B19F
-775A	EDFD
-775B	BEA6
-775C	B1A0
-775D	B240
-775E	B241
-775F	B242
-7760	B243
-7761	CBAF
-7762	EEA1
-7763	B6BD
-7764	B244
-7765	EEA2
-7766	C4C0
-7767	B245
-7768	EDFE
-7769	B246
-776A	B247
-776B	BDDE
-776C	B2C7
-776D	B248
-776E	B249
-776F	B24A
-7770	B24B
-7771	B24C
-7772	B24D
-7773	B24E
-7774	B24F
-7775	B250
-7776	B251
-7777	B252
-7778	B253
-7779	B6C3
-777A	B254
-777B	B255
-777C	B256
-777D	EEA5
-777E	D8BA
-777F	EEA3
-7780	EEA6
-7781	B257
-7782	B258
-7783	B259
-7784	C3E9
-7785	B3F2
-7786	B25A
-7787	B25B
-7788	B25C
-7789	B25D
-778A	B25E
-778B	B25F
-778C	EEA7
-778D	EEA4
-778E	CFB9
-778F	B260
-7790	B261
-7791	EEA8
-7792	C2F7
-7793	B262
-7794	B263
-7795	B264
-7796	B265
-7797	B266
-7798	B267
-7799	B268
-779A	B269
-779B	B26A
-779C	B26B
-779D	B26C
-779E	B26D
-779F	EEA9
-77A0	EEAA
-77A1	B26E
-77A2	DEAB
-77A3	B26F
-77A4	B270
-77A5	C6B3
-77A6	B271
-77A7	C7C6
-77A8	B272
-77A9	D6F5
-77AA	B5C9
-77AB	B273
-77AC	CBB2
-77AD	B274
-77AE	B275
-77AF	B276
-77B0	EEAB
-77B1	B277
-77B2	B278
-77B3	CDAB
-77B4	B279
-77B5	EEAC
-77B6	B27A
-77B7	B27B
-77B8	B27C
-77B9	B27D
-77BA	B27E
-77BB	D5B0
-77BC	B280
-77BD	EEAD
-77BE	B281
-77BF	F6C4
-77C0	B282
-77C1	B283
-77C2	B284
-77C3	B285
-77C4	B286
-77C5	B287
-77C6	B288
-77C7	B289
-77C8	B28A
-77C9	B28B
-77CA	B28C
-77CB	B28D
-77CC	B28E
-77CD	DBC7
-77CE	B28F
-77CF	B290
-77D0	B291
-77D1	B292
-77D2	B293
-77D3	B294
-77D4	B295
-77D5	B296
-77D6	B297
-77D7	B4A3
-77D8	B298
-77D9	B299
-77DA	B29A
-77DB	C3AC
-77DC	F1E6
-77DD	B29B
-77DE	B29C
-77DF	B29D
-77E0	B29E
-77E1	B29F
-77E2	CAB8
-77E3	D2D3
-77E4	B2A0
-77E5	D6AA
-77E6	B340
-77E7	EFF2
-77E8	B341
-77E9	BED8
-77EA	B342
-77EB	BDC3
-77EC	EFF3
-77ED	B6CC
-77EE	B0AB
-77EF	B343
-77F0	B344
-77F1	B345
-77F2	B346
-77F3	CAAF
-77F4	B347
-77F5	B348
-77F6	EDB6
-77F7	B349
-77F8	EDB7
-77F9	B34A
-77FA	B34B
-77FB	B34C
-77FC	B34D
-77FD	CEF9
-77FE	B7AF
-77FF	BFF3
-7800	EDB8
-7801	C2EB
-7802	C9B0
-7803	B34E
-7804	B34F
-7805	B350
-7806	B351
-7807	B352
-7808	B353
-7809	EDB9
-780A	B354
-780B	B355
-780C	C6F6
-780D	BFB3
-780E	B356
-780F	B357
-7810	B358
-7811	EDBC
-7812	C5F8
-7813	B359
-7814	D1D0
-7815	B35A
-7816	D7A9
-7817	EDBA
-7818	EDBB
-7819	B35B
-781A	D1E2
-781B	B35C
-781C	EDBF
-781D	EDC0
-781E	B35D
-781F	EDC4
-7820	B35E
-7821	B35F
-7822	B360
-7823	EDC8
-7824	B361
-7825	EDC6
-7826	EDCE
-7827	D5E8
-7828	B362
-7829	EDC9
-782A	B363
-782B	B364
-782C	EDC7
-782D	EDBE
-782E	B365
-782F	B366
-7830	C5E9
-7831	B367
-7832	B368
-7833	B369
-7834	C6C6
-7835	B36A
-7836	B36B
-7837	C9E9
-7838	D4D2
-7839	EDC1
-783A	EDC2
-783B	EDC3
-783C	EDC5
-783D	B36C
-783E	C0F9
-783F	B36D
-7840	B4A1
-7841	B36E
-7842	B36F
-7843	B370
-7844	B371
-7845	B9E8
-7846	B372
-7847	EDD0
-7848	B373
-7849	B374
-784A	B375
-784B	B376
-784C	EDD1
-784D	B377
-784E	EDCA
-784F	B378
-7850	EDCF
-7851	B379
-7852	CEF8
-7853	B37A
-7854	B37B
-7855	CBB6
-7856	EDCC
-7857	EDCD
-7858	B37C
-7859	B37D
-785A	B37E
-785B	B380
-785C	B381
-785D	CFF5
-785E	B382
-785F	B383
-7860	B384
-7861	B385
-7862	B386
-7863	B387
-7864	B388
-7865	B389
-7866	B38A
-7867	B38B
-7868	B38C
-7869	B38D
-786A	EDD2
-786B	C1F2
-786C	D3B2
-786D	EDCB
-786E	C8B7
-786F	B38E
-7870	B38F
-7871	B390
-7872	B391
-7873	B392
-7874	B393
-7875	B394
-7876	B395
-7877	BCEF
-7878	B396
-7879	B397
-787A	B398
-787B	B399
-787C	C5F0
-787D	B39A
-787E	B39B
-787F	B39C
-7880	B39D
-7881	B39E
-7882	B39F
-7883	B3A0
-7884	B440
-7885	B441
-7886	B442
-7887	EDD6
-7888	B443
-7889	B5EF
-788A	B444
-788B	B445
-788C	C2B5
-788D	B0AD
-788E	CBE9
-788F	B446
-7890	B447
-7891	B1AE
-7892	B448
-7893	EDD4
-7894	B449
-7895	B44A
-7896	B44B
-7897	CDEB
-7898	B5E2
-7899	B44C
-789A	EDD5
-789B	EDD3
-789C	EDD7
-789D	B44D
-789E	B44E
-789F	B5FA
-78A0	B44F
-78A1	EDD8
-78A2	B450
-78A3	EDD9
-78A4	B451
-78A5	EDDC
-78A6	B452
-78A7	B1CC
-78A8	B453
-78A9	B454
-78AA	B455
-78AB	B456
-78AC	B457
-78AD	B458
-78AE	B459
-78AF	B45A
-78B0	C5F6
-78B1	BCEE
-78B2	EDDA
-78B3	CCBC
-78B4	B2EA
-78B5	B45B
-78B6	B45C
-78B7	B45D
-78B8	B45E
-78B9	EDDB
-78BA	B45F
-78BB	B460
-78BC	B461
-78BD	B462
-78BE	C4EB
-78BF	B463
-78C0	B464
-78C1	B4C5
-78C2	B465
-78C3	B466
-78C4	B467
-78C5	B0F5
-78C6	B468
-78C7	B469
-78C8	B46A
-78C9	EDDF
-78CA	C0DA
-78CB	B4E8
-78CC	B46B
-78CD	B46C
-78CE	B46D
-78CF	B46E
-78D0	C5CD
-78D1	B46F
-78D2	B470
-78D3	B471
-78D4	EDDD
-78D5	BFC4
-78D6	B472
-78D7	B473
-78D8	B474
-78D9	EDDE
-78DA	B475
-78DB	B476
-78DC	B477
-78DD	B478
-78DE	B479
-78DF	B47A
-78E0	B47B
-78E1	B47C
-78E2	B47D
-78E3	B47E
-78E4	B480
-78E5	B481
-78E6	B482
-78E7	B483
-78E8	C4A5
-78E9	B484
-78EA	B485
-78EB	B486
-78EC	EDE0
-78ED	B487
-78EE	B488
-78EF	B489
-78F0	B48A
-78F1	B48B
-78F2	EDE1
-78F3	B48C
-78F4	EDE3
-78F5	B48D
-78F6	B48E
-78F7	C1D7
-78F8	B48F
-78F9	B490
-78FA	BBC7
-78FB	B491
-78FC	B492
-78FD	B493
-78FE	B494
-78FF	B495
-7900	B496
-7901	BDB8
-7902	B497
-7903	B498
-7904	B499
-7905	EDE2
-7906	B49A
-7907	B49B
-7908	B49C
-7909	B49D
-790A	B49E
-790B	B49F
-790C	B4A0
-790D	B540
-790E	B541
-790F	B542
-7910	B543
-7911	B544
-7912	B545
-7913	EDE4
-7914	B546
-7915	B547
-7916	B548
-7917	B549
-7918	B54A
-7919	B54B
-791A	B54C
-791B	B54D
-791C	B54E
-791D	B54F
-791E	EDE6
-791F	B550
-7920	B551
-7921	B552
-7922	B553
-7923	B554
-7924	EDE5
-7925	B555
-7926	B556
-7927	B557
-7928	B558
-7929	B559
-792A	B55A
-792B	B55B
-792C	B55C
-792D	B55D
-792E	B55E
-792F	B55F
-7930	B560
-7931	B561
-7932	B562
-7933	B563
-7934	EDE7
-7935	B564
-7936	B565
-7937	B566
-7938	B567
-7939	B568
-793A	CABE
-793B	ECEA
-793C	C0F1
-793D	B569
-793E	C9E7
-793F	B56A
-7940	ECEB
-7941	C6EE
-7942	B56B
-7943	B56C
-7944	B56D
-7945	B56E
-7946	ECEC
-7947	B56F
-7948	C6ED
-7949	ECED
-794A	B570
-794B	B571
-794C	B572
-794D	B573
-794E	B574
-794F	B575
-7950	B576
-7951	B577
-7952	B578
-7953	ECF0
-7954	B579
-7955	B57A
-7956	D7E6
-7957	ECF3
-7958	B57B
-7959	B57C
-795A	ECF1
-795B	ECEE
-795C	ECEF
-795D	D7A3
-795E	C9F1
-795F	CBEE
-7960	ECF4
-7961	B57D
-7962	ECF2
-7963	B57E
-7964	B580
-7965	CFE9
-7966	B581
-7967	ECF6
-7968	C6B1
-7969	B582
-796A	B583
-796B	B584
-796C	B585
-796D	BCC0
-796E	B586
-796F	ECF5
-7970	B587
-7971	B588
-7972	B589
-7973	B58A
-7974	B58B
-7975	B58C
-7976	B58D
-7977	B5BB
-7978	BBF6
-7979	B58E
-797A	ECF7
-797B	B58F
-797C	B590
-797D	B591
-797E	B592
-797F	B593
-7980	D9F7
-7981	BDFB
-7982	B594
-7983	B595
-7984	C2BB
-7985	ECF8
-7986	B596
-7987	B597
-7988	B598
-7989	B599
-798A	ECF9
-798B	B59A
-798C	B59B
-798D	B59C
-798E	B59D
-798F	B8A3
-7990	B59E
-7991	B59F
-7992	B5A0
-7993	B640
-7994	B641
-7995	B642
-7996	B643
-7997	B644
-7998	B645
-7999	B646
-799A	ECFA
-799B	B647
-799C	B648
-799D	B649
-799E	B64A
-799F	B64B
-79A0	B64C
-79A1	B64D
-79A2	B64E
-79A3	B64F
-79A4	B650
-79A5	B651
-79A6	B652
-79A7	ECFB
-79A8	B653
-79A9	B654
-79AA	B655
-79AB	B656
-79AC	B657
-79AD	B658
-79AE	B659
-79AF	B65A
-79B0	B65B
-79B1	B65C
-79B2	B65D
-79B3	ECFC
-79B4	B65E
-79B5	B65F
-79B6	B660
-79B7	B661
-79B8	B662
-79B9	D3ED
-79BA	D8AE
-79BB	C0EB
-79BC	B663
-79BD	C7DD
-79BE	BACC
-79BF	B664
-79C0	D0E3
-79C1	CBBD
-79C2	B665
-79C3	CDBA
-79C4	B666
-79C5	B667
-79C6	B8D1
-79C7	B668
-79C8	B669
-79C9	B1FC
-79CA	B66A
-79CB	C7EF
-79CC	B66B
-79CD	D6D6
-79CE	B66C
-79CF	B66D
-79D0	B66E
-79D1	BFC6
-79D2	C3EB
-79D3	B66F
-79D4	B670
-79D5	EFF5
-79D6	B671
-79D7	B672
-79D8	C3D8
-79D9	B673
-79DA	B674
-79DB	B675
-79DC	B676
-79DD	B677
-79DE	B678
-79DF	D7E2
-79E0	B679
-79E1	B67A
-79E2	B67B
-79E3	EFF7
-79E4	B3D3
-79E5	B67C
-79E6	C7D8
-79E7	D1ED
-79E8	B67D
-79E9	D6C8
-79EA	B67E
-79EB	EFF8
-79EC	B680
-79ED	EFF6
-79EE	B681
-79EF	BBFD
-79F0	B3C6
-79F1	B682
-79F2	B683
-79F3	B684
-79F4	B685
-79F5	B686
-79F6	B687
-79F7	B688
-79F8	BDD5
-79F9	B689
-79FA	B68A
-79FB	D2C6
-79FC	B68B
-79FD	BBE0
-79FE	B68C
-79FF	B68D
-7A00	CFA1
-7A01	B68E
-7A02	EFFC
-7A03	EFFB
-7A04	B68F
-7A05	B690
-7A06	EFF9
-7A07	B691
-7A08	B692
-7A09	B693
-7A0A	B694
-7A0B	B3CC
-7A0C	B695
-7A0D	C9D4
-7A0E	CBB0
-7A0F	B696
-7A10	B697
-7A11	B698
-7A12	B699
-7A13	B69A
-7A14	EFFE
-7A15	B69B
-7A16	B69C
-7A17	B0DE
-7A18	B69D
-7A19	B69E
-7A1A	D6C9
-7A1B	B69F
-7A1C	B6A0
-7A1D	B740
-7A1E	EFFD
-7A1F	B741
-7A20	B3ED
-7A21	B742
-7A22	B743
-7A23	F6D5
-7A24	B744
-7A25	B745
-7A26	B746
-7A27	B747
-7A28	B748
-7A29	B749
-7A2A	B74A
-7A2B	B74B
-7A2C	B74C
-7A2D	B74D
-7A2E	B74E
-7A2F	B74F
-7A30	B750
-7A31	B751
-7A32	B752
-7A33	CEC8
-7A34	B753
-7A35	B754
-7A36	B755
-7A37	F0A2
-7A38	B756
-7A39	F0A1
-7A3A	B757
-7A3B	B5BE
-7A3C	BCDA
-7A3D	BBFC
-7A3E	B758
-7A3F	B8E5
-7A40	B759
-7A41	B75A
-7A42	B75B
-7A43	B75C
-7A44	B75D
-7A45	B75E
-7A46	C4C2
-7A47	B75F
-7A48	B760
-7A49	B761
-7A4A	B762
-7A4B	B763
-7A4C	B764
-7A4D	B765
-7A4E	B766
-7A4F	B767
-7A50	B768
-7A51	F0A3
-7A52	B769
-7A53	B76A
-7A54	B76B
-7A55	B76C
-7A56	B76D
-7A57	CBEB
-7A58	B76E
-7A59	B76F
-7A5A	B770
-7A5B	B771
-7A5C	B772
-7A5D	B773
-7A5E	B774
-7A5F	B775
-7A60	B776
-7A61	B777
-7A62	B778
-7A63	B779
-7A64	B77A
-7A65	B77B
-7A66	B77C
-7A67	B77D
-7A68	B77E
-7A69	B780
-7A6A	B781
-7A6B	B782
-7A6C	B783
-7A6D	B784
-7A6E	B785
-7A6F	B786
-7A70	F0A6
-7A71	B787
-7A72	B788
-7A73	B789
-7A74	D1A8
-7A75	B78A
-7A76	BEBF
-7A77	C7EE
-7A78	F1B6
-7A79	F1B7
-7A7A	BFD5
-7A7B	B78B
-7A7C	B78C
-7A7D	B78D
-7A7E	B78E
-7A7F	B4A9
-7A80	F1B8
-7A81	CDBB
-7A82	B78F
-7A83	C7D4
-7A84	D5AD
-7A85	B790
-7A86	F1B9
-7A87	B791
-7A88	F1BA
-7A89	B792
-7A8A	B793
-7A8B	B794
-7A8C	B795
-7A8D	C7CF
-7A8E	B796
-7A8F	B797
-7A90	B798
-7A91	D2A4
-7A92	D6CF
-7A93	B799
-7A94	B79A
-7A95	F1BB
-7A96	BDD1
-7A97	B4B0
-7A98	BEBD
-7A99	B79B
-7A9A	B79C
-7A9B	B79D
-7A9C	B4DC
-7A9D	CED1
-7A9E	B79E
-7A9F	BFDF
-7AA0	F1BD
-7AA1	B79F
-7AA2	B7A0
-7AA3	B840
-7AA4	B841
-7AA5	BFFA
-7AA6	F1BC
-7AA7	B842
-7AA8	F1BF
-7AA9	B843
-7AAA	B844
-7AAB	B845
-7AAC	F1BE
-7AAD	F1C0
-7AAE	B846
-7AAF	B847
-7AB0	B848
-7AB1	B849
-7AB2	B84A
-7AB3	F1C1
-7AB4	B84B
-7AB5	B84C
-7AB6	B84D
-7AB7	B84E
-7AB8	B84F
-7AB9	B850
-7ABA	B851
-7ABB	B852
-7ABC	B853
-7ABD	B854
-7ABE	B855
-7ABF	C1FE
-7AC0	B856
-7AC1	B857
-7AC2	B858
-7AC3	B859
-7AC4	B85A
-7AC5	B85B
-7AC6	B85C
-7AC7	B85D
-7AC8	B85E
-7AC9	B85F
-7ACA	B860
-7ACB	C1A2
-7ACC	B861
-7ACD	B862
-7ACE	B863
-7ACF	B864
-7AD0	B865
-7AD1	B866
-7AD2	B867
-7AD3	B868
-7AD4	B869
-7AD5	B86A
-7AD6	CAFA
-7AD7	B86B
-7AD8	B86C
-7AD9	D5BE
-7ADA	B86D
-7ADB	B86E
-7ADC	B86F
-7ADD	B870
-7ADE	BEBA
-7ADF	BEB9
-7AE0	D5C2
-7AE1	B871
-7AE2	B872
-7AE3	BFA2
-7AE4	B873
-7AE5	CDAF
-7AE6	F1B5
-7AE7	B874
-7AE8	B875
-7AE9	B876
-7AEA	B877
-7AEB	B878
-7AEC	B879
-7AED	BDDF
-7AEE	B87A
-7AEF	B6CB
-7AF0	B87B
-7AF1	B87C
-7AF2	B87D
-7AF3	B87E
-7AF4	B880
-7AF5	B881
-7AF6	B882
-7AF7	B883
-7AF8	B884
-7AF9	D6F1
-7AFA	F3C3
-7AFB	B885
-7AFC	B886
-7AFD	F3C4
-7AFE	B887
-7AFF	B8CD
-7B00	B888
-7B01	B889
-7B02	B88A
-7B03	F3C6
-7B04	F3C7
-7B05	B88B
-7B06	B0CA
-7B07	B88C
-7B08	F3C5
-7B09	B88D
-7B0A	F3C9
-7B0B	CBF1
-7B0C	B88E
-7B0D	B88F
-7B0E	B890
-7B0F	F3CB
-7B10	B891
-7B11	D0A6
-7B12	B892
-7B13	B893
-7B14	B1CA
-7B15	F3C8
-7B16	B894
-7B17	B895
-7B18	B896
-7B19	F3CF
-7B1A	B897
-7B1B	B5D1
-7B1C	B898
-7B1D	B899
-7B1E	F3D7
-7B1F	B89A
-7B20	F3D2
-7B21	B89B
-7B22	B89C
-7B23	B89D
-7B24	F3D4
-7B25	F3D3
-7B26	B7FB
-7B27	B89E
-7B28	B1BF
-7B29	B89F
-7B2A	F3CE
-7B2B	F3CA
-7B2C	B5DA
-7B2D	B8A0
-7B2E	F3D0
-7B2F	B940
-7B30	B941
-7B31	F3D1
-7B32	B942
-7B33	F3D5
-7B34	B943
-7B35	B944
-7B36	B945
-7B37	B946
-7B38	F3CD
-7B39	B947
-7B3A	BCE3
-7B3B	B948
-7B3C	C1FD
-7B3D	B949
-7B3E	F3D6
-7B3F	B94A
-7B40	B94B
-7B41	B94C
-7B42	B94D
-7B43	B94E
-7B44	B94F
-7B45	F3DA
-7B46	B950
-7B47	F3CC
-7B48	B951
-7B49	B5C8
-7B4A	B952
-7B4B	BDEE
-7B4C	F3DC
-7B4D	B953
-7B4E	B954
-7B4F	B7A4
-7B50	BFF0
-7B51	D6FE
-7B52	CDB2
-7B53	B955
-7B54	B4F0
-7B55	B956
-7B56	B2DF
-7B57	B957
-7B58	F3D8
-7B59	B958
-7B5A	F3D9
-7B5B	C9B8
-7B5C	B959
-7B5D	F3DD
-7B5E	B95A
-7B5F	B95B
-7B60	F3DE
-7B61	B95C
-7B62	F3E1
-7B63	B95D
-7B64	B95E
-7B65	B95F
-7B66	B960
-7B67	B961
-7B68	B962
-7B69	B963
-7B6A	B964
-7B6B	B965
-7B6C	B966
-7B6D	B967
-7B6E	F3DF
-7B6F	B968
-7B70	B969
-7B71	F3E3
-7B72	F3E2
-7B73	B96A
-7B74	B96B
-7B75	F3DB
-7B76	B96C
-7B77	BFEA
-7B78	B96D
-7B79	B3EF
-7B7A	B96E
-7B7B	F3E0
-7B7C	B96F
-7B7D	B970
-7B7E	C7A9
-7B7F	B971
-7B80	BCF2
-7B81	B972
-7B82	B973
-7B83	B974
-7B84	B975
-7B85	F3EB
-7B86	B976
-7B87	B977
-7B88	B978
-7B89	B979
-7B8A	B97A
-7B8B	B97B
-7B8C	B97C
-7B8D	B9BF
-7B8E	B97D
-7B8F	B97E
-7B90	F3E4
-7B91	B980
-7B92	B981
-7B93	B982
-7B94	B2AD
-7B95	BBFE
-7B96	B983
-7B97	CBE3
-7B98	B984
-7B99	B985
-7B9A	B986
-7B9B	B987
-7B9C	F3ED
-7B9D	F3E9
-7B9E	B988
-7B9F	B989
-7BA0	B98A
-7BA1	B9DC
-7BA2	F3EE
-7BA3	B98B
-7BA4	B98C
-7BA5	B98D
-7BA6	F3E5
-7BA7	F3E6
-7BA8	F3EA
-7BA9	C2E1
-7BAA	F3EC
-7BAB	F3EF
-7BAC	F3E8
-7BAD	BCFD
-7BAE	B98E
-7BAF	B98F
-7BB0	B990
-7BB1	CFE4
-7BB2	B991
-7BB3	B992
-7BB4	F3F0
-7BB5	B993
-7BB6	B994
-7BB7	B995
-7BB8	F3E7
-7BB9	B996
-7BBA	B997
-7BBB	B998
-7BBC	B999
-7BBD	B99A
-7BBE	B99B
-7BBF	B99C
-7BC0	B99D
-7BC1	F3F2
-7BC2	B99E
-7BC3	B99F
-7BC4	B9A0
-7BC5	BA40
-7BC6	D7AD
-7BC7	C6AA
-7BC8	BA41
-7BC9	BA42
-7BCA	BA43
-7BCB	BA44
-7BCC	F3F3
-7BCD	BA45
-7BCE	BA46
-7BCF	BA47
-7BD0	BA48
-7BD1	F3F1
-7BD2	BA49
-7BD3	C2A8
-7BD4	BA4A
-7BD5	BA4B
-7BD6	BA4C
-7BD7	BA4D
-7BD8	BA4E
-7BD9	B8DD
-7BDA	F3F5
-7BDB	BA4F
-7BDC	BA50
-7BDD	F3F4
-7BDE	BA51
-7BDF	BA52
-7BE0	BA53
-7BE1	B4DB
-7BE2	BA54
-7BE3	BA55
-7BE4	BA56
-7BE5	F3F6
-7BE6	F3F7
-7BE7	BA57
-7BE8	BA58
-7BE9	BA59
-7BEA	F3F8
-7BEB	BA5A
-7BEC	BA5B
-7BED	BA5C
-7BEE	C0BA
-7BEF	BA5D
-7BF0	BA5E
-7BF1	C0E9
-7BF2	BA5F
-7BF3	BA60
-7BF4	BA61
-7BF5	BA62
-7BF6	BA63
-7BF7	C5F1
-7BF8	BA64
-7BF9	BA65
-7BFA	BA66
-7BFB	BA67
-7BFC	F3FB
-7BFD	BA68
-7BFE	F3FA
-7BFF	BA69
-7C00	BA6A
-7C01	BA6B
-7C02	BA6C
-7C03	BA6D
-7C04	BA6E
-7C05	BA6F
-7C06	BA70
-7C07	B4D8
-7C08	BA71
-7C09	BA72
-7C0A	BA73
-7C0B	F3FE
-7C0C	F3F9
-7C0D	BA74
-7C0E	BA75
-7C0F	F3FC
-7C10	BA76
-7C11	BA77
-7C12	BA78
-7C13	BA79
-7C14	BA7A
-7C15	BA7B
-7C16	F3FD
-7C17	BA7C
-7C18	BA7D
-7C19	BA7E
-7C1A	BA80
-7C1B	BA81
-7C1C	BA82
-7C1D	BA83
-7C1E	BA84
-7C1F	F4A1
-7C20	BA85
-7C21	BA86
-7C22	BA87
-7C23	BA88
-7C24	BA89
-7C25	BA8A
-7C26	F4A3
-7C27	BBC9
-7C28	BA8B
-7C29	BA8C
-7C2A	F4A2
-7C2B	BA8D
-7C2C	BA8E
-7C2D	BA8F
-7C2E	BA90
-7C2F	BA91
-7C30	BA92
-7C31	BA93
-7C32	BA94
-7C33	BA95
-7C34	BA96
-7C35	BA97
-7C36	BA98
-7C37	BA99
-7C38	F4A4
-7C39	BA9A
-7C3A	BA9B
-7C3B	BA9C
-7C3C	BA9D
-7C3D	BA9E
-7C3E	BA9F
-7C3F	B2BE
-7C40	F4A6
-7C41	F4A5
-7C42	BAA0
-7C43	BB40
-7C44	BB41
-7C45	BB42
-7C46	BB43
-7C47	BB44
-7C48	BB45
-7C49	BB46
-7C4A	BB47
-7C4B	BB48
-7C4C	BB49
-7C4D	BCAE
-7C4E	BB4A
-7C4F	BB4B
-7C50	BB4C
-7C51	BB4D
-7C52	BB4E
-7C53	BB4F
-7C54	BB50
-7C55	BB51
-7C56	BB52
-7C57	BB53
-7C58	BB54
-7C59	BB55
-7C5A	BB56
-7C5B	BB57
-7C5C	BB58
-7C5D	BB59
-7C5E	BB5A
-7C5F	BB5B
-7C60	BB5C
-7C61	BB5D
-7C62	BB5E
-7C63	BB5F
-7C64	BB60
-7C65	BB61
-7C66	BB62
-7C67	BB63
-7C68	BB64
-7C69	BB65
-7C6A	BB66
-7C6B	BB67
-7C6C	BB68
-7C6D	BB69
-7C6E	BB6A
-7C6F	BB6B
-7C70	BB6C
-7C71	BB6D
-7C72	BB6E
-7C73	C3D7
-7C74	D9E1
-7C75	BB6F
-7C76	BB70
-7C77	BB71
-7C78	BB72
-7C79	BB73
-7C7A	BB74
-7C7B	C0E0
-7C7C	F4CC
-7C7D	D7D1
-7C7E	BB75
-7C7F	BB76
-7C80	BB77
-7C81	BB78
-7C82	BB79
-7C83	BB7A
-7C84	BB7B
-7C85	BB7C
-7C86	BB7D
-7C87	BB7E
-7C88	BB80
-7C89	B7DB
-7C8A	BB81
-7C8B	BB82
-7C8C	BB83
-7C8D	BB84
-7C8E	BB85
-7C8F	BB86
-7C90	BB87
-7C91	F4CE
-7C92	C1A3
-7C93	BB88
-7C94	BB89
-7C95	C6C9
-7C96	BB8A
-7C97	B4D6
-7C98	D5B3
-7C99	BB8B
-7C9A	BB8C
-7C9B	BB8D
-7C9C	F4D0
-7C9D	F4CF
-7C9E	F4D1
-7C9F	CBDA
-7CA0	BB8E
-7CA1	BB8F
-7CA2	F4D2
-7CA3	BB90
-7CA4	D4C1
-7CA5	D6E0
-7CA6	BB91
-7CA7	BB92
-7CA8	BB93
-7CA9	BB94
-7CAA	B7E0
-7CAB	BB95
-7CAC	BB96
-7CAD	BB97
-7CAE	C1B8
-7CAF	BB98
-7CB0	BB99
-7CB1	C1BB
-7CB2	F4D3
-7CB3	BEAC
-7CB4	BB9A
-7CB5	BB9B
-7CB6	BB9C
-7CB7	BB9D
-7CB8	BB9E
-7CB9	B4E2
-7CBA	BB9F
-7CBB	BBA0
-7CBC	F4D4
-7CBD	F4D5
-7CBE	BEAB
-7CBF	BC40
-7CC0	BC41
-7CC1	F4D6
-7CC2	BC42
-7CC3	BC43
-7CC4	BC44
-7CC5	F4DB
-7CC6	BC45
-7CC7	F4D7
-7CC8	F4DA
-7CC9	BC46
-7CCA	BAFD
-7CCB	BC47
-7CCC	F4D8
-7CCD	F4D9
-7CCE	BC48
-7CCF	BC49
-7CD0	BC4A
-7CD1	BC4B
-7CD2	BC4C
-7CD3	BC4D
-7CD4	BC4E
-7CD5	B8E2
-7CD6	CCC7
-7CD7	F4DC
-7CD8	BC4F
-7CD9	B2DA
-7CDA	BC50
-7CDB	BC51
-7CDC	C3D3
-7CDD	BC52
-7CDE	BC53
-7CDF	D4E3
-7CE0	BFB7
-7CE1	BC54
-7CE2	BC55
-7CE3	BC56
-7CE4	BC57
-7CE5	BC58
-7CE6	BC59
-7CE7	BC5A
-7CE8	F4DD
-7CE9	BC5B
-7CEA	BC5C
-7CEB	BC5D
-7CEC	BC5E
-7CED	BC5F
-7CEE	BC60
-7CEF	C5B4
-7CF0	BC61
-7CF1	BC62
-7CF2	BC63
-7CF3	BC64
-7CF4	BC65
-7CF5	BC66
-7CF6	BC67
-7CF7	BC68
-7CF8	F4E9
-7CF9	BC69
-7CFA	BC6A
-7CFB	CFB5
-7CFC	BC6B
-7CFD	BC6C
-7CFE	BC6D
-7CFF	BC6E
-7D00	BC6F
-7D01	BC70
-7D02	BC71
-7D03	BC72
-7D04	BC73
-7D05	BC74
-7D06	BC75
-7D07	BC76
-7D08	BC77
-7D09	BC78
-7D0A	CEC9
-7D0B	BC79
-7D0C	BC7A
-7D0D	BC7B
-7D0E	BC7C
-7D0F	BC7D
-7D10	BC7E
-7D11	BC80
-7D12	BC81
-7D13	BC82
-7D14	BC83
-7D15	BC84
-7D16	BC85
-7D17	BC86
-7D18	BC87
-7D19	BC88
-7D1A	BC89
-7D1B	BC8A
-7D1C	BC8B
-7D1D	BC8C
-7D1E	BC8D
-7D1F	BC8E
-7D20	CBD8
-7D21	BC8F
-7D22	CBF7
-7D23	BC90
-7D24	BC91
-7D25	BC92
-7D26	BC93
-7D27	BDF4
-7D28	BC94
-7D29	BC95
-7D2A	BC96
-7D2B	D7CF
-7D2C	BC97
-7D2D	BC98
-7D2E	BC99
-7D2F	C0DB
-7D30	BC9A
-7D31	BC9B
-7D32	BC9C
-7D33	BC9D
-7D34	BC9E
-7D35	BC9F
-7D36	BCA0
-7D37	BD40
-7D38	BD41
-7D39	BD42
-7D3A	BD43
-7D3B	BD44
-7D3C	BD45
-7D3D	BD46
-7D3E	BD47
-7D3F	BD48
-7D40	BD49
-7D41	BD4A
-7D42	BD4B
-7D43	BD4C
-7D44	BD4D
-7D45	BD4E
-7D46	BD4F
-7D47	BD50
-7D48	BD51
-7D49	BD52
-7D4A	BD53
-7D4B	BD54
-7D4C	BD55
-7D4D	BD56
-7D4E	BD57
-7D4F	BD58
-7D50	BD59
-7D51	BD5A
-7D52	BD5B
-7D53	BD5C
-7D54	BD5D
-7D55	BD5E
-7D56	BD5F
-7D57	BD60
-7D58	BD61
-7D59	BD62
-7D5A	BD63
-7D5B	BD64
-7D5C	BD65
-7D5D	BD66
-7D5E	BD67
-7D5F	BD68
-7D60	BD69
-7D61	BD6A
-7D62	BD6B
-7D63	BD6C
-7D64	BD6D
-7D65	BD6E
-7D66	BD6F
-7D67	BD70
-7D68	BD71
-7D69	BD72
-7D6A	BD73
-7D6B	BD74
-7D6C	BD75
-7D6D	BD76
-7D6E	D0F5
-7D6F	BD77
-7D70	BD78
-7D71	BD79
-7D72	BD7A
-7D73	BD7B
-7D74	BD7C
-7D75	BD7D
-7D76	BD7E
-7D77	F4EA
-7D78	BD80
-7D79	BD81
-7D7A	BD82
-7D7B	BD83
-7D7C	BD84
-7D7D	BD85
-7D7E	BD86
-7D7F	BD87
-7D80	BD88
-7D81	BD89
-7D82	BD8A
-7D83	BD8B
-7D84	BD8C
-7D85	BD8D
-7D86	BD8E
-7D87	BD8F
-7D88	BD90
-7D89	BD91
-7D8A	BD92
-7D8B	BD93
-7D8C	BD94
-7D8D	BD95
-7D8E	BD96
-7D8F	BD97
-7D90	BD98
-7D91	BD99
-7D92	BD9A
-7D93	BD9B
-7D94	BD9C
-7D95	BD9D
-7D96	BD9E
-7D97	BD9F
-7D98	BDA0
-7D99	BE40
-7D9A	BE41
-7D9B	BE42
-7D9C	BE43
-7D9D	BE44
-7D9E	BE45
-7D9F	BE46
-7DA0	BE47
-7DA1	BE48
-7DA2	BE49
-7DA3	BE4A
-7DA4	BE4B
-7DA5	BE4C
-7DA6	F4EB
-7DA7	BE4D
-7DA8	BE4E
-7DA9	BE4F
-7DAA	BE50
-7DAB	BE51
-7DAC	BE52
-7DAD	BE53
-7DAE	F4EC
-7DAF	BE54
-7DB0	BE55
-7DB1	BE56
-7DB2	BE57
-7DB3	BE58
-7DB4	BE59
-7DB5	BE5A
-7DB6	BE5B
-7DB7	BE5C
-7DB8	BE5D
-7DB9	BE5E
-7DBA	BE5F
-7DBB	BE60
-7DBC	BE61
-7DBD	BE62
-7DBE	BE63
-7DBF	BE64
-7DC0	BE65
-7DC1	BE66
-7DC2	BE67
-7DC3	BE68
-7DC4	BE69
-7DC5	BE6A
-7DC6	BE6B
-7DC7	BE6C
-7DC8	BE6D
-7DC9	BE6E
-7DCA	BE6F
-7DCB	BE70
-7DCC	BE71
-7DCD	BE72
-7DCE	BE73
-7DCF	BE74
-7DD0	BE75
-7DD1	BE76
-7DD2	BE77
-7DD3	BE78
-7DD4	BE79
-7DD5	BE7A
-7DD6	BE7B
-7DD7	BE7C
-7DD8	BE7D
-7DD9	BE7E
-7DDA	BE80
-7DDB	BE81
-7DDC	BE82
-7DDD	BE83
-7DDE	BE84
-7DDF	BE85
-7DE0	BE86
-7DE1	BE87
-7DE2	BE88
-7DE3	BE89
-7DE4	BE8A
-7DE5	BE8B
-7DE6	BE8C
-7DE7	BE8D
-7DE8	BE8E
-7DE9	BE8F
-7DEA	BE90
-7DEB	BE91
-7DEC	BE92
-7DED	BE93
-7DEE	BE94
-7DEF	BE95
-7DF0	BE96
-7DF1	BE97
-7DF2	BE98
-7DF3	BE99
-7DF4	BE9A
-7DF5	BE9B
-7DF6	BE9C
-7DF7	BE9D
-7DF8	BE9E
-7DF9	BE9F
-7DFA	BEA0
-7DFB	BF40
-7DFC	BF41
-7DFD	BF42
-7DFE	BF43
-7DFF	BF44
-7E00	BF45
-7E01	BF46
-7E02	BF47
-7E03	BF48
-7E04	BF49
-7E05	BF4A
-7E06	BF4B
-7E07	BF4C
-7E08	BF4D
-7E09	BF4E
-7E0A	BF4F
-7E0B	BF50
-7E0C	BF51
-7E0D	BF52
-7E0E	BF53
-7E0F	BF54
-7E10	BF55
-7E11	BF56
-7E12	BF57
-7E13	BF58
-7E14	BF59
-7E15	BF5A
-7E16	BF5B
-7E17	BF5C
-7E18	BF5D
-7E19	BF5E
-7E1A	BF5F
-7E1B	BF60
-7E1C	BF61
-7E1D	BF62
-7E1E	BF63
-7E1F	BF64
-7E20	BF65
-7E21	BF66
-7E22	BF67
-7E23	BF68
-7E24	BF69
-7E25	BF6A
-7E26	BF6B
-7E27	BF6C
-7E28	BF6D
-7E29	BF6E
-7E2A	BF6F
-7E2B	BF70
-7E2C	BF71
-7E2D	BF72
-7E2E	BF73
-7E2F	BF74
-7E30	BF75
-7E31	BF76
-7E32	BF77
-7E33	BF78
-7E34	BF79
-7E35	BF7A
-7E36	BF7B
-7E37	BF7C
-7E38	BF7D
-7E39	BF7E
-7E3A	BF80
-7E3B	F7E3
-7E3C	BF81
-7E3D	BF82
-7E3E	BF83
-7E3F	BF84
-7E40	BF85
-7E41	B7B1
-7E42	BF86
-7E43	BF87
-7E44	BF88
-7E45	BF89
-7E46	BF8A
-7E47	F4ED
-7E48	BF8B
-7E49	BF8C
-7E4A	BF8D
-7E4B	BF8E
-7E4C	BF8F
-7E4D	BF90
-7E4E	BF91
-7E4F	BF92
-7E50	BF93
-7E51	BF94
-7E52	BF95
-7E53	BF96
-7E54	BF97
-7E55	BF98
-7E56	BF99
-7E57	BF9A
-7E58	BF9B
-7E59	BF9C
-7E5A	BF9D
-7E5B	BF9E
-7E5C	BF9F
-7E5D	BFA0
-7E5E	C040
-7E5F	C041
-7E60	C042
-7E61	C043
-7E62	C044
-7E63	C045
-7E64	C046
-7E65	C047
-7E66	C048
-7E67	C049
-7E68	C04A
-7E69	C04B
-7E6A	C04C
-7E6B	C04D
-7E6C	C04E
-7E6D	C04F
-7E6E	C050
-7E6F	C051
-7E70	C052
-7E71	C053
-7E72	C054
-7E73	C055
-7E74	C056
-7E75	C057
-7E76	C058
-7E77	C059
-7E78	C05A
-7E79	C05B
-7E7A	C05C
-7E7B	C05D
-7E7C	C05E
-7E7D	C05F
-7E7E	C060
-7E7F	C061
-7E80	C062
-7E81	C063
-7E82	D7EB
-7E83	C064
-7E84	C065
-7E85	C066
-7E86	C067
-7E87	C068
-7E88	C069
-7E89	C06A
-7E8A	C06B
-7E8B	C06C
-7E8C	C06D
-7E8D	C06E
-7E8E	C06F
-7E8F	C070
-7E90	C071
-7E91	C072
-7E92	C073
-7E93	C074
-7E94	C075
-7E95	C076
-7E96	C077
-7E97	C078
-7E98	C079
-7E99	C07A
-7E9A	C07B
-7E9B	F4EE
-7E9C	C07C
-7E9D	C07D
-7E9E	C07E
-7E9F	E6F9
-7EA0	BEC0
-7EA1	E6FA
-7EA2	BAEC
-7EA3	E6FB
-7EA4	CFCB
-7EA5	E6FC
-7EA6	D4BC
-7EA7	BCB6
-7EA8	E6FD
-7EA9	E6FE
-7EAA	BCCD
-7EAB	C8D2
-7EAC	CEB3
-7EAD	E7A1
-7EAE	C080
-7EAF	B4BF
-7EB0	E7A2
-7EB1	C9B4
-7EB2	B8D9
-7EB3	C4C9
-7EB4	C081
-7EB5	D7DD
-7EB6	C2DA
-7EB7	B7D7
-7EB8	D6BD
-7EB9	CEC6
-7EBA	B7C4
-7EBB	C082