[SPAY-212] SPAY-212