[SPAY-308] SPAY-308