Port clustering improvements from 2.4.x to 2.6.x (master) #76

Closed groldan closed 9 years ago