Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev