[SPAY-271] SPAY-271