1) Added robust mechanism to handle data population restarts.