Merge "Reduce number of maximum clusters" into sc-dev