[SPAY-266] SPAY-266