Merge pull request #5934 from Maoni0/gcwhere