[SPAY-281] SPAY-281