[SPAY-268] SPAY-268