diff --git a/contrib/babelfishpg_common/sql/datetime.sql b/contrib/babelfishpg_common/sql/datetime.sql
index 99598da055..255e2dc5d4 100644
--- a/contrib/babelfishpg_common/sql/datetime.sql
+++ b/contrib/babelfishpg_common/sql/datetime.sql
@@ -325,7 +325,7 @@ WITH FUNCTION sys.timestamptz2datetime (TIMESTAMPTZ) AS ASSIGNMENT;
 CREATE OR REPLACE FUNCTION sys.date2datetime(DATE)
 RETURNS DATETIME
 AS 'babelfishpg_common', 'date_datetime'
-LANGUAGE C VOLATILE STRICT PARALLEL SAFE;
+LANGUAGE C STABLE STRICT PARALLEL SAFE;
 
 CREATE CAST (DATE AS DATETIME)
 WITH FUNCTION sys.date2datetime (DATE) AS IMPLICIT;
diff --git a/contrib/babelfishpg_common/sql/datetime2.sql b/contrib/babelfishpg_common/sql/datetime2.sql
index a007f09ee4..c81115b39a 100644
--- a/contrib/babelfishpg_common/sql/datetime2.sql
+++ b/contrib/babelfishpg_common/sql/datetime2.sql
@@ -212,7 +212,7 @@ WITH FUNCTION sys.timestamptz2datetime2 (TIMESTAMPTZ) AS ASSIGNMENT;
 CREATE OR REPLACE FUNCTION sys.date2datetime2(DATE)
 RETURNS DATETIME2
 AS 'babelfishpg_common', 'date_datetime2'
-LANGUAGE C VOLATILE STRICT PARALLEL SAFE;
+LANGUAGE C STABLE STRICT PARALLEL SAFE;
 
 CREATE CAST (DATE AS DATETIME2)
 WITH FUNCTION sys.date2datetime2 (DATE) AS IMPLICIT;
diff --git a/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--4.0.0--4.1.0.sql b/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--4.0.0--4.1.0.sql
index 33e9453498..4d05a1c1b9 100644
--- a/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--4.0.0--4.1.0.sql
+++ b/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--4.0.0--4.1.0.sql
@@ -187,6 +187,16 @@ EXCEPTION WHEN OTHERS THEN
 END;
 $$;
 
+CREATE OR REPLACE FUNCTION sys.date2datetime(DATE)
+RETURNS DATETIME
+AS 'babelfishpg_common', 'date_datetime'
+LANGUAGE C STABLE STRICT PARALLEL SAFE;
+
+CREATE OR REPLACE FUNCTION sys.date2datetime2(DATE)
+RETURNS DATETIME2
+AS 'babelfishpg_common', 'date_datetime2'
+LANGUAGE C STABLE STRICT PARALLEL SAFE;
+
 -- Drops the temporary procedure used by the upgrade script.
 -- Please have this be one of the last statements executed in this upgrade script.
 DROP PROCEDURE sys.babelfish_drop_deprecated_object(varchar, varchar, varchar);
