Merge pull request #6864 from illume/upstream-cluster-deletion-reload-0032