Always set stop value when stopping tracking (lib)
Merge branch 'master' into builds
7.535