Merge pull request #2247 from ivmai/match-ext-libgc-api