Finish updating fabric for #31