[SPAY-417] SPAY-417