am 87258edd: Merge "Slow path should break def tracking"

* commit '87258edd817672daefc1d262af4cfdf732d4e454':
  Slow path should break def tracking