Merge change 6307 into donut

* changes:
  Fixes a compatibility issue with users that have the old TTS installed already.