Fix to the GFI upload
Merge branch 'hotfix-2.3.10' into develop