[SPAY-289] SPAY-289