TS 2116

Making buffer_upload plugin build correctly