[SPAY-295] SPAY-295