@twilio/conversations 2.1.0 → 3.0.0-rc.1

package/builds/twilio-conversations.js

@@ -2784,6 +2784,21 @@ this.Twilio.Conversations = (function (exports) {
 	  }
 	});
 
+	var $$n = _export;
+	var $map$1 = arrayIteration.map;
+	var arrayMethodHasSpeciesSupport$3 = arrayMethodHasSpeciesSupport$5;
+
+	var HAS_SPECIES_SUPPORT$2 = arrayMethodHasSpeciesSupport$3('map');
+
+	// `Array.prototype.map` method
+	// https://tc39.es/ecma262/#sec-array.prototype.map
+	// with adding support of @@species
+	$$n({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$2 }, {
+	  map: function map(callbackfn /* , thisArg */) {
+	    return $map$1(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+	  }
+	});
+
 	// iterable DOM collections
 	// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
 	var domIterables = {
@@ -2871,140 +2886,6 @@ this.Twilio.Conversations = (function (exports) {
 
 	handlePrototype$1(DOMTokenListPrototype$1);
 
-	var isObject$a = isObject$n;
-	var setPrototypeOf$5 = objectSetPrototypeOf;
-
-	// makes subclassing work correct for wrapped built-ins
-	var inheritIfRequired$3 = function ($this, dummy, Wrapper) {
-	  var NewTarget, NewTargetPrototype;
-	  if (
-	    // it can work only with native `setPrototypeOf`
-	    setPrototypeOf$5 &&
-	    // we haven't completely correct pre-ES6 way for getting `new.target`, so use this
-	    typeof (NewTarget = dummy.constructor) == 'function' &&
-	    NewTarget !== Wrapper &&
-	    isObject$a(NewTargetPrototype = NewTarget.prototype) &&
-	    NewTargetPrototype !== Wrapper.prototype
-	  ) setPrototypeOf$5($this, NewTargetPrototype);
-	  return $this;
-	};
-
-	// a string of all valid unicode whitespaces
-	var whitespaces$1 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
-	  '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
-
-	var requireObjectCoercible$7 = requireObjectCoercible$a;
-	var toString$a = toString$d;
-	var whitespaces = whitespaces$1;
-
-	var whitespace = '[' + whitespaces + ']';
-	var ltrim = RegExp('^' + whitespace + whitespace + '*');
-	var rtrim = RegExp(whitespace + whitespace + '*$');
-
-	// `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
-	var createMethod$3 = function (TYPE) {
-	  return function ($this) {
-	    var string = toString$a(requireObjectCoercible$7($this));
-	    if (TYPE & 1) string = string.replace(ltrim, '');
-	    if (TYPE & 2) string = string.replace(rtrim, '');
-	    return string;
-	  };
-	};
-
-	var stringTrim = {
-	  // `String.prototype.{ trimLeft, trimStart }` methods
-	  // https://tc39.es/ecma262/#sec-string.prototype.trimstart
-	  start: createMethod$3(1),
-	  // `String.prototype.{ trimRight, trimEnd }` methods
-	  // https://tc39.es/ecma262/#sec-string.prototype.trimend
-	  end: createMethod$3(2),
-	  // `String.prototype.trim` method
-	  // https://tc39.es/ecma262/#sec-string.prototype.trim
-	  trim: createMethod$3(3)
-	};
-
-	var DESCRIPTORS$9 = descriptors;
-	var global$h = global$C;
-	var isForced$1 = isForced_1;
-	var redefine$7 = redefine$d.exports;
-	var has$6 = has$g;
-	var classof$5 = classofRaw$1;
-	var inheritIfRequired$2 = inheritIfRequired$3;
-	var isSymbol$1 = isSymbol$6;
-	var toPrimitive = toPrimitive$2;
-	var fails$m = fails$z;
-	var create$6 = objectCreate;
-	var getOwnPropertyNames$2 = objectGetOwnPropertyNames.f;
-	var getOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f;
-	var defineProperty$8 = objectDefineProperty.f;
-	var trim = stringTrim.trim;
-
-	var NUMBER = 'Number';
-	var NativeNumber = global$h[NUMBER];
-	var NumberPrototype = NativeNumber.prototype;
-
-	// Opera ~12 has broken Object#toString
-	var BROKEN_CLASSOF = classof$5(create$6(NumberPrototype)) == NUMBER;
-
-	// `ToNumber` abstract operation
-	// https://tc39.es/ecma262/#sec-tonumber
-	var toNumber = function (argument) {
-	  if (isSymbol$1(argument)) throw TypeError('Cannot convert a Symbol value to a number');
-	  var it = toPrimitive(argument, 'number');
-	  var first, third, radix, maxCode, digits, length, index, code;
-	  if (typeof it == 'string' && it.length > 2) {
-	    it = trim(it);
-	    first = it.charCodeAt(0);
-	    if (first === 43 || first === 45) {
-	      third = it.charCodeAt(2);
-	      if (third === 88 || third === 120) return NaN; // Number('+0x1') should be NaN, old V8 fix
-	    } else if (first === 48) {
-	      switch (it.charCodeAt(1)) {
-	        case 66: case 98: radix = 2; maxCode = 49; break; // fast equal of /^0b[01]+$/i
-	        case 79: case 111: radix = 8; maxCode = 55; break; // fast equal of /^0o[0-7]+$/i
-	        default: return +it;
-	      }
-	      digits = it.slice(2);
-	      length = digits.length;
-	      for (index = 0; index < length; index++) {
-	        code = digits.charCodeAt(index);
-	        // parseInt parses a string to a first unavailable symbol
-	        // but ToNumber should return NaN if a string contains unavailable symbols
-	        if (code < 48 || code > maxCode) return NaN;
-	      } return parseInt(digits, radix);
-	    }
-	  } return +it;
-	};
-
-	// `Number` constructor
-	// https://tc39.es/ecma262/#sec-number-constructor
-	if (isForced$1(NUMBER, !NativeNumber(' 0o1') || !NativeNumber('0b1') || NativeNumber('+0x1'))) {
-	  var NumberWrapper = function Number(value) {
-	    var it = arguments.length < 1 ? 0 : value;
-	    var dummy = this;
-	    return dummy instanceof NumberWrapper
-	      // check on 1..constructor(foo) case
-	      && (BROKEN_CLASSOF ? fails$m(function () { NumberPrototype.valueOf.call(dummy); }) : classof$5(dummy) != NUMBER)
-	        ? inheritIfRequired$2(new NativeNumber(toNumber(it)), dummy, NumberWrapper) : toNumber(it);
-	  };
-	  for (var keys$2 = DESCRIPTORS$9 ? getOwnPropertyNames$2(NativeNumber) : (
-	    // ES3:
-	    'MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,' +
-	    // ES2015 (in case, if modules with ES2015 Number statics required before):
-	    'EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,' +
-	    'MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger,' +
-	    // ESNext
-	    'fromString,range'
-	  ).split(','), j$1 = 0, key$1; keys$2.length > j$1; j$1++) {
-	    if (has$6(NativeNumber, key$1 = keys$2[j$1]) && !has$6(NumberWrapper, key$1)) {
-	      defineProperty$8(NumberWrapper, key$1, getOwnPropertyDescriptor$1(NativeNumber, key$1));
-	    }
-	  }
-	  NumberWrapper.prototype = NumberPrototype;
-	  NumberPrototype.constructor = NumberWrapper;
-	  redefine$7(global$h, NUMBER, NumberWrapper);
-	}
-
 	/**
 	 * Copyright (c) 2014-present, Facebook, Inc.
 	 *
@@ -3421,7 +3302,7 @@ this.Twilio.Conversations = (function (exports) {
 	  this.reset(true);
 	}
 
-	function keys$1(object) {
+	function keys$2(object) {
 	  var keys = [];
 
 	  for (var key in object) {
@@ -3686,7 +3567,7 @@ this.Twilio.Conversations = (function (exports) {
 	  mark: mark,
 	  awrap: awrap,
 	  async: async,
-	  keys: keys$1,
+	  keys: keys$2,
 	  values: values
 	};
 
@@ -3708,15 +3589,15 @@ this.Twilio.Conversations = (function (exports) {
 	  if ((typeof Reflect === "undefined" ? "undefined" : _typeof$3(Reflect)) === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
 	}
 
-	var $$n = _export;
-	var fails$l = fails$z;
+	var $$m = _export;
+	var fails$m = fails$z;
 	var isArray$1 = isArray$4;
-	var isObject$9 = isObject$n;
+	var isObject$a = isObject$n;
 	var toObject$b = toObject$g;
 	var toLength$j = toLength$n;
 	var createProperty$3 = createProperty$5;
 	var arraySpeciesCreate$1 = arraySpeciesCreate$3;
-	var arrayMethodHasSpeciesSupport$3 = arrayMethodHasSpeciesSupport$5;
+	var arrayMethodHasSpeciesSupport$2 = arrayMethodHasSpeciesSupport$5;
 	var wellKnownSymbol$d = wellKnownSymbol$s;
 	var V8_VERSION = engineV8Version;
 
@@ -3727,16 +3608,16 @@ this.Twilio.Conversations = (function (exports) {
 	// We can't use this feature detection in V8 since it causes
 	// deoptimization and serious performance degradation
 	// https://github.com/zloirock/core-js/issues/679
-	var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$l(function () {
+	var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$m(function () {
 	  var array = [];
 	  array[IS_CONCAT_SPREADABLE] = false;
 	  return array.concat()[0] !== array;
 	});
 
-	var SPECIES_SUPPORT = arrayMethodHasSpeciesSupport$3('concat');
+	var SPECIES_SUPPORT = arrayMethodHasSpeciesSupport$2('concat');
 
 	var isConcatSpreadable = function (O) {
-	  if (!isObject$9(O)) return false;
+	  if (!isObject$a(O)) return false;
 	  var spreadable = O[IS_CONCAT_SPREADABLE];
 	  return spreadable !== undefined ? !!spreadable : isArray$1(O);
 	};
@@ -3746,7 +3627,7 @@ this.Twilio.Conversations = (function (exports) {
 	// `Array.prototype.concat` method
 	// https://tc39.es/ecma262/#sec-array.prototype.concat
 	// with adding support of @@isConcatSpreadable and @@species
-	$$n({ target: 'Array', proto: true, forced: FORCED$5 }, {
+	$$m({ target: 'Array', proto: true, forced: FORCED$5 }, {
 	  // eslint-disable-next-line no-unused-vars -- required for `.length`
 	  concat: function concat(arg) {
 	    var O = toObject$b(this);
@@ -3823,7 +3704,7 @@ this.Twilio.Conversations = (function (exports) {
 	  return result;
 	};
 
-	var $$m = _export;
+	var $$l = _export;
 	var from = arrayFrom$1;
 	var checkCorrectnessOfIteration$2 = checkCorrectnessOfIteration$4;
 
@@ -3834,18 +3715,18 @@ this.Twilio.Conversations = (function (exports) {
 
 	// `Array.from` method
 	// https://tc39.es/ecma262/#sec-array.from
-	$$m({ target: 'Array', stat: true, forced: INCORRECT_ITERATION }, {
+	$$l({ target: 'Array', stat: true, forced: INCORRECT_ITERATION }, {
 	  from: from
 	});
 
 	var toInteger$6 = toInteger$9;
-	var toString$9 = toString$d;
-	var requireObjectCoercible$6 = requireObjectCoercible$a;
+	var toString$a = toString$d;
+	var requireObjectCoercible$7 = requireObjectCoercible$a;
 
 	// `String.prototype.codePointAt` methods implementation
-	var createMethod$2 = function (CONVERT_TO_STRING) {
+	var createMethod$3 = function (CONVERT_TO_STRING) {
 	  return function ($this, pos) {
-	    var S = toString$9(requireObjectCoercible$6($this));
+	    var S = toString$a(requireObjectCoercible$7($this));
 	    var position = toInteger$6(pos);
 	    var size = S.length;
 	    var first, second;
@@ -3861,22 +3742,22 @@ this.Twilio.Conversations = (function (exports) {
 	var stringMultibyte = {
 	  // `String.prototype.codePointAt` method
 	  // https://tc39.es/ecma262/#sec-string.prototype.codepointat
-	  codeAt: createMethod$2(false),
+	  codeAt: createMethod$3(false),
 	  // `String.prototype.at` method
 	  // https://github.com/mathiasbynens/String.prototype.at
-	  charAt: createMethod$2(true)
+	  charAt: createMethod$3(true)
 	};
 
-	var fails$k = fails$z;
+	var fails$l = fails$z;
 
-	var correctPrototypeGetter = !fails$k(function () {
+	var correctPrototypeGetter = !fails$l(function () {
 	  function F() { /* empty */ }
 	  F.prototype.constructor = null;
 	  // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
 	  return Object.getPrototypeOf(new F()) !== F.prototype;
 	});
 
-	var has$5 = has$g;
+	var has$6 = has$g;
 	var toObject$9 = toObject$g;
 	var sharedKey = sharedKey$4;
 	var CORRECT_PROTOTYPE_GETTER = correctPrototypeGetter;
@@ -3889,13 +3770,13 @@ this.Twilio.Conversations = (function (exports) {
 	// eslint-disable-next-line es/no-object-getprototypeof -- safe
 	var objectGetPrototypeOf = CORRECT_PROTOTYPE_GETTER ? Object.getPrototypeOf : function (O) {
 	  O = toObject$9(O);
-	  if (has$5(O, IE_PROTO)) return O[IE_PROTO];
+	  if (has$6(O, IE_PROTO)) return O[IE_PROTO];
 	  if (typeof O.constructor == 'function' && O instanceof O.constructor) {
 	    return O.constructor.prototype;
 	  } return O instanceof Object ? ObjectPrototype$2 : null;
 	};
 
-	var fails$j = fails$z;
+	var fails$k = fails$z;
 	var getPrototypeOf$4 = objectGetPrototypeOf;
 	var createNonEnumerableProperty$6 = createNonEnumerableProperty$c;
 	var wellKnownSymbol$c = wellKnownSymbol$s;
@@ -3918,7 +3799,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }
 	}
 
-	var NEW_ITERATOR_PROTOTYPE = IteratorPrototype$2 == undefined || fails$j(function () {
+	var NEW_ITERATOR_PROTOTYPE = IteratorPrototype$2 == undefined || fails$k(function () {
 	  var test = {};
 	  // FF44- legacy iterators case
 	  return IteratorPrototype$2[ITERATOR$5].call(test) !== test;
@@ -3940,7 +3821,7 @@ this.Twilio.Conversations = (function (exports) {
 	};
 
 	var IteratorPrototype$1 = iteratorsCore.IteratorPrototype;
-	var create$5 = objectCreate;
+	var create$6 = objectCreate;
 	var createPropertyDescriptor$2 = createPropertyDescriptor$7;
 	var setToStringTag$5 = setToStringTag$8;
 	var Iterators$2 = iterators;
@@ -3949,19 +3830,19 @@ this.Twilio.Conversations = (function (exports) {
 
 	var createIteratorConstructor$2 = function (IteratorConstructor, NAME, next) {
 	  var TO_STRING_TAG = NAME + ' Iterator';
-	  IteratorConstructor.prototype = create$5(IteratorPrototype$1, { next: createPropertyDescriptor$2(1, next) });
+	  IteratorConstructor.prototype = create$6(IteratorPrototype$1, { next: createPropertyDescriptor$2(1, next) });
 	  setToStringTag$5(IteratorConstructor, TO_STRING_TAG, false);
 	  Iterators$2[TO_STRING_TAG] = returnThis$1;
 	  return IteratorConstructor;
 	};
 
-	var $$l = _export;
+	var $$k = _export;
 	var createIteratorConstructor$1 = createIteratorConstructor$2;
 	var getPrototypeOf$3 = objectGetPrototypeOf;
-	var setPrototypeOf$4 = objectSetPrototypeOf;
+	var setPrototypeOf$5 = objectSetPrototypeOf;
 	var setToStringTag$4 = setToStringTag$8;
 	var createNonEnumerableProperty$5 = createNonEnumerableProperty$c;
-	var redefine$6 = redefine$d.exports;
+	var redefine$7 = redefine$d.exports;
 	var wellKnownSymbol$b = wellKnownSymbol$s;
 	var Iterators$1 = iterators;
 	var IteratorsCore = iteratorsCore;
@@ -4003,8 +3884,8 @@ this.Twilio.Conversations = (function (exports) {
 	    CurrentIteratorPrototype = getPrototypeOf$3(anyNativeIterator.call(new Iterable()));
 	    if (CurrentIteratorPrototype !== Object.prototype && CurrentIteratorPrototype.next) {
 	      if (getPrototypeOf$3(CurrentIteratorPrototype) !== IteratorPrototype) {
-	        if (setPrototypeOf$4) {
-	          setPrototypeOf$4(CurrentIteratorPrototype, IteratorPrototype);
+	        if (setPrototypeOf$5) {
+	          setPrototypeOf$5(CurrentIteratorPrototype, IteratorPrototype);
 	        } else if (typeof CurrentIteratorPrototype[ITERATOR$4] != 'function') {
 	          createNonEnumerableProperty$5(CurrentIteratorPrototype, ITERATOR$4, returnThis);
 	        }
@@ -4035,16 +3916,16 @@ this.Twilio.Conversations = (function (exports) {
 	    };
 	    if (FORCED) for (KEY in methods) {
 	      if (BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME || !(KEY in IterablePrototype)) {
-	        redefine$6(IterablePrototype, KEY, methods[KEY]);
+	        redefine$7(IterablePrototype, KEY, methods[KEY]);
 	      }
-	    } else $$l({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
+	    } else $$k({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
 	  }
 
 	  return methods;
 	};
 
 	var charAt$1 = stringMultibyte.charAt;
-	var toString$8 = toString$d;
+	var toString$9 = toString$d;
 	var InternalStateModule$6 = internalState;
 	var defineIterator$2 = defineIterator$3;
 
@@ -4057,7 +3938,7 @@ this.Twilio.Conversations = (function (exports) {
 	defineIterator$2(String, 'String', function (iterated) {
 	  setInternalState$6(this, {
 	    type: STRING_ITERATOR,
-	    string: toString$8(iterated),
+	    string: toString$9(iterated),
 	    index: 0
 	  });
 	// `%StringIteratorPrototype%.next` method
@@ -4342,7 +4223,7 @@ this.Twilio.Conversations = (function (exports) {
 	  return ["".concat(new Date().toISOString(), " Conversations ").concat(prefix, ":")].concat(Array.from(args));
 	}
 
-	var log$b = loglevel.exports.getLogger("twilio-conversations"); // twilio-conversations is used by Flex SDK. Please DO NOT change
+	var log$a = loglevel.exports.getLogger("twilio-conversations"); // twilio-conversations is used by Flex SDK. Please DO NOT change
 
 	var Logger = /*#__PURE__*/function () {
 	  function Logger(prefix) {
@@ -4356,7 +4237,7 @@ this.Twilio.Conversations = (function (exports) {
 	  _createClass$3(Logger, [{
 	    key: "setLevel",
 	    value: function setLevel(level) {
-	      log$b.setLevel(level);
+	      log$a.setLevel(level);
 	    }
 	  }, {
 	    key: "trace",
@@ -4365,7 +4246,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key] = arguments[_key];
 	      }
 
-	      log$b.trace.apply(null, prepareLine$1(this.prefix + "T", args));
+	      log$a.trace.apply(null, prepareLine$1(this.prefix + "T", args));
 	    }
 	  }, {
 	    key: "debug",
@@ -4374,7 +4255,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key2] = arguments[_key2];
 	      }
 
-	      log$b.debug.apply(null, prepareLine$1(this.prefix + "D", args));
+	      log$a.debug.apply(null, prepareLine$1(this.prefix + "D", args));
 	    }
 	  }, {
 	    key: "info",
@@ -4383,7 +4264,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key3] = arguments[_key3];
 	      }
 
-	      log$b.info.apply(null, prepareLine$1(this.prefix + "I", args));
+	      log$a.info.apply(null, prepareLine$1(this.prefix + "I", args));
 	    }
 	  }, {
 	    key: "warn",
@@ -4392,7 +4273,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key4] = arguments[_key4];
 	      }
 
-	      log$b.warn.apply(null, prepareLine$1(this.prefix + "W", args));
+	      log$a.warn.apply(null, prepareLine$1(this.prefix + "W", args));
 	    }
 	  }, {
 	    key: "error",
@@ -4401,7 +4282,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key5] = arguments[_key5];
 	      }
 
-	      log$b.error.apply(null, prepareLine$1(this.prefix + "E", args));
+	      log$a.error.apply(null, prepareLine$1(this.prefix + "E", args));
 	    }
 	  }], [{
 	    key: "scope",
@@ -4411,7 +4292,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "setLevel",
 	    value: function setLevel(level) {
-	      log$b.setLevel(level);
+	      log$a.setLevel(level);
 	    }
 	  }, {
 	    key: "trace",
@@ -4420,7 +4301,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key6] = arguments[_key6];
 	      }
 
-	      log$b.trace.apply(null, prepareLine$1("T", args));
+	      log$a.trace.apply(null, prepareLine$1("T", args));
 	    }
 	  }, {
 	    key: "debug",
@@ -4429,7 +4310,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key7] = arguments[_key7];
 	      }
 
-	      log$b.debug.apply(null, prepareLine$1("D", args));
+	      log$a.debug.apply(null, prepareLine$1("D", args));
 	    }
 	  }, {
 	    key: "info",
@@ -4438,7 +4319,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key8] = arguments[_key8];
 	      }
 
-	      log$b.info.apply(null, prepareLine$1("I", args));
+	      log$a.info.apply(null, prepareLine$1("I", args));
 	    }
 	  }, {
 	    key: "warn",
@@ -4447,7 +4328,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key9] = arguments[_key9];
 	      }
 
-	      log$b.warn.apply(null, prepareLine$1("W", args));
+	      log$a.warn.apply(null, prepareLine$1("W", args));
 	    }
 	  }, {
 	    key: "error",
@@ -4456,7 +4337,7 @@ this.Twilio.Conversations = (function (exports) {
 	        args[_key10] = arguments[_key10];
 	      }
 
-	      log$b.error.apply(null, prepareLine$1("E", args));
+	      log$a.error.apply(null, prepareLine$1("E", args));
 	    }
 	  }]);
 
