[SPAY-232] SPAY-232