[Reducing Mosaic] SONE-994