@@ -4591,8 +4472,8 @@ this.Twilio.Conversations = (function (exports) {
 	    mediaAttachmentsCountLimit: configurationResponse.options.media_attachments_count_limit,
 	    mediaAttachmentSizeLimitInMb: configurationResponse.options.media_attachment_size_limit_in_mb,
 	    mediaAttachmentsTotalSizeLimitInMb: configurationResponse.options.media_attachments_total_size_limit_in_mb,
-	    emailHistoriesAllowedMimeTypes: configurationResponse.options.email_histories_allowed_mime_types,
-	    emailBodiesAllowedMimeTypes: configurationResponse.options.email_bodies_allowed_mime_types
+	    emailHistoriesAllowedContentTypes: configurationResponse.options.email_histories_allowed_mime_types,
+	    emailBodiesAllowedContentTypes: configurationResponse.options.email_bodies_allowed_mime_types
 	  };
 	  this.typingIndicatorTimeoutOverride = constructorOptions.typingIndicatorTimeoutOverride;
 	  this.backoffConfiguration = _objectSpread$4({
@@ -4625,23 +4506,8 @@ this.Twilio.Conversations = (function (exports) {
 	  }
 	};
 
-	var $$k = _export;
-	var $map$1 = arrayIteration.map;
-	var arrayMethodHasSpeciesSupport$2 = arrayMethodHasSpeciesSupport$5;
-
-	var HAS_SPECIES_SUPPORT$2 = arrayMethodHasSpeciesSupport$2('map');
-
-	// `Array.prototype.map` method
-	// https://tc39.es/ecma262/#sec-array.prototype.map
-	// with adding support of @@species
-	$$k({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$2 }, {
-	  map: function map(callbackfn /* , thisArg */) {
-	    return $map$1(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-	  }
-	});
-
 	var wellKnownSymbol$a = wellKnownSymbol$s;
-	var create$4 = objectCreate;
+	var create$5 = objectCreate;
 	var definePropertyModule$1 = objectDefineProperty;
 
 	var UNSCOPABLES = wellKnownSymbol$a('unscopables');
@@ -4652,7 +4518,7 @@ this.Twilio.Conversations = (function (exports) {
 	if (ArrayPrototype[UNSCOPABLES] == undefined) {
 	  definePropertyModule$1.f(ArrayPrototype, UNSCOPABLES, {
 	    configurable: true,
-	    value: create$4(null)
+	    value: create$5(null)
 	  });
 	}
 
@@ -4714,7 +4580,7 @@ this.Twilio.Conversations = (function (exports) {
 	addToUnscopables$2('values');
 	addToUnscopables$2('entries');
 
-	var global$g = global$C;
+	var global$h = global$C;
 	var DOMIterables = domIterables;
 	var DOMTokenListPrototype = domTokenListPrototype;
 	var ArrayIteratorMethods = es_array_iterator;
@@ -4748,11 +4614,145 @@ this.Twilio.Conversations = (function (exports) {
 	};
 
 	for (var COLLECTION_NAME in DOMIterables) {
-	  handlePrototype(global$g[COLLECTION_NAME] && global$g[COLLECTION_NAME].prototype, COLLECTION_NAME);
+	  handlePrototype(global$h[COLLECTION_NAME] && global$h[COLLECTION_NAME].prototype, COLLECTION_NAME);
 	}
 
 	handlePrototype(DOMTokenListPrototype, 'DOMTokenList');
 
+	var isObject$9 = isObject$n;
+	var setPrototypeOf$4 = objectSetPrototypeOf;
+
+	// makes subclassing work correct for wrapped built-ins
+	var inheritIfRequired$3 = function ($this, dummy, Wrapper) {
+	  var NewTarget, NewTargetPrototype;
+	  if (
+	    // it can work only with native `setPrototypeOf`
+	    setPrototypeOf$4 &&
+	    // we haven't completely correct pre-ES6 way for getting `new.target`, so use this
+	    typeof (NewTarget = dummy.constructor) == 'function' &&
+	    NewTarget !== Wrapper &&
+	    isObject$9(NewTargetPrototype = NewTarget.prototype) &&
+	    NewTargetPrototype !== Wrapper.prototype
+	  ) setPrototypeOf$4($this, NewTargetPrototype);
+	  return $this;
+	};
+
+	// a string of all valid unicode whitespaces
+	var whitespaces$1 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
+	  '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
+
+	var requireObjectCoercible$6 = requireObjectCoercible$a;
+	var toString$8 = toString$d;
+	var whitespaces = whitespaces$1;
+
+	var whitespace = '[' + whitespaces + ']';
+	var ltrim = RegExp('^' + whitespace + whitespace + '*');
+	var rtrim = RegExp(whitespace + whitespace + '*$');
+
+	// `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
+	var createMethod$2 = function (TYPE) {
+	  return function ($this) {
+	    var string = toString$8(requireObjectCoercible$6($this));
+	    if (TYPE & 1) string = string.replace(ltrim, '');
+	    if (TYPE & 2) string = string.replace(rtrim, '');
+	    return string;
+	  };
+	};
+
+	var stringTrim = {
+	  // `String.prototype.{ trimLeft, trimStart }` methods
+	  // https://tc39.es/ecma262/#sec-string.prototype.trimstart
+	  start: createMethod$2(1),
+	  // `String.prototype.{ trimRight, trimEnd }` methods
+	  // https://tc39.es/ecma262/#sec-string.prototype.trimend
+	  end: createMethod$2(2),
+	  // `String.prototype.trim` method
+	  // https://tc39.es/ecma262/#sec-string.prototype.trim
+	  trim: createMethod$2(3)
+	};
+
+	var DESCRIPTORS$9 = descriptors;
+	var global$g = global$C;
+	var isForced$1 = isForced_1;
+	var redefine$6 = redefine$d.exports;
+	var has$5 = has$g;
+	var classof$5 = classofRaw$1;
+	var inheritIfRequired$2 = inheritIfRequired$3;
+	var isSymbol$1 = isSymbol$6;
+	var toPrimitive = toPrimitive$2;
+	var fails$j = fails$z;
+	var create$4 = objectCreate;
+	var getOwnPropertyNames$2 = objectGetOwnPropertyNames.f;
+	var getOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f;
+	var defineProperty$8 = objectDefineProperty.f;
+	var trim = stringTrim.trim;
+
+	var NUMBER = 'Number';
+	var NativeNumber = global$g[NUMBER];
+	var NumberPrototype = NativeNumber.prototype;
+
+	// Opera ~12 has broken Object#toString
+	var BROKEN_CLASSOF = classof$5(create$4(NumberPrototype)) == NUMBER;
+
+	// `ToNumber` abstract operation
+	// https://tc39.es/ecma262/#sec-tonumber
+	var toNumber = function (argument) {
+	  if (isSymbol$1(argument)) throw TypeError('Cannot convert a Symbol value to a number');
+	  var it = toPrimitive(argument, 'number');
+	  var first, third, radix, maxCode, digits, length, index, code;
+	  if (typeof it == 'string' && it.length > 2) {
+	    it = trim(it);
+	    first = it.charCodeAt(0);
+	    if (first === 43 || first === 45) {
+	      third = it.charCodeAt(2);
+	      if (third === 88 || third === 120) return NaN; // Number('+0x1') should be NaN, old V8 fix
+	    } else if (first === 48) {
+	      switch (it.charCodeAt(1)) {
+	        case 66: case 98: radix = 2; maxCode = 49; break; // fast equal of /^0b[01]+$/i
+	        case 79: case 111: radix = 8; maxCode = 55; break; // fast equal of /^0o[0-7]+$/i
+	        default: return +it;
+	      }
+	      digits = it.slice(2);
+	      length = digits.length;
+	      for (index = 0; index < length; index++) {
+	        code = digits.charCodeAt(index);
+	        // parseInt parses a string to a first unavailable symbol
+	        // but ToNumber should return NaN if a string contains unavailable symbols
+	        if (code < 48 || code > maxCode) return NaN;
+	      } return parseInt(digits, radix);
+	    }
+	  } return +it;
+	};
+
+	// `Number` constructor
+	// https://tc39.es/ecma262/#sec-number-constructor
+	if (isForced$1(NUMBER, !NativeNumber(' 0o1') || !NativeNumber('0b1') || NativeNumber('+0x1'))) {
+	  var NumberWrapper = function Number(value) {
+	    var it = arguments.length < 1 ? 0 : value;
+	    var dummy = this;
+	    return dummy instanceof NumberWrapper
+	      // check on 1..constructor(foo) case
+	      && (BROKEN_CLASSOF ? fails$j(function () { NumberPrototype.valueOf.call(dummy); }) : classof$5(dummy) != NUMBER)
+	        ? inheritIfRequired$2(new NativeNumber(toNumber(it)), dummy, NumberWrapper) : toNumber(it);
+	  };
+	  for (var keys$1 = DESCRIPTORS$9 ? getOwnPropertyNames$2(NativeNumber) : (
+	    // ES3:
+	    'MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,' +
+	    // ES2015 (in case, if modules with ES2015 Number statics required before):
+	    'EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,' +
+	    'MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger,' +
+	    // ESNext
+	    'fromString,range'
+	  ).split(','), j$1 = 0, key$1; keys$1.length > j$1; j$1++) {
+	    if (has$5(NativeNumber, key$1 = keys$1[j$1]) && !has$5(NumberWrapper, key$1)) {
+	      defineProperty$8(NumberWrapper, key$1, getOwnPropertyDescriptor$1(NativeNumber, key$1));
+	    }
+	  }
+	  NumberWrapper.prototype = NumberPrototype;
+	  NumberPrototype.constructor = NumberWrapper;
+	  redefine$6(global$g, NUMBER, NumberWrapper);
+	}
+
 	var anObject$6 = anObject$k;
 
 	// `RegExp.prototype.flags` getter implementation
@@ -9214,7 +9214,7 @@ this.Twilio.Conversations = (function (exports) {
 	function _createSuper$b(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$c(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
 	function _isNativeReflectConstruct$c() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-	var log$a = Logger.scope("User");
+	var log$9 = Logger.scope("User");
 	/**
 	 * Extended user information.
 	 * Note that `isOnline` and `isNotifiable` properties are eligible
@@ -9356,7 +9356,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 2:
 	                updateReasons = [];
-	                log$a.debug("User for", this.state.identity, "updated:", key, value);
+	                log$9.debug("User for", this.state.identity, "updated:", key, value);
 	                _context.t0 = key;
 	                _context.next = _context.t0 === "friendlyName" ? 7 : _context.t0 === "attributes" ? 9 : _context.t0 === "reachability" ? 12 : 15;
 	                break;
@@ -9370,7 +9370,7 @@ this.Twilio.Conversations = (function (exports) {
 	                return _context.abrupt("break", 16);
 
 	              case 9:
-	                updateAttributes = parseAttributes(value.value, "Retrieved malformed attributes from the server for user: ".concat(this.state.identity), log$a);
+	                updateAttributes = parseAttributes(value.value, "Retrieved malformed attributes from the server for user: ".concat(this.state.identity), log$9);
 
 	                if (!isEqual(this.state.attributes, updateAttributes)) {
 	                  this.state.attributes = updateAttributes;
@@ -9441,7 +9441,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 4:
 	                return _context2.abrupt("return", map.get("reachability").then(update).catch(function (err) {
-	                  log$a.warn("Failed to get reachability info for ", _this2.state.identity, err);
+	                  log$9.warn("Failed to get reachability info for ", _this2.state.identity, err);
 	                }));
 
 	              case 5:
@@ -9488,7 +9488,7 @@ this.Twilio.Conversations = (function (exports) {
 	                }).then(function (map) {
 	                  _this3.entity = map;
 	                  map.on("itemUpdated", function (args) {
-	                    log$a.debug(_this3.state.entityName + " (" + _this3.state.identity + ") itemUpdated: " + args.item.key);
+	                    log$9.debug(_this3.state.entityName + " (" + _this3.state.identity + ") itemUpdated: " + args.item.key);
 	                    return _this3._update(args.item.key, args.item.data);
 	                  });
 	                  return Promise.all([map.get("friendlyName").then(function (item) {
@@ -9499,7 +9499,7 @@ this.Twilio.Conversations = (function (exports) {
 	                    return _this3._update(item.key, item.data);
 	                  })]);
 	                }).then(function () {
-	                  log$a.debug("Fetched for", _this3.identity);
+	                  log$9.debug("Fetched for", _this3.identity);
 	                  _this3.subscribed = "subscribed";
 
 	                  _this3.emit("userSubscribed", _this3);
@@ -12505,7 +12505,7 @@ this.Twilio.Conversations = (function (exports) {
 	var abs = Math.abs;
 	var pow$1 = Math.pow;
 	var floor$4 = Math.floor;
-	var log$9 = Math.log;
+	var log$8 = Math.log;
 	var LN2 = Math.LN2;
 
 	var pack = function (number, mantissaLength, bytes) {
@@ -12524,7 +12524,7 @@ this.Twilio.Conversations = (function (exports) {
 	    mantissa = number != number ? 1 : 0;
 	    exponent = eMax;
 	  } else {
-	    exponent = floor$4(log$9(number) / LN2);
+	    exponent = floor$4(log$8(number) / LN2);
 	    if (number * (c = pow$1(2, -exponent)) < 1) {
 	      exponent--;
 	      c *= 2;
@@ -22303,7 +22303,7 @@ this.Twilio.Conversations = (function (exports) {
 	  return isInteger(number) && number > 0;
 	}
 
-	var log$8 = loglevelLog__namespace.getLogger('twilio-sync'); // twilio-sync is used by Flex SDK. Please DO NOT change
+	var log$7 = loglevelLog__namespace.getLogger('twilio-sync'); // twilio-sync is used by Flex SDK. Please DO NOT change
 
 	function prepareLine(prefix, args) {
 	  return ["".concat(new Date().toISOString(), " Sync ").concat(prefix, ":")].concat(Array.from(args));
@@ -22311,42 +22311,42 @@ this.Twilio.Conversations = (function (exports) {
 
 	var log$1$1 = {
 	  setLevel: function setLevel(level) {
-	    log$8.setLevel(level);
+	    log$7.setLevel(level);
 	  },
 	  trace: function trace() {
 	    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 	      args[_key] = arguments[_key];
 	    }
 
-	    log$8.trace.apply(null, prepareLine('T', args));
+	    log$7.trace.apply(null, prepareLine('T', args));
 	  },
 	  debug: function debug() {
 	    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
 	      args[_key2] = arguments[_key2];
 	    }
 
-	    log$8.debug.apply(null, prepareLine('D', args));
+	    log$7.debug.apply(null, prepareLine('D', args));
 	  },
 	  info: function info() {
 	    for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
 	      args[_key3] = arguments[_key3];
 	    }
 
-	    log$8.info.apply(null, prepareLine('I', args));
+	    log$7.info.apply(null, prepareLine('I', args));
 	  },
 	  warn: function warn() {
 	    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
 	      args[_key4] = arguments[_key4];
 	    }
 
-	    log$8.warn.apply(null, prepareLine('W', args));
+	    log$7.warn.apply(null, prepareLine('W', args));
 	  },
 	  error: function error() {
 	    for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
 	      args[_key5] = arguments[_key5];
 	    }
 
-	    log$8.error.apply(null, prepareLine('E', args));
+	    log$7.error.apply(null, prepareLine('E', args));
 	  }
 	};
 	var SUBSCRIPTIONS_PATH = '/v4/Subscriptions';
@@ -30430,7 +30430,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	__decorate([declarativeTypeValidator.validateTypes(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], InstantQuery.prototype, "updateIndexName", null);
 
-	var version$1 = "3.1.0";
+	var version$1 = "3.1.1-rc.1";
 
 	function _createSuper$9(Derived) {
 	  var hasNativeReflectConstruct = _isNativeReflectConstruct$a();
@@ -30503,7 +30503,7 @@ this.Twilio.Conversations = (function (exports) {
 	}
 
 	var SYNC_PRODUCT_ID = 'data_sync';
-	var SDK_VERSION$1 = version$1;
+	var SDK_VERSION = version$1;
 
 	function decompose(arg) {
 	  if (!arg) {
@@ -30580,7 +30580,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	    if (!options.clientMetadata.hasOwnProperty('sdk')) {
 	      options.clientMetadata.sdk = 'JS';
-	      options.clientMetadata.sdkv = SDK_VERSION$1;
+	      options.clientMetadata.sdkv = SDK_VERSION;
 	    }
 
 	    var startTwilsock = !options.twilsockClient; // Create default init registrations if none were provided.
@@ -30616,7 +30616,7 @@ this.Twilio.Conversations = (function (exports) {
 	      return _this._routeMessage(messageType, payload);
 	    });
 	    var config = new Configuration(options);
-	    var network = new NetworkService(new ClientInfo(SDK_VERSION$1), config, twilsock$1);
+	    var network = new NetworkService(new ClientInfo(SDK_VERSION), config, twilsock$1);
 	    var storage = new SessionStorage(config);
 	    _this.services = {
 	      config: config,
@@ -31802,7 +31802,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "version",
 	    get: function get() {
-	      return SDK_VERSION$1;
+	      return SDK_VERSION;
 	    }
 	  }]);
 
@@ -33642,6 +33642,80 @@ this.Twilio.Conversations = (function (exports) {
 	  var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 
 	  var log__namespace = /*#__PURE__*/_interopNamespace(log$2);
+	  /**
+	   * Cancellable promise. Extends the functionality of the native Promise to include the cancel method.
+	   *
+	   * Example:
+	   *
+	   * ```ts
+	   *
+	   * const cancellableFetchPromise = new CancellablePromise(async (resolve, reject, onCancel) => {
+	   *     const request = fetch("https://example.com/");
+	   *
+	   *     onCancel(() => request.cancel());
+	   *
+	   *     try {
+	   *         const response = await request;
+	   *         resolve(response);
+	   *     } catch (err) {
+	   *         reject(err);
+	   *     }
+	   * });
+	   *
+	   * cancellableFetchPromise.cancel();
+	   * ```
+	   */
+
+
+	  var CancellablePromise = /*#__PURE__*/function (_Promise) {
+	    _inherits$4(CancellablePromise, _Promise);
+
+	    var _super = _createSuper$8(CancellablePromise);
+
+	    /**
+	     * Creates a new CancellablePromise.
+	     * @param executor A callback used to initialize the promise. This callback is passed three arguments:
+	     * a resolve callback used to resolve the promise with a value or the result of another promise,
+	     * a reject callback used to reject the promise with a provided reason or error,
+	     * and an onCancel callback used to define behavior of cancellation.
+	     */
+	    function CancellablePromise(executor) {
+	      var _this6;
+
+	      _classCallCheck$4(this, CancellablePromise);
+
+	      var outerCancellationFunction;
+	      var outerRejectPromise;
+	      _this6 = _super.call(this, function (resolve, reject) {
+	        outerRejectPromise = reject;
+	        return executor(resolve, reject, function (cancellationFunction) {
+	          outerCancellationFunction = cancellationFunction;
+	        });
+	      });
+	      _this6.cancel = outerCancellationFunction;
+	      _this6.rejectPromise = outerRejectPromise;
+	      return _this6;
+	    }
+	    /**
+	     * Cancels the promise and invokes the cancellation callback if it was defined during instantiation. Cancellation will result in the promise being rejected.
+	     */
+
+
+	    _createClass$3(CancellablePromise, [{
+	      key: "cancel",
+	      value: function cancel() {
+	        if (this.onCancel) {
+	          this.onCancel();
+	        }
+
+	        if (this.rejectPromise) {
+	          this.rejectPromise(new Error("Promise was cancelled"));
+	        }
+	      }
+	    }]);
+
+	    return CancellablePromise;
+	  }( /*#__PURE__*/_wrapNativeSuper(Promise));
 	  /*! *****************************************************************************
 	  Copyright (c) Microsoft Corporation.
 	  
@@ -33929,8 +34003,6 @@ this.Twilio.Conversations = (function (exports) {
 	       *
 	       * It is reasonable to build your own refresh logic upon these two functions: as soon as URL returned
 	       * by getCachedContentUrl() returns 40x status you should call getContentUrl() to refresh it.
-	       *
-	       * @returns {Promise<string>}
 	       */
 
 	    }, {
@@ -33938,72 +34010,47 @@ this.Twilio.Conversations = (function (exports) {
 	      value: function getContentUrl() {
 	        var _this = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-	          var response;
-	          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-	            while (1) {
-	              switch (_context.prev = _context.next) {
-	                case 0:
-	                  _context.next = 2;
-	                  return _this.network.get("".concat(_this.config.mediaUrl, "/").concat(_this.sid));
-
-	                case 2:
-	                  response = _context.sent;
-
-	                  _this._update(response.body);
-
-	                  return _context.abrupt("return", Promise.resolve(_this.state.contentDirectUrl));
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject, onCancel) {
+	            var request, response;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+	              while (1) {
+	                switch (_context.prev = _context.next) {
+	                  case 0:
+	                    request = _this.network.get("".concat(_this.config.mediaUrl, "/").concat(_this.sid));
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    _context.prev = 2;
+	                    _context.next = 5;
+	                    return request;
 
-	                case 5:
-	                case "end":
-	                  return _context.stop();
-	              }
-	            }
-	          }, _callee);
-	        }))();
-	      }
-	      /**
-	       * Returns direct content URL to uploaded binary. This URL will expire after some time.
-	       * This function does not support getting a new URL however. Once set it will remain the same.
-	       * Use getContentUrl() to query a new one.
-	       *
-	       * It is reasonable to build your own refresh logic upon these two functions: as soon as URL returned
-	       * by getCachedContentUrl() returns 40x status you should call getContentUrl() to refresh it.
-	       *
-	       * @returns {Promise<string>}
-	       */
+	                  case 5:
+	                    response = _context.sent;
 
-	    }, {
-	      key: "getCachedContentUrl",
-	      value: function getCachedContentUrl() {
-	        var _this2 = this;
+	                    _this._update(response.body);
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-	          return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-	            while (1) {
-	              switch (_context2.prev = _context2.next) {
-	                case 0:
-	                  if (!_this2.state.contentDirectUrl) {
-	                    _context2.next = 2;
+	                    resolve(_this.state.contentDirectUrl);
+	                    _context.next = 13;
 	                    break;
-	                  }
 
-	                  return _context2.abrupt("return", Promise.resolve(_this2.state.contentDirectUrl));
+	                  case 10:
+	                    _context.prev = 10;
+	                    _context.t0 = _context["catch"](2);
+	                    reject(_context.t0);
 
-	                case 2:
-	                  _context2.next = 4;
-	                  return _this2.getContentUrl();
-
-	                case 4:
-	                  return _context2.abrupt("return", _context2.sent);
-
-	                case 5:
-	                case "end":
-	                  return _context2.stop();
+	                  case 13:
+	                  case "end":
+	                    return _context.stop();
+	                }
 	              }
-	            }
-	          }, _callee2);
-	        }))();
+	            }, _callee, null, [[2, 10]]);
+	          }));
+
+	          return function (_x, _x2, _x3) {
+	            return _ref.apply(this, arguments);
+	          };
+	        }());
 	      }
 	    }, {
 	      key: "_update",
@@ -34037,19 +34084,19 @@ this.Twilio.Conversations = (function (exports) {
 	  var TransportError = /*#__PURE__*/function (_Error) {
 	    _inherits$4(TransportError, _Error);
 
-	    var _super = _createSuper$8(TransportError);
+	    var _super2 = _createSuper$8(TransportError);
 
 	    function TransportError(message, code, body, status, headers) {
-	      var _this5;
+	      var _this7;
 
 	      _classCallCheck$4(this, TransportError);
 
-	      _this5 = _super.call(this, message);
-	      _this5.code = code;
-	      _this5.body = body;
-	      _this5.status = status;
-	      _this5.headers = headers;
-	      return _this5;
+	      _this7 = _super2.call(this, message);
+	      _this7.code = code;
+	      _this7.body = body;
+	      _this7.status = status;
+	      _this7.headers = headers;
+	      return _this7;
 	    }
 
 	    return TransportError;
@@ -34102,20 +34149,7 @@ this.Twilio.Conversations = (function (exports) {
 	       * Make a GET request by given URL
 	       */
 	      function get(url, headers) {
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-	          return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-	            while (1) {
-	              switch (_context2.prev = _context2.next) {
-	                case 0:
-	                  return _context2.abrupt("return", Transport.request("GET", url, headers));
-
-	                case 1:
-	                case "end":
-	                  return _context2.stop();
-	              }
-	            }
-	          }, _callee2);
-	        }))();
+	        return Transport.request("GET", url, headers);
 	      }
 	      /**
 	       * Make a POST request by given URL
@@ -34124,82 +34158,61 @@ this.Twilio.Conversations = (function (exports) {
 	    }, {
 	      key: "post",
 	      value: function post(url, headers, body) {
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-	          return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-	            while (1) {
-	              switch (_context3.prev = _context3.next) {
-	                case 0:
-	                  return _context3.abrupt("return", Transport.request("POST", url, headers, body));
-
-	                case 1:
-	                case "end":
-	                  return _context3.stop();
-	              }
-	            }
-	          }, _callee3);
-	        }))();
+	        return Transport.request("POST", url, headers, body);
 	      }
 	    }], [{
 	      key: "request",
 	      value: function request(method, url, headers, body) {
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-	          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-	            while (1) {
-	              switch (_context.prev = _context.next) {
-	                case 0:
-	                  return _context.abrupt("return", new Promise(function (resolve, reject) {
-	                    var xhr = new XHR();
-	                    xhr.open(method, url, true);
-
-	                    xhr.onreadystatechange = function onreadystatechange() {
-	                      if (xhr.readyState !== 4) {
-	                        return;
-	                      }
-
-	                      var headers = parseResponseHeaders(xhr.getAllResponseHeaders());
-	                      var body = extractBody(xhr);
+	        return new CancellablePromise(function (resolve, reject, onCancel) {
+	          var xhr = new XHR();
+	          var isCancelled = false;
+	          onCancel(function () {
+	            xhr.abort();
+	            isCancelled = true;
+	          });
+	          xhr.open(method, url, true);
 
-	                      if (200 <= xhr.status && xhr.status < 300) {
-	                        resolve({
-	                          status: xhr.status,
-	                          headers: headers,
-	                          body: body
-	                        });
-	                      } else {
-	                        var _xhr$statusText;
+	          xhr.onreadystatechange = function onreadystatechange() {
+	            if (xhr.readyState !== 4 || isCancelled) {
+	              return;
+	            }
 
-	                        var status = (_xhr$statusText = xhr.statusText) !== null && _xhr$statusText !== void 0 ? _xhr$statusText : "NONE";
-	                        var bodyRepresentation;
+	            var headers = parseResponseHeaders(xhr.getAllResponseHeaders());
+	            var body = extractBody(xhr);
 
-	                        if (typeof body === "string") {
-	                          bodyRepresentation = body && body.split("\n", 2).length === 1 ? body : "";
-	                        } else {
-	                          bodyRepresentation = JSON.stringify(body);
-	                        }
+	            if (200 <= xhr.status && xhr.status < 300) {
+	              resolve({
+	                status: xhr.status,
+	                headers: headers,
+	                body: body
+	              });
+	            } else {
+	              var _xhr$statusText;
 
-	                        var message = "".concat(xhr.status, ": [").concat(status, "] ").concat(bodyRepresentation);
-	                        reject(new TransportError(message, xhr.status, body, status, headers));
-	                      }
-	                    };
+	              var status = (_xhr$statusText = xhr.statusText) !== null && _xhr$statusText !== void 0 ? _xhr$statusText : "NONE";
+	              var bodyRepresentation;
 
-	                    for (var headerName in headers) {
-	                      xhr.setRequestHeader(headerName, headers[headerName]);
+	              if (typeof body === "string") {
+	                bodyRepresentation = body && body.split("\n", 2).length === 1 ? body : "";
+	              } else {
+	                bodyRepresentation = JSON.stringify(body);
+	              }
 
-	                      if (headerName === "Content-Type" && headers[headerName] === "application/json") {
-	                        body = JSON.stringify(body);
-	                      }
-	                    }
+	              var message = "".concat(xhr.status, ": [").concat(status, "] ").concat(bodyRepresentation);
+	              reject(new TransportError(message, xhr.status, body, status, headers));
+	            }
+	          };
 
-	                    xhr.send(body);
-	                  }));
+	          for (var headerName in headers) {
+	            xhr.setRequestHeader(headerName, headers[headerName]);
 
-	                case 1:
-	                case "end":
-	                  return _context.stop();
-	              }
+	            if (headerName === "Content-Type" && headers[headerName] === "application/json") {
+	              body = JSON.stringify(body);
 	            }
-	          }, _callee);
-	        }))();
+	          }
+
+	          xhr.send(body);
+	        });
 	      }
 	    }]);
 
@@ -34233,19 +34246,25 @@ this.Twilio.Conversations = (function (exports) {
 	      value: function executeWithRetry(request, retryWhenThrottled) {
 	        var _this = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-	          return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-	            while (1) {
-	              switch (_context2.prev = _context2.next) {
-	                case 0:
-	                  return _context2.abrupt("return", new Promise(function (resolve, reject) {
-	                    var codesToRetryOn = [502, 503, 504];
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(resolve, reject, onCancel) {
+	            var retrier, codesToRetryOn;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+	              while (1) {
+	                switch (_context2.prev = _context2.next) {
+	                  case 0:
+	                    retrier = new operationRetrier.Retrier(_this.backoffConfig());
+	                    onCancel(function () {
+	                      request.cancel();
+	                      retrier.removeAllListeners();
+	                      retrier.cancel();
+	                    });
+	                    codesToRetryOn = [502, 503, 504];
 
 	                    if (retryWhenThrottled) {
 	                      codesToRetryOn.push(429);
 	                    }
 
-	                    var retrier = new operationRetrier.Retrier(_this.backoffConfig());
 	                    retrier.on("attempt", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
 	                      var result;
 	                      return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
@@ -34295,130 +34314,158 @@ this.Twilio.Conversations = (function (exports) {
 	                      return reject(err);
 	                    });
 	                    retrier.start();
-	                  }));
 
-	                case 1:
-	                case "end":
-	                  return _context2.stop();
+	                  case 9:
+	                  case "end":
+	                    return _context2.stop();
+	                }
 	              }
-	            }
-	          }, _callee2);
-	        }))();
+	            }, _callee2);
+	          }));
+
+	          return function (_x, _x2, _x3) {
+	            return _ref2.apply(this, arguments);
+	          };
+	        }());
 	      }
 	    }, {
 	      key: "get",
 	      value: function get(url) {
 	        var _this2 = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-	          var headers, response;
-	          return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-	            while (1) {
-	              switch (_context3.prev = _context3.next) {
-	                case 0:
-	                  headers = {
-	                    "X-Twilio-Token": _this2.config.token
-	                  };
-	                  log$1.trace("sending GET request to ", url, " headers ", headers);
-	                  _context3.prev = 2;
-	                  _context3.next = 5;
-	                  return _this2.executeWithRetry(function () {
-	                    return _this2.transport.get(url, headers);
-	                  }, _this2.retryWhenThrottled());
-
-	                case 5:
-	                  response = _context3.sent;
-	                  log$1.trace("response", response);
-	                  return _context3.abrupt("return", response);
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref4 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(resolve, reject, onCancel) {
+	            var headers, request, response;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+	              while (1) {
+	                switch (_context3.prev = _context3.next) {
+	                  case 0:
+	                    headers = {
+	                      "X-Twilio-Token": _this2.config.token
+	                    };
+	                    request = _this2.executeWithRetry(function () {
+	                      return _this2.transport.get(url, headers);
+	                    }, _this2.retryWhenThrottled());
+	                    log$1.trace("sending GET request to ", url, " headers ", headers);
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    _context3.prev = 4;
+	                    _context3.next = 7;
+	                    return request;
+
+	                  case 7:
+	                    response = _context3.sent;
+	                    log$1.trace("response", response);
+	                    resolve(response);
+	                    _context3.next = 16;
+	                    break;
 
-	                case 10:
-	                  _context3.prev = 10;
-	                  _context3.t0 = _context3["catch"](2);
-	                  log$1.debug("get() error ".concat(_context3.t0));
-	                  throw _context3.t0;
+	                  case 12:
+	                    _context3.prev = 12;
+	                    _context3.t0 = _context3["catch"](4);
+	                    log$1.debug("get() error ".concat(_context3.t0));
+	                    reject(_context3.t0);
 
-	                case 14:
-	                case "end":
-	                  return _context3.stop();
+	                  case 16:
+	                  case "end":
+	                    return _context3.stop();
+	                }
 	              }
-	            }
-	          }, _callee3, null, [[2, 10]]);
-	        }))();
+	            }, _callee3, null, [[4, 12]]);
+	          }));
+
+	          return function (_x4, _x5, _x6) {
+	            return _ref4.apply(this, arguments);
+	          };
+	        }());
 	      }
 	    }, {
 	      key: "post",
 	      value: function post(url, category, media, contentType, filename) {
 	        var _this3 = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
-	          var headers, fullUrl, response;
-	          return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
-	            while (1) {
-	              switch (_context4.prev = _context4.next) {
-	                case 0:
-	                  headers = {
-	                    "X-Twilio-Token": _this3.config.token
-	                  };
-
-	                  if ((typeof FormData === "undefined" || !(media instanceof FormData)) && contentType) {
-	                    Object.assign(headers, {
-	                      "Content-Type": contentType
-	                    });
-	                  }
+	        var headers = {
+	          "X-Twilio-Token": this.config.token
+	        };
 
-	                  fullUrl = new URL(url);
+	        if ((typeof FormData === "undefined" || !(media instanceof FormData)) && contentType) {
+	          Object.assign(headers, {
+	            "Content-Type": contentType
+	          });
+	        }
 
-	                  if (category) {
-	                    fullUrl.searchParams.append("Category", category);
-	                  }
+	        var fullUrl = new URL(url);
 
-	                  if (filename) {
-	                    fullUrl.searchParams.append("Filename", filename);
-	                  }
+	        if (category) {
+	          fullUrl.searchParams.append("Category", category);
+	        }
 
-	                  log$1.trace("sending POST request to ".concat(url, " with headers ").concat(headers));
-	                  _context4.prev = 6;
-	                  _context4.next = 9;
-	                  return _this3.transport.post(fullUrl.href, headers, media);
+	        if (filename) {
+	          fullUrl.searchParams.append("Filename", filename);
+	        }
 
-	                case 9:
-	                  response = _context4.sent;
-	                  _context4.next = 18;
-	                  break;
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref5 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(resolve, reject, onCancel) {
+	            var request, response;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+	              while (1) {
+	                switch (_context4.prev = _context4.next) {
+	                  case 0:
+	                    request = _this3.transport.post(fullUrl.href, headers, media);
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    log$1.trace("sending POST request to ".concat(url, " with headers ").concat(headers));
+	                    _context4.prev = 3;
+	                    _context4.next = 6;
+	                    return request;
+
+	                  case 6:
+	                    response = _context4.sent;
+	                    _context4.next = 17;
+	                    break;
 
-	                case 12:
-	                  _context4.prev = 12;
-	                  _context4.t0 = _context4["catch"](6);
+	                  case 9:
+	                    _context4.prev = 9;
+	                    _context4.t0 = _context4["catch"](3);
 
-	                  if (!(global["XMLHttpRequest"] === undefined && media instanceof FormData)) {
-	                    _context4.next = 16;
-	                    break;
-	                  }
+	                    if (!(global["XMLHttpRequest"] === undefined && media instanceof FormData)) {
+	                      _context4.next = 14;
+	                      break;
+	                    }
 
-	                  throw new TypeError("Posting FormData supported only with browser engine's FormData");
+	                    reject(new TypeError("Posting FormData supported only with browser engine's FormData"));
+	                    return _context4.abrupt("return");
 
-	                case 16:
-	                  log$1.debug("post() error ".concat(_context4.t0));
-	                  throw _context4.t0;
+	                  case 14:
+	                    log$1.debug("post() error ".concat(_context4.t0));
+	                    reject(_context4.t0);
+	                    return _context4.abrupt("return");
 
-	                case 18:
-	                  log$1.trace("response", response);
-	                  return _context4.abrupt("return", response);
+	                  case 17:
+	                    log$1.trace("response", response);
+	                    resolve(response);
 
-	                case 20:
-	                case "end":
-	                  return _context4.stop();
+	                  case 19:
+	                  case "end":
+	                    return _context4.stop();
+	                }
 	              }
-	            }
-	          }, _callee4, null, [[6, 12]]);
-	        }))();
+	            }, _callee4, null, [[3, 9]]);
+	          }));
+
+	          return function (_x7, _x8, _x9) {
+	            return _ref5.apply(this, arguments);
+	          };
+	        }());
 	      }
 	    }]);
 
 	    return Network;
 	  }();
 
-	  var version = "0.5.3";
+	  var version = "0.6.0-rc.1";
 
 	  var _class, _temp;
 
@@ -34476,7 +34523,6 @@ this.Twilio.Conversations = (function (exports) {
 	      /**
 	       * Gets media from media service
 	       * @param {String} sid - Media's SID
-	       * @returns {Promise<Media>}
 	       */
 
 	    }, {
@@ -34484,33 +34530,50 @@ this.Twilio.Conversations = (function (exports) {
 	      value: function get(sid) {
 	        var _this = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-	          var response;
-	          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-	            while (1) {
-	              switch (_context.prev = _context.next) {
-	                case 0:
-	                  _context.next = 2;
-	                  return _this.network.get("".concat(_this.config.mediaUrl, "/").concat(sid));
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject, onCancel) {
+	            var request, response;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+	              while (1) {
+	                switch (_context.prev = _context.next) {
+	                  case 0:
+	                    request = _this.network.get("".concat(_this.config.mediaUrl, "/").concat(sid));
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    _context.prev = 2;
+	                    _context.next = 5;
+	                    return request;
+
+	                  case 5:
+	                    response = _context.sent;
+	                    resolve(new Media(_this.config, _this.network, response.body));
+	                    _context.next = 12;
+	                    break;
 
-	                case 2:
-	                  response = _context.sent;
-	                  return _context.abrupt("return", new Media(_this.config, _this.network, response.body));
+	                  case 9:
+	                    _context.prev = 9;
+	                    _context.t0 = _context["catch"](2);
+	                    reject(_context.t0);
 
-	                case 4:
-	                case "end":
-	                  return _context.stop();
+	                  case 12:
+	                  case "end":
+	                    return _context.stop();
+	                }
 	              }
-	            }
-	          }, _callee);
-	        }))();
+	            }, _callee, null, [[2, 9]]);
+	          }));
+
+	          return function (_x, _x2, _x3) {
+	            return _ref.apply(this, arguments);
+	          };
+	        }());
 	      }
 	      /**
 	       * Posts raw content to media service
 	       * @param {String} contentType - content type of media
 	       * @param {String|Buffer|Blob} media - content to post
 	       * @param {MediaCategory|null} category - category for the media
-	       * @returns {Promise<Media>}
 	       */
 
 	    }, {
@@ -34518,26 +34581,44 @@ this.Twilio.Conversations = (function (exports) {
 	      value: function post(contentType, media, category, filename) {
 	        var _this2 = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-	          var response;
-	          return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-	            while (1) {
-	              switch (_context2.prev = _context2.next) {
-	                case 0:
-	                  _context2.next = 2;
-	                  return _this2.network.post(_this2.config.mediaUrl, category !== null && category !== void 0 ? category : "media", media, contentType, filename);
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(resolve, reject, onCancel) {
+	            var request, response;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+	              while (1) {
+	                switch (_context2.prev = _context2.next) {
+	                  case 0:
+	                    request = _this2.network.post(_this2.config.mediaUrl, category !== null && category !== void 0 ? category : "media", media, contentType, filename);
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    _context2.prev = 2;
+	                    _context2.next = 5;
+	                    return request;
+
+	                  case 5:
+	                    response = _context2.sent;
+	                    resolve(new Media(_this2.config, _this2.network, response.body));
+	                    _context2.next = 12;
+	                    break;
 
-	                case 2:
-	                  response = _context2.sent;
-	                  return _context2.abrupt("return", new Media(_this2.config, _this2.network, response.body));
+	                  case 9:
+	                    _context2.prev = 9;
+	                    _context2.t0 = _context2["catch"](2);
+	                    reject(_context2.t0);
 
-	                case 4:
-	                case "end":
-	                  return _context2.stop();
+	                  case 12:
+	                  case "end":
+	                    return _context2.stop();
+	                }
 	              }
-	            }
-	          }, _callee2);
-	        }))();
+	            }, _callee2, null, [[2, 9]]);
+	          }));
+
+	          return function (_x4, _x5, _x6) {
+	            return _ref2.apply(this, arguments);
+	          };
+	        }());
 	      }
 	      /**
 	       * Posts FormData to media service. Can be used only with browser engine's FormData.
@@ -34545,7 +34626,6 @@ this.Twilio.Conversations = (function (exports) {
 	       * new TypeError("Posting FormData supported only with browser engine's FormData")
 	       * @param {FormData} formData - form data to post
 	       * @param {MediaCategory|null} category - category for the media
-	       * @returns {Promise<Media>}
 	       */
 
 	    }, {
@@ -34553,26 +34633,44 @@ this.Twilio.Conversations = (function (exports) {
 	      value: function postFormData(formData, category) {
 	        var _this3 = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-	          var response;
-	          return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-	            while (1) {
-	              switch (_context3.prev = _context3.next) {
-	                case 0:
-	                  _context3.next = 2;
-	                  return _this3.network.post(_this3.config.mediaUrl, category !== null && category !== void 0 ? category : "media", formData);
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(resolve, reject, onCancel) {
+	            var request, response;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+	              while (1) {
+	                switch (_context3.prev = _context3.next) {
+	                  case 0:
+	                    request = _this3.network.post(_this3.config.mediaUrl, category !== null && category !== void 0 ? category : "media", formData);
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    _context3.prev = 2;
+	                    _context3.next = 5;
+	                    return request;
+
+	                  case 5:
+	                    response = _context3.sent;
+	                    resolve(new Media(_this3.config, _this3.network, response.body));
+	                    _context3.next = 12;
+	                    break;
 
-	                case 2:
-	                  response = _context3.sent;
-	                  return _context3.abrupt("return", new Media(_this3.config, _this3.network, response.body));
+	                  case 9:
+	                    _context3.prev = 9;
+	                    _context3.t0 = _context3["catch"](2);
+	                    reject(_context3.t0);
 
-	                case 4:
-	                case "end":
-	                  return _context3.stop();
+	                  case 12:
+	                  case "end":
+	                    return _context3.stop();
+	                }
 	              }
-	            }
-	          }, _callee3);
-	        }))();
+	            }, _callee3, null, [[2, 9]]);
+	          }));
+
+	          return function (_x7, _x8, _x9) {
+	            return _ref3.apply(this, arguments);
+	          };
+	        }());
 	      }
 	      /**
 	       * Retrieve information about multiple media SIDs at the same time.
@@ -34584,40 +34682,126 @@ this.Twilio.Conversations = (function (exports) {
 	      value: function mediaSetGet(mediaSids) {
 	        var _this4 = this;
 
-	        return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
-	          var query, response;
-	          return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
-	            while (1) {
-	              switch (_context4.prev = _context4.next) {
-	                case 0:
-	                  query = {
-	                    command: "get",
-	                    list: mediaSids.map(function (sid) {
-	                      return {
-	                        media_sid: sid
-	                      };
-	                    })
-	                  };
-	                  _context4.next = 3;
-	                  return _this4.network.post("".concat(_this4.config.mediaSetUrl), null, query, "application/json");
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref4 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(resolve, reject, onCancel) {
+	            var query, request, response, media;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+	              while (1) {
+	                switch (_context4.prev = _context4.next) {
+	                  case 0:
+	                    query = {
+	                      command: "get",
+	                      list: mediaSids.map(function (sid) {
+	                        return {
+	                          media_sid: sid
+	                        };
+	                      })
+	                    };
+	                    request = _this4.network.post("".concat(_this4.config.mediaSetUrl), null, query, "application/json");
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    _context4.prev = 3;
+	                    _context4.next = 6;
+	                    return request;
+
+	                  case 6:
+	                    response = _context4.sent;
+	                    media = response.body.map(function (item) {
+	                      if (item.code !== 200) {
+	                        reject("Failed to obtain detailed information about Media items (failed SID ".concat(item.media_record.sid, ")"));
+	                        return;
+	                      }
 
-	                case 3:
-	                  response = _context4.sent;
-	                  return _context4.abrupt("return", response.body.map(function (item) {
-	                    if (item.code !== 200) {
-	                      throw new Error("Failed to obtain detailed information about Media items (failed SID ".concat(item.media_record.sid, ")"));
-	                    }
+	                      return new Media(_this4.config, _this4.network, item.media_record);
+	                    });
+	                    resolve(media);
+	                    _context4.next = 14;
+	                    break;
 
-	                    return new Media(_this4.config, _this4.network, item.media_record);
-	                  }));
+	                  case 11:
+	                    _context4.prev = 11;
+	                    _context4.t0 = _context4["catch"](3);
+	                    reject(_context4.t0);
 
-	                case 5:
-	                case "end":
-	                  return _context4.stop();
+	                  case 14:
+	                  case "end":
+	                    return _context4.stop();
+	                }
 	              }
-	            }
-	          }, _callee4);
-	        }))();
+	            }, _callee4, null, [[3, 11]]);
+	          }));
+
+	          return function (_x10, _x11, _x12) {
+	            return _ref4.apply(this, arguments);
+	          };
+	        }());
+	      }
+	      /**
+	       * Retrieve temporary URLs for a set of media SIDs.
+	       * @param mediaSids array of the media SIDs to get URLs from.
+	       */
+
+	    }, {
+	      key: "mediaSetGetContentUrls",
+	      value: function mediaSetGetContentUrls(mediaSids) {
+	        var _this5 = this;
+
+	        return new CancellablePromise( /*#__PURE__*/function () {
+	          var _ref5 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(resolve, reject, onCancel) {
+	            var query, request, response, urls;
+	            return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+	              while (1) {
+	                switch (_context5.prev = _context5.next) {
+	                  case 0:
+	                    query = {
+	                      command: "get",
+	                      list: mediaSids.map(function (sid) {
+	                        return {
+	                          media_sid: sid
+	                        };
+	                      })
+	                    };
+	                    request = _this5.network.post("".concat(_this5.config.mediaSetUrl), null, query, "application/json");
+	                    onCancel(function () {
+	                      return request.cancel();
+	                    });
+	                    _context5.prev = 3;
+	                    _context5.next = 6;
+	                    return request;
+
+	                  case 6:
+	                    response = _context5.sent;
+	                    urls = new Map();
+	                    response.body.forEach(function (item) {
+	                      if (item.code !== 200) {
+	                        reject("Failed to obtain detailed information about Media items (failed SID ".concat(item.media_record.sid, ")"));
+	                        return;
+	                      }
+
+	                      urls.set(item.media_record.sid, item.media_record.links.content_direct_temporary);
+	                    });
+	                    resolve(urls);
+	                    _context5.next = 15;
+	                    break;
+
+	                  case 12:
+	                    _context5.prev = 12;
+	                    _context5.t0 = _context5["catch"](3);
+	                    reject(_context5.t0);
+
+	                  case 15:
+	                  case "end":
+	                    return _context5.stop();
+	                }
+	              }
+	            }, _callee5, null, [[3, 12]]);
+	          }));
+
+	          return function (_x13, _x14, _x15) {
+	            return _ref5.apply(this, arguments);
+	          };
+	        }());
 	      }
 	    }]);
 
