[SPAY-262] SPAY-262