bug #24281
Merge remote-tracking branch 'origin/24281_map_popup_thumbnails' into develop