Merge "Fix return type of UploadBase::check* functions"