Merge "VolumeShaper: Initial implementation"