[SPAY-206] SPAY-206