diff --git a/citus-tools b/citus-tools
new file mode 160000
index 00000000000..3376bd6845f
--- /dev/null
+++ b/citus-tools
@@ -0,0 +1 @@
+Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf
diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h
index ec2cb8a57f2..32bb3810067 100644
--- a/src/include/distributed/commands.h
+++ b/src/include/distributed/commands.h
@@ -80,11 +80,11 @@ typedef enum DistOpsOperationType
  */
 typedef struct DistributeObjectOps
 {
-	char * (*deparse)(Node *);
+	char *(*deparse)(Node *);
 	void (*qualify)(Node *);
-	List * (*preprocess)(Node *, const char *, ProcessUtilityContext);
-	List * (*postprocess)(Node *, const char *);
-	List * (*address)(Node *, bool, bool);
+	List *(*preprocess)(Node *, const char *, ProcessUtilityContext);
+	List *(*postprocess)(Node *, const char *);
+	List *(*address)(Node *, bool, bool);
 	bool markDistributed;
 
 	/* fields used by common implementations, omitted for specialized implementations */
diff --git a/src/include/distributed/listutils.h b/src/include/distributed/listutils.h
index db9ea7ce712..32f9102c408 100644
--- a/src/include/distributed/listutils.h
+++ b/src/include/distributed/listutils.h
@@ -160,7 +160,7 @@ typedef struct ListCellAndListWrapper
 	for (int var ## PositionDoNotUse = 0; \
 		 (var ## PositionDoNotUse) < list_length(l) && \
 		 (((var) = list_nth(l, var ## PositionDoNotUse)) || true); \
-		 var ## PositionDoNotUse ++)
+		 var ## PositionDoNotUse++)
 
 /* utility functions declaration shared within this module */
 extern List * SortList(List *pointerList,
diff --git a/src/test/regress/expected/alter_index.out b/src/test/regress/expected/alter_index.out
index 4d4a725b306..3fe86e910d8 100644
--- a/src/test/regress/expected/alter_index.out
+++ b/src/test/regress/expected/alter_index.out
@@ -32,29 +32,33 @@ SELECT create_distributed_table('t2','a');
 (1 row)
 
 -- verify statistics is set
-SELECT c.relname, a.attstattarget
+-- pg17 Changed `attstattarget` in `pg_attribute` to use `NullableDatum`, allowing null representation for default statistics target in PostgreSQL 17.
+-- https://github.com/postgres/postgres/commit/6a004f1be87d34cfe51acf2fe2552d2b08a79273
+SELECT c.relname, 
+       CASE WHEN a.attstattarget = -1 THEN NULL ELSE a.attstattarget END AS attstattarget
 FROM pg_attribute a
 JOIN pg_class c ON a.attrelid = c.oid AND c.relname LIKE 'test\_idx%'
 ORDER BY c.relname, a.attnum;
   relname  | attstattarget
 ---------------------------------------------------------------------
  test_idx  |          4646
- test_idx2 |            -1
+ test_idx2 |
  test_idx2 |         10000
  test_idx2 |          3737
 (4 rows)
 
 \c - - - :worker_1_port
-SELECT c.relname, a.attstattarget
+SELECT c.relname, 
+       CASE WHEN a.attstattarget = -1 THEN NULL ELSE a.attstattarget END AS attstattarget
 FROM pg_attribute a
 JOIN pg_class c ON a.attrelid = c.oid AND c.relname SIMILAR TO 'test\_idx%\_\d%'
 ORDER BY c.relname, a.attnum;
      relname      | attstattarget
 ---------------------------------------------------------------------
- test_idx2_980004 |            -1
+ test_idx2_980004 |
  test_idx2_980004 |         10000
  test_idx2_980004 |          3737
- test_idx2_980006 |            -1
+ test_idx2_980006 |
  test_idx2_980006 |         10000
  test_idx2_980006 |          3737
  test_idx_980000  |          4646
diff --git a/src/test/regress/sql/alter_index.sql b/src/test/regress/sql/alter_index.sql
index 3531bad18ef..38ba06cb571 100644
--- a/src/test/regress/sql/alter_index.sql
+++ b/src/test/regress/sql/alter_index.sql
@@ -23,13 +23,17 @@ ALTER INDEX test_idx2 ALTER COLUMN 2 SET STATISTICS 99999;
 SELECT create_distributed_table('t2','a');
 
 -- verify statistics is set
-SELECT c.relname, a.attstattarget
+-- pg17 Changed `attstattarget` in `pg_attribute` to use `NullableDatum`, allowing null representation for default statistics target in PostgreSQL 17.
+-- https://github.com/postgres/postgres/commit/6a004f1be87d34cfe51acf2fe2552d2b08a79273
+SELECT c.relname, 
+       CASE WHEN a.attstattarget = -1 THEN NULL ELSE a.attstattarget END AS attstattarget
 FROM pg_attribute a
 JOIN pg_class c ON a.attrelid = c.oid AND c.relname LIKE 'test\_idx%'
 ORDER BY c.relname, a.attnum;
 
 \c - - - :worker_1_port
-SELECT c.relname, a.attstattarget
+SELECT c.relname, 
+       CASE WHEN a.attstattarget = -1 THEN NULL ELSE a.attstattarget END AS attstattarget
 FROM pg_attribute a
 JOIN pg_class c ON a.attrelid = c.oid AND c.relname SIMILAR TO 'test\_idx%\_\d%'
 ORDER BY c.relname, a.attnum;