diff --git a/test/JDBC/expected/babel-4517-vu-cleanup.out b/test/JDBC/expected/babel-4517-vu-cleanup.out
new file mode 100644
index 0000000000..0fb9ac047a
--- /dev/null
+++ b/test/JDBC/expected/babel-4517-vu-cleanup.out
@@ -0,0 +1,11 @@
+drop view view_4517_date
+GO
+
+drop view view_4517_datetime
+GO
+
+drop view view_4517_datetime2
+GO
+
+drop table babel_4517
+GO
diff --git a/test/JDBC/expected/babel-4517-vu-prepare.out b/test/JDBC/expected/babel-4517-vu-prepare.out
new file mode 100644
index 0000000000..1cb449962c
--- /dev/null
+++ b/test/JDBC/expected/babel-4517-vu-prepare.out
@@ -0,0 +1,33 @@
+create table babel_4517 (
+    date_col date NULL,
+    datetime_col datetime NULL,
+    datetime2_col datetime2 NULL
+)
+GO
+
+create NONCLUSTERED INDEX date_col_indx on babel_4517
+(
+    date_col ASC
+)
+GO
+
+create NONCLUSTERED INDEX datetime_col_indx on babel_4517
+(
+    datetime_col ASC
+)
+GO
+
+create NONCLUSTERED INDEX datetime2_col_indx on babel_4517
+(
+    datetime2_col ASC
+)
+GO
+
+create view view_4517_date as select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date);
+GO
+
+create view view_4517_datetime as select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date);
+GO
+
+create view view_4517_datetime2 as select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date);
+GO
diff --git a/test/JDBC/expected/babel-4517-vu-verify.out b/test/JDBC/expected/babel-4517-vu-verify.out
new file mode 100644
index 0000000000..87865ac62d
--- /dev/null
+++ b/test/JDBC/expected/babel-4517-vu-verify.out
@@ -0,0 +1,223 @@
+BEGIN TRANSACTION babel_4517
+GO
+
+SELECT set_config('babelfishpg_tsql.explain_costs', 'off', true)
+GO
+~~START~~
+text
+off
+~~END~~
+
+
+SELECT set_config('debug_parallel_query', '0', true)
+GO
+~~START~~
+text
+off
+~~END~~
+
+
+SET BABELFISH_SHOWPLAN_ALL on
+GO
+
+select * from view_4517_date;
+GO
+~~START~~
+text
+Query Text: select * from view_4517_date
+Bitmap Heap Scan on babel_4517
+  Recheck Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+  ->  Bitmap Index Scan on date_col_indxbabel_4517ff7ff8b3790b9274b0932920e1e110d9
+        Index Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+~~END~~
+
+
+select * from view_4517_datetime
+GO
+~~START~~
+text
+Query Text: select * from view_4517_datetime
+Bitmap Heap Scan on babel_4517
+  Recheck Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+  ->  Bitmap Index Scan on datetime_col_indxbabel_4517f212471e91ba8fdbefe418ea0d8f877d
+        Index Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+~~END~~
+
+
+select * from view_4517_datetime2
+GO
+~~START~~
+text
+Query Text: select * from view_4517_datetime2
+Bitmap Heap Scan on babel_4517
+  Recheck Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+  ->  Bitmap Index Scan on datetime2_col_indxbabel_451706006b35cf68c461b9e87edb9222fcdd
+        Index Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+~~END~~
+
+
+select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date);
+GO
+~~START~~
+text
+Query Text: select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date)
+Bitmap Heap Scan on babel_4517
+  Recheck Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+  ->  Bitmap Index Scan on date_col_indxbabel_4517ff7ff8b3790b9274b0932920e1e110d9
+        Index Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+~~END~~
+
+
+select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date);
+GO
+~~START~~
+text
+Query Text: select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date)
+Bitmap Heap Scan on babel_4517
+  Recheck Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+  ->  Bitmap Index Scan on datetime_col_indxbabel_4517f212471e91ba8fdbefe418ea0d8f877d
+        Index Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+~~END~~
+
+
+select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date);
+GO
+~~START~~
+text
+Query Text: select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date)
+Bitmap Heap Scan on babel_4517
+  Recheck Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+  ->  Bitmap Index Scan on datetime2_col_indxbabel_451706006b35cf68c461b9e87edb9222fcdd
+        Index Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+~~END~~
+
+
+SET BABELFISH_SHOWPLAN_ALL off
+GO
+
+SELECT set_config('debug_parallel_query', '1', true)
+SELECT set_config('parallel_setup_cost', '0', true)
+SELECT set_config('parallel_tuple_cost', '0', true)
+GO
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+0
+~~END~~
+
+~~START~~
+text
+0
+~~END~~
+
+
+SET BABELFISH_SHOWPLAN_ALL on
+GO
+
+select * from view_4517_date;
+GO
+~~START~~
+text
+Query Text: select * from view_4517_date
+Gather
+  Workers Planned: 1
+  Single Copy: true
+  ->  Bitmap Heap Scan on babel_4517
+        Recheck Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+        ->  Bitmap Index Scan on date_col_indxbabel_4517ff7ff8b3790b9274b0932920e1e110d9
+              Index Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+~~END~~
+
+
+select * from view_4517_datetime
+GO
+~~START~~
+text
+Query Text: select * from view_4517_datetime
+Gather
+  Workers Planned: 1
+  Single Copy: true
+  ->  Bitmap Heap Scan on babel_4517
+        Recheck Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+        ->  Bitmap Index Scan on datetime_col_indxbabel_4517f212471e91ba8fdbefe418ea0d8f877d
+              Index Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+~~END~~
+
+
+select * from view_4517_datetime2
+GO
+~~START~~
+text
+Query Text: select * from view_4517_datetime2
+Gather
+  Workers Planned: 1
+  Single Copy: true
+  ->  Bitmap Heap Scan on babel_4517
+        Recheck Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+        ->  Bitmap Index Scan on datetime2_col_indxbabel_451706006b35cf68c461b9e87edb9222fcdd
+              Index Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+~~END~~
+
+
+select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date);
+GO
+~~START~~
+text
+Query Text: select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date)
+Gather
+  Workers Planned: 1
+  Single Copy: true
+  ->  Bitmap Heap Scan on babel_4517
+        Recheck Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+        ->  Bitmap Index Scan on date_col_indxbabel_4517ff7ff8b3790b9274b0932920e1e110d9
+              Index Cond: ((date_col <= '2023-08-31'::date) AND (date_col >= '2023-08-31'::date))
+~~END~~
+
+
+select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date);
+GO
+~~START~~
+text
+Query Text: select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date)
+Gather
+  Workers Planned: 1
+  Single Copy: true
+  ->  Bitmap Heap Scan on babel_4517
+        Recheck Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+        ->  Bitmap Index Scan on datetime_col_indxbabel_4517f212471e91ba8fdbefe418ea0d8f877d
+              Index Cond: ((datetime_col <= ('2023-08-31'::date)::datetime) AND (datetime_col >= ('2023-08-31'::date)::datetime))
+~~END~~
+
+
+select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date);
+GO
+~~START~~
+text
+Query Text: select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date)
+Gather
+  Workers Planned: 1
+  Single Copy: true
+  ->  Bitmap Heap Scan on babel_4517
+        Recheck Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+        ->  Bitmap Index Scan on datetime2_col_indxbabel_451706006b35cf68c461b9e87edb9222fcdd
+              Index Cond: ((datetime2_col <= ('2023-08-31'::date)::datetime2) AND (datetime2_col >= ('2023-08-31'::date)::datetime2))
+~~END~~
+
+
+SET BABELFISH_SHOWPLAN_ALL off
+GO
+
+COMMIT TRANSACTION babel_4517
+GO
+
+SELECT set_config('babelfishpg_tsql.explain_costs', 'on', false)
+GO
+~~START~~
+text
+on
+~~END~~
+
diff --git a/test/JDBC/input/babel-4517-vu-cleanup.sql b/test/JDBC/input/babel-4517-vu-cleanup.sql
new file mode 100644
index 0000000000..b2ed9ddb2b
--- /dev/null
+++ b/test/JDBC/input/babel-4517-vu-cleanup.sql
@@ -0,0 +1,11 @@
+drop view view_4517_date
+GO
+
+drop view view_4517_datetime
+GO
+
+drop view view_4517_datetime2
+GO
+
+drop table babel_4517
+GO
\ No newline at end of file
diff --git a/test/JDBC/input/babel-4517-vu-prepare.sql b/test/JDBC/input/babel-4517-vu-prepare.sql
new file mode 100644
index 0000000000..1cb449962c
--- /dev/null
+++ b/test/JDBC/input/babel-4517-vu-prepare.sql
@@ -0,0 +1,33 @@
+create table babel_4517 (
+    date_col date NULL,
+    datetime_col datetime NULL,
+    datetime2_col datetime2 NULL
+)
+GO
+
+create NONCLUSTERED INDEX date_col_indx on babel_4517
+(
+    date_col ASC
+)
+GO
+
+create NONCLUSTERED INDEX datetime_col_indx on babel_4517
+(
+    datetime_col ASC
+)
+GO
+
+create NONCLUSTERED INDEX datetime2_col_indx on babel_4517
+(
+    datetime2_col ASC
+)
+GO
+
+create view view_4517_date as select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date);
+GO
+
+create view view_4517_datetime as select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date);
+GO
+
+create view view_4517_datetime2 as select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date);
+GO
diff --git a/test/JDBC/input/babel-4517-vu-verify.sql b/test/JDBC/input/babel-4517-vu-verify.sql
new file mode 100644
index 0000000000..9fcb0d500c
--- /dev/null
+++ b/test/JDBC/input/babel-4517-vu-verify.sql
@@ -0,0 +1,67 @@
+BEGIN TRANSACTION babel_4517
+GO
+
+SELECT set_config('babelfishpg_tsql.explain_costs', 'off', true)
+GO
+
+SELECT set_config('debug_parallel_query', '0', true)
+GO
+
+SET BABELFISH_SHOWPLAN_ALL on
+GO
+
+select * from view_4517_date;
+GO
+
+select * from view_4517_datetime
+GO
+
+select * from view_4517_datetime2
+GO
+
+select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date);
+GO
+
+select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date);
+GO
+
+select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date);
+GO
+
+SET BABELFISH_SHOWPLAN_ALL off
+GO
+
+SELECT set_config('debug_parallel_query', '1', true)
+SELECT set_config('parallel_setup_cost', '0', true)
+SELECT set_config('parallel_tuple_cost', '0', true)
+GO
+
+SET BABELFISH_SHOWPLAN_ALL on
+GO
+
+select * from view_4517_date;
+GO
+
+select * from view_4517_datetime
+GO
+
+select * from view_4517_datetime2
+GO
+
+select * from babel_4517 where date_col <= cast('2023-08-31' as date) and date_col >= cast('2023-08-31' as date);
+GO
+
+select * from babel_4517 where datetime_col <= cast('2023-08-31' as date) and datetime_col >= cast('2023-08-31' as date);
+GO
+
+select * from babel_4517 where datetime2_col <= cast('2023-08-31' as date) and datetime2_col >= cast('2023-08-31' as date);
+GO
+
+SET BABELFISH_SHOWPLAN_ALL off
+GO
+
+COMMIT TRANSACTION babel_4517
+GO
+
+SELECT set_config('babelfishpg_tsql.explain_costs', 'on', false)
+GO
\ No newline at end of file
diff --git a/test/JDBC/upgrade/13_4/schedule b/test/JDBC/upgrade/13_4/schedule
index 08c93ed9b5..e3d15c8505 100644
--- a/test/JDBC/upgrade/13_4/schedule
+++ b/test/JDBC/upgrade/13_4/schedule
@@ -224,3 +224,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
\ No newline at end of file
diff --git a/test/JDBC/upgrade/13_5/schedule b/test/JDBC/upgrade/13_5/schedule
index aecee68d0b..9ef3448c9f 100644
--- a/test/JDBC/upgrade/13_5/schedule
+++ b/test/JDBC/upgrade/13_5/schedule
@@ -277,3 +277,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
\ No newline at end of file
diff --git a/test/JDBC/upgrade/13_6/schedule b/test/JDBC/upgrade/13_6/schedule
index a17b9cf75f..91ef09e19f 100644
--- a/test/JDBC/upgrade/13_6/schedule
+++ b/test/JDBC/upgrade/13_6/schedule
@@ -331,3 +331,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
\ No newline at end of file
diff --git a/test/JDBC/upgrade/13_7/schedule b/test/JDBC/upgrade/13_7/schedule
index cd0dfc594a..fcfbe14505 100644
--- a/test/JDBC/upgrade/13_7/schedule
+++ b/test/JDBC/upgrade/13_7/schedule
@@ -325,3 +325,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/13_8/schedule b/test/JDBC/upgrade/13_8/schedule
index cd0dfc594a..fcfbe14505 100644
--- a/test/JDBC/upgrade/13_8/schedule
+++ b/test/JDBC/upgrade/13_8/schedule
@@ -325,3 +325,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/13_9/schedule b/test/JDBC/upgrade/13_9/schedule
index d639ba80d8..c9853ea88e 100644
--- a/test/JDBC/upgrade/13_9/schedule
+++ b/test/JDBC/upgrade/13_9/schedule
@@ -328,3 +328,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
\ No newline at end of file
diff --git a/test/JDBC/upgrade/14_10/schedule b/test/JDBC/upgrade/14_10/schedule
index 1b0014008c..9756b56741 100644
--- a/test/JDBC/upgrade/14_10/schedule
+++ b/test/JDBC/upgrade/14_10/schedule
@@ -423,3 +423,4 @@ permission_restrictions_from_pg
 BABEL-4529-before-15_6-or-14_11
 BABEL-730-before-15_6-or-16_1
 babel-4475
