[SPAY-387] SPAY-387