Merge "Add internal methods for setting compute clients"