[SPAY-293] SPAY-293