[SPAY-272] SPAY-272