Merge pull request #2935 from kumpera/new-gc-test