Merge "Check for null params in VolumeShaper" into main