[SPAY-415] SPAY-415