make same changes to cluster branch

~3