case 4354 - Fix various notices, web upload tab.
Merge branch 'case-4354' into development