[SPAY-226] SPAY-226