* Improve DelayedTrackerStore * Review changes (cherry picked from commit ad84a8c3e9bd56025ab59beb5c024a7b7d6e2b35)