[SPAY-418] SPAY-418