Merge "Remove ring_volume from VolumePanel" into main