Merge branch 'master' into wip_leon_T7754_fix_download_upload_for_admin