Port MODCLUSTER-332 fix from 1.2.x branch.