[SPAY-242] SPAY-242