[SPAY-288] SPAY-288