[SPAY-209] SPAY-209