diff --git a/test/JDBC/expected/BABEL-4672-vu-cleanup.out b/test/JDBC/expected/BABEL-4672-vu-cleanup.out
new file mode 100644
index 0000000000..5c054edce7
--- /dev/null
+++ b/test/JDBC/expected/BABEL-4672-vu-cleanup.out
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS tbl_emp_salary;
+GO
+
+DROP TABLE IF EXISTS emp_salary;
+GO
diff --git a/test/JDBC/expected/BABEL-4672-vu-prepare.out b/test/JDBC/expected/BABEL-4672-vu-prepare.out
new file mode 100644
index 0000000000..54fa8fbae0
--- /dev/null
+++ b/test/JDBC/expected/BABEL-4672-vu-prepare.out
@@ -0,0 +1,5 @@
+CREATE TABLE emp_salary(emp_id int, salary int);
+GO
+
+CREATE TABLE tbl_emp_salary(emp_id int, salary int);
+GO
diff --git a/test/JDBC/expected/BABEL-4672-vu-verify.out b/test/JDBC/expected/BABEL-4672-vu-verify.out
new file mode 100644
index 0000000000..7a9bb7be86
--- /dev/null
+++ b/test/JDBC/expected/BABEL-4672-vu-verify.out
@@ -0,0 +1,354 @@
+----------- Section 1 IOT INSERT Triggers
+-- IOT INSERT TRIGGER  -> AFTER INSERT TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_insert ON emp_salary
+INSTEAD OF INSERT
+AS
+INSERT INTO emp_salary VALUES(2, 2000);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_insert ON emp_salary
+AFTER INSERT
+AS
+INSERT INTO emp_salary VALUES(3, 3000);
+GO
+
+INSERT INTO emp_salary VALUES (1,1000);
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+2#!#2000
+3#!#3000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_insert;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_insert;
+GO
+
+-- IOT INSERT TRIGGER  -> AFTER UPDATE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_insert ON emp_salary
+INSTEAD OF INSERT
+AS
+UPDATE emp_salary SET salary = salary + 999 where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_update ON emp_salary
+AFTER UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 9999 where emp_id = 2;
+GO
+
+INSERT INTO emp_salary VALUES (4,4000);
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+2#!#12998
+3#!#3000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_update;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_insert;
+GO
+
+-- IOT INSERT TRIGGER  -> AFTER DELETE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_insert ON emp_salary
+INSTEAD OF INSERT
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id from INSERTED);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_delete ON emp_salary
+AFTER DELETE
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id -1 from DELETED);
+GO
+
+INSERT INTO emp_salary VALUES (3,1000);
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_delete;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_insert;
+GO
+
+TRUNCATE TABLE emp_salary;
+GO
+
+----------- Section 2 IOT UPDATE Triggers
+-- IOT UPDATE TRIGGER  -> AFTER INSERT TRIGGER
+INSERT INTO emp_salary VALUES (1, 1000);
+GO
+~~ROW COUNT: 1~~
+
+
+CREATE TRIGGER tr_emp_salary_instead_update ON emp_salary
+INSTEAD OF UPDATE
+AS
+INSERT INTO emp_salary VALUES(2, 2000);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_insert ON emp_salary
+AFTER INSERT
+AS
+INSERT INTO emp_salary VALUES(3, 3000);
+GO
+
+UPDATE emp_salary SET salary = salary + 5 where emp_id = 1;
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+1#!#1000
+2#!#2000
+3#!#3000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_insert;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_update;
+GO
+
+-- IOT UPDATE TRIGGER  -> AFTER UPDATE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_update ON emp_salary
+INSTEAD OF UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 999 where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_update ON emp_salary
+AFTER UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 9999 where emp_id = 2;
+GO
+
+UPDATE emp_salary SET salary = salary + 5 where emp_id = 2;
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+1#!#1000
+2#!#12998
+3#!#3000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_update;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_update;
+GO
+
+-- IOT UPDATE TRIGGER  -> AFTER DELETE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_update ON emp_salary
+INSTEAD OF UPDATE
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id from INSERTED)
+GO
+
+CREATE TRIGGER tr_emp_salary_after_delete ON emp_salary
+AFTER DELETE
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id +1 from DELETED)
+GO
+
+UPDATE emp_salary SET salary = salary + 5 where emp_id = 1;
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+3#!#3000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_delete;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_update;
+GO
+
+TRUNCATE TABLE emp_salary;
+GO
+
+----------- Section 3 IOT DELETE Triggers
+-- IOT DELETE TRIGGER -> AFTER INSERT TRIGGER
+INSERT INTO emp_salary VALUES(1, 1000);
+GO
+~~ROW COUNT: 1~~
+
+
+CREATE TRIGGER tr_emp_salary_instead_delete ON emp_salary
+INSTEAD OF DELETE
+AS
+INSERT INTO emp_salary VALUES(2, 2000);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_insert ON emp_salary
+AFTER INSERT
+AS
+INSERT INTO emp_salary VALUES(3, 3000);
+GO
+
+DELETE FROM emp_salary where emp_id = 1;
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+1#!#1000
+2#!#2000
+3#!#3000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_insert;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_delete;
+GO
+
+-- IOT DELETE TRIGGER  -> AFTER UPDATE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_delete ON emp_salary
+INSTEAD OF DELETE
+AS
+UPDATE emp_salary SET salary = salary + 999 where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_update ON emp_salary
+AFTER UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 9999 where emp_id = 2;
+GO
+
+DELETE FROM emp_salary where emp_id = 1;
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+1#!#1000
+2#!#12998
+3#!#3000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_update;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_delete;
+GO
+
+-- IOT DELETE TRIGGER  -> AFTER DELETE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_delete ON emp_salary
+INSTEAD OF DELETE
+AS
+DELETE FROM emp_salary where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_delete ON emp_salary
+AFTER DELETE
+AS
+DELETE FROM emp_salary where emp_id = 3;
+GO
+
+DELETE FROM emp_salary where emp_id = 1;
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+~~START~~
+int#!#int
+1#!#1000
+~~END~~
+
+
+DROP TRIGGER tr_emp_salary_after_delete;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_delete;
+GO
+
+TRUNCATE TABLE emp_salary;
+GO
diff --git a/test/JDBC/input/triggers/BABEL-4672-vu-cleanup.sql b/test/JDBC/input/triggers/BABEL-4672-vu-cleanup.sql
new file mode 100644
index 0000000000..a0bc5b13b9
--- /dev/null
+++ b/test/JDBC/input/triggers/BABEL-4672-vu-cleanup.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS tbl_emp_salary;
+GO
+
+DROP TABLE IF EXISTS emp_salary;
+GO
\ No newline at end of file
diff --git a/test/JDBC/input/triggers/BABEL-4672-vu-prepare.sql b/test/JDBC/input/triggers/BABEL-4672-vu-prepare.sql
new file mode 100644
index 0000000000..f933af4baf
--- /dev/null
+++ b/test/JDBC/input/triggers/BABEL-4672-vu-prepare.sql
@@ -0,0 +1,5 @@
+CREATE TABLE emp_salary(emp_id int, salary int);
+GO
+
+CREATE TABLE tbl_emp_salary(emp_id int, salary int);
+GO
\ No newline at end of file
diff --git a/test/JDBC/input/triggers/BABEL-4672-vu-verify.sql b/test/JDBC/input/triggers/BABEL-4672-vu-verify.sql
new file mode 100644
index 0000000000..8dc0309f29
--- /dev/null
+++ b/test/JDBC/input/triggers/BABEL-4672-vu-verify.sql
@@ -0,0 +1,242 @@
+----------- Section 1 IOT INSERT Triggers
+-- IOT INSERT TRIGGER  -> AFTER INSERT TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_insert ON emp_salary
+INSTEAD OF INSERT
+AS
+INSERT INTO emp_salary VALUES(2, 2000);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_insert ON emp_salary
+AFTER INSERT
+AS
+INSERT INTO emp_salary VALUES(3, 3000);
+GO
+
+INSERT INTO emp_salary VALUES (1,1000);
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_insert;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_insert;
+GO
+
+-- IOT INSERT TRIGGER  -> AFTER UPDATE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_insert ON emp_salary
+INSTEAD OF INSERT
+AS
+UPDATE emp_salary SET salary = salary + 999 where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_update ON emp_salary
+AFTER UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 9999 where emp_id = 2;
+GO
+
+INSERT INTO emp_salary VALUES (4,4000);
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_update;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_insert;
+GO
+
+-- IOT INSERT TRIGGER  -> AFTER DELETE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_insert ON emp_salary
+INSTEAD OF INSERT
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id from INSERTED);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_delete ON emp_salary
+AFTER DELETE
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id -1 from DELETED);
+GO
+
+INSERT INTO emp_salary VALUES (3,1000);
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_delete;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_insert;
+GO
+
+TRUNCATE TABLE emp_salary;
+GO
+
+----------- Section 2 IOT UPDATE Triggers
+-- IOT UPDATE TRIGGER  -> AFTER INSERT TRIGGER
+INSERT INTO emp_salary VALUES (1, 1000);
+GO
+
+CREATE TRIGGER tr_emp_salary_instead_update ON emp_salary
+INSTEAD OF UPDATE
+AS
+INSERT INTO emp_salary VALUES(2, 2000);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_insert ON emp_salary
+AFTER INSERT
+AS
+INSERT INTO emp_salary VALUES(3, 3000);
+GO
+
+UPDATE emp_salary SET salary = salary + 5 where emp_id = 1;
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_insert;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_update;
+GO
+
+-- IOT UPDATE TRIGGER  -> AFTER UPDATE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_update ON emp_salary
+INSTEAD OF UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 999 where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_update ON emp_salary
+AFTER UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 9999 where emp_id = 2;
+GO
+
+UPDATE emp_salary SET salary = salary + 5 where emp_id = 2;
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_update;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_update;
+GO
+
+-- IOT UPDATE TRIGGER  -> AFTER DELETE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_update ON emp_salary
+INSTEAD OF UPDATE
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id from INSERTED)
+GO
+
+CREATE TRIGGER tr_emp_salary_after_delete ON emp_salary
+AFTER DELETE
+AS
+DELETE FROM emp_salary where emp_id = (SELECT emp_id +1 from DELETED)
+GO
+
+UPDATE emp_salary SET salary = salary + 5 where emp_id = 1;
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_delete;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_update;
+GO
+
+TRUNCATE TABLE emp_salary;
+GO
+
+----------- Section 3 IOT DELETE Triggers
+-- IOT DELETE TRIGGER -> AFTER INSERT TRIGGER
+INSERT INTO emp_salary VALUES(1, 1000);
+GO
+
+CREATE TRIGGER tr_emp_salary_instead_delete ON emp_salary
+INSTEAD OF DELETE
+AS
+INSERT INTO emp_salary VALUES(2, 2000);
+GO
+
+CREATE TRIGGER tr_emp_salary_after_insert ON emp_salary
+AFTER INSERT
+AS
+INSERT INTO emp_salary VALUES(3, 3000);
+GO
+
+DELETE FROM emp_salary where emp_id = 1;
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_insert;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_delete;
+GO
+
+-- IOT DELETE TRIGGER  -> AFTER UPDATE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_delete ON emp_salary
+INSTEAD OF DELETE
+AS
+UPDATE emp_salary SET salary = salary + 999 where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_update ON emp_salary
+AFTER UPDATE
+AS
+UPDATE emp_salary SET salary = salary + 9999 where emp_id = 2;
+GO
+
+DELETE FROM emp_salary where emp_id = 1;
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_update;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_delete;
+GO
+
+-- IOT DELETE TRIGGER  -> AFTER DELETE TRIGGER
+CREATE TRIGGER tr_emp_salary_instead_delete ON emp_salary
+INSTEAD OF DELETE
+AS
+DELETE FROM emp_salary where emp_id = 2;
+GO
+
+CREATE TRIGGER tr_emp_salary_after_delete ON emp_salary
+AFTER DELETE
+AS
+DELETE FROM emp_salary where emp_id = 3;
+GO
+
+DELETE FROM emp_salary where emp_id = 1;
+GO
+
+SELECT emp_id, salary FROM emp_salary ORDER BY emp_id;
+GO
+
+DROP TRIGGER tr_emp_salary_after_delete;
+GO
+
+DROP TRIGGER tr_emp_salary_instead_delete;
+GO
+
+TRUNCATE TABLE emp_salary;
+GO
\ No newline at end of file
diff --git a/test/JDBC/upgrade/13_4/schedule b/test/JDBC/upgrade/13_4/schedule
index eb7cf384b3..4cebd88367 100644
--- a/test/JDBC/upgrade/13_4/schedule
+++ b/test/JDBC/upgrade/13_4/schedule
@@ -205,5 +205,6 @@ orderby-before-14_8-or-15_3
 AUTO_ANALYZE-before-15-5-or-14-10
 permission_restrictions_from_pg
 # babel-4517 created : BABEL-4727 to track the issue
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/13_5/schedule b/test/JDBC/upgrade/13_5/schedule
index 22df5c83df..10a9057f15 100644
--- a/test/JDBC/upgrade/13_5/schedule
+++ b/test/JDBC/upgrade/13_5/schedule
@@ -256,5 +256,6 @@ orderby-before-14_8-or-15_3
 AUTO_ANALYZE-before-15-5-or-14-10
 permission_restrictions_from_pg
 # babel-4517 created : BABEL-4727 to track the issue
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/13_6/schedule b/test/JDBC/upgrade/13_6/schedule
index 9a8fa8886e..db4192ee4e 100644
--- a/test/JDBC/upgrade/13_6/schedule
+++ b/test/JDBC/upgrade/13_6/schedule
@@ -316,5 +316,6 @@ BABEL-4410
 AUTO_ANALYZE-before-15-5-or-14-10
 permission_restrictions_from_pg
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/13_7/schedule b/test/JDBC/upgrade/13_7/schedule
index 7cd309126f..85ab15aeee 100644
--- a/test/JDBC/upgrade/13_7/schedule
+++ b/test/JDBC/upgrade/13_7/schedule
@@ -316,5 +316,6 @@ BABEL-4410
 AUTO_ANALYZE-before-15-5-or-14-10
 permission_restrictions_from_pg
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/13_8/schedule b/test/JDBC/upgrade/13_8/schedule
index 7cd309126f..ec8452a7bf 100644
--- a/test/JDBC/upgrade/13_8/schedule
+++ b/test/JDBC/upgrade/13_8/schedule
@@ -166,6 +166,7 @@ Test-sp_helpdbfixedrole
 Test-sp_helpsrvrolemember
 BABEL-404
 BABEL-493
