[SPAY-252] SPAY-252