[SPAY-519] SPAY-519