[SPAY-238] SPAY-238