[SPAY-292] SPAY-292