Fix failing test due to data purger being enabled
Merge remote-tracking branch 'origin/master'