Merge branch 'refs/heads/53'

# Conflicts: # admin/src/LogsPage.ts # admin/src/OptionsPage.ts # frontend/src/icons.ts # frontend/src/upload.ts # package-lock.json # package.json # shared/dialogs.ts # src/api.get_file_list.ts # src/api.monitor.ts # src/cross.ts # src/upload.ts # src/util-os.ts # tests/config.yaml