Introduce shared stencil component
follow up master