[SPAY-267] SPAY-267