[SPAY-278] SPAY-278