[SPAY-389] SPAY-389