diff --git a/flow/scripts/util.tcl b/flow/scripts/util.tcl
index 5b7d98c8d1..53747a7d9a 100644
--- a/flow/scripts/util.tcl
+++ b/flow/scripts/util.tcl
@@ -40,6 +40,9 @@ proc repair_timing_helper { args } {
   append_env_var additional_args SKIP_VT_SWAP -skip_vt_swap 0
   append_env_var additional_args SKIP_CRIT_VT_SWAP -skip_crit_vt_swap 0
   append_env_var additional_args MATCH_CELL_FOOTPRINT -match_cell_footprint 0
+  # DO NOT MERGE: neighbor-check CI eval -- force the (off-by-default)
+  # neighbor feasibility check on for every repair_timing call.
+  lappend additional_args -neighbor_check
   lappend additional_args {*}$args -verbose
 
   log_cmd repair_timing {*}$additional_args
diff --git a/tools/OpenROAD b/tools/OpenROAD
index 20d2d5c16e..2f0d25c289 160000
--- a/tools/OpenROAD
+++ b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit 20d2d5c16e3077c5c5f66e4e977e24e3f479c0f9
+Subproject commit 2f0d25c289f1b7ae1eeecd1580d2d837c8ef3fb2