[core] optimize of uploading by drop HTML or URL text
Merge branch '2.1' into 2.1_n