Merge "Slow path should break def tracking"