Merge in changes from base Slicer repo