[SPAY-306] SPAY-306