RIFTSAW-523: clustering support.
RIFTSAW-523: clustering support.