[SPAY-269] SPAY-269