Merge "Use persist property for velocitytracker strategy"