Merge pull request #6707 from shreyas-acharya/fix/clusters-version-polling-background-tab