[SPAY-231] SPAY-231