+babel-4517
diff --git a/test/JDBC/upgrade/14_11/schedule b/test/JDBC/upgrade/14_11/schedule
index 0ad4e9a9ca..a9891e9dc1 100644
--- a/test/JDBC/upgrade/14_11/schedule
+++ b/test/JDBC/upgrade/14_11/schedule
@@ -421,3 +421,4 @@ BABEL-4606
 sys-parsename-before-15_6-or-16_1
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
\ No newline at end of file
diff --git a/test/JDBC/upgrade/14_3/schedule b/test/JDBC/upgrade/14_3/schedule
index 37bb96953e..14bdc1bbc1 100644
--- a/test/JDBC/upgrade/14_3/schedule
+++ b/test/JDBC/upgrade/14_3/schedule
@@ -346,3 +346,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
\ No newline at end of file
diff --git a/test/JDBC/upgrade/14_5/schedule b/test/JDBC/upgrade/14_5/schedule
index 48b101e9f9..9ea22dbddd 100644
--- a/test/JDBC/upgrade/14_5/schedule
+++ b/test/JDBC/upgrade/14_5/schedule
@@ -361,3 +361,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/14_6/schedule b/test/JDBC/upgrade/14_6/schedule
index f6a6dde260..c96573a06c 100644
--- a/test/JDBC/upgrade/14_6/schedule
+++ b/test/JDBC/upgrade/14_6/schedule
@@ -396,3 +396,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/14_7/schedule b/test/JDBC/upgrade/14_7/schedule
index d9697243fc..0d2f5b5a0e 100644
--- a/test/JDBC/upgrade/14_7/schedule
+++ b/test/JDBC/upgrade/14_7/schedule
@@ -417,3 +417,4 @@ babel_index_nulls_order-before-15-5
 BABEL-2999
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/14_8/schedule b/test/JDBC/upgrade/14_8/schedule
index 6d9e5908d5..0f5e2e3e0b 100644
--- a/test/JDBC/upgrade/14_8/schedule
+++ b/test/JDBC/upgrade/14_8/schedule
@@ -418,3 +418,4 @@ permission_restrictions_from_pg
 BABEL-4606
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/14_9/schedule b/test/JDBC/upgrade/14_9/schedule
index 61ffab0e93..b2171c04d4 100644
--- a/test/JDBC/upgrade/14_9/schedule
+++ b/test/JDBC/upgrade/14_9/schedule
@@ -421,3 +421,4 @@ BABEL-4606
 sys-parsename-before-15_6-or-16_1
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/15_1/schedule b/test/JDBC/upgrade/15_1/schedule
index 8639e4cb4f..60125660b6 100644
--- a/test/JDBC/upgrade/15_1/schedule
+++ b/test/JDBC/upgrade/15_1/schedule
@@ -396,3 +396,4 @@ BABEL-2999
 permission_restrictions_from_pg
 BABEL-4606
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/15_2/schedule b/test/JDBC/upgrade/15_2/schedule
index d2dbe4a046..28dddf02f0 100644
--- a/test/JDBC/upgrade/15_2/schedule
+++ b/test/JDBC/upgrade/15_2/schedule
@@ -426,3 +426,4 @@ permission_restrictions_from_pg
 BABEL-4606
 BABEL-730-before-15_6-or-16_1
 babel-4475
