[SPAY-298] SPAY-298