Merge "Fix SO to RO translation for volumes"