Merge change 20674

* changes:
  Add a new setting for controling how much time to wait before discarding uphill operations