[SPAY-228] SPAY-228