Merged work:
- shelf / gallery updates
- PolyWrap Capture/Deform SOPs