[SPAY-373] SPAY-373