URL upload (Part 1)
Merge origin/master
haykkyureghyan
URL Upload (part 2)