RIFTSAW-523: clustering support.