Merge change 6880 into donut

* changes:
  Fixing TTS breakage.