+BABEL-4672
 BABEL-621
 BABEL-775
 BABEL-1206-before-15-5-or-14-10
@@ -316,5 +317,6 @@ BABEL-4410
 AUTO_ANALYZE-before-15-5-or-14-10
 permission_restrictions_from_pg
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/13_9/schedule b/test/JDBC/upgrade/13_9/schedule
index aab93bb460..65106d7f52 100644
--- a/test/JDBC/upgrade/13_9/schedule
+++ b/test/JDBC/upgrade/13_9/schedule
@@ -316,5 +316,6 @@ BABEL-4410
 AUTO_ANALYZE-before-15-5-or-14-10
 permission_restrictions_from_pg
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/14_10/schedule b/test/JDBC/upgrade/14_10/schedule
index 0d1d197710..3124d40876 100644
--- a/test/JDBC/upgrade/14_10/schedule
+++ b/test/JDBC/upgrade/14_10/schedule
@@ -421,6 +421,7 @@ sys_certificates
 sys_database_permissions
 babel-4475
 BABEL-4606
+BABEL-4672
 babel-4517
 BABEL_4553
 BABEL-4641-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/14_11/schedule b/test/JDBC/upgrade/14_11/schedule
index 9e3be8672e..e9483c78b7 100644
--- a/test/JDBC/upgrade/14_11/schedule
+++ b/test/JDBC/upgrade/14_11/schedule
@@ -420,6 +420,7 @@ sys_certificates
 sys_database_permissions
 babel-4475
 BABEL-4606
