Merge "Further volume improvements." into ics-mr1