Merge "Fix webp&gif issue" into devel/master