[SPAY-382] SPAY-382