@@ -34626,10 +34810,11 @@ this.Twilio.Conversations = (function (exports) {
 
 	  __decorate([declarativeTypeValidator.validateTypes(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], exports['default'].prototype, "updateToken", null);
 
-	  __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports['default'].prototype, "get", null);
+	  __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", CancellablePromise)], exports['default'].prototype, "get", null);
 
 	  exports['default'] = __decorate([declarativeTypeValidator.validateConstructorTypes(declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.nonEmptyString, [declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.literal(null)], [declarativeTypeValidator.pureObject, "undefined"]), __metadata("design:paramtypes", [String, String, Object, Object])], exports['default']); // Proper renames should happen in index.ts,
 
+	  exports.CancellablePromise = CancellablePromise;
 	  exports.Client = exports['default'];
 	  exports.McsClient = exports['default'];
 	  exports.McsMedia = Media;
@@ -34673,7 +34858,7 @@ this.Twilio.Conversations = (function (exports) {
 	function _createSuper$7(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$7(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
 	function _isNativeReflectConstruct$7() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-	var log$7 = Logger.scope("Participant");
+	var log$6 = Logger.scope("Participant");
 	/**
 	 * A participant represents a remote client in a conversation.
 	 */
@@ -34698,7 +34883,7 @@ this.Twilio.Conversations = (function (exports) {
 	    _this.links = links;
 	    _this.services = services;
 	    _this.state = {
-	      attributes: parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + sid, log$7),
+	      attributes: parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + sid, log$6),
 	      dateCreated: data.dateCreated ? parseTime$1(data.dateCreated) : null,
 	      dateUpdated: data.dateCreated ? parseTime$1(data.dateUpdated) : null,
 	      sid: sid,
@@ -34887,7 +35072,7 @@ this.Twilio.Conversations = (function (exports) {
 	    key: "_update",
 	    value: function _update(data) {
 	      var updateReasons = [];
-	      var updateAttributes = parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + this.state.sid, log$7);
+	      var updateAttributes = parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + this.state.sid, log$6);
 
 	      if (data.attributes && !isEqual(this.state.attributes, updateAttributes)) {
 	        this.state.attributes = updateAttributes;
@@ -35056,7 +35241,7 @@ this.Twilio.Conversations = (function (exports) {
 	function _createSuper$6(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$6(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
 	function _isNativeReflectConstruct$6() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-	var log$6 = Logger.scope("Participants");
+	var log$5 = Logger.scope("Participants");
 	/**
 	 * @classdesc Represents the collection of participants for the conversation
 	 * @fires Participants#participantJoined
@@ -35132,14 +35317,14 @@ this.Twilio.Conversations = (function (exports) {
 	        mode: "open_existing"
 	      }).then(function (rosterMap) {
 	        rosterMap.on("itemAdded", function (args) {
-	          log$6.debug(_this2.conversation.sid + " itemAdded: " + args.item.key);
+	          log$5.debug(_this2.conversation.sid + " itemAdded: " + args.item.key);
 
 	          _this2.upsertParticipant(args.item.key, args.item.data).then(function (participant) {
 	            _this2.emit("participantJoined", participant);
 	          });
 	        });
 	        rosterMap.on("itemRemoved", function (args) {
-	          log$6.debug(_this2.conversation.sid + " itemRemoved: " + args.key);
+	          log$5.debug(_this2.conversation.sid + " itemRemoved: " + args.key);
 	          var participantSid = args.key;
 
 	          if (!_this2.participants.has(participantSid)) {
@@ -35157,7 +35342,7 @@ this.Twilio.Conversations = (function (exports) {
 	          _this2.emit("participantLeft", leftParticipant);
 	        });
 	        rosterMap.on("itemUpdated", function (args) {
-	          log$6.debug(_this2.conversation.sid + " itemUpdated: " + args.item.key);
+	          log$5.debug(_this2.conversation.sid + " itemUpdated: " + args.item.key);
 
 	          _this2.upsertParticipant(args.item.key, args.item.data);
 	        });
@@ -35179,10 +35364,10 @@ this.Twilio.Conversations = (function (exports) {
 	        _this2.rosterEntityPromise = null;
 
 	        if (_this2.services.syncClient.connectionState != "disconnected") {
-	          log$6.error("Failed to get roster object for conversation", _this2.conversation.sid, err);
+	          log$5.error("Failed to get roster object for conversation", _this2.conversation.sid, err);
 	        }
 
-	        log$6.debug("ERROR: Failed to get roster object for conversation", _this2.conversation.sid, err);
+	        log$5.debug("ERROR: Failed to get roster object for conversation", _this2.conversation.sid, err);
 	        throw err;
 	      });
 	    }
@@ -35649,117 +35834,140 @@ this.Twilio.Conversations = (function (exports) {
 
 	  }, {
 	    key: "getContentTemporaryUrl",
-	    value: function () {
-	      var _getContentTemporaryUrl = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee() {
-	        var _this$mcsMedia$getCon, _this$mcsMedia;
+	    value: function getContentTemporaryUrl() {
+	      var _this = this;
 
-	        return _regeneratorRuntime$1.wrap(function _callee$(_context) {
-	          while (1) {
-	            switch (_context.prev = _context.next) {
-	              case 0:
-	                _context.next = 2;
-	                return this._fetchMcsMedia();
+	      return new browser.CancellablePromise( /*#__PURE__*/function () {
+	        var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee(resolve, reject, onCancel) {
+	          var _this$mcsMedia;
 
-	              case 2:
-	                return _context.abrupt("return", (_this$mcsMedia$getCon = (_this$mcsMedia = this.mcsMedia) === null || _this$mcsMedia === void 0 ? void 0 : _this$mcsMedia.getContentUrl()) !== null && _this$mcsMedia$getCon !== void 0 ? _this$mcsMedia$getCon : null);
+	          var fetchMediaRequest, contentUrlRequest, mcsMedia;
+	          return _regeneratorRuntime$1.wrap(function _callee$(_context) {
+	            while (1) {
+	              switch (_context.prev = _context.next) {
+	                case 0:
+	                  fetchMediaRequest = _this._fetchMcsMedia();
+	                  contentUrlRequest = (_this$mcsMedia = _this.mcsMedia) === null || _this$mcsMedia === void 0 ? void 0 : _this$mcsMedia.getContentUrl();
+	                  onCancel(function () {
+	                    fetchMediaRequest.cancel();
 
-	              case 3:
-	              case "end":
-	                return _context.stop();
-	            }
-	          }
-	        }, _callee, this);
-	      }));
+	                    if (contentUrlRequest) {
+	                      contentUrlRequest.cancel();
+	                    }
+	                  });
+	                  _context.prev = 3;
 
-	      function getContentTemporaryUrl() {
-	        return _getContentTemporaryUrl.apply(this, arguments);
-	      }
+	                  if (_this.mcsMedia) {
+	                    _context.next = 9;
+	                    break;
+	                  }
 
-	      return getContentTemporaryUrl;
-	    }()
-	    /**
-	     * Returns cached direct content URL for the media.
-	     *
-	     * This URL will expire in several minutes. This function does not refresh the URL and can be used to query it several times
-	     * without causing network traffic.
-	     * If the URL becomes expired, you need to request a new one using getContentTemporaryUrl().
-	     *
-	     * @returns {Promise<String>}
-	     */
+	                  _context.next = 7;
+	                  return fetchMediaRequest;
 
-	  }, {
-	    key: "getCachedTemporaryUrl",
-	    value: function () {
-	      var _getCachedTemporaryUrl = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee2() {
-	        var _this$mcsMedia$getCac, _this$mcsMedia2;
+	                case 7:
+	                  mcsMedia = _context.sent;
+	                  contentUrlRequest = mcsMedia.getContentUrl();
 
-	        return _regeneratorRuntime$1.wrap(function _callee2$(_context2) {
-	          while (1) {
-	            switch (_context2.prev = _context2.next) {
-	              case 0:
-	                _context2.next = 2;
-	                return this._fetchMcsMedia();
+	                case 9:
+	                  _context.t0 = resolve;
 
-	              case 2:
-	                return _context2.abrupt("return", (_this$mcsMedia$getCac = (_this$mcsMedia2 = this.mcsMedia) === null || _this$mcsMedia2 === void 0 ? void 0 : _this$mcsMedia2.getCachedContentUrl()) !== null && _this$mcsMedia$getCac !== void 0 ? _this$mcsMedia$getCac : null);
+	                  if (!contentUrlRequest) {
+	                    _context.next = 16;
+	                    break;
+	                  }
 
-	              case 3:
-	              case "end":
-	                return _context2.stop();
-	            }
-	          }
-	        }, _callee2, this);
-	      }));
+	                  _context.next = 13;
+	                  return contentUrlRequest;
 
-	      function getCachedTemporaryUrl() {
-	        return _getCachedTemporaryUrl.apply(this, arguments);
-	      }
+	                case 13:
+	                  _context.t1 = _context.sent;
+	                  _context.next = 17;
+	                  break;
 
-	      return getCachedTemporaryUrl;
-	    }()
+	                case 16:
+	                  _context.t1 = null;
+
+	                case 17:
+	                  _context.t2 = _context.t1;
+	                  (0, _context.t0)(_context.t2);
+	                  _context.next = 24;
+	                  break;
+
+	                case 21:
+	                  _context.prev = 21;
+	                  _context.t3 = _context["catch"](3);
+	                  reject(_context.t3);
+
+	                case 24:
+	                case "end":
+	                  return _context.stop();
+	              }
+	            }
+	          }, _callee, null, [[3, 21]]);
+	        }));
+
+	        return function (_x, _x2, _x3) {
+	          return _ref.apply(this, arguments);
+	        };
+	      }());
+	    }
 	  }, {
 	    key: "_fetchMcsMedia",
-	    value: function () {
-	      var _fetchMcsMedia2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee3() {
-	        return _regeneratorRuntime$1.wrap(function _callee3$(_context3) {
-	          while (1) {
-	            switch (_context3.prev = _context3.next) {
-	              case 0:
-	                if (this.mcsMedia) {
-	                  _context3.next = 8;
-	                  break;
-	                }
+	    value: function _fetchMcsMedia() {
+	      var _this2 = this;
 
-	                if (!this.services.mcsClient) {
-	                  _context3.next = 7;
+	      return new browser.CancellablePromise( /*#__PURE__*/function () {
+	        var _ref2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee2(resolve, reject, onCancel) {
+	          var request;
+	          return _regeneratorRuntime$1.wrap(function _callee2$(_context2) {
+	            while (1) {
+	              switch (_context2.prev = _context2.next) {
+	                case 0:
+	                  request = _this2.services.mcsClient.get(_this2.state.sid);
+
+	                  if (!_this2.services.mcsClient) {
+	                    _context2.next = 14;
+	                    break;
+	                  }
+
+	                  onCancel(function () {
+	                    return request.cancel();
+	                  });
+	                  _context2.prev = 3;
+	                  _context2.next = 6;
+	                  return request;
+
+	                case 6:
+	                  _this2.mcsMedia = _context2.sent;
+	                  resolve(_this2.mcsMedia);
+	                  _context2.next = 13;
 	                  break;
-	                }
 
-	                _context3.next = 4;
-	                return this.services.mcsClient.get(this.state.sid);
+	                case 10:
+	                  _context2.prev = 10;
+	                  _context2.t0 = _context2["catch"](3);
+	                  reject(_context2.t0);
 
-	              case 4:
-	                this.mcsMedia = _context3.sent;
-	                _context3.next = 8;
-	                break;
+	                case 13:
+	                  return _context2.abrupt("return");
 
-	              case 7:
-	                throw new Error("Media Content Service is unavailable");
+	                case 14:
+	                  reject(new Error("Media Content Service is unavailable"));
 
-	              case 8:
-	              case "end":
-	                return _context3.stop();
+	                case 15:
+	                case "end":
+	                  return _context2.stop();
+	              }
 	            }
-	          }
-	        }, _callee3, this);
-	      }));
-
-	      function _fetchMcsMedia() {
-	        return _fetchMcsMedia2.apply(this, arguments);
-	      }
+	          }, _callee2, null, [[3, 10]]);
+	        }));
 
-	      return _fetchMcsMedia;
-	    }()
+	        return function (_x4, _x5, _x6) {
+	          return _ref2.apply(this, arguments);
+	        };
+	      }());
+	    }
 	  }]);
 
 	  return Media;
