[SPAY-223] SPAY-223