BZ-11757 fixed multiple download
Merge remote-tracking branch 'origin/master'