[SPAY-277] SPAY-277