[SPAY-282] SPAY-282