work on #961 (CDN images)