[SPAY-274] SPAY-274