Further changes to support cluster compute supervisors.