[SPAY-296] SPAY-296