[SPAY-416] SPAY-416