+babel-4517
diff --git a/test/JDBC/upgrade/15_3/schedule b/test/JDBC/upgrade/15_3/schedule
index 5475e807c4..6c1a38094d 100644
--- a/test/JDBC/upgrade/15_3/schedule
+++ b/test/JDBC/upgrade/15_3/schedule
@@ -448,3 +448,4 @@ BABEL-2999
 BABEL-4606
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/15_4/schedule b/test/JDBC/upgrade/15_4/schedule
index c9017f7842..8969b2f9e2 100644
--- a/test/JDBC/upgrade/15_4/schedule
+++ b/test/JDBC/upgrade/15_4/schedule
@@ -460,3 +460,4 @@ BABEL-2999
 BABEL-4606
 permission_restrictions_from_pg
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/15_5/schedule b/test/JDBC/upgrade/15_5/schedule
index e6800acd6a..d937882ebf 100644
--- a/test/JDBC/upgrade/15_5/schedule
+++ b/test/JDBC/upgrade/15_5/schedule
@@ -488,3 +488,4 @@ BABEL-4606
 permission_restrictions_from_pg
 BABEL-4529-before-15_6-or-14_11
 BABEL-730-before-15_6-or-16_1
+babel-4517
diff --git a/test/JDBC/upgrade/15_6/schedule b/test/JDBC/upgrade/15_6/schedule
index cd0d72a382..5b1d1d5dd4 100644
--- a/test/JDBC/upgrade/15_6/schedule
+++ b/test/JDBC/upgrade/15_6/schedule
@@ -503,4 +503,5 @@ BABEL-4529
 sys_availability_groups
 sys_availability_replicas
 BABEL-730
