Merge change 6098 into donut

* changes:
  Commented out invalid test.