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.cnf b/mysql-test/main/mysqltest_multi_opt.cnf
new file mode 100644
index 0000000000000..c5be802b3f79f
--- /dev/null
+++ b/mysql-test/main/mysqltest_multi_opt.cnf
@@ -0,0 +1,20 @@
+!include include/default_my.cnf
+[mysqld]
+replicate_do_table=test.t1
+replicate_do_table=test.t2
+replicate_ignore_table=test.i1
+replicate_ignore_table=test.i2
+replicate_wild_do_table=test.wd1
+replicate_wild_do_table=test.wd2
+replicate_wild_ignore_table=test.wi1
+replicate_wild_ignore_table=test.wi2
+replicate_do_db=db1
+replicate_do_db=db2
+replicate_ignore_db=idb1
+replicate_ignore_db=idb2
+binlog_do_db=bdb1
+binlog_do_db=bdb2
+binlog_ignore_db=bib1
+binlog_ignore_db=bib2
+optimizer_switch=index_merge=off
+optimizer_switch=index_merge_union=off
diff --git a/mysql-test/main/mysqltest_multi_opt.result b/mysql-test/main/mysqltest_multi_opt.result
new file mode 100644
index 0000000000000..9ef536ffde626
--- /dev/null
+++ b/mysql-test/main/mysqltest_multi_opt.result
@@ -0,0 +1,28 @@
+#
+# MDEV-35767 MTR Overwrites Test-Specific .cnf File Options On Duplicate Option
+# Test all replication and binlog filter variables
+#
+SELECT @@replicate_do_table;
+@@replicate_do_table
+test.t2,test.t1
+SELECT @@replicate_ignore_table;
+@@replicate_ignore_table
+test.i2,test.i1
+SELECT @@replicate_wild_do_table;
+@@replicate_wild_do_table
+test.wd1,test.wd2
+SELECT @@replicate_wild_ignore_table;
+@@replicate_wild_ignore_table
+test.wi1,test.wi2
+SELECT @@replicate_do_db;
+@@replicate_do_db
+db1,db2
+SELECT @@replicate_ignore_db;
+@@replicate_ignore_db
+idb1,idb2
+#
+# Verify optimizer_switch contains both flags
+#
+SELECT @@optimizer_switch LIKE '%index_merge=off%' AND @@optimizer_switch LIKE '%index_merge_union=off%';
+@@optimizer_switch LIKE '%index_merge=off%' AND @@optimizer_switch LIKE '%index_merge_union=off%'
+1
diff --git a/mysql-test/main/mysqltest_multi_opt.test b/mysql-test/main/mysqltest_multi_opt.test
new file mode 100644
index 0000000000000..a46f1aad236fa
--- /dev/null
+++ b/mysql-test/main/mysqltest_multi_opt.test
@@ -0,0 +1,20 @@
+#
+# Test all multi-part options for duplicate .cnf option
+#
+
+-- source include/not_embedded.inc
+
+--echo #
+--echo # MDEV-35767 MTR Overwrites Test-Specific .cnf File Options On Duplicate Option
+--echo # Test all replication and binlog filter variables
+--echo #
+
+SELECT @@replicate_do_table;
+SELECT @@replicate_ignore_table;
+SELECT @@replicate_wild_do_table;
+SELECT @@replicate_wild_ignore_table;
+SELECT @@replicate_do_db;
+SELECT @@replicate_ignore_db;
+
+--echo # Verify optimizer_switch contains both flags
+SELECT @@optimizer_switch LIKE '%index_merge=off%' AND @@optimizer_switch LIKE '%index_merge_union=off%';
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