-babel-4475
\ No newline at end of file
+babel-4475
+babel-4517
diff --git a/test/JDBC/upgrade/16_1/schedule b/test/JDBC/upgrade/16_1/schedule
index 5a330d6c8e..99b5f1d7c4 100644
--- a/test/JDBC/upgrade/16_1/schedule
+++ b/test/JDBC/upgrade/16_1/schedule
@@ -495,3 +495,4 @@ permission_restrictions_from_pg
 BABEL-4529-before-15_6-or-14_11
 BABEL-730-before-15_6-or-16_1
 babel-4475
+babel-4517
diff --git a/test/JDBC/upgrade/latest/schedule b/test/JDBC/upgrade/latest/schedule
index dee41f5ca7..d988b2f0f2 100644
--- a/test/JDBC/upgrade/latest/schedule
+++ b/test/JDBC/upgrade/latest/schedule
@@ -506,3 +506,4 @@ sys_availability_groups
 sys_availability_replicas
 BABEL-730
 babel-4475
+babel-4517
diff --git a/test/python/expected/upgrade_validation/expected_dependency.out b/test/python/expected/upgrade_validation/expected_dependency.out
index fcdb547343..9a716d0ad9 100644
--- a/test/python/expected/upgrade_validation/expected_dependency.out
+++ b/test/python/expected/upgrade_validation/expected_dependency.out
@@ -306,7 +306,6 @@ Function sys.datalength(anyelement)
 Function sys.datalength(character)
 Function sys.datalength(sys.sql_variant)
 Function sys.datalength(text)
