Improve description texts
Merge branch 'dev' into blob_upload