Added GF to main channel.
Corrected package order
Corrected order (again)
Merge pull request #2630 from saludes/master

Added GF