Merge branch 'volume_orientation'