-Function sys.date2datetime2(date)
 Function sys.date2datetimeoffset(date)
 Function sys.date2smalldatetime(date)
 Function sys.date_bucket_internal_helper(text,integer,boolean,boolean,anyelement)
@@ -895,8 +894,6 @@ Operator sys.<=(sys."bit",integer)
 Operator sys.<=(sys."bit",sys."bit")
 Operator sys.<=(sys.bbf_binary,sys.bbf_binary)
 Operator sys.<=(sys.bbf_varbinary,sys.bbf_varbinary)
-Operator sys.<=(sys.datetime,sys.datetime)
-Operator sys.<=(sys.datetime2,sys.datetime2)
 Operator sys.<=(sys.datetimeoffset,sys.datetimeoffset)
 Operator sys.<=(sys.fixeddecimal,bigint)
 Operator sys.<=(sys.fixeddecimal,integer)
@@ -982,8 +979,6 @@ Operator sys.>=(sys."bit",integer)
 Operator sys.>=(sys."bit",sys."bit")
 Operator sys.>=(sys.bbf_binary,sys.bbf_binary)
 Operator sys.>=(sys.bbf_varbinary,sys.bbf_varbinary)
-Operator sys.>=(sys.datetime,sys.datetime)
-Operator sys.>=(sys.datetime2,sys.datetime2)
 Operator sys.>=(sys.datetimeoffset,sys.datetimeoffset)
 Operator sys.>=(sys.fixeddecimal,bigint)
 Operator sys.>=(sys.fixeddecimal,integer)