Merge "Fix to config when clustering enabled"