[SPAY-388] SPAY-388