[SPAY-227] SPAY-227