fix bug in collecting instances in a cluster
Merge remote-tracking branch 'origin/master'