[Reducing Mosaic] SONE-504