Merge pull request #13124 from eileenmcnaughton/export_fgb