@@ -36015,7 +36223,7 @@ this.Twilio.Conversations = (function (exports) {
 	function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$5(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
 	function _isNativeReflectConstruct$5() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-	var log$5 = Logger.scope("Message");
+	var log$4 = Logger.scope("Message");
 	/**
 	 * A message in a conversation.
 	 */
@@ -36053,7 +36261,7 @@ this.Twilio.Conversations = (function (exports) {
 	      timestamp: data.timestamp ? new Date(data.timestamp) : null,
 	      dateUpdated: data.dateUpdated ? new Date(data.dateUpdated) : null,
 	      lastUpdatedBy: (_data$lastUpdatedBy = data.lastUpdatedBy) !== null && _data$lastUpdatedBy !== void 0 ? _data$lastUpdatedBy : null,
-	      attributes: parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(data.sid), log$5),
+	      attributes: parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(data.sid), log$4),
 	      type: (_data$type = data.type) !== null && _data$type !== void 0 ? _data$type : "text",
 	      media: data.type && data.type === "media" && data.media ? new Media(data.media, _this.services) : null,
 	      medias: data.type && data.type === "media" && data.medias ? data.medias.map(function (m) {
@@ -36189,7 +36397,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "attachedMedia",
 	    get: function get() {
-	      return this.getMediaByCategory(["media"]);
+	      return this.getMediaByCategories(["media"]);
 	    }
 	    /**
 	     * The server-assigned unique identifier of the authoring participant.
@@ -36217,8 +36425,8 @@ this.Twilio.Conversations = (function (exports) {
 	     */
 
 	  }, {
-	    key: "getMediaByCategory",
-	    value: function getMediaByCategory(categories) {
+	    key: "getMediaByCategories",
+	    value: function getMediaByCategories(categories) {
 	      var _this$state$medias;
 
 	      return ((_this$state$medias = this.state.medias) !== null && _this$state$medias !== void 0 ? _this$state$medias : []).filter(function (m) {
@@ -36227,7 +36435,7 @@ this.Twilio.Conversations = (function (exports) {
 	    }
 	    /**
 	     * Get a media descriptor for an email body attachment of a provided type.
-	     * Allowed body types are returned in the Conversation.limits().emailBodiesAllowedMimeTypes array.
+	     * Allowed body types are returned in the Conversation.limits().emailBodiesAllowedContentTypes array.
 	     * @param type Type of email body to request, defaults to `text/plain`.
 	     */
 
@@ -36237,13 +36445,13 @@ this.Twilio.Conversations = (function (exports) {
 	      var _this$getMediaByCateg, _this$getMediaByCateg2;
 
 	      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "text/plain";
-	      return (_this$getMediaByCateg = (_this$getMediaByCateg2 = this.getMediaByCategory(["body"])) === null || _this$getMediaByCateg2 === void 0 ? void 0 : _this$getMediaByCateg2.filter(function (m) {
+	      return (_this$getMediaByCateg = (_this$getMediaByCateg2 = this.getMediaByCategories(["body"])) === null || _this$getMediaByCateg2 === void 0 ? void 0 : _this$getMediaByCateg2.filter(function (m) {
 	        return m.contentType == type;
 	      }).shift()) !== null && _this$getMediaByCateg !== void 0 ? _this$getMediaByCateg : null;
 	    }
 	    /**
 	     * Get a media descriptor for an email history attachment of a provided type.
-	     * Allowed body types are returned in the Conversation.limits().emailHistoriesAllowedMimeTypes array.
+	     * Allowed body types are returned in the Conversation.limits().emailHistoriesAllowedContentTypes array.
 	     * @param type Type of email history to request, defaults to `text/plain`.
 	     */
 
@@ -36253,7 +36461,7 @@ this.Twilio.Conversations = (function (exports) {
 	      var _this$getMediaByCateg3, _this$getMediaByCateg4;
 
 	      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "text/plain";
-	      return (_this$getMediaByCateg3 = (_this$getMediaByCateg4 = this.getMediaByCategory(["history"])) === null || _this$getMediaByCateg4 === void 0 ? void 0 : _this$getMediaByCateg4.filter(function (m) {
+	      return (_this$getMediaByCateg3 = (_this$getMediaByCateg4 = this.getMediaByCategories(["history"])) === null || _this$getMediaByCateg4 === void 0 ? void 0 : _this$getMediaByCateg4.filter(function (m) {
 	        return m.contentType == type;
 	      }).shift()) !== null && _this$getMediaByCateg3 !== void 0 ? _this$getMediaByCateg3 : null;
 	    }
@@ -36292,7 +36500,7 @@ this.Twilio.Conversations = (function (exports) {
 	        updateReasons.push("dateCreated");
 	      }
 
-	      var updatedAttributes = parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(this.sid), log$5);
+	      var updatedAttributes = parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(this.sid), log$4);
 
 	      if (!isEqual(this.state.attributes, updatedAttributes)) {
 	        this.state.attributes = updatedAttributes;
@@ -36345,7 +36553,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	                _context.next = 4;
 	                return this.conversation.getParticipantBySid(this.state.participantSid).catch(function () {
-	                  log$5.debug("Participant with sid \"".concat(_this2.participantSid, "\" not found for message ").concat(_this2.sid));
+	                  log$4.debug("Participant with sid \"".concat(_this2.participantSid, "\" not found for message ").concat(_this2.sid));
 	                  return null;
 	                });
 
@@ -36360,7 +36568,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	                _context.next = 8;
 	                return this.conversation.getParticipantByIdentity(this.state.author).catch(function () {
-	                  log$5.debug("Participant with identity \"".concat(_this2.author, "\" not found for message ").concat(_this2.sid));
+	                  log$4.debug("Participant with identity \"".concat(_this2.author, "\" not found for message ").concat(_this2.sid));
 	                  return null;
 	                });
 
@@ -36571,57 +36779,96 @@ this.Twilio.Conversations = (function (exports) {
 	      return updateAttributes;
 	    }()
 	    /**
-	     * Get content URLs for all media attachments in the given set using single operation.
-	     * @param contentSet Set of media attachments to query for content URL.
+	     * Get content URLs for all media attachments in the given set using a single operation.
+	     * @param contentSet Set of media attachments to query content URLs.
 	     */
 
 	  }, {
-	    key: "attachTemporaryUrlsFor",
-	    value: function () {
-	      var _attachTemporaryUrlsFor = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee6(contentSet) {
-	        var _this3 = this;
+	    key: "getTemporaryContentUrlsForMedia",
+	    value: function getTemporaryContentUrlsForMedia(contentSet) {
+	      var _contentSet$map;
 
-	        var sids;
-	        return _regeneratorRuntime$1.wrap(function _callee6$(_context6) {
-	          while (1) {
-	            switch (_context6.prev = _context6.next) {
-	              case 0:
-	                // We ignore existing mcsMedia members of each of the media entries.
-	                // Instead we just collect their sids and pull new descriptors from a mediaSet GET endpoint.
-	                sids = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map(function (m) {
-	                  return m.sid;
-	                });
+	      // We ignore existing mcsMedia members of each of the media entries.
+	      // Instead we just collect their sids and pull new descriptors from a mediaSet GET endpoint.
+	      var sids = (_contentSet$map = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map(function (m) {
+	        return m.sid;
+	      })) !== null && _contentSet$map !== void 0 ? _contentSet$map : [];
+	      return this.getTemporaryContentUrlsForMediaSids(sids);
+	    }
+	    /**
+	     * Get content URLs for all media attachments in the given set of media sids using a single operation.
+	     * @param mediaSids Set of media sids to query for the content URL.
+	     */
 
-	                if (!(this.services.mcsClient && sids)) {
-	                  _context6.next = 7;
-	                  break;
-	                }
+	  }, {
+	    key: "getTemporaryContentUrlsForMediaSids",
+	    value: function getTemporaryContentUrlsForMediaSids(mediaSids) {
+	      var _this3 = this;
 
-	                _context6.next = 4;
-	                return this.services.mcsClient.mediaSetGet(sids);
+	      return new browser.CancellablePromise( /*#__PURE__*/function () {
+	        var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee6(resolve, reject, onCancel) {
+	          var mediaGetRequest, urls;
+	          return _regeneratorRuntime$1.wrap(function _callee6$(_context6) {
+	            while (1) {
+	              switch (_context6.prev = _context6.next) {
+	                case 0:
+	                  mediaGetRequest = _this3.services.mcsClient.mediaSetGetContentUrls(mediaSids !== null && mediaSids !== void 0 ? mediaSids : []);
 
-	              case 4:
-	                return _context6.abrupt("return", _context6.sent.map(function (item) {
-	                  return new Media(item, _this3.services);
-	                }));
+	                  if (!(!_this3.services.mcsClient || !mediaSids)) {
+	                    _context6.next = 4;
+	                    break;
+	                  }
 
-	              case 7:
-	                throw new Error("Media Content Service is unavailable");
+	                  reject(new Error("Media Content Service is unavailable"));
+	                  return _context6.abrupt("return");
 
-	              case 8:
-	              case "end":
-	                return _context6.stop();
+	                case 4:
+	                  onCancel(function () {
+	                    mediaGetRequest.cancel();
+	                  });
+	                  _context6.prev = 5;
+	                  _context6.next = 8;
+	                  return mediaGetRequest;
+
+	                case 8:
+	                  urls = _context6.sent;
+	                  resolve(urls);
+	                  _context6.next = 15;
+	                  break;
+
+	                case 12:
+	                  _context6.prev = 12;
+	                  _context6.t0 = _context6["catch"](5);
+	                  reject(_context6.t0);
+
+	                case 15:
+	                case "end":
+	                  return _context6.stop();
+	              }
 	            }
-	          }
-	        }, _callee6, this);
-	      }));
+	          }, _callee6, null, [[5, 12]]);
+	        }));
 
-	      function attachTemporaryUrlsFor(_x3) {
-	        return _attachTemporaryUrlsFor.apply(this, arguments);
-	      }
+	        return function (_x3, _x4, _x5) {
+	          return _ref.apply(this, arguments);
+	        };
+	      }());
+	    }
+	    /**
+	     * Get content URLs for all media attached to the message.
+	     */
 
-	      return attachTemporaryUrlsFor;
-	    }()
+	  }, {
+	    key: "getTemporaryContentUrlsForAttachedMedia",
+	    value: function getTemporaryContentUrlsForAttachedMedia() {
+	      var _media$map;
+
+	      var media = this.attachedMedia;
+	      var sids = (_media$map = media === null || media === void 0 ? void 0 : media.map(function (m) {
+	        return m.sid;
+	      })) !== null && _media$map !== void 0 ? _media$map : [];
+	      return this.getTemporaryContentUrlsForMediaSids(sids);
+	    }
 	  }, {
 	    key: "_getDetailedDeliveryReceiptsPaginator",
 	    value: function () {
@@ -36657,7 +36904,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee7, this);
 	      }));
 
-	      function _getDetailedDeliveryReceiptsPaginator(_x4) {
+	      function _getDetailedDeliveryReceiptsPaginator(_x6) {
 	        return _getDetailedDeliveryReceiptsPaginator2.apply(this, arguments);
 	      }
 
@@ -36682,7 +36929,7 @@ this.Twilio.Conversations = (function (exports) {
 	  return [value instanceof Array && value.length > 0 && value.reduce(function (a, c) {
 	    return a && c instanceof Media;
 	  }, true), "a non-empty array of Media"];
-	})), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Array]), __metadata$1("design:returntype", Promise)], Message.prototype, "attachTemporaryUrlsFor", null);
+	})), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Array]), __metadata$1("design:returntype", browser.CancellablePromise)], Message.prototype, "getTemporaryContentUrlsForMedia", null);
 
 	function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -36693,7 +36940,7 @@ this.Twilio.Conversations = (function (exports) {
 	function _createSuper$4(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$4(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
 	function _isNativeReflectConstruct$4() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-	var log$4 = Logger.scope("Messages");
+	var log$3 = Logger.scope("Messages");
 	/**
 	 * Represents the collection of messages in a conversation
 	 */
@@ -36752,7 +36999,7 @@ this.Twilio.Conversations = (function (exports) {
 	              case 6:
 	                list = _context.sent;
 	                list.on("itemAdded", function (args) {
-	                  log$4.debug("".concat(_this2.conversation.sid, " itemAdded: ").concat(args.item.index));
+	                  log$3.debug("".concat(_this2.conversation.sid, " itemAdded: ").concat(args.item.index));
 	                  var links = {
 	                    self: "".concat(_this2.conversation.links.messages, "/").concat(args.item.data.sid),
 	                    conversation: _this2.conversation.links.self,
@@ -36761,7 +37008,7 @@ this.Twilio.Conversations = (function (exports) {
 	                  var message = new Message(args.item.index, args.item.data, _this2.conversation, links, _this2.configuration, _this2.services);
 
 	                  if (_this2.messagesByIndex.has(message.index)) {
-	                    log$4.debug("Message arrived, but is already known and ignored", _this2.conversation.sid, message.index);
+	                    log$3.debug("Message arrived, but is already known and ignored", _this2.conversation.sid, message.index);
 	                    return;
 	                  }
 
@@ -36774,7 +37021,7 @@ this.Twilio.Conversations = (function (exports) {
 	                  _this2.emit("messageAdded", message);
 	                });
 	                list.on("itemRemoved", function (args) {
-	                  log$4.debug("#{this.conversation.sid} itemRemoved: ".concat(args.index));
+	                  log$3.debug("#{this.conversation.sid} itemRemoved: ".concat(args.index));
 	                  var index = args.index;
 
 	                  if (_this2.messagesByIndex.has(index)) {
@@ -36792,7 +37039,7 @@ this.Twilio.Conversations = (function (exports) {
 	                  }
 	                });
 	                list.on("itemUpdated", function (args) {
-	                  log$4.debug("".concat(_this2.conversation.sid, " itemUpdated: ").concat(args.item.index));
+	                  log$3.debug("".concat(_this2.conversation.sid, " itemUpdated: ").concat(args.item.index));
 
 	                  var message = _this2.messagesByIndex.get(args.item.index);
 
@@ -36808,10 +37055,10 @@ this.Twilio.Conversations = (function (exports) {
 	                this.messagesListPromise = null;
 
 	                if (this.services.syncClient.connectionState !== "disconnected") {
-	                  log$4.error("Failed to get messages object for conversation", this.conversation.sid, _context.t0);
+	                  log$3.error("Failed to get messages object for conversation", this.conversation.sid, _context.t0);
 	                }
 
-	                log$4.debug("ERROR: Failed to get messages object for conversation", this.conversation.sid, _context.t0);
+	                log$3.debug("ERROR: Failed to get messages object for conversation", this.conversation.sid, _context.t0);
 	                throw _context.t0;
 
 	              case 19:
@@ -36868,114 +37115,126 @@ this.Twilio.Conversations = (function (exports) {
 	      return unsubscribe;
 	    }()
 	    /**
-	     * Send Message to the conversation, message could include both text and multiple media attachments.
+	     * Send a message to the conversation. The message could include text and multiple media attachments.
 	     * @param message Message to post
-	     * @returns Returns a promise which can fail
 	     */
 
 	  }, {
 	    key: "sendV2",
-	    value: function () {
-	      var _sendV = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee3(message) {
-	        var _message$emailOptions;
+	    value: function sendV2(message) {
+	      var _this3 = this;
 
-	        var media, _iterator, _step, _mediaContent$content, _mediaContent$media, _step$value, category, mediaContent;
+	      log$3.debug("Sending message V2", message.mediaContent, message.attributes, message.emailOptions);
+	      return new browser.CancellablePromise( /*#__PURE__*/function () {
+	        var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee3(resolve, reject, onCancel) {
+	          var _message$emailOptions;
 
-	        return _regeneratorRuntime$1.wrap(function _callee3$(_context3) {
-	          while (1) {
-	            switch (_context3.prev = _context3.next) {
-	              case 0:
-	                log$4.debug("Sending message V2", message.mediaContent, message.attributes, message.emailOptions);
-	                media = [];
-	                _iterator = _createForOfIteratorHelper$2(message.mediaContent);
-	                _context3.prev = 3;
+	          var media, requests, _iterator, _step, _step$value, category, mediaContent, _mediaContent$content, _mediaContent$media, request, messagesPostRequest;
 
-	                _iterator.s();
+	          return _regeneratorRuntime$1.wrap(function _callee3$(_context3) {
+	            while (1) {
+	              switch (_context3.prev = _context3.next) {
+	                case 0:
+	                  media = [];
+	                  requests = [];
+	                  onCancel(function () {
+	                    requests.forEach(function (request) {
+	                      return request.cancel();
+	                    });
+	                  });
+	                  _iterator = _createForOfIteratorHelper$2(message.mediaContent);
+	                  _context3.prev = 4;
 
-	              case 5:
-	                if ((_step = _iterator.n()).done) {
-	                  _context3.next = 22;
-	                  break;
-	                }
+	                  _iterator.s();
 
-	                _step$value = _slicedToArray$1(_step.value, 2), category = _step$value[0], mediaContent = _step$value[1];
-	                log$4.debug("Adding media to a message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent);
-	                _context3.t0 = media;
+	                case 6:
+	                  if ((_step = _iterator.n()).done) {
+	                    _context3.next = 25;
+	                    break;
+	                  }
 
-	                if (!(mediaContent instanceof FormData)) {
+	                  _step$value = _slicedToArray$1(_step.value, 2), category = _step$value[0], mediaContent = _step$value[1];
+	                  _context3.prev = 8;
+	                  log$3.debug("Adding media to a message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent);
+	                  request = mediaContent instanceof FormData ? _this3.services.mcsClient.postFormData(mediaContent, category) : _this3.services.mcsClient.post((_mediaContent$content = mediaContent.contentType) !== null && _mediaContent$content !== void 0 ? _mediaContent$content : "", (_mediaContent$media = mediaContent.media) !== null && _mediaContent$media !== void 0 ? _mediaContent$media : "", category, mediaContent.filename);
+	                  requests.push(request);
+	                  _context3.t0 = media;
 	                  _context3.next = 15;
-	                  break;
-	                }
-
-	                _context3.next = 12;
-	                return this.services.mcsClient.postFormData(mediaContent, category);
+	                  return request;
 
-	              case 12:
-	                _context3.t1 = _context3.sent;
-	                _context3.next = 18;
-	                break;
+	                case 15:
+	                  _context3.t1 = _context3.sent;
 
-	              case 15:
-	                _context3.next = 17;
-	                return this.services.mcsClient.post((_mediaContent$content = mediaContent.contentType) !== null && _mediaContent$content !== void 0 ? _mediaContent$content : "", (_mediaContent$media = mediaContent.media) !== null && _mediaContent$media !== void 0 ? _mediaContent$media : "", category, mediaContent.filename);
+	                  _context3.t0.push.call(_context3.t0, _context3.t1);
 
-	              case 17:
-	                _context3.t1 = _context3.sent;
+	                  _context3.next = 23;
+	                  break;
 
-	              case 18:
-	                _context3.t2 = _context3.t1;
+	                case 19:
+	                  _context3.prev = 19;
+	                  _context3.t2 = _context3["catch"](8);
+	                  reject(_context3.t2);
+	                  return _context3.abrupt("return");
 
-	                _context3.t0.push.call(_context3.t0, _context3.t2);
+	                case 23:
+	                  _context3.next = 6;
+	                  break;
 
-	              case 20:
-	                _context3.next = 5;
-	                break;
+	                case 25:
+	                  _context3.next = 30;
+	                  break;
 
-	              case 22:
-	                _context3.next = 27;
-	                break;
+	                case 27:
+	                  _context3.prev = 27;
+	                  _context3.t3 = _context3["catch"](4);
 
-	              case 24:
-	                _context3.prev = 24;
-	                _context3.t3 = _context3["catch"](3);
+	                  _iterator.e(_context3.t3);
 
-	                _iterator.e(_context3.t3);
+	                case 30:
+	                  _context3.prev = 30;
 
-	              case 27:
-	                _context3.prev = 27;
+	                  _iterator.f();
 
-	                _iterator.f();
+	                  return _context3.finish(30);
 
-	                return _context3.finish(27);
+	                case 33:
+	                  messagesPostRequest = _this3.services.commandExecutor.mutateResource("post", _this3.conversation.links.messages, {
+	                    body: message.text,
+	                    subject: (_message$emailOptions = message.emailOptions) === null || _message$emailOptions === void 0 ? void 0 : _message$emailOptions.subject,
+	                    media_sids: media.map(function (m) {
+	                      return m.sid;
+	                    }),
+	                    attributes: typeof message.attributes !== "undefined" ? JSON.stringify(message.attributes) : undefined
+	                  });
+	                  _context3.prev = 34;
+	                  _context3.t4 = resolve;
+	                  _context3.next = 38;
+	                  return messagesPostRequest;
 
-	              case 30:
-	                _context3.next = 32;
-	                return this.services.commandExecutor.mutateResource("post", this.conversation.links.messages, {
-	                  body: message.text,
-	                  subject: (_message$emailOptions = message.emailOptions) === null || _message$emailOptions === void 0 ? void 0 : _message$emailOptions.subject,
-	                  media_sids: media.map(function (m) {
-	                    return m.sid;
-	                  }),
-	                  attributes: typeof message.attributes !== "undefined" ? JSON.stringify(message.attributes) : undefined
-	                });
+	                case 38:
+	                  _context3.t5 = _context3.sent;
+	                  (0, _context3.t4)(_context3.t5);
+	                  _context3.next = 45;
+	                  break;
 
-	              case 32:
-	                return _context3.abrupt("return", _context3.sent);
+	                case 42:
+	                  _context3.prev = 42;
+	                  _context3.t6 = _context3["catch"](34);
+	                  reject(_context3.t6);
 
-	              case 33:
-	              case "end":
-	                return _context3.stop();
+	                case 45:
+	                case "end":
+	                  return _context3.stop();
+	              }
 	            }
-	          }
-	        }, _callee3, this, [[3, 24, 27, 30]]);
-	      }));
-
-	      function sendV2(_x2) {
-	        return _sendV.apply(this, arguments);
-	      }
+	          }, _callee3, null, [[4, 27, 30, 33], [8, 19], [34, 42]]);
+	        }));
 
-	      return sendV2;
-	    }()
+	        return function (_x2, _x3, _x4) {
+	          return _ref.apply(this, arguments);
+	        };
+	      }());
+	    }
 	    /**
 	     * Send Message to the conversation
 	     * @param message Message to post
@@ -36997,18 +37256,14 @@ this.Twilio.Conversations = (function (exports) {
 	              case 0:
 	                attributes = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
 	                emailOptions = _args4.length > 2 ? _args4[2] : undefined;
-	                log$4.debug("Sending text message", message, attributes, emailOptions);
-	                _context4.next = 5;
-	                return this.services.commandExecutor.mutateResource("post", this.conversation.links.messages, {
+	                log$3.debug("Sending text message", message, attributes, emailOptions);
+	                return _context4.abrupt("return", this.services.commandExecutor.mutateResource("post", this.conversation.links.messages, {
 	                  body: message !== null && message !== void 0 ? message : "",
 	                  attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined,
 	                  subject: emailOptions === null || emailOptions === void 0 ? void 0 : emailOptions.subject
-	                });
-
-	              case 5:
-	                return _context4.abrupt("return", _context4.sent);
+	                }));
 
-	              case 6:
+	              case 4:
 	              case "end":
 	                return _context4.stop();
 	            }
@@ -37016,7 +37271,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee4, this);
 	      }));
 
-	      function send(_x3) {
+	      function send(_x5) {
 	        return _send.apply(this, arguments);
 	      }
 
@@ -37046,8 +37301,8 @@ this.Twilio.Conversations = (function (exports) {
 	              case 0:
 	                attributes = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
 	                emailOptions = _args5.length > 2 ? _args5[2] : undefined;
-	                log$4.debug("Sending media message", mediaContent, attributes, emailOptions);
-	                log$4.debug("Sending media message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent, attributes);
+	                log$3.debug("Sending media message", mediaContent, attributes, emailOptions);
+	                log$3.debug("Sending media message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent, attributes);
 
 	                if (!(mediaContent instanceof FormData)) {
 	                  _context5.next = 10;
@@ -37088,7 +37343,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee5, this);
 	      }));
 
-	      function sendMedia(_x4) {
+	      function sendMedia(_x6) {
 	        return _sendMedia.apply(this, arguments);
 	      }
 
@@ -37123,7 +37378,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee6, this);
 	      }));
 
-	      function getMessages(_x5, _x6) {
+	      function getMessages(_x7, _x8) {
 	        return _getMessages2.apply(this, arguments);
 	      }
 
@@ -37132,7 +37387,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "_wrapPaginator",
 	    value: function _wrapPaginator(order, page, op) {
-	      var _this3 = this;
+	      var _this4 = this;
 
 	      // Due to an inconsistency between Sync and Chat conventions, next and
 	      // previous pages should be swapped.
@@ -37140,13 +37395,13 @@ this.Twilio.Conversations = (function (exports) {
 
 	      var nextPage = function nextPage() {
 	        return page.nextPage().then(function (page) {
-	          return _this3._wrapPaginator(order, page, op);
+	          return _this4._wrapPaginator(order, page, op);
 	        });
 	      };
 
 	      var previousPage = function previousPage() {
 	        return page.prevPage().then(function (page) {
-	          return _this3._wrapPaginator(order, page, op);
+	          return _this4._wrapPaginator(order, page, op);
 	        });
 	      };
 
@@ -37165,7 +37420,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "_upsertMessage",
 	    value: function _upsertMessage(index, value) {
-	      var _this4 = this;
+	      var _this5 = this;
 
 	      var cachedMessage = this.messagesByIndex.get(index);
 
@@ -37181,7 +37436,7 @@ this.Twilio.Conversations = (function (exports) {
 	      var message = new Message(index, value, this.conversation, links, this.configuration, this.services);
 	      this.messagesByIndex.set(message.index, message);
 	      message.on("updated", function (args) {
-	        return _this4.emit("messageUpdated", args);
+	        return _this5.emit("messageUpdated", args);
 	      });
 	      return message;
 	    }
@@ -37198,7 +37453,7 @@ this.Twilio.Conversations = (function (exports) {
 	    key: "_getMessages",
 	    value: function () {
 	      var _getMessages3 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee7() {
-	        var _this5 = this;
+	        var _this6 = this;
 
 	        var pageSize,
 	            anchor,
@@ -37234,7 +37489,7 @@ this.Twilio.Conversations = (function (exports) {
 	                _context7.next = 12;
 	                return this._wrapPaginator(order, page, function (items) {
 	                  return Promise.all(items.map(function (item) {
-	                    return _this5._upsertMessage(item.index, item.data);
+	                    return _this6._upsertMessage(item.index, item.data);
 	                  }));
 	                });
 
@@ -37287,34 +37542,48 @@ this.Twilio.Conversations = (function (exports) {
 
 	  _createClass$3(UnsentMessage, [{
 	    key: "send",
-	    value: function () {
-	      var _send = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee() {
-	        var response;
-	        return _regeneratorRuntime$1.wrap(function _callee$(_context) {
-	          while (1) {
-	            switch (_context.prev = _context.next) {
-	              case 0:
-	                _context.next = 2;
-	                return this.messagesEntity.sendV2(this);
+	    value: function send() {
+	      var _this = this;
 
-	              case 2:
-	                response = _context.sent;
-	                return _context.abrupt("return", parseToNumber(response.index));
+	      return new browser.CancellablePromise( /*#__PURE__*/function () {
+	        var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee(resolve, reject, onCancel) {
+	          var request, response;
+	          return _regeneratorRuntime$1.wrap(function _callee$(_context) {
+	            while (1) {
+	              switch (_context.prev = _context.next) {
+	                case 0:
+	                  request = _this.messagesEntity.sendV2(_this);
+	                  onCancel(function () {
+	                    return request.cancel();
+	                  });
+	                  _context.prev = 2;
+	                  _context.next = 5;
+	                  return request;
 
-	              case 4:
-	              case "end":
-	                return _context.stop();
-	            }
-	          }
-	        }, _callee, this);
-	      }));
+	                case 5:
+	                  response = _context.sent;
+	                  resolve(parseToNumber(response.index));
+	                  _context.next = 12;
+	                  break;
 
-	      function send() {
-	        return _send.apply(this, arguments);
-	      }
+	                case 9:
+	                  _context.prev = 9;
+	                  _context.t0 = _context["catch"](2);
+	                  reject(_context.t0);
 
-	      return send;
-	    }()
+	                case 12:
+	                case "end":
+	                  return _context.stop();
+	              }
+	            }
+	          }, _callee, null, [[2, 9]]);
+	        }));
+
+	        return function (_x, _x2, _x3) {
+	          return _ref.apply(this, arguments);
+	        };
+	      }());
+	    }
 	  }]);
 
 	  return UnsentMessage;
@@ -37383,27 +37652,27 @@ this.Twilio.Conversations = (function (exports) {
 	      return this;
 	    }
 	    /**
-	     * Set email body with given MIME-type.
-	     * @param mimeType Format of the body to set (text/plain or text/html).
-	     * @param body Body payload in selected format.
+	     * Set the email body with a given content type.
+	     * @param contentType Format of the body to set (text/plain or text/html).
+	     * @param body Body payload in the selected format.
 	     */
 
 	  }, {
 	    key: "setEmailBody",
-	    value: function setEmailBody(mimeType, body) {
-	      this.emailBodies.set(mimeType, body);
+	    value: function setEmailBody(contentType, body) {
+	      this.emailBodies.set(contentType, body);
 	      return this;
 	    }
 	    /**
-	     * Set email history with given MIME-type.
-	     * @param mimeType Format of the history to set (text/plain or text/html).
-	     * @param history History payload in selected format.
+	     * Set the email history with a given content type.
+	     * @param contentType Format of the history to set (text/plain or text/html).
+	     * @param history History payload in the selected format.
 	     */
 
 	  }, {
 	    key: "setEmailHistory",
-	    value: function setEmailHistory(mimeType, history) {
-	      this.emailHistories.set(mimeType, history);
+	    value: function setEmailHistory(contentType, history) {
+	      this.emailHistories.set(contentType, history);
 	      return this;
 	    }
 	    /**
@@ -37439,22 +37708,22 @@ this.Twilio.Conversations = (function (exports) {
 	      var _this = this;
 
 	      this.emailBodies.forEach(function (_, key) {
-	        if (!_this.limits.emailBodiesAllowedMimeTypes.includes(key)) {
-	          throw new Error("Unsupported email body MIME type ".concat(key));
+	        if (!_this.limits.emailBodiesAllowedContentTypes.includes(key)) {
+	          throw new Error("Unsupported email body content type ".concat(key));
 	        }
 	      });
 	      this.emailHistories.forEach(function (_, key) {
-	        if (!_this.limits.emailHistoriesAllowedMimeTypes.includes(key)) {
-	          throw new Error("Unsupported email history MIME type ".concat(key));
+	        if (!_this.limits.emailHistoriesAllowedContentTypes.includes(key)) {
+	          throw new Error("Unsupported email history content type ".concat(key));
 	        }
 	      });
 
-	      if (this.emailBodies.size > this.limits.emailBodiesAllowedMimeTypes.length) {
-	        throw new Error("Too many email bodies attached to the message (".concat(this.emailBodies.size, " > ").concat(this.limits.emailBodiesAllowedMimeTypes.length, ")"));
+	      if (this.emailBodies.size > this.limits.emailBodiesAllowedContentTypes.length) {
+	        throw new Error("Too many email bodies attached to the message (".concat(this.emailBodies.size, " > ").concat(this.limits.emailBodiesAllowedContentTypes.length, ")"));
 	      }
 
-	      if (this.emailHistories.size > this.limits.emailHistoriesAllowedMimeTypes.length) {
-	        throw new Error("Too many email histories attached to the message (".concat(this.emailHistories.size, " > ").concat(this.limits.emailHistoriesAllowedMimeTypes.length, ")"));
+	      if (this.emailHistories.size > this.limits.emailHistoriesAllowedContentTypes.length) {
+	        throw new Error("Too many email histories attached to the message (".concat(this.emailHistories.size, " > ").concat(this.limits.emailHistoriesAllowedContentTypes.length, ")"));
 	      }
 
 	      if (this.message.mediaContent.length > this.limits.mediaAttachmentsCountLimit) {
@@ -37471,6 +37740,15 @@ this.Twilio.Conversations = (function (exports) {
 	      });
 	      return this.message;
 	    }
+	    /**
+	     * Prepares a message and sends it to the conversation.
+	     */
+
+	  }, {
+	    key: "buildAndSend",
+	    value: function buildAndSend() {
+	      return this.build().send();
+	    }
 	  }, {
 	    key: "getPayloadContentType",
 	    value: function getPayloadContentType(payload) {
@@ -37494,7 +37772,7 @@ this.Twilio.Conversations = (function (exports) {
 	function _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
 	function _isNativeReflectConstruct$3() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-	var log$3 = Logger.scope("Conversation");
+	var log$2 = Logger.scope("Conversation");
 	var fieldMappings = {
 	  lastMessage: "lastMessage",
 	  attributes: "attributes",
@@ -37774,10 +38052,10 @@ this.Twilio.Conversations = (function (exports) {
 	        _this2.entityPromise = null;
 
 	        if (_this2.services.syncClient.connectionState != "disconnected") {
-	          log$3.error("Failed to get conversation object", err);
+	          log$2.error("Failed to get conversation object", err);
 	        }
 
-	        log$3.debug("ERROR: Failed to get conversation object", err);
+	        log$2.debug("ERROR: Failed to get conversation object", err);
 	        throw err;
 	      });
 	    }
@@ -37803,7 +38081,7 @@ this.Twilio.Conversations = (function (exports) {
 	                return this._subscribe();
 
 	              case 3:
-	                log$3.trace("_subscribeStreams, this.entity.data=", (_this$entity = this.entity) === null || _this$entity === void 0 ? void 0 : _this$entity.data);
+	                log$2.trace("_subscribeStreams, this.entity.data=", (_this$entity = this.entity) === null || _this$entity === void 0 ? void 0 : _this$entity.data);
 	                messagesObjectName = (_this$entity2 = this.entity) === null || _this$entity2 === void 0 ? void 0 : _this$entity2.data.messages;
 	                rosterObjectName = (_this$entity3 = this.entity) === null || _this$entity3 === void 0 ? void 0 : _this$entity3.data.roster;
 	                _context.next = 8;
@@ -37818,10 +38096,10 @@ this.Twilio.Conversations = (function (exports) {
 	                _context.t0 = _context["catch"](0);
 
 	                if (this.services.syncClient.connectionState !== "disconnected") {
-	                  log$3.error("Failed to subscribe on conversation objects", this.sid, _context.t0);
+	                  log$2.error("Failed to subscribe on conversation objects", this.sid, _context.t0);
 	                }
 
-	                log$3.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context.t0);
+	                log$2.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context.t0);
 	                throw _context.t0;
 
 	              case 15:
@@ -37900,7 +38178,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	      if (status === "joined") {
 	        this._subscribeStreams().catch(function (err) {
-	          log$3.debug("ERROR while setting conversation status " + status, err);
+	          log$2.debug("ERROR while setting conversation status " + status, err);
 
 	          if (_this3.services.syncClient.connectionState !== "disconnected") {
 	            throw err;
@@ -37908,7 +38186,7 @@ this.Twilio.Conversations = (function (exports) {
 	        });
 	      } else if (this.entityPromise) {
 	        this._unsubscribe().catch(function (err) {
-	          log$3.debug("ERROR while setting conversation status " + status, err);
+	          log$2.debug("ERROR while setting conversation status " + status, err);
 
 	          if (_this3.services.syncClient.connectionState !== "disconnected") {
 	            throw err;
@@ -37936,7 +38214,7 @@ this.Twilio.Conversations = (function (exports) {
 	    function _update(update) {
 	      var _update$lastMessage, _update$lastMessage2, _this$channelState$la2, _this$channelState$la3, _this$channelState$lo;
 
-	      log$3.trace("_update", update);
+	      log$2.trace("_update", update);
 	      Conversation.preprocessUpdate(update, this.sid);
 	      var updateReasons = new Set();
 
@@ -39035,7 +39313,7 @@ this.Twilio.Conversations = (function (exports) {
 	          JSON.stringify(update.attributes);
 	        }
 	      } catch (e) {
-	        log$3.warn("Retrieved malformed attributes from the server for conversation: " + conversationSid);
+	        log$2.warn("Retrieved malformed attributes from the server for conversation: " + conversationSid);
 	        update.attributes = {};
 	      }
 
@@ -39044,7 +39322,7 @@ this.Twilio.Conversations = (function (exports) {
 	          update.dateCreated = new Date(update.dateCreated);
 	        }
 	      } catch (e) {
-	        log$3.warn("Retrieved malformed dateCreated from the server for conversation: " + conversationSid);
+	        log$2.warn("Retrieved malformed dateCreated from the server for conversation: " + conversationSid);
 	        delete update.dateCreated;
 	      }
 
@@ -39053,7 +39331,7 @@ this.Twilio.Conversations = (function (exports) {
 	          update.dateUpdated = new Date(update.dateUpdated);
 	        }
 	      } catch (e) {
-	        log$3.warn("Retrieved malformed dateUpdated from the server for conversation: " + conversationSid);
+	        log$2.warn("Retrieved malformed dateUpdated from the server for conversation: " + conversationSid);
 	        delete update.dateUpdated;
 	      }
 
@@ -39062,7 +39340,7 @@ this.Twilio.Conversations = (function (exports) {
 	          update.lastMessage.timestamp = new Date(update.lastMessage.timestamp);
 	        }
 	      } catch (e) {
-	        log$3.warn("Retrieved malformed lastMessage.timestamp from the server for conversation: " + conversationSid);
+	        log$2.warn("Retrieved malformed lastMessage.timestamp from the server for conversation: " + conversationSid);
 	        delete update.lastMessage.timestamp;
 	      }
 	    }
@@ -39185,7 +39463,7 @@ this.Twilio.Conversations = (function (exports) {
 	function _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
 	function _isNativeReflectConstruct$2() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-	var log$2 = Logger.scope("Conversations");
+	var log$1 = Logger.scope("Conversations");
 	/**
 	 * Represents conversations collection
 	 * {@see Conversation}
@@ -39315,12 +39593,12 @@ this.Twilio.Conversations = (function (exports) {
 	              case 3:
 	                map = _context2.sent;
 	                map.on("itemAdded", function (args) {
-	                  log$2.debug("itemAdded: ".concat(args.item.key));
+	                  log$1.debug("itemAdded: ".concat(args.item.key));
 
 	                  _this2._upsertConversation("sync", args.item.key, args.item.data);
 	                });
 	                map.on("itemRemoved", function (args) {
-	                  log$2.debug("itemRemoved: ".concat(args.key));
+	                  log$1.debug("itemRemoved: ".concat(args.key));
 	                  var sid = args.key;
 
 	                  if (!_this2.myConversationsFetched) {
@@ -39346,7 +39624,7 @@ this.Twilio.Conversations = (function (exports) {
 	                  conversation.emit("removed", conversation);
 	                });
 	                map.on("itemUpdated", function (args) {
-	                  log$2.debug("itemUpdated: ".concat(args.item.key));
+	                  log$1.debug("itemUpdated: ".concat(args.item.key));
 
 	                  _this2._upsertConversation("sync", args.item.key, args.item.data);
 	                });
@@ -39376,7 +39654,7 @@ this.Twilio.Conversations = (function (exports) {
 	              case 16:
 	                this.myConversationsFetched = true;
 	                this.tombstones.clear();
-	                log$2.debug("The conversations list has been successfully fetched");
+	                log$1.debug("The conversations list has been successfully fetched");
 	                return _context2.abrupt("return", this);
 
 	              case 22:
@@ -39385,10 +39663,10 @@ this.Twilio.Conversations = (function (exports) {
 	                errorMessage = "Failed to fetch the conversations list";
 
 	                if (this.services.syncClient.connectionState !== "disconnected") {
-	                  log$2.error(errorMessage, _context2.t0);
+	                  log$1.error(errorMessage, _context2.t0);
 	                }
 
-	                log$2.debug("ERROR: ".concat(errorMessage), _context2.t0);
+	                log$1.debug("ERROR: ".concat(errorMessage), _context2.t0);
 	                throw _context2.t0;
 
 	              case 28:
@@ -39677,7 +39955,7 @@ this.Twilio.Conversations = (function (exports) {
 	                  break;
 	                }
 
-	                log$2.trace("upsertConversation: conversation is known from sync and came from chat, ignoring", {
+	                log$1.trace("upsertConversation: conversation is known from sync and came from chat, ignoring", {
 	                  sid: conversation.sid,
 	                  data: data.status,
 	                  conversation: conversation.status
@@ -39767,7 +40045,7 @@ this.Twilio.Conversations = (function (exports) {
 	          while (1) {
 	            switch (_context10.prev = _context10.next) {
 	              case 0:
-	                log$2.trace("upsertConversation called for ".concat(sid), data);
+	                log$1.trace("upsertConversation called for ".concat(sid), data);
 	                conversation = this.conversations.get(sid); // If the channel is known, update it
 
 	                if (!conversation) {
@@ -39775,7 +40053,7 @@ this.Twilio.Conversations = (function (exports) {
 	                  break;
 	                }
 
-	                log$2.trace("upsertConversation: the conversation ".concat(conversation.sid, " is known;") + "its status is known from the source ".concat(conversation._statusSource(), " ") + "and the update came from the source ".concat(source), conversation);
+	                log$1.trace("upsertConversation: the conversation ".concat(conversation.sid, " is known;") + "its status is known from the source ".concat(conversation._statusSource(), " ") + "and the update came from the source ".concat(source), conversation);
 	                _context10.next = 6;
 	                return this._updateConversation(source, conversation, data);
 
@@ -39792,12 +40070,12 @@ this.Twilio.Conversations = (function (exports) {
 	                  break;
 	                }
 
-	                log$2.trace("upsertChannel: the channel is deleted but reappeared again from chat, ignoring", sid);
+	                log$1.trace("upsertChannel: the channel is deleted but reappeared again from chat, ignoring", sid);
 	                return _context10.abrupt("return", null);
 
 	              case 12:
 	                // If the conversation is unknown, fetch it
-	                log$2.trace("upsertConversation: creating a local conversation object with sid " + sid, data);
+	                log$1.trace("upsertConversation: creating a local conversation object with sid " + sid, data);
 	                baseLink = "".concat(this.configuration.links.conversations, "/").concat(sid);
 	                links = {
 	                  self: baseLink,
@@ -40222,7 +40500,7 @@ this.Twilio.Conversations = (function (exports) {
 	  return Users;
 	}(ReplayEventEmitter_1);
 
-	var log$1 = Logger.scope("TypingIndicator");
+	var log = Logger.scope("TypingIndicator");
 	/**
 	 * An important note in regards to typing timeout timers. There are two places that the SDK can get the "typing_timeout" attribute from. The first
 	 * place that the attribute appears in is the response received from POST -> /v1/typing REST call. In the body of that response, the value of the
@@ -40310,7 +40588,7 @@ this.Twilio.Conversations = (function (exports) {
 	          while (1) {
 	            switch (_context2.prev = _context2.next) {
 	              case 0:
-	                log$1.trace("Got new typing indicator ", message);
+	                log.trace("Got new typing indicator ", message);
 	                this.getConversation(message.channel_sid).then(function (conversation) {
 	                  if (!conversation) {
 	                    return;
@@ -40326,7 +40604,7 @@ this.Twilio.Conversations = (function (exports) {
 	                    participant._startTyping(timeout);
 	                  });
 	                }).catch(function (err) {
-	                  log$1.error(err);
+	                  log.error(err);
 	                  throw err;
 	                });
 
@@ -40366,7 +40644,7 @@ this.Twilio.Conversations = (function (exports) {
 	    value: function _send(conversationSid) {
 	      var _this3 = this;
 
-	      log$1.trace("Sending typing indicator");
+	      log.trace("Sending typing indicator");
 	      var url = this.configuration.links.typing;
 	      var headers = {
 	        "Content-Type": "application/x-www-form-urlencoded"
@@ -40377,7 +40655,7 @@ this.Twilio.Conversations = (function (exports) {
 	          _this3.serviceTypingTimeout = response.body.typing_timeout * 1000;
 	        }
 	      }).catch(function (err) {
-	        log$1.error("Failed to send typing indicator:", err);
+	        log.error("Failed to send typing indicator:", err);
 	        throw err;
 	      });
 	    }
@@ -40433,7 +40711,7 @@ this.Twilio.Conversations = (function (exports) {
 	  this.data = data.data || {};
 	};
 
-	var version = "2.1.0";
+	var version = "3.0.0-rc.1";
 
 	function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -40647,8 +40925,9 @@ this.Twilio.Conversations = (function (exports) {
 	function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 	var Client_1;
-	var log = Logger.scope("Client");
-	var SDK_VERSION = version;
+	/**
+	 * Client services.
+	 */
 
 	var ClientServices = function ClientServices() {
 	  _classCallCheck$4(this, ClientServices);
@@ -40664,28 +40943,246 @@ this.Twilio.Conversations = (function (exports) {
 	  var _super = _createSuper(Client);
 
 	  /**
-	   * Client connection state.
+	   * Fired when a conversation becomes visible to the client. The event is also
+	   * triggered when the client creates a new conversation.
+	   * Fired for all conversations that the client has joined.
+	   *
+	   * Parameters:
+	   * 1. {@link Conversation} `conversation` - the conversation in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the client joins a conversation.
+	   *
+	   * Parameters:
+	   * 1. {@link Conversation} `conversation` - the conversation in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the client leaves a conversation.
+	   *
+	   * Parameters:
+	   * 1. {@link Conversation} `conversation` - the conversation in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a conversation is no longer visible to the client.
+	   *
+	   * Parameters:
+	   * 1. {@link Conversation} `conversation` - the conversation in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the attributes or the metadata of a conversation have been
+	   * updated. During conversation's creation and initialization, this event
+	   * might be fired multiple times for same joined or created conversation as
+	   * new data is arriving from different sources.
+	   *
+	   * Parameters:
+	   * 1. object `data` - info object provided with the event. It has the
+	   * following properties:
+	   *     * {@link Conversation} `conversation` - the conversation in question
+	   *     * {@link ConversationUpdateReason}[] `updateReasons` - array of reasons
+	   *     for the update
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a participant has joined a conversation.
+	   *
+	   * Parameters:
+	   * 1. {@link Participant} `participant` - the participant in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a participant has left a conversation.
+	   *
+	   * Parameters:
+	   * 1. {@link Participant} `participant` - the participant in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a participant's fields have been updated.
+	   *
+	   * Parameters:
+	   * 1. object `data` - info object provided with the event. It has the
+	   * following properties:
+	   *     * {@link Participant} `participant` - the participant in question
+	   *     * {@link ParticipantUpdateReason}[] `updateReasons` - array of reasons
+	   *     for the update
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a new message has been added to the conversation on the server.
+	   *
+	   * Parameters:
+	   * 1. {@link Message} `message` - the message in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a message is removed from the message list of a conversation.
+	   *
+	   * Parameters:
+	   * 1. {@link Message} `message` - the message in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the fields of an existing message are updated with new values.
+	   *
+	   * Parameters:
+	   * 1. object `data` - info object provided with the event. It has the
+	   * following properties:
+	   *     * {@link Message} `message` - the message in question
+	   *     * {@link MessageUpdateReason}[] `updateReasons` - array of reasons for
+	   *     the update
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the token is about to expire and needs to be updated.
+	   * * Parameters:
+	   * 1. number `message` - token's time to live
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the token has expired.
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a participant has stopped typing.
+	   *
+	   * Parameters:
+	   * 1. {@link Participant} `participant` - the participant in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when a participant has started typing.
+	   *
+	   * Parameters:
+	   * 1. {@link Participant} `participant` - the participant in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the client has received (and parsed) a push notification via one
+	   * of the push channels (apn or fcm).
+	   *
+	   * Parameters:
+	   * 1. {@link PushNotification} `pushNotification` - the push notification in
+	   * question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the client has subscribed to a user.
+	   *
+	   * Parameters:
+	   * 1. {@link User} `user` - the user in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the client has unsubscribed from a user.
+	   *
+	   * Parameters:
+	   * 1. {@link User} `user` - the user in question
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the properties or the reachability status of a user have been
+	   * updated.
+	   *
+	   * Parameters:
+	   * 1. object `data` - info object provided with the event. It has the
+	   * following properties:
+	   *     * {@link User} `user` - the user in question
+	   *     * {@link UserUpdateReason}[] `updateReasons` - array of reasons for the
+	   *     update
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the state of the client has been changed.
+	   *
+	   * Parameters:
+	   * 1. object `data` - info object provided with the event. It has the
+	   * following properties:
+	   *     * {@link State} `state` - the new client state
+	   *     * Error? `error` - the initialization error if present
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the connection state of the client has been changed.
+	   *
+	   * Parameters:
+	   * 1. {@link ConnectionState} `state` - the new connection state
+	   * @event
+	   */
+
+	  /**
+	   * Fired when the connection is interrupted for an unexpected reason.
+	   *
+	   * Parameters:
+	   * 1. object `data` - info object provided with the event. It has the
+	   * following properties:
+	   *     * boolean `terminal` - Twilsock will stop connection attempts if true
+	   *     * string `message` - the error message of the root cause
+	   *     * number? `httpStatusCode` - http status code if available
+	   *     * number? `errorCode` - Twilio public error code if available
+	   * @event
 	   */
 
 	  /**
 	   * Current version of the Conversations client.
 	   */
 
+	  /**
+	   * Logger instance.
+	   */
+
+	  /**
+	   * Supported push notification channels.
+	   */
+
+	  /**
+	   * Supported push data fields.
+	   */
+
 	  /**
 	   * Current version of the Conversations client.
 	   */
 
 	  /**
-	   * Returned Conversations instance is not yet fully initialized. Calling any operations will block until it is.
-	   * Use connection events to monitor when client becomes fully available (connectionStateChanged with state
-	   * 'connected') or not available (connectionStateChange with state 'denied', event tokenExpired, event connectionError).
+	   * Client connection state.
+	   */
+
+	  /**
+	   * Returned Conversations instance is not yet fully initialized. Calling any
+	   * operations will block until it is. Use connection events to monitor when
+	   * client becomes fully available (connectionStateChanged with state
+	   * 'connected') or not available (connectionStateChange with state 'denied',
+	   * event tokenExpired, event connectionError).
 	   *
 	   * @param fpaToken Access token
 	   * @param options Options to customize the Client
 	   * @returns A not yet fully-initialized client.
 	   */
 	  function Client(fpaToken) {
-	    var _this$options$logLeve, _this$options$twilsoc, _this$options$transpo, _this$options$notific, _this$options$syncCli;
+	    var _this$_options$logLev, _this$_options$twilso, _this$_options$transp, _this$_options$notifi, _this$_options$syncCl;
 
 	    var _this;
 
@@ -40695,87 +41192,89 @@ this.Twilio.Conversations = (function (exports) {
 
 	    _this = _super.call(this);
 
-	    _defineProperty$3(_assertThisInitialized$3(_this), "connectionState", "unknown");
+	    _defineProperty$3(_assertThisInitialized$3(_this), "version", version);
 
-	    _defineProperty$3(_assertThisInitialized$3(_this), "version", SDK_VERSION);
+	    _defineProperty$3(_assertThisInitialized$3(_this), "connectionState", "unknown");
 
 	    _defineProperty$3(_assertThisInitialized$3(_this), "parsePushNotification", Client_1.parsePushNotification);
 
-	    _this.fpaToken = fpaToken !== null && fpaToken !== void 0 ? fpaToken : "";
-	    _this.options = options !== null && options !== void 0 ? options : {};
+	    _this._fpaToken = fpaToken !== null && fpaToken !== void 0 ? fpaToken : "";
+	    _this._options = options !== null && options !== void 0 ? options : {};
 
-	    if (!_this.options.disableDeepClone) {
-	      var _options = _objectSpread(_objectSpread({}, _this.options), {}, {
+	    if (!_this._options.disableDeepClone) {
+	      var _options = _objectSpread(_objectSpread({}, _this._options), {}, {
 	        transport: undefined,
 	        twilsockClient: undefined
 	      });
 
 	      _options = deepClone$1(_options);
-	      _options.transport = _this.options.transport;
-	      _options.twilsockClient = _this.options.twilsockClient;
-	      _this.options = _options;
+	      _options.transport = _this._options.transport;
+	      _options.twilsockClient = _this._options.twilsockClient;
+	      _this._options = _options;
 	    }
 
-	    _this.options.logLevel = (_this$options$logLeve = _this.options.logLevel) !== null && _this$options$logLeve !== void 0 ? _this$options$logLeve : "silent";
-	    log.setLevel(_this.options.logLevel);
-	    var productId = _this.options.productId = "ip_messaging"; // Filling ClientMetadata
+	    _this._options.logLevel = (_this$_options$logLev = _this._options.logLevel) !== null && _this$_options$logLev !== void 0 ? _this$_options$logLev : "silent";
+
+	    Client_1._logger.setLevel(_this._options.logLevel);
 
-	    _this.options.clientMetadata = _this.options.clientMetadata || {};
+	    var productId = _this._options.productId = "ip_messaging"; // Filling ClientMetadata
 
-	    if (!_this.options.clientMetadata.hasOwnProperty("type")) {
-	      _this.options.clientMetadata.type = "conversations";
+	    _this._options.clientMetadata = _this._options.clientMetadata || {};
+
+	    if (!_this._options.clientMetadata.hasOwnProperty("type")) {
+	      _this._options.clientMetadata.type = "conversations";
 	    }
 
-	    if (!_this.options.clientMetadata.hasOwnProperty("sdk")) {
-	      _this.options.clientMetadata.sdk = "JS";
-	      _this.options.clientMetadata.sdkv = SDK_VERSION;
+	    if (!_this._options.clientMetadata.hasOwnProperty("sdk")) {
+	      _this._options.clientMetadata.sdk = "JS";
+	      _this._options.clientMetadata.sdkv = version;
 	    } // Enable session local storage for Sync
 
 
-	    _this.options.Sync = _this.options.Sync || {};
+	    _this._options.Sync = _this._options.Sync || {};
 
-	    if (typeof _this.options.Sync.enableSessionStorage === "undefined") {
-	      _this.options.Sync.enableSessionStorage = true;
+	    if (typeof _this._options.Sync.enableSessionStorage === "undefined") {
+	      _this._options.Sync.enableSessionStorage = true;
 	    }
 
-	    if (_this.options.region) {
-	      _this.options.Sync.region = _this.options.region;
+	    if (_this._options.region) {
+	      _this._options.Sync.region = _this._options.region;
 	    }
 
 	    if (!fpaToken) {
 	      throw new Error("A valid Twilio token should be provided");
 	    }
 
-	    _this.services = new ClientServices();
-	    _this._myself = new User("", "", null, _this.services);
-	    var startTwilsock = !_this.options.twilsockClient; // Create default init registrations if none were provided.
+	    _this._services = new ClientServices();
+	    _this._myself = new User("", "", null, _this._services);
+	    var startTwilsock = !_this._options.twilsockClient; // Create default init registrations if none were provided.
 	    // Otherwise, the outside party have to list all the init registrations they
 	    // need.
 	    // Init registrations passed to the Conversations client will be passed down
 	    // to the Sync client as well.
 
-	    if (!_this.options.initRegistrations) {
+	    if (!_this._options.initRegistrations) {
 	      var initRegistration = new browser$3.InitRegistration(productId);
 	      Client_1.populateInitRegistrations(initRegistration);
-	      _this.options.initRegistrations = [initRegistration];
+	      _this._options.initRegistrations = [initRegistration];
 	    }
 
-	    _this.services.twilsockClient = _this.options.twilsockClient = (_this$options$twilsoc = _this.options.twilsockClient) !== null && _this$options$twilsoc !== void 0 ? _this$options$twilsoc : new browser$3.TwilsockClient(fpaToken, productId, _this.options);
+	    _this._services.twilsockClient = _this._options.twilsockClient = (_this$_options$twilso = _this._options.twilsockClient) !== null && _this$_options$twilso !== void 0 ? _this$_options$twilso : new browser$3.TwilsockClient(fpaToken, productId, _this._options);
 
-	    _this.services.twilsockClient.on("tokenAboutToExpire", function (ttl) {
+	    _this._services.twilsockClient.on("tokenAboutToExpire", function (ttl) {
 	      return _this.emit("tokenAboutToExpire", ttl);
 	    });
 
-	    _this.services.twilsockClient.on("tokenExpired", function () {
+	    _this._services.twilsockClient.on("tokenExpired", function () {
 	      return _this.emit("tokenExpired");
 	    });
 
-	    _this.services.twilsockClient.on("connectionError", function (error) {
+	    _this._services.twilsockClient.on("connectionError", function (error) {
 	      return _this.emit("connectionError", error);
 	    });
 
-	    _this.services.twilsockClient.on("stateChanged", function (state) {
-	      log.debug("Handling stateChanged for ConversationsClient: new state ".concat(state));
+	    _this._services.twilsockClient.on("stateChanged", function (state) {
+	      Client_1._logger.debug("Handling stateChanged for ConversationsClient: new state ".concat(state));
 
 	      if (state !== _this.connectionState) {
 	        _this.connectionState = state;
@@ -40784,49 +41283,52 @@ this.Twilio.Conversations = (function (exports) {
 	      }
 	    });
 
-	    _this.services.transport = _this.options.transport = (_this$options$transpo = _this.options.transport) !== null && _this$options$transpo !== void 0 ? _this$options$transpo : _this.options.twilsockClient;
-	    _this.services.notificationClient = _this.options.notificationsClient = (_this$options$notific = _this.options.notificationsClient) !== null && _this$options$notific !== void 0 ? _this$options$notific : new browser$2.Notifications(fpaToken, _this.options);
-	    _this.services.syncClient = _this.options.syncClient = (_this$options$syncCli = _this.options.syncClient) !== null && _this$options$syncCli !== void 0 ? _this$options$syncCli : new SyncClient(fpaToken, _this.options);
+	    _this._services.transport = _this._options.transport = (_this$_options$transp = _this._options.transport) !== null && _this$_options$transp !== void 0 ? _this$_options$transp : _this._options.twilsockClient;
+	    _this._services.notificationClient = _this._options.notificationsClient = (_this$_options$notifi = _this._options.notificationsClient) !== null && _this$_options$notifi !== void 0 ? _this$_options$notifi : new browser$2.Notifications(fpaToken, _this._options);
+	    _this._services.syncClient = _this._options.syncClient = (_this$_options$syncCl = _this._options.syncClient) !== null && _this$_options$syncCl !== void 0 ? _this$_options$syncCl : new SyncClient(fpaToken, _this._options);
 	    var configurationOptions = (options === null || options === void 0 ? void 0 : options.Chat) || (options === null || options === void 0 ? void 0 : options.IPMessaging) || options || {};
 	    var region = configurationOptions.region || (options === null || options === void 0 ? void 0 : options.region);
 	    var baseUrl = configurationOptions.apiUri || configurationOptions.typingUri || "https://aim.".concat(region || "us1", ".twilio.com");
-	    _this.services.commandExecutor = new CommandExecutor(baseUrl, {
-	      transport: _this.options.transport
+	    _this._services.commandExecutor = new CommandExecutor(baseUrl, {
+	      transport: _this._options.transport
 	    }, productId);
 
-	    var emitFailed = function emitFailed(err) {
-	      _this._rejectEnsureReady(err);
+	    var emitFailed = function emitFailed(error) {
+	      _this._rejectEnsureReady(error);
 
-	      _this.emit("stateChanged", "failed");
+	      _this.emit("stateChanged", {
+	        state: "failed",
+	        error: error
+	      });
 	    };
 
-	    _this.services.twilsockClient.once("connectionError", emitFailed);
+	    _this._services.twilsockClient.once("connectionError", emitFailed);
 
-	    _this.services.twilsockClient.once("disconnected", emitFailed); // ConversationsClient will be able to initialize only after twilsock is connected
+	    _this._services.twilsockClient.once("disconnected", emitFailed); // The client will be able to initialize only after Twilsock is connected
 
 
-	    _this.services.twilsockClient.once("connected", /*#__PURE__*/_asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee() {
+	    _this._services.twilsockClient.once("connected", /*#__PURE__*/_asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee() {
 	      var startupEvent;
 	      return _regeneratorRuntime$1.wrap(function _callee$(_context) {
 	        while (1) {
 	          switch (_context.prev = _context.next) {
 	            case 0:
-	              log.debug("ConversationsClient started INITIALIZING");
+	              Client_1._logger.debug("ConversationsClient started INITIALIZING");
 
-	              _this.services.twilsockClient.off("connectionError", emitFailed);
+	              _this._services.twilsockClient.off("connectionError", emitFailed);
 
-	              _this.services.twilsockClient.off("disconnected", emitFailed);
+	              _this._services.twilsockClient.off("disconnected", emitFailed);
 
 	              _context.prev = 3;
 	              startupEvent = "conversations.client.startup";
 
-	              _this.services.twilsockClient.addPartialTelemetryEvent(new browser$3.TelemetryEventDescription(startupEvent, "Conversations client startup", new Date()), startupEvent, browser$3.TelemetryPoint.Start);
+	              _this._services.twilsockClient.addPartialTelemetryEvent(new browser$3.TelemetryEventDescription(startupEvent, "Conversations client startup", new Date()), startupEvent, browser$3.TelemetryPoint.Start);
 
 	              _context.next = 8;
 	              return _this._initialize();
 
 	            case 8:
-	              _this.services.twilsockClient.addPartialTelemetryEvent(new browser$3.TelemetryEventDescription("", "", new Date()), startupEvent, browser$3.TelemetryPoint.End);
+	              _this._services.twilsockClient.addPartialTelemetryEvent(new browser$3.TelemetryEventDescription("", "", new Date()), startupEvent, browser$3.TelemetryPoint.End);
 
 	              _context.next = 15;
 	              break;
@@ -40838,7 +41340,10 @@ this.Twilio.Conversations = (function (exports) {
 	              // Fail ChatClient if initialization is incomplete
 	              _this._rejectEnsureReady(_context.t0);
 
-	              _this.emit("stateChanged", "failed");
+	              _this.emit("stateChanged", {
+	                state: "failed",
+	                error: _context.t0
+	              });
 
 	            case 15:
 	            case "end":
@@ -40856,154 +41361,77 @@ this.Twilio.Conversations = (function (exports) {
 	    }); // @todo How to process unhandled rejection here?
 
 	    if (startTwilsock) {
-	      _this.services.twilsockClient.connect();
+	      _this._services.twilsockClient.connect();
 	    }
 
 	    return _this;
 	  }
+	  /**
+	   * Information of the logged-in user. Before client initialization, returns an
+	   * uninitialized user. Will trigger a {@link Client.userUpdated} event after
+	   * initialization.
+	   */
+
 
 	  _createClass$3(Client, [{
 	    key: "user",
-	    get:
-	    /**
-	     * Information of the logged-in user. Before client initialization, returns an
-	     * uninitialized user. Will trigger a {@link Client.userUpdated} event after
-	     * initialization.
-	     */
-	    function get() {
+	    get: function get() {
 	      return this._myself;
 	    }
 	    /**
-	     * Client reachability state. Throws if accessed before the client
+	     * Client reachability state. Throws an error if accessed before the client
 	     * initialization was completed.
 	     */
 
 	  }, {
 	    key: "reachabilityEnabled",
 	    get: function get() {
-	      if (!this.configuration) {
+	      if (!this._configuration) {
 	        throw new Error("Reachability information could not yet be accessed as the client " + "has not yet been initialized. Subscribe to the 'stateChanged' event " + "to properly react to the client initialization.");
 	      }
 
-	      return this.configuration.reachabilityEnabled;
-	    }
-	  }, {
-	    key: "token",
-	    get: function get() {
-	      return this.fpaToken;
-	    }
-	  }, {
-	    key: "_subscribeToPushNotifications",
-	    value: function _subscribeToPushNotifications(channelType) {
-	      var _this2 = this;
-
-	      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
-	        _this2.services.notificationClient.subscribe(channelType, messageType);
-	      });
+	      return this._configuration.reachabilityEnabled;
 	    }
-	  }, {
-	    key: "_unsubscribeFromPushNotifications",
-	    value: function _unsubscribeFromPushNotifications(channelType) {
-	      var _this3 = this;
+	    /**
+	     * @deprecated Call constructor directly.
+	     *
+	     * Factory method to create a Conversations client instance.
+	     *
+	     * The factory method will automatically trigger connection.
+	     * Do not use it if you need finer-grained control.
+	     *
+	     * Since this method returns an already-initialized client, some of the events
+	     * will be lost because they happen *before* the initialization. It is
+	     * recommended that `client.onWithReplay` is used as opposed to `client.on`
+	     * for subscribing to client events. The `client.onWithReplay` will re-emit
+	     * the most recent value for a given event if it emitted before the
+	     * subscription.
+	     *
+	     * @param token Access token.
+	     * @param options Options to customize the client.
+	     * @returns Returns a fully initialized client.
+	     */
 
-	      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
-	        _this3.services.notificationClient.unsubscribe(channelType, messageType);
-	      });
-	    }
 	  }, {
-	    key: "_initialize",
-	    value: function () {
-	      var _initialize2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee2() {
-	        var _this4 = this;
-
-	        var configurationResponse;
+	    key: "shutdown",
+	    value:
+	    /**
+	     * Gracefully shut down the client.
+	     */
+	    function () {
+	      var _shutdown = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee2() {
 	        return _regeneratorRuntime$1.wrap(function _callee2$(_context2) {
 	          while (1) {
 	            switch (_context2.prev = _context2.next) {
 	              case 0:
 	                _context2.next = 2;
-	                return this.services.commandExecutor.fetchResource("Client/v2/Configuration");
+	                return this._ensureReady;
 
 	              case 2:
-	                configurationResponse = _context2.sent;
-	                this.configuration = new Configuration$1(this.options, configurationResponse, log);
-
-	                this._myself._resolveInitialization(this.configuration, this.configuration.userIdentity, this.configuration.userInfo, true);
-
-	                this.services.typingIndicator = new TypingIndicator(this.getConversationBySid.bind(this), this.configuration, this.services);
-	                this.services.network = new Network(this.configuration, this.services);
-	                this.services.users = new Users(this._myself, this.configuration, this.services);
-	                this.services.users.on("userSubscribed", function (user) {
-	                  _this4.emit("userSubscribed", user);
-	                });
-	                this.services.users.on("userUpdated", function (args) {
-	                  return _this4.emit("userUpdated", args);
-	                });
-	                this.services.users.on("userUnsubscribed", function (user) {
-	                  _this4.emit("userUnsubscribed", user);
-	                });
-	                this.conversations = new Conversations(this.configuration, this.services);
-	                this.conversations.on("conversationAdded", function (conversation) {
-	                  _this4.emit("conversationAdded", conversation);
-	                });
-	                this.conversations.on("conversationRemoved", function (conversation) {
-	                  _this4.emit("conversationRemoved", conversation);
-	                });
-	                this.conversations.on("conversationJoined", function (conversation) {
-	                  _this4.emit("conversationJoined", conversation);
-	                });
-	                this.conversations.on("conversationLeft", function (conversation) {
-	                  _this4.emit("conversationLeft", conversation);
-	                });
-	                this.conversations.on("conversationUpdated", function (args) {
-	                  return _this4.emit("conversationUpdated", args);
-	                });
-	                this.conversations.on("participantJoined", function (participant) {
-	                  _this4.emit("participantJoined", participant);
-	                });
-	                this.conversations.on("participantLeft", function (participant) {
-	                  _this4.emit("participantLeft", participant);
-	                });
-	                this.conversations.on("participantUpdated", function (args) {
-	                  return _this4.emit("participantUpdated", args);
-	                });
-	                this.conversations.on("messageAdded", function (message) {
-	                  return _this4.emit("messageAdded", message);
-	                });
-	                this.conversations.on("messageUpdated", function (args) {
-	                  return _this4.emit("messageUpdated", args);
-	                });
-	                this.conversations.on("messageRemoved", function (message) {
-	                  return _this4.emit("messageRemoved", message);
-	                });
-	                this.conversations.on("typingStarted", function (participant) {
-	                  return _this4.emit("typingStarted", participant);
-	                });
-	                this.conversations.on("typingEnded", function (participant) {
-	                  return _this4.emit("typingEnded", participant);
-	                });
-	                this.conversationsPromise = this.conversations.fetchConversations().then(function () {
-	                  return _this4.conversations;
-	                }).catch(function (error) {
-	                  throw error;
-	                });
-	                _context2.next = 28;
-	                return this.services.users.myself._ensureFetched();
-
-	              case 28:
-	                Client_1.supportedPushChannels.forEach(function (channelType) {
-	                  return _this4._subscribeToPushNotifications(channelType);
-	                });
-	                this.services.typingIndicator.initialize();
-	                this.services.mcsClient = new browser.McsClient(this.fpaToken, this.configuration.links.mediaService, this.configuration.links.mediaSetService, _objectSpread(_objectSpread({}, this.options), {}, {
-	                  transport: undefined
-	                }));
-
-	                this._resolveEnsureReady();
-
-	                this.emit("stateChanged", "initialized");
+	                _context2.next = 4;
+	                return this._services.twilsockClient.disconnect();
 
-	              case 33:
+	              case 4:
 	              case "end":
 	                return _context2.stop();
 	            }
@@ -41011,20 +41439,21 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee2, this);
 	      }));
 
-	      function _initialize() {
-	        return _initialize2.apply(this, arguments);
+	      function shutdown() {
+	        return _shutdown.apply(this, arguments);
 	      }
 
-	      return _initialize;
+	      return shutdown;
 	    }()
 	    /**
-	     * Gracefully shut down the client.
+	     * Update the token used by the client and re-register with the Conversations services.
+	     * @param token New access token.
 	     */
 
 	  }, {
-	    key: "shutdown",
+	    key: "updateToken",
 	    value: function () {
-	      var _shutdown = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee3() {
+	      var _updateToken = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee3(token) {
 	        return _regeneratorRuntime$1.wrap(function _callee3$(_context3) {
 	          while (1) {
 	            switch (_context3.prev = _context3.next) {
@@ -41033,10 +41462,32 @@ this.Twilio.Conversations = (function (exports) {
 	                return this._ensureReady;
 
 	              case 2:
-	                _context3.next = 4;
-	                return this.services.twilsockClient.disconnect();
+	                Client_1._logger.info("updateToken");
 
-	              case 4:
+	                if (!(this._fpaToken === token)) {
+	                  _context3.next = 5;
+	                  break;
+	                }
+
+	                return _context3.abrupt("return", this);
+
+	              case 5:
+	                _context3.next = 7;
+	                return this._services.twilsockClient.updateToken(token);
+
+	              case 7:
+	                _context3.next = 9;
+	                return this._services.notificationClient.updateToken(token);
+
+	              case 9:
+	                _context3.next = 11;
+	                return this._services.mcsClient.updateToken(token);
+
+	              case 11:
+	                this._fpaToken = token;
+	                return _context3.abrupt("return", this);
+
+	              case 13:
 	              case "end":
 	                return _context3.stop();
 	            }
@@ -41044,21 +41495,22 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee3, this);
 	      }));
 
-	      function shutdown() {
-	        return _shutdown.apply(this, arguments);
+	      function updateToken(_x) {
+	        return _updateToken.apply(this, arguments);
 	      }
 
-	      return shutdown;
+	      return updateToken;
 	    }()
 	    /**
-	     * Update the token used by the client and re-register with the Conversations services.
-	     * @param token New access token.
+	     * Get a known conversation by its SID.
+	     * @param conversationSid Conversation sid
 	     */
 
 	  }, {
-	    key: "updateToken",
+	    key: "getConversationBySid",
 	    value: function () {
-	      var _updateToken = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee4(token) {
+	      var _getConversationBySid = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee4(conversationSid) {
+	        var conversation;
 	        return _regeneratorRuntime$1.wrap(function _callee4$(_context4) {
 	          while (1) {
 	            switch (_context4.prev = _context4.next) {
@@ -41067,32 +41519,27 @@ this.Twilio.Conversations = (function (exports) {
 	                return this._ensureReady;
 
 	              case 2:
-	                log.info("updateToken");
+	                _context4.next = 4;
+	                return this._conversations.myConversationsRead.promise;
 
-	                if (!(this.fpaToken === token)) {
-	                  _context4.next = 5;
-	                  break;
-	                }
+	              case 4:
+	                _context4.next = 6;
+	                return this._conversations.getConversation(conversationSid);
 
-	                return _context4.abrupt("return", this);
+	              case 6:
+	                conversation = _context4.sent;
 
-	              case 5:
-	                _context4.next = 7;
-	                return this.services.twilsockClient.updateToken(token);
+	                if (conversation) {
+	                  _context4.next = 9;
+	                  break;
+	                }
 
-	              case 7:
-	                _context4.next = 9;
-	                return this.services.notificationClient.updateToken(token);
+	                throw new Error("Conversation with SID ".concat(conversationSid, " is not found."));
 
 	              case 9:
-	                _context4.next = 11;
-	                return this.services.mcsClient.updateToken(token);
-
-	              case 11:
-	                this.fpaToken = token;
-	                return _context4.abrupt("return", this);
+	                return _context4.abrupt("return", conversation);
 
-	              case 13:
+	              case 10:
 	              case "end":
 	                return _context4.stop();
 	            }
@@ -41100,21 +41547,22 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee4, this);
 	      }));
 
-	      function updateToken(_x) {
-	        return _updateToken.apply(this, arguments);
+	      function getConversationBySid(_x2) {
+	        return _getConversationBySid.apply(this, arguments);
 	      }
 
-	      return updateToken;
+	      return getConversationBySid;
 	    }()
 	    /**
-	     * Get a known conversation by its SID.
+	     * Peek a conversation by its SID.
 	     * @param conversationSid Conversation sid
+	     * @internal
 	     */
 
 	  }, {
-	    key: "getConversationBySid",
+	    key: "peekConversationBySid",
 	    value: function () {
-	      var _getConversationBySid = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee5(conversationSid) {
+	      var _peekConversationBySid = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee5(conversationSid) {
 	        var conversation;
 	        return _regeneratorRuntime$1.wrap(function _callee5$(_context5) {
 	          while (1) {
@@ -41125,38 +41573,22 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 2:
 	                _context5.next = 4;
-	                return this.conversations.myConversationsRead.promise;
+	                return this._conversations.peekConversation(conversationSid);
 
 	              case 4:
-	                _context5.next = 6;
-	                return this.conversations.getConversation(conversationSid);
-
-	              case 6:
-	                conversation = _context5.sent;
-
-	                if (conversation) {
-	                  _context5.next = 11;
-	                  break;
-	                }
-
-	                _context5.next = 10;
-	                return this.conversations.peekConversation(conversationSid);
-
-	              case 10:
 	                conversation = _context5.sent;
 
-	              case 11:
 	                if (conversation) {
-	                  _context5.next = 13;
+	                  _context5.next = 7;
 	                  break;
 	                }
 
 	                throw new Error("Conversation with SID ".concat(conversationSid, " is not found."));
 
-	              case 13:
+	              case 7:
 	                return _context5.abrupt("return", conversation);
 
-	              case 14:
+	              case 8:
 	              case "end":
 	                return _context5.stop();
 	            }
@@ -41164,11 +41596,11 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee5, this);
 	      }));
 
-	      function getConversationBySid(_x2) {
-	        return _getConversationBySid.apply(this, arguments);
+	      function peekConversationBySid(_x3) {
+	        return _peekConversationBySid.apply(this, arguments);
 	      }
 
-	      return getConversationBySid;
+	      return peekConversationBySid;
 	    }()
 	    /**
 	     * Get a known conversation by its unique identifier name.
@@ -41189,11 +41621,11 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 2:
 	                _context6.next = 4;
-	                return this.conversations.myConversationsRead.promise;
+	                return this._conversations.myConversationsRead.promise;
 
 	              case 4:
 	                _context6.next = 6;
-	                return this.conversations.getConversationByUniqueName(uniqueName);
+	                return this._conversations.getConversationByUniqueName(uniqueName);
 
 	              case 6:
 	                conversation = _context6.sent;
@@ -41216,7 +41648,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee6, this);
 	      }));
 
-	      function getConversationByUniqueName(_x3) {
+	      function getConversationByUniqueName(_x4) {
 	        return _getConversationByUniqueName.apply(this, arguments);
 	      }
 
@@ -41238,7 +41670,7 @@ this.Twilio.Conversations = (function (exports) {
 	                return this._ensureReady;
 
 	              case 2:
-	                return _context7.abrupt("return", this.conversationsPromise.then(function (conversations) {
+	                return _context7.abrupt("return", this._conversationsPromise.then(function (conversations) {
 	                  return conversations.getConversations();
 	                }));
 
@@ -41275,7 +41707,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 2:
 	                options = options || {};
-	                return _context8.abrupt("return", this.conversationsPromise.then(function (conversationsEntity) {
+	                return _context8.abrupt("return", this._conversationsPromise.then(function (conversationsEntity) {
 	                  return conversationsEntity.addConversation(options);
 	                }));
 
@@ -41287,7 +41719,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee8, this);
 	      }));
 
-	      function createConversation(_x4) {
+	      function createConversation(_x5) {
 	        return _createConversation.apply(this, arguments);
 	      }
 
@@ -41296,7 +41728,8 @@ this.Twilio.Conversations = (function (exports) {
 	    /**
 	     * Register for push notifications.
 	     * @param channelType Channel type.
-	     * @param registrationId Push notification ID provided by the FCM/APNS service on the platform.
+	     * @param registrationId Push notification ID provided by the FCM/APNS service
+	     * on the platform.
 	     */
 
 	  }, {
@@ -41313,9 +41746,10 @@ this.Twilio.Conversations = (function (exports) {
 	              case 2:
 	                this._subscribeToPushNotifications(channelType);
 
-	                this.services.notificationClient.setPushRegistrationId(channelType, registrationId);
+	                this._services.notificationClient.setPushRegistrationId(channelType, registrationId);
+
 	                _context9.next = 6;
-	                return this.services.notificationClient.commitChanges();
+	                return this._services.notificationClient.commitChanges();
 
 	              case 6:
 	              case "end":
@@ -41325,7 +41759,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee9, this);
 	      }));
 
-	      function setPushRegistrationId(_x5, _x6) {
+	      function setPushRegistrationId(_x6, _x7) {
 	        return _setPushRegistrationId.apply(this, arguments);
 	      }
 
@@ -41352,7 +41786,7 @@ this.Twilio.Conversations = (function (exports) {
 	                this._unsubscribeFromPushNotifications(channelType);
 
 	                _context10.next = 5;
-	                return this.services.notificationClient.commitChanges();
+	                return this._services.notificationClient.commitChanges();
 
 	              case 5:
 	              case "end":
@@ -41362,7 +41796,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee10, this);
 	      }));
 
-	      function unsetPushRegistrationId(_x7) {
+	      function unsetPushRegistrationId(_x8) {
 	        return _unsetPushRegistrationId.apply(this, arguments);
 	      }
 
@@ -41372,11 +41806,14 @@ this.Twilio.Conversations = (function (exports) {
 	     * Clear existing registrations directly using provided device token.
 	     * This is useful to ensure stopped subscriptions without resubscribing.
 	     *
-	     * This function goes completely beside the state machine and removes all registrations.
-	     * Use with caution: if it races with current state machine operations, madness will ensue.
+	     * This function goes completely beside the state machine and removes all
+	     * registrations.
+	     * Use with caution: if it races with current state machine operations,
+	     * madness will ensue.
 	     *
 	     * @param channelType Channel type.
-	     * @param registrationId Push notification ID provided by the FCM/APNS service on the platform.
+	     * @param registrationId Push notification ID provided by the FCM/APNS service
+	     * on the platform.
 	     */
 
 	  }, {
@@ -41388,7 +41825,7 @@ this.Twilio.Conversations = (function (exports) {
 	            switch (_context11.prev = _context11.next) {
 	              case 0:
 	                _context11.next = 2;
-	                return this.services.notificationClient.removeRegistrations(channelType, registrationId);
+	                return this._services.notificationClient.removeRegistrations(channelType, registrationId);
 
 	              case 2:
 	              case "end":
@@ -41398,17 +41835,22 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee11, this);
 	      }));
 
-	      function removePushRegistrations(_x8, _x9) {
+	      function removePushRegistrations(_x9, _x10) {
 	        return _removePushRegistrations.apply(this, arguments);
 	      }
 
 	      return removePushRegistrations;
 	    }()
+	    /**
+	     * Current version of the Conversations client.
+	     */
+
 	  }, {
 	    key: "handlePushNotification",
 	    value:
 	    /**
-	     * Handle push notification payload parsing and emit the {@link Client.pushNotification} event on this {@link Client} instance.
+	     * Handle push notification payload parsing and emit the
+	     * {@link Client.pushNotification} event on this {@link Client} instance.
 	     * @param notificationPayload Push notification payload
 	     */
 	    function () {
@@ -41421,7 +41863,8 @@ this.Twilio.Conversations = (function (exports) {
 	                return this._ensureReady;
 
 	              case 2:
-	                log.debug("handlePushNotification, notificationPayload=", notificationPayload);
+	                Client_1._logger.debug("handlePushNotification, notificationPayload=", notificationPayload);
+
 	                this.emit("pushNotification", Client_1.parsePushNotification(notificationPayload));
 
 	              case 4:
@@ -41432,14 +41875,15 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee12, this);
 	      }));
 
-	      function handlePushNotification(_x10) {
+	      function handlePushNotification(_x11) {
 	        return _handlePushNotification.apply(this, arguments);
 	      }
 
 	      return handlePushNotification;
 	    }()
 	    /**
-	     * Gets a user with the given identity. If it's in the subscribed list, then return the user object from it;
+	     * Gets a user with the given identity. If it's in the subscribed list, then
+	     * return the user object from it;
 	     * if not, then subscribe and add user to the subscribed list.
 	     * @param identity Identity of the user.
 	     * @returns A fully initialized user.
@@ -41457,7 +41901,7 @@ this.Twilio.Conversations = (function (exports) {
 	                return this._ensureReady;
 
 	              case 2:
-	                return _context13.abrupt("return", this.services.users.getUser(identity));
+	                return _context13.abrupt("return", this._services.users.getUser(identity));
 
 	              case 3:
 	              case "end":
@@ -41467,7 +41911,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee13, this);
 	      }));
 
-	      function getUser(_x11) {
+	      function getUser(_x12) {
 	        return _getUser.apply(this, arguments);
 	      }
 
@@ -41489,7 +41933,7 @@ this.Twilio.Conversations = (function (exports) {
 	                return this._ensureReady;
 
 	              case 2:
-	                return _context14.abrupt("return", this.services.users.getSubscribedUsers());
+	                return _context14.abrupt("return", this._services.users.getSubscribedUsers());
 
 	              case 3:
 	              case "end":
@@ -41505,52 +41949,254 @@ this.Twilio.Conversations = (function (exports) {
 
 	      return getSubscribedUsers;
 	    }()
-	  }], [{
-	    key: "populateInitRegistrations",
-	    value: function populateInitRegistrations(reg) {
-	      reg.populateInitRegistrations([NotificationTypes.TYPING_INDICATOR]);
-	      SyncClient.populateInitRegistrations(reg);
+	    /**
+	     * Get content URLs for all media attachments in the given set of media sids
+	     * using a single operation.
+	     * @param mediaSids Set of media sids to query for the content URL.
+	     */
+
+	  }, {
+	    key: "getTemporaryContentUrlsForMediaSids",
+	    value: function getTemporaryContentUrlsForMediaSids(mediaSids) {
+	      var _this2 = this;
+
+	      return new browser.CancellablePromise( /*#__PURE__*/function () {
+	        var _ref2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee15(resolve, reject, onCancel) {
+	          var request, urls;
+	          return _regeneratorRuntime$1.wrap(function _callee15$(_context15) {
+	            while (1) {
+	              switch (_context15.prev = _context15.next) {
+	                case 0:
+	                  if (!(!_this2._services.mcsClient || !mediaSids)) {
+	                    _context15.next = 3;
+	                    break;
+	                  }
+
+	                  reject(new Error("Media Content Service is unavailable"));
+	                  return _context15.abrupt("return");
+
+	                case 3:
+	                  request = _this2._services.mcsClient.mediaSetGetContentUrls(mediaSids);
+	                  onCancel(function () {
+	                    request.cancel();
+	                  });
+	                  _context15.prev = 5;
+	                  _context15.next = 8;
+	                  return request;
+
+	                case 8:
+	                  urls = _context15.sent;
+	                  resolve(urls);
+	                  _context15.next = 15;
+	                  break;
+
+	                case 12:
+	                  _context15.prev = 12;
+	                  _context15.t0 = _context15["catch"](5);
+	                  reject(_context15.t0);
+
+	                case 15:
+	                case "end":
+	                  return _context15.stop();
+	              }
+	            }
+	          }, _callee15, null, [[5, 12]]);
+	        }));
+
+	        return function (_x13, _x14, _x15) {
+	          return _ref2.apply(this, arguments);
+	        };
+	      }());
 	    }
 	    /**
-	     * Fired when a conversation becomes visible to the client. The event is also triggered when the client creates a new conversation.
-	     * Fired for all conversations client has joined.
-	     *
-	     * Parameters:
-	     * 1. {@link Conversation} `conversation` - the conversation in question
-	     * @event
+	     * Get content URLs for all media attachments in the given set using a single
+	     * operation.
+	     * @param contentSet Set of media attachments to query content URLs.
 	     */
 
 	  }, {
-	    key: "create",
-	    value:
+	    key: "getTemporaryContentUrlsForMedia",
+	    value: function getTemporaryContentUrlsForMedia(contentSet) {
+	      // We ignore existing mcsMedia members of each of the media entries.
+	      // Instead, we just collect their sids and pull new descriptors from a
+	      // mediaSet GET endpoint.
+	      var sids = contentSet.map(function (m) {
+	        return m.sid;
+	      });
+	      return this.getTemporaryContentUrlsForMediaSids(sids);
+	    }
 	    /**
-	     * @deprecated Call constructor directly.
-	     *
-	     * Factory method to create a Conversations client instance.
-	     *
-	     * The factory method will automatically trigger connection.
-	     * Do not use it if you need finer-grained control.
-	     *
-	     * Since this method returns an already-initialized client, some of the events
-	     * will be lost because they happen *before* the initialization. It is
-	     * recommended that `client.onWithReplay` is used as opposed to `client.on`
-	     * for subscribing to client events. The `client.onWithReplay` will re-emit
-	     * the most recent value for a given event if it emitted before the
-	     * subscription.
-	     *
-	     * @param token Access token.
-	     * @param options Options to customize the client.
-	     * @returns Returns a fully initialized client.
+	     * Initialize the client.
 	     */
-	    function () {
-	      var _create = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee15(token, options) {
+
+	  }, {
+	    key: "_initialize",
+	    value: function () {
+	      var _initialize2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee16() {
+	        var _this3 = this;
+
+	        var configurationResponse;
+	        return _regeneratorRuntime$1.wrap(function _callee16$(_context16) {
+	          while (1) {
+	            switch (_context16.prev = _context16.next) {
+	              case 0:
+	                _context16.next = 2;
+	                return this._services.commandExecutor.fetchResource("Client/v2/Configuration");
+
+	              case 2:
+	                configurationResponse = _context16.sent;
+	                this._configuration = new Configuration$1(this._options, configurationResponse, Client_1._logger);
+
+	                this._myself._resolveInitialization(this._configuration, this._configuration.userIdentity, this._configuration.userInfo, true);
+
+	                this._services.typingIndicator = new TypingIndicator(this.getConversationBySid.bind(this), this._configuration, this._services);
+	                this._services.network = new Network(this._configuration, this._services);
+	                this._services.users = new Users(this._myself, this._configuration, this._services);
+
+	                this._services.users.on("userSubscribed", function (user) {
+	                  _this3.emit("userSubscribed", user);
+	                });
+
+	                this._services.users.on("userUpdated", function (args) {
+	                  return _this3.emit("userUpdated", args);
+	                });
+
+	                this._services.users.on("userUnsubscribed", function (user) {
+	                  _this3.emit("userUnsubscribed", user);
+	                });
+
+	                this._conversations = new Conversations(this._configuration, this._services);
+
+	                this._conversations.on("conversationAdded", function (conversation) {
+	                  _this3.emit("conversationAdded", conversation);
+	                });
+
+	                this._conversations.on("conversationRemoved", function (conversation) {
+	                  _this3.emit("conversationRemoved", conversation);
+	                });
+
+	                this._conversations.on("conversationJoined", function (conversation) {
+	                  _this3.emit("conversationJoined", conversation);
+	                });
+
+	                this._conversations.on("conversationLeft", function (conversation) {
+	                  _this3.emit("conversationLeft", conversation);
+	                });
+
+	                this._conversations.on("conversationUpdated", function (args) {
+	                  return _this3.emit("conversationUpdated", args);
+	                });
+
+	                this._conversations.on("participantJoined", function (participant) {
+	                  _this3.emit("participantJoined", participant);
+	                });
+
+	                this._conversations.on("participantLeft", function (participant) {
+	                  _this3.emit("participantLeft", participant);
+	                });
+
+	                this._conversations.on("participantUpdated", function (args) {
+	                  return _this3.emit("participantUpdated", args);
+	                });
+
+	                this._conversations.on("messageAdded", function (message) {
+	                  return _this3.emit("messageAdded", message);
+	                });
+
+	                this._conversations.on("messageUpdated", function (args) {
+	                  return _this3.emit("messageUpdated", args);
+	                });
+
+	                this._conversations.on("messageRemoved", function (message) {
+	                  return _this3.emit("messageRemoved", message);
+	                });
+
+	                this._conversations.on("typingStarted", function (participant) {
+	                  return _this3.emit("typingStarted", participant);
+	                });
+
+	                this._conversations.on("typingEnded", function (participant) {
+	                  return _this3.emit("typingEnded", participant);
+	                });
+
+	                this._conversationsPromise = this._conversations.fetchConversations().then(function () {
+	                  return _this3._conversations;
+	                }).catch(function (error) {
+	                  throw error;
+	                });
+	                _context16.next = 28;
+	                return this._services.users.myself._ensureFetched();
+
+	              case 28:
+	                Client_1._supportedPushChannels.forEach(function (channelType) {
+	                  return _this3._subscribeToPushNotifications(channelType);
+	                });
+
+	                this._services.typingIndicator.initialize();
+
+	                this._services.mcsClient = new browser.McsClient(this._fpaToken, this._configuration.links.mediaService, this._configuration.links.mediaSetService, _objectSpread(_objectSpread({}, this._options), {}, {
+	                  transport: undefined
+	                }));
+
+	                this._resolveEnsureReady();
+
+	                this.emit("stateChanged", {
+	                  state: "initialized"
+	                });
+
+	              case 33:
+	              case "end":
+	                return _context16.stop();
+	            }
+	          }
+	        }, _callee16, this);
+	      }));
+
+	      function _initialize() {
+	        return _initialize2.apply(this, arguments);
+	      }
+
+	      return _initialize;
+	    }()
+	    /**
+	     * Subscribe to push notifications.
+	     * @param channelType The channel type to subscribe to.
+	     */
+
+	  }, {
+	    key: "_subscribeToPushNotifications",
+	    value: function _subscribeToPushNotifications(channelType) {
+	      var _this4 = this;
+
+	      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
+	        _this4._services.notificationClient.subscribe(channelType, messageType);
+	      });
+	    }
+	    /**
+	     * Unsubscribe from push notifications.
+	     * @param channelType The channel type to unsubscribe from.
+	     */
+
+	  }, {
+	    key: "_unsubscribeFromPushNotifications",
+	    value: function _unsubscribeFromPushNotifications(channelType) {
+	      var _this5 = this;
+
+	      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
+	        _this5._services.notificationClient.unsubscribe(channelType, messageType);
+	      });
+	    }
+	  }], [{
+	    key: "create",
+	    value: function () {
+	      var _create = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee17(token, options) {
 	        var client;
-	        return _regeneratorRuntime$1.wrap(function _callee15$(_context15) {
+	        return _regeneratorRuntime$1.wrap(function _callee17$(_context17) {
 	          while (1) {
-	            switch (_context15.prev = _context15.next) {
+	            switch (_context17.prev = _context17.next) {
 	              case 0:
 	                if (!(options !== null && options !== void 0 && options.twilsockClient)) {
-	                  _context15.next = 2;
+	                  _context17.next = 2;
 	                  break;
 	                }
 
@@ -41558,64 +42204,45 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 2:
 	                client = new Client_1(token, options);
-	                _context15.next = 5;
+	                _context17.next = 5;
 	                return client._ensureReady;
 
 	              case 5:
-	                return _context15.abrupt("return", client);
+	                return _context17.abrupt("return", client);
 
 	              case 6:
 	              case "end":
-	                return _context15.stop();
+	                return _context17.stop();
 	            }
 	          }
-	        }, _callee15);
+	        }, _callee17);
 	      }));
 
-	      function create(_x12, _x13) {
+	      function create(_x16, _x17) {
 	        return _create.apply(this, arguments);
 	      }
 
 	      return create;
 	    }()
-	  }, {
-	    key: "parsePushNotificationChatData",
-	    value: function parsePushNotificationChatData(data) {
-	      var result = {};
-
-	      for (var key in Client_1.supportedPushDataFields) {
-	        if (typeof data[key] === "undefined" || data[key] === null) {
-	          continue;
-	        }
-
-	        if (key !== "message_index") {
-	          result[Client_1.supportedPushDataFields[key]] = data[key];
-	          continue;
-	        }
-
-	        if (parseToNumber(data[key]) !== null) {
-	          result[Client_1.supportedPushDataFields[key]] = Number(data[key]);
-	        }
-	      }
-
-	      return result;
-	    }
 	    /**
-	     * Static method for push notification payload parsing. Returns parsed push as a {@link PushNotification} object.
+	     * Static method for push notification payload parsing. Returns parsed push as
+	     * a {@link PushNotification} object.
 	     * @param notificationPayload Push notification payload.
 	     */
 
 	  }, {
 	    key: "parsePushNotification",
 	    value: function parsePushNotification(notificationPayload) {
-	      log.debug("parsePushNotification, notificationPayload=", notificationPayload); // APNS specifics
+	      Client_1._logger.debug("parsePushNotification, notificationPayload=", notificationPayload); // APNS specifics
+
 
 	      if (typeof notificationPayload.aps !== "undefined") {
 	        if (!notificationPayload.twi_message_type) {
 	          throw new Error("Provided push notification payload does not contain Programmable Chat push notification type");
 	        }
 
-	        var data = Client_1.parsePushNotificationChatData(notificationPayload);
+	        var data = Client_1._parsePushNotificationChatData(notificationPayload);
+
 	        var apsPayload = notificationPayload.aps;
 	        var body;
 	        var title = null;
@@ -41646,7 +42273,7 @@ this.Twilio.Conversations = (function (exports) {
 	          throw new Error("Provided push notification payload does not contain Programmable Chat push notification type");
 	        }
 
-	        var _data = Client_1.parsePushNotificationChatData(notificationPayload.data);
+	        var _data = Client_1._parsePushNotificationChatData(notificationPayload.data);
 
 	        return new PushNotification({
 	          title: dataPayload.twi_title || null,
@@ -41661,19 +42288,80 @@ this.Twilio.Conversations = (function (exports) {
 
 	      throw new Error("Provided push notification payload is not Programmable Chat notification");
 	    }
+	    /**
+	     * Static method for parsing push notification chat data.
+	     * @param data Data to parse
+	     */
+
+	  }, {
+	    key: "_parsePushNotificationChatData",
+	    value: function _parsePushNotificationChatData(data) {
+	      var result = {};
+
+	      for (var key in Client_1._supportedPushDataFields) {
+	        var value = data[key];
+
+	        if (typeof value === "undefined" || value === null) {
+	          continue;
+	        }
+
+	        if (key === "message_index" || key === "media_count") {
+	          var number = parseToNumber(value);
+
+	          if (number !== null) {
+	            result[Client_1._supportedPushDataFields[key]] = number;
+	          }
+
+	          continue;
+	        }
+
+	        if (key === "media") {
+	          if (typeof value === "string") {
+	            try {
+	              result[Client_1._supportedPushDataFields[key]] = JSON.parse(value);
+	            } catch (_unused) {
+	              Client_1._logger.debug("Media message notification parsing error");
+	            }
+	          }
+
+	          continue;
+	        }
+
+	        result[Client_1._supportedPushDataFields[key]] = value;
+	      }
+
+	      return result;
+	    }
+	    /**
+	     * Populate the client with init registrations.
+	     * @param reg The init registration to populate.
+	     */
+
+	  }, {
+	    key: "populateInitRegistrations",
+	    value: function populateInitRegistrations(reg) {
+	      reg.populateInitRegistrations([NotificationTypes.TYPING_INDICATOR]);
+	      SyncClient.populateInitRegistrations(reg);
+	    }
 	  }]);
 
 	  return Client;
-	}(ReplayEventEmitter_1), _defineProperty$3(_class, "version", SDK_VERSION), _defineProperty$3(_class, "supportedPushChannels", ["fcm", "apn"]), _defineProperty$3(_class, "supportedPushDataFields", {
+	}(ReplayEventEmitter_1), _defineProperty$3(_class, "conversationAdded", "conversationAdded"), _defineProperty$3(_class, "conversationJoined", "conversationJoined"), _defineProperty$3(_class, "conversationLeft", "conversationLeft"), _defineProperty$3(_class, "conversationRemoved", "conversationRemoved"), _defineProperty$3(_class, "conversationUpdated", "conversationUpdated"), _defineProperty$3(_class, "participantJoined", "participantJoined"), _defineProperty$3(_class, "participantLeft", "participantLeft"), _defineProperty$3(_class, "participantUpdated", "participantUpdated"), _defineProperty$3(_class, "messageAdded", "messageAdded"), _defineProperty$3(_class, "messageRemoved", "messageRemoved"), _defineProperty$3(_class, "messageUpdated", "messageUpdated"), _defineProperty$3(_class, "tokenAboutToExpire", "tokenAboutToExpire"), _defineProperty$3(_class, "tokenExpired", "tokenExpired"), _defineProperty$3(_class, "typingEnded", "typingEnded"), _defineProperty$3(_class, "typingStarted", "typingStarted"), _defineProperty$3(_class, "pushNotification", "pushNotification"), _defineProperty$3(_class, "userSubscribed", "userSubscribed"), _defineProperty$3(_class, "userUnsubscribed", "userUnsubscribed"), _defineProperty$3(_class, "userUpdated", "userUpdated"), _defineProperty$3(_class, "stateChanged", "stateChanged"), _defineProperty$3(_class, "connectionStateChanged", "connectionStateChanged"), _defineProperty$3(_class, "connectionError", "connectionError"), _defineProperty$3(_class, "version", version), _defineProperty$3(_class, "_logger", Logger.scope("Client")), _defineProperty$3(_class, "_supportedPushChannels", ["fcm", "apn"]), _defineProperty$3(_class, "_supportedPushDataFields", {
 	  conversation_sid: "conversationSid",
+	  conversation_title: "conversationTitle",
 	  message_sid: "messageSid",
-	  message_index: "messageIndex"
-	}), _defineProperty$3(_class, "conversationAdded", "conversationAdded"), _defineProperty$3(_class, "conversationJoined", "conversationJoined"), _defineProperty$3(_class, "conversationLeft", "conversationLeft"), _defineProperty$3(_class, "conversationRemoved", "conversationRemoved"), _defineProperty$3(_class, "conversationUpdated", "conversationUpdated"), _defineProperty$3(_class, "participantJoined", "participantJoined"), _defineProperty$3(_class, "participantLeft", "participantLeft"), _defineProperty$3(_class, "participantUpdated", "participantUpdated"), _defineProperty$3(_class, "messageAdded", "messageAdded"), _defineProperty$3(_class, "messageRemoved", "messageRemoved"), _defineProperty$3(_class, "messageUpdated", "messageUpdated"), _defineProperty$3(_class, "tokenAboutToExpire", "tokenAboutToExpire"), _defineProperty$3(_class, "tokenExpired", "tokenExpired"), _defineProperty$3(_class, "typingEnded", "typingEnded"), _defineProperty$3(_class, "typingStarted", "typingStarted"), _defineProperty$3(_class, "pushNotification", "pushNotification"), _defineProperty$3(_class, "userSubscribed", "userSubscribed"), _defineProperty$3(_class, "userUnsubscribed", "userUnsubscribed"), _defineProperty$3(_class, "userUpdated", "userUpdated"), _defineProperty$3(_class, "stateChanged", "stateChanged"), _defineProperty$3(_class, "connectionStateChanged", "connectionStateChanged"), _defineProperty$3(_class, "connectionError", "connectionError"), _temp);
+	  message_index: "messageIndex",
+	  media_count: "mediaCount",
+	  media: "media" // object
+
+	}), _temp);
 
 	__decorate$1([validateTypesAsync_1(nonEmptyString_1), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], exports.Client.prototype, "updateToken", null);
 
 	__decorate$1([validateTypesAsync_1(nonEmptyString_1), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], exports.Client.prototype, "getConversationBySid", null);
 
+	__decorate$1([validateTypesAsync_1(nonEmptyString_1), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], exports.Client.prototype, "peekConversationBySid", null);
+
 	__decorate$1([validateTypesAsync_1(nonEmptyString_1), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], exports.Client.prototype, "getConversationByUniqueName", null);
 
 	__decorate$1([validateTypesAsync_1(["undefined", objectSchema_1("conversation options", {