Merge pull request #7772 from jkotas/gcinfo-cleanup