Wrong thumbnails URLs are returned by ImagesService
Merge branch 'bugid-96310' into dev