[SPAY-286] SPAY-286