local patch for Stress testing legacy