fix for GG not loading images
(cherry-picked from 0561373)
Merge remote-tracking branch 'origin/release-147' into release-147