[SPAY-224] SPAY-224