[SPAY-251] SPAY-251