Review and merge pull request 1009#1012

AlexImb wants to merge 2 commits intomasterelninotech/uppload:masterfrom

cursor/review-and-merge-pull-request-1009-7a2belninotech/uppload:cursor/review-and-merge-pull-request-1009-7a2bCopy head branch name to clipboard