am 3bef2909: Merge change 4595 into donut

Merge commit '3bef2909f1f0e8ea57e9934494b0ff8b7ecd8656'

* commit '3bef2909f1f0e8ea57e9934494b0ff8b7ecd8656':
  Reactivating test that failed with a extensive gref count increase