[SPAY-236] SPAY-236