Merge pull request #23832 from pzygielo/gfbuild

Fixed nightly and weekly builds which use gfbuild.sh