[SPAY-254] SPAY-254