[SPAY-207] SPAY-207