[SPAY-279] SPAY-279