Implement SERENGETI-1618 'cli implementation for cluster fix'.