Merge change 8707

* changes:
  Fix mangling to translate dollar signs.