Merge "Ensure current volume is current" into lmp-dev