[SPAY-294] SPAY-294