[SPAY-309] SPAY-309