[SPAY-258] SPAY-258