+BABEL-4672
 babel-4517
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL_4817
diff --git a/test/JDBC/upgrade/14_3/schedule b/test/JDBC/upgrade/14_3/schedule
index a5a65e8097..ae5b70d171 100644
--- a/test/JDBC/upgrade/14_3/schedule
+++ b/test/JDBC/upgrade/14_3/schedule
@@ -329,5 +329,6 @@ BABEL-4410
 AUTO_ANALYZE-before-15-5-or-14-10
 permission_restrictions_from_pg
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/14_5/schedule b/test/JDBC/upgrade/14_5/schedule
index c0972f18ed..5d09abf737 100644
--- a/test/JDBC/upgrade/14_5/schedule
+++ b/test/JDBC/upgrade/14_5/schedule
@@ -342,5 +342,6 @@ AUTO_ANALYZE-before-15-5-or-14-10
 BABEL_4389
 permission_restrictions_from_pg
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/14_6/schedule b/test/JDBC/upgrade/14_6/schedule
index 809fbc1c68..69a5896966 100644
--- a/test/JDBC/upgrade/14_6/schedule
+++ b/test/JDBC/upgrade/14_6/schedule
@@ -368,5 +368,6 @@ BABEL_4330
 AUTO_ANALYZE-before-15-5-or-14-10
 BABEL_4389
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/14_7/schedule b/test/JDBC/upgrade/14_7/schedule
index bf50fe0a78..3d5c785f43 100644
--- a/test/JDBC/upgrade/14_7/schedule
+++ b/test/JDBC/upgrade/14_7/schedule
@@ -410,5 +410,6 @@ BABEL_4330
 AUTO_ANALYZE-before-15-5-or-14-10
 BABEL_4389
 babel-4517
