Merge "Fix for warning in ForeignAPIFile when no thumbnails"