[SPAY-239] SPAY-239