Merge "VolumeShaper: Update Builder methods and Object overrides"