[SPAY-253] SPAY-253