diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm
index c88b1170a80df..35e3124e173c4 100644
--- a/mysql-test/lib/My/Config.pm
+++ b/mysql-test/lib/My/Config.pm
@@ -29,6 +29,14 @@ my %multipart_options=
   (
    "plugin-load-add" => 1,
    "optimizer-switch" => 1,
+   "replicate-do-table" => 1,
+   "replicate-ignore-table" => 1,
+   "replicate-wild-do-table" => 1,
+   "replicate-wild-ignore-table" => 1,
+   "replicate-do-db" => 1,
+   "replicate-ignore-db" => 1,
+   "binlog-do-db" => 1,
+   "binlog-ignore-db" => 1,
 );
 
 
diff --git a/mysql-test/main/mysqltest_multi_opt_replicate_do.cnf b/mysql-test/main/mysqltest_multi_opt_replicate_do.cnf
new file mode 100644
index 0000000000000..0e25e20a6bfc5
--- /dev/null
+++ b/mysql-test/main/mysqltest_multi_opt_replicate_do.cnf
@@ -0,0 +1,5 @@
+!include include/default_my.cnf
+[mysqld]
+replicate_do_table=test.t1
+replicate_do_table=test.t2
+replicate_do_table=test.t3
diff --git a/mysql-test/main/mysqltest_multi_opt_replicate_do.result b/mysql-test/main/mysqltest_multi_opt_replicate_do.result
new file mode 100644
index 0000000000000..4345b8e09101f
--- /dev/null
+++ b/mysql-test/main/mysqltest_multi_opt_replicate_do.result
@@ -0,0 +1,6 @@
+#
+# MDEV-35767 MTR Overwrites Test-Specific .cnf File Options On Duplicate Option
+#
+SELECT @@replicate_do_table;
+@@replicate_do_table
+test.t3,test.t1,test.t2
diff --git a/mysql-test/main/mysqltest_multi_opt_replicate_do.test b/mysql-test/main/mysqltest_multi_opt_replicate_do.test
new file mode 100644
index 0000000000000..8325f2d5c4cd4
--- /dev/null
+++ b/mysql-test/main/mysqltest_multi_opt_replicate_do.test
@@ -0,0 +1,11 @@
+#
+# Test list parsing for duplicate .cnf option
+#
+
+-- source include/not_embedded.inc
+
+--echo #
+--echo # MDEV-35767 MTR Overwrites Test-Specific .cnf File Options On Duplicate Option
+--echo #
+
+SELECT @@replicate_do_table;
diff --git a/storage/connect/JdbcInterface.jar b/storage/connect/JdbcInterface.jar
new file mode 100644
index 0000000000000..bd21079b5084a
Binary files /dev/null and b/storage/connect/JdbcInterface.jar differ