Merge "Change volume client methods to return one value"