[SPAY-337] SPAY-337