Use cluster name
Merge bug25979