Merge "Volume: Design followup." into lmp-dev