COOPR-568: changes for distributed mode