+BABEL-4672
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL-4863-before-16_3-or-15_7-or-14_12
diff --git a/test/JDBC/upgrade/14_8/schedule b/test/JDBC/upgrade/14_8/schedule
index c93328baa5..783bfc5892 100644
--- a/test/JDBC/upgrade/14_8/schedule
+++ b/test/JDBC/upgrade/14_8/schedule
@@ -410,6 +410,7 @@ BABEL_4330
 AUTO_ANALYZE-before-15-5-or-14-10
 BABEL_4389
 BABEL-4606
+BABEL-4672
 babel-4517
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL_4817
diff --git a/test/JDBC/upgrade/14_9/schedule b/test/JDBC/upgrade/14_9/schedule
index adc2818127..e1cdd88375 100644
--- a/test/JDBC/upgrade/14_9/schedule
+++ b/test/JDBC/upgrade/14_9/schedule
@@ -414,6 +414,7 @@ BABEL-4410
 AUTO_ANALYZE-before-15-5-or-14-10
 babel-4475
 BABEL-4606
+BABEL-4672
 babel-4517
 BABEL-4641-before-16_3-or-15_7-or-14_12
 BABEL_4817
diff --git a/test/JDBC/upgrade/latest/schedule b/test/JDBC/upgrade/latest/schedule
index 784e0a77ac..fca297aad6 100644
--- a/test/JDBC/upgrade/latest/schedule
+++ b/test/JDBC/upgrade/latest/schedule
@@ -420,6 +420,7 @@ sys_asymmetric_keys
 sys_certificates
 sys_database_permissions
 BABEL-4606
+BABEL-4672
 babel-4475
 sys_availability_groups
 sys_availability_replicas