speed up Gsf
Merge pull request #4438 from VinInn/GsfSpeedup

Speed up GSF