[SPAY-276] SPAY-276