Merge "Add internal methods for setting volume clients"