Merge "media volume: remove old --set and rename --index to --set"