[SPAY-284] SPAY-284