[SPAY-273] SPAY-273