[SPAY-362] SPAY-362