Merge "Bug 5596 Added cluster provider"