handle broken images
Merge branch 'release/4.1.28'