[SPAY-259] SPAY-259