Merge "Mark volume fields private"