Merge change 4595 into donut

* changes:
  Reactivating test that failed with a extensive gref count increase