Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0