[SPAY-234] SPAY-234