[SPAY-303] SPAY-303