Merge remote-tracking branch 'origin/feature/6707_remove_proxy'
Merge remote-tracking branch 'origin/feature/6176_upload_scripts'
Hide auto update column

re #6935
Merge branch 'feature/6935_hide_autoupdate' into develop