Merge pull request #3504 from rbayet/fix-3500-tracker-prevent-loss-of… #2190

Job	Run time
Integration (7.4, 2.4.2-p2, community, true)	5m 45s
Integration (7.4, 2.4.2-p2, enterprise, true)	7m 6s
Integration (7.4, 2.4.3-p3, community, false)	5m 32s
Integration (7.4, 2.4.3-p3, enterprise, false)	7m 53s
Integration (8.1, 2.4.4-p9, community, true)	5m 54s
Integration (8.1, 2.4.4-p9, enterprise, true)	6m 34s
Integration (8.1, 2.4.5-p8, community, false)	4m 57s
Integration (8.1, 2.4.5-p8, enterprise, false)	5m 56s
	49m 37s

Provide feedback