diff --git a/flow/scripts/floorplan.tcl b/flow/scripts/floorplan.tcl
index 00c1b8dabe..bd3a7adc4e 100644
--- a/flow/scripts/floorplan.tcl
+++ b/flow/scripts/floorplan.tcl
@@ -131,6 +131,8 @@ if { !$::env(SKIP_REPAIR_TIE_FANOUT) } {
 
 if { [env_var_exists_and_non_empty SWAP_ARITH_OPERATORS] } {
   log_cmd estimate_parasitics -placement
+  # Enable sanity checker until replace_arith_modules becomes stable
+  set_debug_level ODB replace_design_check_sanity 1
   replace_arith_modules
 }
 
diff --git a/flow/scripts/resize.tcl b/flow/scripts/resize.tcl
index ff71c58cb0..b1d8ca5aa9 100644
--- a/flow/scripts/resize.tcl
+++ b/flow/scripts/resize.tcl
@@ -15,6 +15,8 @@ if { [env_var_exists_and_non_empty EARLY_SIZING_CAP_RATIO] } {
 }
 
 if { [env_var_exists_and_non_empty SWAP_ARITH_OPERATORS] } {
+  # Enable sanity checker until replace_arith_modules becomes stable
+  set_debug_level ODB replace_design_check_sanity 1
   replace_arith_modules
   global_placement -incremental
 }
diff --git a/tools/OpenROAD b/tools/OpenROAD
index fea33a69ec..afade0342f 160000
--- a/tools/OpenROAD
+++ b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit fea33a69ecfe760bb44e22d24ad9276685e97058
+Subproject commit afade0342f489e8145f9eaac09be3c166491508f