BUG-6595: Adding a retry for the issue when the