diff --git a/src/backend/access/bitmap/bitmapattutil.c b/src/backend/access/bitmap/bitmapattutil.c
index 226140d622ae659da3781a60742d0746b2ede90f..280c354b4a03c1c38b57180a74754529b47a003f 100644
--- a/src/backend/access/bitmap/bitmapattutil.c
+++ b/src/backend/access/bitmap/bitmapattutil.c
@@ -181,7 +181,7 @@ _bitmap_create_lov_heapandindex(Relation rel,
 								 false, 0,
 								 ONCOMMIT_NOOP, NULL /* GP Policy */,
 								 (Datum)0, false, true,
-								 false, /* is_internal */
+								 true, /* is_internal */
 								 /* valid_opts */ true,
 								 /* is_part_child */ false,
 								 /* is_part_parent */ false);
@@ -250,7 +250,7 @@ _bitmap_create_lov_heapandindex(Relation rel,
 						 /* allow_system_table_mods */ true,
 						 /* skip_build */ false,
 						 /* concurrent */ false,
-						 /* is_internal */ false,	/* GPDB_93_MERGE_FIXME: What's the appropriate is_internal flag? */
+						 /* is_internal */ true,
 						 NULL);
 	*lovIndexOid = idxid;
 
diff --git a/src/backend/cdb/cdbpartition.c b/src/backend/cdb/cdbpartition.c
index e96712bef678f31458490576c1212ef1a4114b06..d3ad213f9db7d79467ccbc2bfe707983ee952506 100644
--- a/src/backend/cdb/cdbpartition.c
+++ b/src/backend/cdb/cdbpartition.c
@@ -8429,7 +8429,7 @@ constraint_apply_mapped(HeapTuple tuple, AttrMap *map, Relation cand,
 									  con->conislocal,
 									  con->coninhcount,
 									  false, /* conNoInherit */
-									  false /* is_internal */); /* GPDB_93_MERGE_FIXME: should this be considered internal? */
+									  true /* is_internal */);
 				break;
 			}
 
@@ -8484,7 +8484,7 @@ constraint_apply_mapped(HeapTuple tuple, AttrMap *map, Relation cand,
 									  con->conislocal,
 									  con->coninhcount,
 									  true, /* conNoInherit */
-									  false /* is_internal */); /* GPDB_93_MERGE_FIXME: should this be considered internal? */
+									  true /* is_internal */);
 
 				heap_close(frel, AccessExclusiveLock);
 				break;