[SPAY-297] SPAY-297