[SPAY-339] SPAY-339