Fixed: Displayed root folder path getting truncated when adding an author with a long name

Bump version to 0.4.16
Pass messages with arguments to NLog in LoggerExtensions
2026-03-12 15:29:59 -04:00 · 2025-05-01 13:53:47 +03:00 · 2025-04-20 09:01:31 +03:00 · 2025-04-13 13:17:00 +03:00 · 2025-04-13 12:55:42 +03:00 · 2025-04-13 12:55:42 +03:00
217 changed files with 6946 additions and 4739 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -120,6 +120,7 @@ _artifacts
 _rawPackage/
 _dotTrace*
 _tests/
+_temp*
 *.Result.xml
 coverage*.xml
 coverage*.json
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,18 +9,18 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '0.4.0'
+  majorVersion: '0.4.16'
  minorVersion: $[counter('minorVersion', 1)]
  readarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(readarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.424'
+  dotnetVersion: '6.0.427'
  nodeVersion: '20.X'
  innoVersion: '6.2.0'
  windowsImage: 'windows-2022'
-  linuxImage: 'ubuntu-20.04'
-  macImage: 'macOS-12'
+  linuxImage: 'ubuntu-22.04'
+  macImage: 'macOS-13'

 trigger:
  branches:
@@ -1102,19 +1102,19 @@ stages:
        vmImage: ${{ variables.windowsImage }}
      steps:
      - checkout: self # Need history for Sonar analysis
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@3
        env:
          SONAR_SCANNER_OPTS: ''
        inputs:
          SonarCloud: 'SonarCloud'
          organization: 'readarr'
-          scannerMode: 'CLI'
+          scannerMode: 'cli'
          configMode: 'manual'
          cliProjectKey: 'readarrui'
          cliProjectName: 'ReadarrUI'
          cliProjectVersion: '$(readarrVersion)'
          cliSources: './frontend'
-      - task: SonarCloudAnalyze@2
+      - task: SonarCloudAnalyze@3

    - job: Api_Docs
      displayName: API Docs
@@ -1190,12 +1190,12 @@ stages:
        submodules: true
      - powershell: Set-Service SCardSvr -StartupType Manual
        displayName: Enable Windows Test Service
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@3
        condition: eq(variables['System.PullRequest.IsFork'], 'False')
        inputs:
          SonarCloud: 'SonarCloud'
          organization: 'readarr'
-          scannerMode: 'MSBuild'
+          scannerMode: 'dotnet'
          projectKey: 'Readarr_Readarr'
          projectName: 'Readarr'
          projectVersion: '$(readarrVersion)'
@@ -1208,10 +1208,10 @@ stages:
          ./build.sh --backend -f net6.0 -r win-x64
          TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
        displayName: Coverage Unit Tests
-      - task: SonarCloudAnalyze@2
+      - task: SonarCloudAnalyze@3
        condition: eq(variables['System.PullRequest.IsFork'], 'False')
        displayName: Publish SonarCloud Results
-      - task: reportgenerator@5
+      - task: reportgenerator@5.3.11
        displayName: Generate Coverage Report
        inputs:
          reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml'
--- a/frontend/.vscode/settings.json
+++ b/frontend/.vscode/settings.json
@@ -9,7 +9,7 @@

  "editor.formatOnSave": false,
  "editor.codeActionsOnSave": {
-    "source.fixAll": true
+    "source.fixAll": "explicit"
  },

  "typescript.preferences.quoteStyle": "single",
--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@@ -26,6 +26,7 @@ module.exports = (env) => {
  const config = {
    mode: isProduction ? 'production' : 'development',
    devtool: isProduction ? 'source-map' : 'eval-source-map',
+    target: 'web',

    stats: {
      children: false
@@ -67,7 +68,7 @@ module.exports = (env) => {
    output: {
      path: distFolder,
      publicPath: '/',
-      filename: '[name]-[contenthash].js',
+      filename: isProduction ? '[name]-[contenthash].js' : '[name].js',
      sourceMapFilename: '[file].map'
    },

@@ -92,7 +93,7 @@ module.exports = (env) => {

      new MiniCssExtractPlugin({
        filename: 'Content/styles.css',
-        chunkFilename: 'Content/[id]-[chunkhash].css'
+        chunkFilename: isProduction ? 'Content/[id]-[chunkhash].css' : 'Content/[id].css'
      }),

      new HtmlWebpackPlugin({
@@ -181,7 +182,7 @@ module.exports = (env) => {
                      loose: true,
                      debug: false,
                      useBuiltIns: 'entry',
-                      corejs: 3
+                      corejs: '3.39'
                    }
                  ]
                ]
@@ -202,7 +203,7 @@ module.exports = (env) => {
              options: {
                importLoaders: 1,
                modules: {
-                  localIdentName: '[name]/[local]/[hash:base64:5]'
+                  localIdentName: isProduction ? '[name]/[local]/[hash:base64:5]' : '[name]/[local]'
                }
              }
            },
--- a/frontend/src/Activity/History/Details/HistoryDetails.js
+++ b/frontend/src/Activity/History/Details/HistoryDetails.js
@@ -165,7 +165,8 @@ function HistoryDetails(props) {

  if (eventType === 'downloadFailed') {
    const {
-      message
+      message,
+      indexer
    } = data;

    return (
@@ -177,11 +178,21 @@ function HistoryDetails(props) {
        />

        {
-          !!message &&
+          indexer ?
+            <DescriptionListItem
+              title={translate('Indexer')}
+              data={indexer}
+            /> :
+            null
+        }
+
+        {
+          message ?
            <DescriptionListItem
              title={translate('Message')}
              data={message}
-            />
+            /> :
+            null
        }
      </DescriptionList>
    );
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -32,7 +32,7 @@ import LogsTableConnector from 'System/Events/LogsTableConnector';
 import Logs from 'System/Logs/Logs';
 import Status from 'System/Status/Status';
 import Tasks from 'System/Tasks/Tasks';
-import UpdatesConnector from 'System/Updates/UpdatesConnector';
+import Updates from 'System/Updates/Updates';
 import UnmappedFilesTableConnector from 'UnmappedFiles/UnmappedFilesTableConnector';
 import getPathWithUrlBase from 'Utilities/getPathWithUrlBase';
 import CutoffUnmetConnector from 'Wanted/CutoffUnmet/CutoffUnmetConnector';
@@ -247,7 +247,7 @@ function AppRoutes(props) {

      <Route
        path="/system/updates"
-        component={UpdatesConnector}
+        component={Updates}
      />

      <Route
--- a/frontend/src/App/State/AppState.ts
+++ b/frontend/src/App/State/AppState.ts
@@ -1,6 +1,7 @@
 import AuthorsAppState from './AuthorsAppState';
 import CommandAppState from './CommandAppState';
 import SettingsAppState from './SettingsAppState';
+import SystemAppState from './SystemAppState';
 import TagsAppState from './TagsAppState';

 interface FilterBuilderPropOption {
@@ -35,10 +36,24 @@ export interface CustomFilter {
  filers: PropertyFilter[];
 }

+export interface AppSectionState {
+  isConnected: boolean;
+  isReconnecting: boolean;
+  version: string;
+  prevVersion?: string;
+  dimensions: {
+    isSmallScreen: boolean;
+    width: number;
+    height: number;
+  };
+}
+
 interface AppState {
+  app: AppSectionState;
  authors: AuthorsAppState;
  commands: CommandAppState;
  settings: SettingsAppState;
+  system: SystemAppState;
  tags: TagsAppState;
 }

--- a/frontend/src/App/State/SettingsAppState.ts
+++ b/frontend/src/App/State/SettingsAppState.ts
@@ -1,5 +1,6 @@
 import AppSectionState, {
  AppSectionDeleteState,
+  AppSectionItemState,
  AppSectionSaveState,
 } from 'App/State/AppSectionState';
 import DownloadClient from 'typings/DownloadClient';
@@ -7,13 +8,16 @@ import ImportList from 'typings/ImportList';
 import Indexer from 'typings/Indexer';
 import IndexerFlag from 'typings/IndexerFlag';
 import Notification from 'typings/Notification';
-import { UiSettings } from 'typings/UiSettings';
+import General from 'typings/Settings/General';
+import UiSettings from 'typings/Settings/UiSettings';

 export interface DownloadClientAppState
  extends AppSectionState<DownloadClient>,
    AppSectionDeleteState,
    AppSectionSaveState {}

+export type GeneralAppState = AppSectionItemState<General>;
+
 export interface ImportListAppState
  extends AppSectionState<ImportList>,
    AppSectionDeleteState,
@@ -33,11 +37,12 @@ export type UiSettingsAppState = AppSectionState<UiSettings>;

 interface SettingsAppState {
  downloadClients: DownloadClientAppState;
+  general: GeneralAppState;
  importLists: ImportListAppState;
  indexerFlags: IndexerFlagSettingsAppState;
  indexers: IndexerAppState;
  notifications: NotificationAppState;
-  uiSettings: UiSettingsAppState;
+  ui: UiSettingsAppState;
 }

 export default SettingsAppState;
--- a/frontend/src/App/State/SystemAppState.ts
+++ b/frontend/src/App/State/SystemAppState.ts
@@ -0,0 +1,13 @@
+import SystemStatus from 'typings/SystemStatus';
+import Update from 'typings/Update';
+import AppSectionState, { AppSectionItemState } from './AppSectionState';
+
+export type SystemStatusAppState = AppSectionItemState<SystemStatus>;
+export type UpdateAppState = AppSectionState<Update>;
+
+interface SystemAppState {
+  updates: UpdateAppState;
+  status: SystemStatusAppState;
+}
+
+export default SystemAppState;
--- a/frontend/src/Author/Author.ts
+++ b/frontend/src/Author/Author.ts
@@ -1,5 +1,7 @@
 import ModelBase from 'App/ModelBase';

+export type AuthorStatus = 'continuing' | 'ended';
+
 interface Author extends ModelBase {
  added: string;
  genres: string[];
@@ -10,6 +12,7 @@ interface Author extends ModelBase {
  metadataProfileId: number;
  rootFolderPath: string;
  sortName: string;
+  status: AuthorStatus;
  tags: number[];
  authorName: string;
  isSaving?: boolean;
--- a/frontend/src/Author/AuthorStatus.ts
+++ b/frontend/src/Author/AuthorStatus.ts
@@ -0,0 +1,21 @@
+import { AuthorStatus } from 'Author/Author';
+import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+
+export function getAuthorStatusDetails(status: AuthorStatus) {
+  let statusDetails = {
+    icon: icons.AUTHOR_CONTINUING,
+    title: translate('StatusEndedContinuing'),
+    message: translate('ContinuingMoreBooksAreExpected'),
+  };
+
+  if (status === 'ended') {
+    statusDetails = {
+      icon: icons.AUTHOR_ENDED,
+      title: translate('StatusEndedEnded'),
+      message: translate('ContinuingNoAdditionalBooksAreExpected'),
+    };
+  }
+
+  return statusDetails;
+}
--- a/frontend/src/Author/Details/AuthorDetails.js
+++ b/frontend/src/Author/Details/AuthorDetails.js
@@ -7,6 +7,7 @@ import AuthorHistoryTable from 'Author/History/AuthorHistoryTable';
 import MonitoringOptionsModal from 'Author/MonitoringOptions/MonitoringOptionsModal';
 import BookEditorFooter from 'Book/Editor/BookEditorFooter';
 import BookFileEditorTable from 'BookFile/Editor/BookFileEditorTable';
+import Alert from 'Components/Alert';
 import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -17,7 +18,7 @@ import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import SwipeHeaderConnector from 'Components/Swipe/SwipeHeaderConnector';
-import { align, icons } from 'Helpers/Props';
+import { align, icons, kinds } from 'Helpers/Props';
 import InteractiveSearchFilterMenuConnector from 'InteractiveSearch/InteractiveSearchFilterMenuConnector';
 import InteractiveSearchTable from 'InteractiveSearch/InteractiveSearchTable';
 import OrganizePreviewModalConnector from 'Organize/OrganizePreviewModalConnector';
@@ -412,22 +413,25 @@ class AuthorDetails extends Component {

          <div className={styles.contentContainer}>
            {
-              !isPopulated && !booksError && !bookFilesError &&
-                <LoadingIndicator />
+              !isPopulated && !booksError && !bookFilesError ?
+                <LoadingIndicator /> :
+                null
            }

            {
-              !isFetching && booksError &&
-                <div>
+              !isFetching && booksError ?
+                <Alert kind={kinds.DANGER}>
                  {translate('LoadingBooksFailed')}
-                </div>
+                </Alert> :
+                null
            }

            {
-              !isFetching && bookFilesError &&
-                <div>
+              !isFetching && bookFilesError ?
+                <Alert kind={kinds.DANGER}>
                  {translate('LoadingBookFilesFailed')}
-                </div>
+                </Alert> :
+                null
            }

            {
--- a/frontend/src/Author/Details/AuthorDetailsHeader.js
+++ b/frontend/src/Author/Details/AuthorDetailsHeader.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import TextTruncate from 'react-text-truncate';
 import AuthorPoster from 'Author/AuthorPoster';
+import { getAuthorStatusDetails } from 'Author/AuthorStatus';
 import HeartRating from 'Components/HeartRating';
 import Icon from 'Components/Icon';
 import Label from 'Components/Label';
@@ -11,7 +12,7 @@ import MonitorToggleButton from 'Components/MonitorToggleButton';
 import Popover from 'Components/Tooltip/Popover';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
-import QualityProfileNameConnector from 'Settings/Profiles/Quality/QualityProfileNameConnector';
+import QualityProfileName from 'Settings/Profiles/Quality/QualityProfileName';
 import fonts from 'Styles/Variables/fonts';
 import formatBytes from 'Utilities/Number/formatBytes';
 import stripHtml from 'Utilities/String/stripHtml';
@@ -87,11 +88,11 @@ class AuthorDetailsHeader extends Component {
      titleWidth
    } = this.state;

+    const statusDetails = getAuthorStatusDetails(status);
+
    const fanartUrl = getFanartUrl(images);
    const marqueeWidth = titleWidth - (isSmallScreen ? 85 : 160);

-    const continuing = status === 'continuing';
-
    let bookFilesCountMessage = translate('BookFilesCountMessage');

    if (bookFileCount === 1) {
@@ -213,7 +214,7 @@ class AuthorDetailsHeader extends Component {

                <span className={styles.qualityProfileName}>
                  {
-                    <QualityProfileNameConnector
+                    <QualityProfileName
                      qualityProfileId={qualityProfileId}
                    />
                  }
@@ -236,16 +237,16 @@ class AuthorDetailsHeader extends Component {

              <Label
                className={styles.detailsLabel}
-                title={continuing ? translate('ContinuingMoreBooksAreExpected') : translate('ContinuingNoAdditionalBooksAreExpected')}
+                title={statusDetails.message}
                size={sizes.LARGE}
              >
                <Icon
-                  name={continuing ? icons.AUTHOR_CONTINUING : icons.AUTHOR_ENDED}
+                  name={statusDetails.icon}
                  size={17}
                />

                <span className={styles.qualityProfileName}>
-                  {continuing ? 'Continuing' : 'Deceased'}
+                  {statusDetails.title}
                </span>
              </Label>

--- a/frontend/src/Author/Index/Overview/AuthorIndexOverviewInfo.js
+++ b/frontend/src/Author/Index/Overview/AuthorIndexOverviewInfo.js
@@ -5,6 +5,7 @@ import dimensions from 'Styles/Variables/dimensions';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
 import AuthorIndexOverviewInfoRow from './AuthorIndexOverviewInfoRow';
 import styles from './AuthorIndexOverviewInfo.css';

@@ -76,9 +77,9 @@ function getInfoRowProps(row, props) {
    };
  }

-  if (name === 'qualityProfileId') {
+  if (name === 'qualityProfileId' && !!props.qualityProfile?.name) {
    return {
-      title: 'Quality Profile',
+      title: translate('QualityProfile'),
      iconName: icons.PROFILE,
      label: props.qualityProfile.name
    };
--- a/frontend/src/Author/Index/Posters/AuthorIndexPoster.js
+++ b/frontend/src/Author/Index/Posters/AuthorIndexPoster.js
@@ -235,12 +235,12 @@ class AuthorIndexPoster extends Component {
              </div>
          }

-          {
-            showQualityProfile &&
-              <div className={styles.title}>
-                {qualityProfile.name}
-              </div>
-          }
+          {showQualityProfile && !!qualityProfile?.name ? (
+            <div className={styles.title} title={translate('QualityProfile')}>
+              {qualityProfile.name}
+            </div>
+          ) : null}
+
          {
            nextAiring &&
              <div className={styles.nextAiring}>
--- a/frontend/src/Author/Index/Table/AuthorIndexRow.js
+++ b/frontend/src/Author/Index/Table/AuthorIndexRow.js
@@ -209,7 +209,7 @@ class AuthorIndexRow extends Component {
                  key={name}
                  className={styles[name]}
                >
-                  {qualityProfile.name}
+                  {qualityProfile?.name ?? ''}
                </VirtualTableRowCell>
              );
            }
@@ -220,7 +220,7 @@ class AuthorIndexRow extends Component {
                  key={name}
                  className={styles[name]}
                >
-                  {metadataProfile.name}
+                  {metadataProfile?.name ?? ''}
                </VirtualTableRowCell>
              );
            }
--- a/frontend/src/Author/Index/Table/AuthorStatusCell.js
+++ b/frontend/src/Author/Index/Table/AuthorStatusCell.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import { getAuthorStatusDetails } from 'Author/AuthorStatus';
 import Icon from 'Components/Icon';
 import VirtualTableRowCell from 'Components/Table/Cells/TableRowCell';
 import { icons } from 'Helpers/Props';
@@ -15,6 +16,8 @@ function AuthorStatusCell(props) {
    ...otherProps
  } = props;

+  const statusDetails = getAuthorStatusDetails(status);
+
  return (
    <Component
      className={className}
@@ -28,8 +31,8 @@ function AuthorStatusCell(props) {

      <Icon
        className={styles.statusIcon}
-        name={status === 'ended' ? icons.AUTHOR_ENDED : icons.AUTHOR_CONTINUING}
-        title={status === 'ended' ? translate('StatusEndedDeceased') : translate('StatusEndedContinuing')}
+        name={statusDetails.icon}
+        title={`${statusDetails.title}: ${statusDetails.message}`}
      />
    </Component>
  );
--- a/frontend/src/Author/NoAuthor.js
+++ b/frontend/src/Author/NoAuthor.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
 import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './NoAuthor.css';

 function NoAuthor(props) {
@@ -31,7 +32,7 @@ function NoAuthor(props) {
          to="/settings/mediamanagement"
          kind={kinds.PRIMARY}
        >
-          Add Root Folder
+          {translate('AddRootFolder')}
        </Button>
      </div>

@@ -40,7 +41,7 @@ function NoAuthor(props) {
          to="/add/search"
          kind={kinds.PRIMARY}
        >
-          Add New Author
+          {translate('AddNewAuthor')}
        </Button>
      </div>
    </div>
--- a/frontend/src/Book/Index/Overview/BookIndexOverviewInfo.js
+++ b/frontend/src/Book/Index/Overview/BookIndexOverviewInfo.js
@@ -5,6 +5,7 @@ import dimensions from 'Styles/Variables/dimensions';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
 import BookIndexOverviewInfoRow from './BookIndexOverviewInfoRow';
 import styles from './BookIndexOverviewInfo.css';

@@ -71,9 +72,9 @@ function getInfoRowProps(row, props) {
    };
  }

-  if (name === 'qualityProfileId') {
+  if (name === 'qualityProfileId' && !!props.qualityProfile?.name) {
    return {
-      title: 'Quality Profile',
+      title: translate('QualityProfile'),
      iconName: icons.PROFILE,
      label: props.qualityProfile.name
    };
--- a/frontend/src/Book/Index/Posters/BookIndexPoster.js
+++ b/frontend/src/Book/Index/Posters/BookIndexPoster.js
@@ -250,12 +250,12 @@ class BookIndexPoster extends Component {
              </div>
          }

-          {
-            showQualityProfile &&
-              <div className={styles.title}>
-                {qualityProfile.name}
-              </div>
-          }
+          {showQualityProfile && !!qualityProfile?.name ? (
+            <div className={styles.title} title={translate('QualityProfile')}>
+              {qualityProfile.name}
+            </div>
+          ) : null}
+
          {
            nextAiring &&
              <div className={styles.nextAiring}>
--- a/frontend/src/Book/Index/Table/BookIndexRow.js
+++ b/frontend/src/Book/Index/Table/BookIndexRow.js
@@ -195,7 +195,7 @@ class BookIndexRow extends Component {
                  key={name}
                  className={styles[name]}
                >
-                  {qualityProfile.name}
+                  {qualityProfile?.name ?? ''}
                </VirtualTableRowCell>
              );
            }
--- a/frontend/src/Bookshelf/BookshelfRow.js
+++ b/frontend/src/Bookshelf/BookshelfRow.js
@@ -1,12 +1,11 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import AuthorNameLink from 'Author/AuthorNameLink';
+import { getAuthorStatusDetails } from 'Author/AuthorStatus';
 import Icon from 'Components/Icon';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
 import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
 import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell';
-import { icons } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import BookshelfBook from './BookshelfBook';
 import styles from './BookshelfRow.css';

@@ -30,6 +29,8 @@ class BookshelfRow extends Component {
      onBookMonitoredPress
    } = this.props;

+    const statusDetails = getAuthorStatusDetails(status);
+
    return (
      <>
        <VirtualTableSelectCell
@@ -52,8 +53,8 @@ class BookshelfRow extends Component {
        <VirtualTableRowCell className={styles.status}>
          <Icon
            className={styles.statusIcon}
-            name={status === 'ended' ? icons.AUTHOR_ENDED : icons.AUTHOR_CONTINUING}
-            title={status === 'ended' ? translate('StatusEndedEnded') : translate('StatusEndedContinuing')}
+            name={statusDetails.icon}
+            title={statusDetails.title}
          />
        </VirtualTableRowCell>

--- a/frontend/src/Components/Form/EnhancedSelectInput.js
+++ b/frontend/src/Components/Form/EnhancedSelectInput.js
@@ -20,6 +20,8 @@ import HintedSelectInputSelectedValue from './HintedSelectInputSelectedValue';
 import TextInput from './TextInput';
 import styles from './EnhancedSelectInput.css';

+const MINIMUM_DISTANCE_FROM_EDGE = 10;
+
 function isArrowKey(keyCode) {
  return keyCode === keyCodes.UP_ARROW || keyCode === keyCodes.DOWN_ARROW;
 }
@@ -137,18 +139,9 @@ class EnhancedSelectInput extends Component {
  // Listeners

  onComputeMaxHeight = (data) => {
-    const {
-      top,
-      bottom
-    } = data.offsets.reference;
-
    const windowHeight = window.innerHeight;

-    if ((/^botton/).test(data.placement)) {
-      data.styles.maxHeight = windowHeight - bottom;
-    } else {
-      data.styles.maxHeight = top;
-    }
+    data.styles.maxHeight = windowHeight - MINIMUM_DISTANCE_FROM_EDGE;

    return data;
  };
@@ -457,6 +450,10 @@ class EnhancedSelectInput extends Component {
                  order: 851,
                  enabled: true,
                  fn: this.onComputeMaxHeight
+                },
+                preventOverflow: {
+                  enabled: true,
+                  boundariesElement: 'viewport'
                }
              }}
            >
--- a/frontend/src/Components/Form/RootFolderSelectInputConnector.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputConnector.js
@@ -28,8 +28,7 @@ function createMapStateToProps() {
      if (includeNoChange) {
        values.unshift({
          key: 'noChange',
-          value: '',
-          name: translate('NoChange'),
+          value: translate('NoChange'),
          isDisabled: includeNoChangeDisabled,
          isMissing: false
        });
@@ -39,7 +38,6 @@ function createMapStateToProps() {
        values.push({
          key: '',
          value: '',
-          name: '',
          isDisabled: true,
          isHidden: true
        });
@@ -56,8 +54,7 @@ function createMapStateToProps() {

      values.push({
        key: ADD_NEW_KEY,
-        value: '',
-        name: 'Add a new path'
+        value: 'Add a new path'
      });

      return {
@@ -105,6 +102,27 @@ class RootFolderSelectInputConnector extends Component {
    }
  }

+  componentDidUpdate(prevProps) {
+    const {
+      name,
+      value,
+      values,
+      onChange
+    } = this.props;
+
+    if (prevProps.values === values) {
+      return;
+    }
+
+    if (!value && values.length && values.some((v) => !!v.key && v.key !== ADD_NEW_KEY)) {
+      const defaultValue = values[0];
+
+      if (defaultValue.key !== ADD_NEW_KEY) {
+        onChange({ name, value: defaultValue.key });
+      }
+    }
+  }
+
  //
  // Render

--- a/frontend/src/Components/Form/RootFolderSelectInputOption.css
+++ b/frontend/src/Components/Form/RootFolderSelectInputOption.css
@@ -13,6 +13,15 @@
  }
 }

+.value {
+  display: flex;
+}
+
+.authorFolder {
+  flex: 0 0 auto;
+  color: var(--disabledColor);
+}
+
 .freeSpace {
  margin-left: 15px;
  color: var(--darkGray);
--- a/frontend/src/Components/Form/RootFolderSelectInputOption.css.d.ts
+++ b/frontend/src/Components/Form/RootFolderSelectInputOption.css.d.ts
@@ -1,10 +1,12 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'authorFolder': string;
  'freeSpace': string;
  'isMissing': string;
  'isMobile': string;
  'optionText': string;
+  'value': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
--- a/frontend/src/Components/Form/RootFolderSelectInputOption.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputOption.js
@@ -7,18 +7,24 @@ import styles from './RootFolderSelectInputOption.css';

 function RootFolderSelectInputOption(props) {
  const {
+    id,
    value,
    name,
    freeSpace,
+    authorFolder,
    isMissing,
    isMobile,
+    isWindows,
    ...otherProps
  } = props;

-  const text = value === '' ? name : `${name} [${value}]`;
+  const slashCharacter = isWindows ? '\\' : '/';
+
+  const text = name === '' ? value : `[${name}] ${value}`;

  return (
    <EnhancedSelectInputOption
+      id={id}
      isMobile={isMobile}
      {...otherProps}
    >
@@ -27,7 +33,18 @@ function RootFolderSelectInputOption(props) {
        isMobile && styles.isMobile
      )}
      >
-        <div>{text}</div>
+        <div className={styles.value}>
+          {text}
+
+          {
+            authorFolder && id !== 'addNew' ?
+              <div className={styles.authorFolder}>
+                {slashCharacter}
+                {authorFolder}
+              </div> :
+              null
+          }
+        </div>

        {
          freeSpace == null ?
@@ -50,11 +67,18 @@ function RootFolderSelectInputOption(props) {
 }

 RootFolderSelectInputOption.propTypes = {
+  id: PropTypes.string.isRequired,
  name: PropTypes.string.isRequired,
  value: PropTypes.string.isRequired,
  freeSpace: PropTypes.number,
+  authorFolder: PropTypes.string,
  isMissing: PropTypes.bool,
-  isMobile: PropTypes.bool.isRequired
+  isMobile: PropTypes.bool.isRequired,
+  isWindows: PropTypes.bool
+};
+
+RootFolderSelectInputOption.defaultProps = {
+  name: ''
 };

 export default RootFolderSelectInputOption;
--- a/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.css
+++ b/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.css
@@ -7,12 +7,22 @@
  overflow: hidden;
 }

-.path {
+.pathContainer {
  @add-mixin truncate;
-
+  display: flex;
  flex: 1 0 0;
 }

+.path {
+  flex: 0 1 auto;
+}
+
+.authorFolder {
+  @add-mixin truncate;
+  flex: 0 1 auto;
+  color: var(--disabledColor);
+}
+
 .freeSpace {
  flex: 0 0 auto;
  margin-left: 15px;
--- a/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.css.d.ts
+++ b/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.css.d.ts
@@ -1,8 +1,10 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'authorFolder': string;
  'freeSpace': string;
  'path': string;
+  'pathContainer': string;
  'selectedValue': string;
 }
 export const cssExports: CssExports;
--- a/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.js
@@ -9,19 +9,34 @@ function RootFolderSelectInputSelectedValue(props) {
    name,
    value,
    freeSpace,
+    authorFolder,
    includeFreeSpace,
+    isWindows,
    ...otherProps
  } = props;

-  const text = value === '' ? name : `${name} [${value}]`;
+  const slashCharacter = isWindows ? '\\' : '/';
+
+  const text = name === '' ? value : `[${name}] ${value}`;

  return (
    <EnhancedSelectInputSelectedValue
      className={styles.selectedValue}
      {...otherProps}
    >
-      <div className={styles.path}>
-        {text}
+      <div className={styles.pathContainer}>
+        <div className={styles.path}>
+          {text}
+        </div>
+
+        {
+          authorFolder ?
+            <div className={styles.authorFolder}>
+              {slashCharacter}
+              {authorFolder}
+            </div> :
+            null
+        }
      </div>

      {
@@ -38,10 +53,13 @@ RootFolderSelectInputSelectedValue.propTypes = {
  name: PropTypes.string,
  value: PropTypes.string,
  freeSpace: PropTypes.number,
+  authorFolder: PropTypes.string,
+  isWindows: PropTypes.bool,
  includeFreeSpace: PropTypes.bool.isRequired
 };

 RootFolderSelectInputSelectedValue.defaultProps = {
+  name: '',
  includeFreeSpace: true
 };

--- a/frontend/src/Components/Form/SelectInput.js
+++ b/frontend/src/Components/Form/SelectInput.js
@@ -52,6 +52,7 @@ class SelectInput extends Component {
            const {
              key,
              value: optionValue,
+              isDisabled: optionIsDisabled = false,
              ...otherOptionProps
            } = option;

@@ -59,6 +60,7 @@ class SelectInput extends Component {
              <option
                key={key}
                value={key}
+                disabled={optionIsDisabled}
                {...otherOptionProps}
              >
                {typeof optionValue === 'function' ? optionValue() : optionValue}
--- a/frontend/src/Components/Modal/Modal.css
+++ b/frontend/src/Components/Modal/Modal.css
@@ -83,13 +83,6 @@
 }

@media only screen and (max-width: $breakpointMedium) {
-  .modal.small,
-  .modal.medium {
-    width: 90%;
-  }
-}
-
-@media only screen and (max-width: $breakpointSmall) {
  .modalContainer {
    position: fixed;
  }
--- a/frontend/src/Components/MonitorToggleButton.css
+++ b/frontend/src/Components/MonitorToggleButton.css
@@ -3,9 +3,9 @@

  padding: 0;
  font-size: inherit;
-}

-.isDisabled {
-  color: var(--disabledColor);
-  cursor: not-allowed;
+  &.isDisabled {
+    color: var(--disabledColor);
+    cursor: not-allowed;
+  }
 }
--- a/frontend/src/Components/Table/Cells/TableRowCell.css
+++ b/frontend/src/Components/Table/Cells/TableRowCell.css
@@ -4,7 +4,7 @@
  line-height: 1.52857143;
 }

-@media only screen and (max-width: $breakpointSmall) {
+@media only screen and (max-width: $breakpointMedium) {
  .cell {
    white-space: nowrap;
  }
--- a/frontend/src/Components/Table/Cells/VirtualTableRowCell.css
+++ b/frontend/src/Components/Table/Cells/VirtualTableRowCell.css
@@ -7,7 +7,7 @@
  white-space: nowrap;
 }

-@media only screen and (max-width: $breakpointSmall) {
+@media only screen and (max-width: $breakpointMedium) {
  .cell {
    white-space: nowrap;
  }
--- a/frontend/src/Components/Table/Table.css
+++ b/frontend/src/Components/Table/Table.css
@@ -10,7 +10,7 @@
  border-collapse: collapse;
 }

-@media only screen and (max-width: $breakpointSmall) {
+@media only screen and (max-width: $breakpointMedium) {
  .tableContainer {
    min-width: 100%;
    width: fit-content;
--- a/frontend/src/Components/Table/TableHeaderCell.css
+++ b/frontend/src/Components/Table/TableHeaderCell.css
@@ -9,7 +9,7 @@
  margin-left: 10px;
 }

-@media only screen and (max-width: $breakpointSmall) {
+@media only screen and (max-width: $breakpointMedium) {
  .headerCell {
    white-space: nowrap;
  }
--- a/frontend/src/Components/Table/TablePager.css
+++ b/frontend/src/Components/Table/TablePager.css
@@ -60,7 +60,7 @@
  height: 25px;
 }

-@media only screen and (max-width: $breakpointSmall) {
+@media only screen and (max-width: $breakpointMedium) {
  .pager {
    flex-wrap: wrap;
  }
--- a/frontend/src/Components/Table/VirtualTableHeaderCell.css
+++ b/frontend/src/Components/Table/VirtualTableHeaderCell.css
@@ -9,7 +9,7 @@
  margin-left: 10px;
 }

-@media only screen and (max-width: $breakpointSmall) {
+@media only screen and (max-width: $breakpointMedium) {
  .headerCell {
    white-space: nowrap;
  }
--- a/frontend/src/Search/AddNewItem.css
+++ b/frontend/src/Search/AddNewItem.css
@@ -35,11 +35,12 @@
 .message {
  margin-top: 30px;
  text-align: center;
+  font-weight: 300;
+  font-size: $largeFontSize;
 }

 .helpText {
  margin-bottom: 10px;
-  font-weight: 300;
  font-size: 24px;
 }

--- a/frontend/src/Search/AddNewItem.js
+++ b/frontend/src/Search/AddNewItem.js
@@ -82,7 +82,8 @@ class AddNewItem extends Component {
  render() {
    const {
      error,
-      items
+      items,
+      hasExistingAuthors
    } = this.props;

    const term = this.state.term;
@@ -186,7 +187,8 @@ class AddNewItem extends Component {
          }

          {
-            !term &&
+            term ?
+              null :
              <div className={styles.message}>
                <div className={styles.helpText}>
                  {translate('ItsEasyToAddANewAuthorOrBookJustStartTypingTheNameOfTheItemYouWantToAdd')}
@@ -199,6 +201,24 @@ class AddNewItem extends Component {
              </div>
          }

+          {
+            !term && !hasExistingAuthors ?
+              <div className={styles.message}>
+                <div className={styles.noAuthorsText}>
+                  You haven't added any authors yet, do you want to add an existing library location (Root Folder) and update?
+                </div>
+                <div>
+                  <Button
+                    to="/settings/mediamanagement"
+                    kind={kinds.PRIMARY}
+                  >
+                    {translate('AddRootFolder')}
+                  </Button>
+                </div>
+              </div> :
+              null
+          }
+
          <div />
        </PageContentBody>
      </PageContent>
@@ -213,6 +233,7 @@ AddNewItem.propTypes = {
  isAdding: PropTypes.bool.isRequired,
  addError: PropTypes.object,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  hasExistingAuthors: PropTypes.bool.isRequired,
  onSearchChange: PropTypes.func.isRequired,
  onClearSearch: PropTypes.func.isRequired
 };
--- a/frontend/src/Search/AddNewItemConnector.js
+++ b/frontend/src/Search/AddNewItemConnector.js
@@ -10,13 +10,15 @@ import AddNewItem from './AddNewItem';
 function createMapStateToProps() {
  return createSelector(
    (state) => state.search,
+    (state) => state.authors.items.length,
    (state) => state.router.location,
-    (search, location) => {
+    (search, existingAuthorsCount, location) => {
      const { params } = parseUrl(location.search);

      return {
+        ...search,
        term: params.term,
-        ...search
+        hasExistingAuthors: existingAuthorsCount > 0
      };
    }
  );
--- a/frontend/src/Search/Author/AddNewAuthorModalContent.js
+++ b/frontend/src/Search/Author/AddNewAuthorModalContent.js
@@ -9,6 +9,7 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import AddAuthorOptionsForm from '../Common/AddAuthorOptionsForm.js';
 import styles from './AddNewAuthorModalContent.css';

@@ -54,7 +55,7 @@ class AddNewAuthorModalContent extends Component {
    return (
      <ModalContent onModalClose={onModalClose}>
        <ModalHeader>
-          Add new Author
+          {translate('AddNewAuthor')}
        </ModalHeader>

        <ModalBody>
@@ -133,7 +134,7 @@ class AddNewAuthorModalContent extends Component {

 AddNewAuthorModalContent.propTypes = {
  authorName: PropTypes.string.isRequired,
-  disambiguation: PropTypes.string.isRequired,
+  disambiguation: PropTypes.string,
  overview: PropTypes.string,
  images: PropTypes.arrayOf(PropTypes.object).isRequired,
  isAdding: PropTypes.bool.isRequired,
--- a/frontend/src/Search/Author/AddNewAuthorModalContentConnector.js
+++ b/frontend/src/Search/Author/AddNewAuthorModalContentConnector.js
@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { addAuthor, setAuthorAddDefault } from 'Store/Actions/searchActions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
+import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
 import selectSettings from 'Store/Selectors/selectSettings';
 import AddNewAuthorModalContent from './AddNewAuthorModalContent';

@@ -12,7 +13,8 @@ function createMapStateToProps() {
    (state) => state.search,
    (state) => state.settings.metadataProfiles,
    createDimensionsSelector(),
-    (searchState, metadataProfiles, dimensions) => {
+    createSystemStatusSelector(),
+    (searchState, metadataProfiles, dimensions, systemStatus) => {
      const {
        isAdding,
        addError,
@@ -32,6 +34,7 @@ function createMapStateToProps() {
        isSmallScreen: dimensions.isSmallScreen,
        validationErrors,
        validationWarnings,
+        isWindows: systemStatus.isWindows,
        ...settings
      };
    }
--- a/frontend/src/Search/Author/AddNewAuthorSearchResult.js
+++ b/frontend/src/Search/Author/AddNewAuthorSearchResult.js
@@ -78,6 +78,7 @@ class AddNewAuthorSearchResult extends Component {
      status,
      overview,
      ratings,
+      folder,
      images,
      isExistingAuthor,
      isSmallScreen
@@ -205,6 +206,7 @@ class AddNewAuthorSearchResult extends Component {
          disambiguation={disambiguation}
          year={year}
          overview={overview}
+          folder={folder}
          images={images}
          onModalClose={this.onAddAuthorModalClose}
        />
@@ -222,6 +224,7 @@ AddNewAuthorSearchResult.propTypes = {
  status: PropTypes.string.isRequired,
  overview: PropTypes.string,
  ratings: PropTypes.object.isRequired,
+  folder: PropTypes.string.isRequired,
  images: PropTypes.arrayOf(PropTypes.object).isRequired,
  isExistingAuthor: PropTypes.bool.isRequired,
  isSmallScreen: PropTypes.bool.isRequired
--- a/frontend/src/Search/Book/AddNewBookModalContent.js
+++ b/frontend/src/Search/Book/AddNewBookModalContent.js
@@ -10,6 +10,7 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { kinds } from 'Helpers/Props';
 import stripHtml from 'Utilities/String/stripHtml';
+import translate from 'Utilities/String/translate';
 import AddAuthorOptionsForm from '../Common/AddAuthorOptionsForm.js';
 import styles from './AddNewBookModalContent.css';

@@ -58,7 +59,7 @@ class AddNewBookModalContent extends Component {
    return (
      <ModalContent onModalClose={onModalClose}>
        <ModalHeader>
-          Add new Book
+          {translate('AddNewBook')}
        </ModalHeader>

        <ModalBody>
--- a/frontend/src/Search/Book/AddNewBookModalContentConnector.js
+++ b/frontend/src/Search/Book/AddNewBookModalContentConnector.js
@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { addBook, setBookAddDefault } from 'Store/Actions/searchActions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
+import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
 import selectSettings from 'Store/Selectors/selectSettings';
 import AddNewBookModalContent from './AddNewBookModalContent';

@@ -13,7 +14,8 @@ function createMapStateToProps() {
    (state) => state.search,
    (state) => state.settings.metadataProfiles,
    createDimensionsSelector(),
-    (isExistingAuthor, searchState, metadataProfiles, dimensions) => {
+    createSystemStatusSelector(),
+    (isExistingAuthor, searchState, metadataProfiles, dimensions, systemStatus) => {
      const {
        isAdding,
        addError,
@@ -33,6 +35,7 @@ function createMapStateToProps() {
        isSmallScreen: dimensions.isSmallScreen,
        validationErrors,
        validationWarnings,
+        isWindows: systemStatus.isWindows,
        ...settings
      };
    }
--- a/frontend/src/Search/Book/AddNewBookSearchResult.js
+++ b/frontend/src/Search/Book/AddNewBookSearchResult.js
@@ -203,6 +203,7 @@ class AddNewBookSearchResult extends Component {
          disambiguation={disambiguation}
          authorName={author.authorName}
          overview={overview}
+          folder={author.folder}
          images={images}
          onModalClose={this.onAddBookModalClose}
        />
--- a/frontend/src/Search/Common/AddAuthorOptionsForm.js
+++ b/frontend/src/Search/Common/AddAuthorOptionsForm.js
@@ -39,7 +39,9 @@ class AddAuthorOptionsForm extends Component {
      includeNoneMetadataProfile,
      includeSpecificBookMonitor,
      showMetadataProfile,
+      folder,
      tags,
+      isWindows,
      onInputChange,
      ...otherProps
    } = this.props;
@@ -54,6 +56,15 @@ class AddAuthorOptionsForm extends Component {
          <FormInputGroup
            type={inputTypes.ROOT_FOLDER_SELECT}
            name="rootFolderPath"
+            valueOptions={{
+              authorFolder: folder,
+              isWindows
+            }}
+            selectedValueOptions={{
+              authorFolder: folder,
+              isWindows
+            }}
+            helpText={translate('AddNewAuthorRootFolderHelpText', { folder })}
            onChange={onInputChange}
            {...rootFolderPath}
          />
@@ -179,8 +190,14 @@ AddAuthorOptionsForm.propTypes = {
  showMetadataProfile: PropTypes.bool.isRequired,
  includeNoneMetadataProfile: PropTypes.bool.isRequired,
  includeSpecificBookMonitor: PropTypes.bool.isRequired,
+  folder: PropTypes.string.isRequired,
  tags: PropTypes.object.isRequired,
+  isWindows: PropTypes.bool.isRequired,
  onInputChange: PropTypes.func.isRequired
 };

+AddAuthorOptionsForm.defaultProps = {
+  includeSpecificBookMonitor: false
+};
+
 export default AddAuthorOptionsForm;
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
@@ -10,11 +10,11 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
+import Column from 'Components/Table/Column';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
 import {
  bulkDeleteDownloadClients,
  bulkEditDownloadClients,
@@ -35,7 +35,7 @@ type OnSelectedChangeCallback = React.ComponentProps<
  typeof ManageDownloadClientsModalRow
 >['onSelectedChange'];

-const COLUMNS = [
+const COLUMNS: Column[] = [
  {
    name: 'name',
    label: () => translate('Name'),
@@ -82,8 +82,6 @@ const COLUMNS = [

 interface ManageDownloadClientsModalContentProps {
  onModalClose(): void;
-  sortKey?: string;
-  sortDirection?: SortDirection;
 }

 function ManageDownloadClientsModalContent(
--- a/frontend/src/Settings/General/UpdateSettings.js
+++ b/frontend/src/Settings/General/UpdateSettings.js
@@ -18,7 +18,6 @@ function UpdateSettings(props) {
  const {
    advancedSettings,
    settings,
-    isWindows,
    packageUpdateMechanism,
    onInputChange
  } = props;
@@ -44,10 +43,10 @@ function UpdateSettings(props) {
      value: titleCase(packageUpdateMechanism)
    });
  } else {
-    updateOptions.push({ key: 'builtIn', value: 'Built-In' });
+    updateOptions.push({ key: 'builtIn', value: translate('BuiltIn') });
  }

-  updateOptions.push({ key: 'script', value: 'Script' });
+  updateOptions.push({ key: 'script', value: translate('Script') });

  return (
    <FieldSet legend={translate('Updates')}>
@@ -60,8 +59,8 @@ function UpdateSettings(props) {
        <FormInputGroup
          type={inputTypes.AUTO_COMPLETE}
          name="branch"
-          helpText={usingExternalUpdateMechanism ? translate('UsingExternalUpdateMechanismBranchUsedByExternalUpdateMechanism') : translate('UsingExternalUpdateMechanismBranchToUseToUpdateReadarr')}
-          helpLink="https://wiki.servarr.com/readarr/faq#how-do-I-update-my-readarr"
+          helpText={usingExternalUpdateMechanism ? translate('BranchUpdateMechanism') : translate('BranchUpdate')}
+          helpLink="https://wiki.servarr.com/readarr/settings#updates"
          {...branch}
          values={branchValues}
          onChange={onInputChange}
@@ -69,62 +68,59 @@ function UpdateSettings(props) {
        />
      </FormGroup>

-      {
-        !isWindows &&
-          <div>
-            <FormGroup
-              advancedSettings={advancedSettings}
-              isAdvanced={true}
-              size={sizes.MEDIUM}
-            >
-              <FormLabel>{translate('Automatic')}</FormLabel>
+      <div>
+        <FormGroup
+          advancedSettings={advancedSettings}
+          isAdvanced={true}
+          size={sizes.MEDIUM}
+        >
+          <FormLabel>{translate('Automatic')}</FormLabel>

-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="updateAutomatically"
-                helpText={translate('UpdateAutomaticallyHelpText')}
-                helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker', { appName: 'Readarr' }) : undefined}
-                onChange={onInputChange}
-                {...updateAutomatically}
-              />
-            </FormGroup>
+          <FormInputGroup
+            type={inputTypes.CHECK}
+            name="updateAutomatically"
+            helpText={translate('UpdateAutomaticallyHelpText')}
+            helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker') : undefined}
+            onChange={onInputChange}
+            {...updateAutomatically}
+          />
+        </FormGroup>

+        <FormGroup
+          advancedSettings={advancedSettings}
+          isAdvanced={true}
+        >
+          <FormLabel>{translate('Mechanism')}</FormLabel>
+
+          <FormInputGroup
+            type={inputTypes.SELECT}
+            name="updateMechanism"
+            values={updateOptions}
+            helpText={translate('UpdateMechanismHelpText')}
+            helpLink="https://wiki.servarr.com/readarr/settings#updates"
+            onChange={onInputChange}
+            {...updateMechanism}
+          />
+        </FormGroup>
+
+        {
+          updateMechanism.value === 'script' &&
            <FormGroup
              advancedSettings={advancedSettings}
              isAdvanced={true}
            >
-              <FormLabel>{translate('Mechanism')}</FormLabel>
+              <FormLabel>{translate('ScriptPath')}</FormLabel>

              <FormInputGroup
-                type={inputTypes.SELECT}
-                name="updateMechanism"
-                values={updateOptions}
-                helpText={translate('UpdateMechanismHelpText')}
-                helpLink="https://wiki.servarr.com/readarr/faq#how-do-i-update-my-readarr"
+                type={inputTypes.TEXT}
+                name="updateScriptPath"
+                helpText={translate('UpdateScriptPathHelpText')}
                onChange={onInputChange}
-                {...updateMechanism}
+                {...updateScriptPath}
              />
            </FormGroup>
-
-            {
-              updateMechanism.value === 'script' &&
-                <FormGroup
-                  advancedSettings={advancedSettings}
-                  isAdvanced={true}
-                >
-                  <FormLabel>{translate('ScriptPath')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.TEXT}
-                    name="updateScriptPath"
-                    helpText={translate('UpdateScriptPathHelpText')}
-                    onChange={onInputChange}
-                    {...updateScriptPath}
-                  />
-                </FormGroup>
-            }
-          </div>
-      }
+        }
+      </div>
    </FieldSet>
  );
 }
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js
@@ -76,7 +76,7 @@ function EditImportListExclusionModalContent(props) {

              <FormGroup>
                <FormLabel>
-                  {translate('MusicbrainzId')}
+                  {translate('ForeignId')}
                </FormLabel>

                <FormInputGroup
--- a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
@@ -10,11 +10,11 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
+import Column from 'Components/Table/Column';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
 import {
  bulkDeleteIndexers,
  bulkEditIndexers,
@@ -35,7 +35,7 @@ type OnSelectedChangeCallback = React.ComponentProps<
  typeof ManageIndexersModalRow
 >['onSelectedChange'];

-const COLUMNS = [
+const COLUMNS: Column[] = [
  {
    name: 'name',
    label: () => translate('Name'),
@@ -82,8 +82,6 @@ const COLUMNS = [

 interface ManageIndexersModalContentProps {
  onModalClose(): void;
-  sortKey?: string;
-  sortDirection?: SortDirection;
 }

 function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
--- a/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -15,11 +14,11 @@ function createMapStateToProps() {
    (state) => state.settings.advancedSettings,
    (state) => state.settings.namingExamples,
    createSettingsSectionSelector(SECTION),
-    (advancedSettings, examples, sectionSettings) => {
+    (advancedSettings, namingExamples, sectionSettings) => {
      return {
        advancedSettings,
-        examples: examples.item,
-        examplesPopulated: !_.isEmpty(examples.item),
+        examples: namingExamples.item,
+        examplesPopulated: namingExamples.isPopulated,
        ...sectionSettings
      };
    }
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileName.tsx
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileName.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { createQualityProfileSelectorForHook } from 'Store/Selectors/createQualityProfileSelector';
+import translate from 'Utilities/String/translate';
+
+interface QualityProfileNameProps {
+  qualityProfileId: number;
+}
+
+function QualityProfileName({ qualityProfileId }: QualityProfileNameProps) {
+  const qualityProfile = useSelector(
+    createQualityProfileSelectorForHook(qualityProfileId)
+  );
+
+  return <span>{qualityProfile?.name ?? translate('Unknown')}</span>;
+}
+
+export default QualityProfileName;
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileNameConnector.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileNameConnector.js
@@ -1,31 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import createQualityProfileSelector from 'Store/Selectors/createQualityProfileSelector';
-
-function createMapStateToProps() {
-  return createSelector(
-    createQualityProfileSelector(),
-    (qualityProfile) => {
-      return {
-        name: qualityProfile.name
-      };
-    }
-  );
-}
-
-function QualityProfileNameConnector({ name, ...otherProps }) {
-  return (
-    <span>
-      {name}
-    </span>
-  );
-}
-
-QualityProfileNameConnector.propTypes = {
-  qualityProfileId: PropTypes.number.isRequired,
-  name: PropTypes.string.isRequired
-};
-
-export default connect(createMapStateToProps)(QualityProfileNameConnector);
--- a/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js
+++ b/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js
@@ -7,7 +7,7 @@ function createRemoveItemHandler(section, url) {
  return function(getState, payload, dispatch) {
    const {
      id,
-      queryParams
+      ...queryParams
    } = payload;

    dispatch(set({ section, isDeleting: true }));
--- a/frontend/src/Store/Actions/wantedActions.js
+++ b/frontend/src/Store/Actions/wantedActions.js
@@ -45,6 +45,12 @@ export const defaultState = {
        isSortable: true,
        isVisible: true
      },
+      {
+        name: 'books.lastSearchTime',
+        label: 'Last Searched',
+        isSortable: true,
+        isVisible: false
+      },
      {
        name: 'actions',
        columnLabel: 'Actions',
@@ -108,6 +114,12 @@ export const defaultState = {
        isSortable: true,
        isVisible: true
      },
+      {
+        name: 'books.lastSearchTime',
+        label: 'Last Searched',
+        isSortable: true,
+        isVisible: false
+      },
      {
        name: 'actions',
        columnLabel: 'Actions',
--- a/frontend/src/System/Updates/UpdateChanges.js
+++ b/frontend/src/System/Updates/UpdateChanges.js
@@ -1,50 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
-import styles from './UpdateChanges.css';
-
-class UpdateChanges extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      title,
-      changes
-    } = this.props;
-
-    if (changes.length === 0) {
-      return null;
-    }
-
-    return (
-      <div>
-        <div className={styles.title}>{title}</div>
-        <ul>
-          {
-            changes.map((change, index) => {
-              const checkChange = change.replace(/#\d{4,5}\b/g, (match, contents) => {
-                return `[${match}](https://github.com/Readarr/Readarr/issues/${match.substring(1)})`;
-              });
-
-              return (
-                <li key={index}>
-                  <InlineMarkdown data={checkChange} />
-                </li>
-              );
-            })
-          }
-        </ul>
-      </div>
-    );
-  }
-
-}
-
-UpdateChanges.propTypes = {
-  title: PropTypes.string.isRequired,
-  changes: PropTypes.arrayOf(PropTypes.string)
-};
-
-export default UpdateChanges;
--- a/frontend/src/System/Updates/UpdateChanges.tsx
+++ b/frontend/src/System/Updates/UpdateChanges.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
+import styles from './UpdateChanges.css';
+
+interface UpdateChangesProps {
+  title: string;
+  changes: string[];
+}
+
+function UpdateChanges(props: UpdateChangesProps) {
+  const { title, changes } = props;
+
+  if (changes.length === 0) {
+    return null;
+  }
+
+  const uniqueChanges = [...new Set(changes)];
+
+  return (
+    <div>
+      <div className={styles.title}>{title}</div>
+      <ul>
+        {uniqueChanges.map((change, index) => {
+          const checkChange = change.replace(
+            /#\d{4,5}\b/g,
+            (match) =>
+              `[${match}](https://github.com/Readarr/Readarr/issues/${match.substring(
+                1
+              )})`
+          );
+
+          return (
+            <li key={index}>
+              <InlineMarkdown data={checkChange} />
+            </li>
+          );
+        })}
+      </ul>
+    </div>
+  );
+}
+
+export default UpdateChanges;
--- a/frontend/src/System/Updates/Updates.js
+++ b/frontend/src/System/Updates/Updates.js
@@ -1,252 +0,0 @@
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import React, { Component, Fragment } from 'react';
-import Alert from 'Components/Alert';
-import Icon from 'Components/Icon';
-import Label from 'Components/Label';
-import SpinnerButton from 'Components/Link/SpinnerButton';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import { icons, kinds } from 'Helpers/Props';
-import formatDate from 'Utilities/Date/formatDate';
-import formatDateTime from 'Utilities/Date/formatDateTime';
-import translate from 'Utilities/String/translate';
-import UpdateChanges from './UpdateChanges';
-import styles from './Updates.css';
-
-class Updates extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      currentVersion,
-      isFetching,
-      isPopulated,
-      updatesError,
-      generalSettingsError,
-      items,
-      isInstallingUpdate,
-      updateMechanism,
-      isDocker,
-      updateMechanismMessage,
-      shortDateFormat,
-      longDateFormat,
-      timeFormat,
-      onInstallLatestPress
-    } = this.props;
-
-    const hasError = !!(updatesError || generalSettingsError);
-    const hasUpdates = isPopulated && !hasError && items.length > 0;
-    const noUpdates = isPopulated && !hasError && !items.length;
-    const hasUpdateToInstall = hasUpdates && _.some(items, { installable: true, latest: true });
-    const noUpdateToInstall = hasUpdates && !hasUpdateToInstall;
-
-    const externalUpdaterPrefix = 'Unable to update Readarr directly,';
-    const externalUpdaterMessages = {
-      external: 'Readarr is configured to use an external update mechanism',
-      apt: 'use apt to install the update',
-      docker: 'update the docker container to receive the update'
-    };
-
-    return (
-      <PageContent title={translate('Updates')}>
-        <PageContentBody>
-          {
-            !isPopulated && !hasError &&
-              <LoadingIndicator />
-          }
-
-          {
-            noUpdates &&
-              <Alert kind={kinds.INFO}>
-                {translate('NoUpdatesAreAvailable')}
-              </Alert>
-          }
-
-          {
-            hasUpdateToInstall &&
-              <div className={styles.messageContainer}>
-                {
-                  (updateMechanism === 'builtIn' || updateMechanism === 'script') && !isDocker ?
-                    <SpinnerButton
-                      className={styles.updateAvailable}
-                      kind={kinds.PRIMARY}
-                      isSpinning={isInstallingUpdate}
-                      onPress={onInstallLatestPress}
-                    >
-                      Install Latest
-                    </SpinnerButton> :
-
-                    <Fragment>
-                      <Icon
-                        name={icons.WARNING}
-                        kind={kinds.WARNING}
-                        size={30}
-                      />
-
-                      <div className={styles.message}>
-                        {externalUpdaterPrefix} <InlineMarkdown data={updateMechanismMessage || externalUpdaterMessages[updateMechanism] || externalUpdaterMessages.external} />
-                      </div>
-                    </Fragment>
-                }
-
-                {
-                  isFetching &&
-                    <LoadingIndicator
-                      className={styles.loading}
-                      size={20}
-                    />
-                }
-              </div>
-          }
-
-          {
-            noUpdateToInstall &&
-              <div className={styles.messageContainer}>
-                <Icon
-                  className={styles.upToDateIcon}
-                  name={icons.CHECK_CIRCLE}
-                  size={30}
-                />
-
-                <div className={styles.message}>
-                  The latest version of Readarr is already installed
-                </div>
-
-                {
-                  isFetching &&
-                    <LoadingIndicator
-                      className={styles.loading}
-                      size={20}
-                    />
-                }
-              </div>
-          }
-
-          {
-            hasUpdates &&
-              <div>
-                {
-                  items.map((update) => {
-                    const hasChanges = !!update.changes;
-
-                    return (
-                      <div
-                        key={update.version}
-                        className={styles.update}
-                      >
-                        <div className={styles.info}>
-                          <div className={styles.version}>{update.version}</div>
-                          <div className={styles.space}>&mdash;</div>
-                          <div
-                            className={styles.date}
-                            title={formatDateTime(update.releaseDate, longDateFormat, timeFormat)}
-                          >
-                            {formatDate(update.releaseDate, shortDateFormat)}
-                          </div>
-
-                          {
-                            update.branch === 'master' ?
-                              null :
-                              <Label
-                                className={styles.label}
-                              >
-                                {update.branch}
-                              </Label>
-                          }
-
-                          {
-                            update.version === currentVersion ?
-                              <Label
-                                className={styles.label}
-                                kind={kinds.SUCCESS}
-                                title={formatDateTime(update.installedOn, longDateFormat, timeFormat)}
-                              >
-                                Currently Installed
-                              </Label> :
-                              null
-                          }
-
-                          {
-                            update.version !== currentVersion && update.installedOn ?
-                              <Label
-                                className={styles.label}
-                                kind={kinds.INVERSE}
-                                title={formatDateTime(update.installedOn, longDateFormat, timeFormat)}
-                              >
-                                Previously Installed
-                              </Label> :
-                              null
-                          }
-                        </div>
-
-                        {
-                          !hasChanges &&
-                            <div>
-                              {translate('MaintenanceRelease')}
-                            </div>
-                        }
-
-                        {
-                          hasChanges &&
-                            <div className={styles.changes}>
-                              <UpdateChanges
-                                title={translate('New')}
-                                changes={update.changes.new}
-                              />
-
-                              <UpdateChanges
-                                title={translate('Fixed')}
-                                changes={update.changes.fixed}
-                              />
-                            </div>
-                        }
-                      </div>
-                    );
-                  })
-                }
-              </div>
-          }
-
-          {
-            !!updatesError &&
-              <div>
-                Failed to fetch updates
-              </div>
-          }
-
-          {
-            !!generalSettingsError &&
-              <div>
-                Failed to update settings
-              </div>
-          }
-        </PageContentBody>
-      </PageContent>
-    );
-  }
-
-}
-
-Updates.propTypes = {
-  currentVersion: PropTypes.string.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  updatesError: PropTypes.object,
-  generalSettingsError: PropTypes.object,
-  items: PropTypes.array.isRequired,
-  isInstallingUpdate: PropTypes.bool.isRequired,
-  isDocker: PropTypes.bool.isRequired,
-  updateMechanism: PropTypes.string,
-  updateMechanismMessage: PropTypes.string,
-  shortDateFormat: PropTypes.string.isRequired,
-  longDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
-  onInstallLatestPress: PropTypes.func.isRequired
-};
-
-export default Updates;
--- a/frontend/src/System/Updates/Updates.tsx
+++ b/frontend/src/System/Updates/Updates.tsx
@@ -0,0 +1,303 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import * as commandNames from 'Commands/commandNames';
+import Alert from 'Components/Alert';
+import Icon from 'Components/Icon';
+import Label from 'Components/Label';
+import SpinnerButton from 'Components/Link/SpinnerButton';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
+import ConfirmModal from 'Components/Modal/ConfirmModal';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import { icons, kinds } from 'Helpers/Props';
+import { executeCommand } from 'Store/Actions/commandActions';
+import { fetchGeneralSettings } from 'Store/Actions/settingsActions';
+import { fetchUpdates } from 'Store/Actions/systemActions';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
+import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
+import { UpdateMechanism } from 'typings/Settings/General';
+import formatDate from 'Utilities/Date/formatDate';
+import formatDateTime from 'Utilities/Date/formatDateTime';
+import translate from 'Utilities/String/translate';
+import UpdateChanges from './UpdateChanges';
+import styles from './Updates.css';
+
+const VERSION_REGEX = /\d+\.\d+\.\d+\.\d+/i;
+
+function createUpdatesSelector() {
+  return createSelector(
+    (state: AppState) => state.system.updates,
+    (state: AppState) => state.settings.general,
+    (updates, generalSettings) => {
+      const { error: updatesError, items } = updates;
+
+      const isFetching = updates.isFetching || generalSettings.isFetching;
+      const isPopulated = updates.isPopulated && generalSettings.isPopulated;
+
+      return {
+        isFetching,
+        isPopulated,
+        updatesError,
+        generalSettingsError: generalSettings.error,
+        items,
+        updateMechanism: generalSettings.item.updateMechanism,
+      };
+    }
+  );
+}
+
+function Updates() {
+  const currentVersion = useSelector((state: AppState) => state.app.version);
+  const { packageUpdateMechanismMessage } = useSelector(
+    createSystemStatusSelector()
+  );
+  const { shortDateFormat, longDateFormat, timeFormat } = useSelector(
+    createUISettingsSelector()
+  );
+  const isInstallingUpdate = useSelector(
+    createCommandExecutingSelector(commandNames.APPLICATION_UPDATE)
+  );
+
+  const {
+    isFetching,
+    isPopulated,
+    updatesError,
+    generalSettingsError,
+    items,
+    updateMechanism,
+  } = useSelector(createUpdatesSelector());
+
+  const dispatch = useDispatch();
+  const [isMajorUpdateModalOpen, setIsMajorUpdateModalOpen] = useState(false);
+  const hasError = !!(updatesError || generalSettingsError);
+  const hasUpdates = isPopulated && !hasError && items.length > 0;
+  const noUpdates = isPopulated && !hasError && !items.length;
+
+  const externalUpdaterPrefix = translate('UpdateAppDirectlyLoadError');
+  const externalUpdaterMessages: Partial<Record<UpdateMechanism, string>> = {
+    external: translate('ExternalUpdater'),
+    apt: translate('AptUpdater'),
+    docker: translate('DockerUpdater'),
+  };
+
+  const { isMajorUpdate, hasUpdateToInstall } = useMemo(() => {
+    const majorVersion = parseInt(
+      currentVersion.match(VERSION_REGEX)?.[0] ?? '0'
+    );
+
+    const latestVersion = items[0]?.version;
+    const latestMajorVersion = parseInt(
+      latestVersion?.match(VERSION_REGEX)?.[0] ?? '0'
+    );
+
+    return {
+      isMajorUpdate: latestMajorVersion > majorVersion,
+      hasUpdateToInstall: items.some(
+        (update) => update.installable && update.latest
+      ),
+    };
+  }, [currentVersion, items]);
+
+  const noUpdateToInstall = hasUpdates && !hasUpdateToInstall;
+
+  const handleInstallLatestPress = useCallback(() => {
+    if (isMajorUpdate) {
+      setIsMajorUpdateModalOpen(true);
+    } else {
+      dispatch(executeCommand({ name: commandNames.APPLICATION_UPDATE }));
+    }
+  }, [isMajorUpdate, setIsMajorUpdateModalOpen, dispatch]);
+
+  const handleInstallLatestMajorVersionPress = useCallback(() => {
+    setIsMajorUpdateModalOpen(false);
+
+    dispatch(
+      executeCommand({
+        name: commandNames.APPLICATION_UPDATE,
+        installMajorUpdate: true,
+      })
+    );
+  }, [setIsMajorUpdateModalOpen, dispatch]);
+
+  const handleCancelMajorVersionPress = useCallback(() => {
+    setIsMajorUpdateModalOpen(false);
+  }, [setIsMajorUpdateModalOpen]);
+
+  useEffect(() => {
+    dispatch(fetchUpdates());
+    dispatch(fetchGeneralSettings());
+  }, [dispatch]);
+
+  return (
+    <PageContent title={translate('Updates')}>
+      <PageContentBody>
+        {isPopulated || hasError ? null : <LoadingIndicator />}
+
+        {noUpdates ? (
+          <Alert kind={kinds.INFO}>{translate('NoUpdatesAreAvailable')}</Alert>
+        ) : null}
+
+        {hasUpdateToInstall ? (
+          <div className={styles.messageContainer}>
+            {updateMechanism === 'builtIn' || updateMechanism === 'script' ? (
+              <SpinnerButton
+                kind={kinds.PRIMARY}
+                isSpinning={isInstallingUpdate}
+                onPress={handleInstallLatestPress}
+              >
+                {translate('InstallLatest')}
+              </SpinnerButton>
+            ) : (
+              <>
+                <Icon name={icons.WARNING} kind={kinds.WARNING} size={30} />
+
+                <div className={styles.message}>
+                  {externalUpdaterPrefix}{' '}
+                  <InlineMarkdown
+                    data={
+                      packageUpdateMechanismMessage ||
+                      externalUpdaterMessages[updateMechanism] ||
+                      externalUpdaterMessages.external
+                    }
+                  />
+                </div>
+              </>
+            )}
+
+            {isFetching ? (
+              <LoadingIndicator className={styles.loading} size={20} />
+            ) : null}
+          </div>
+        ) : null}
+
+        {noUpdateToInstall && (
+          <div className={styles.messageContainer}>
+            <Icon
+              className={styles.upToDateIcon}
+              name={icons.CHECK_CIRCLE}
+              size={30}
+            />
+            <div className={styles.message}>{translate('OnLatestVersion')}</div>
+
+            {isFetching && (
+              <LoadingIndicator className={styles.loading} size={20} />
+            )}
+          </div>
+        )}
+
+        {hasUpdates && (
+          <div>
+            {items.map((update) => {
+              return (
+                <div key={update.version} className={styles.update}>
+                  <div className={styles.info}>
+                    <div className={styles.version}>{update.version}</div>
+                    <div className={styles.space}>&mdash;</div>
+                    <div
+                      className={styles.date}
+                      title={formatDateTime(
+                        update.releaseDate,
+                        longDateFormat,
+                        timeFormat
+                      )}
+                    >
+                      {formatDate(update.releaseDate, shortDateFormat)}
+                    </div>
+
+                    {update.branch === 'master' ? null : (
+                      <Label className={styles.label}>{update.branch}</Label>
+                    )}
+
+                    {update.version === currentVersion ? (
+                      <Label
+                        className={styles.label}
+                        kind={kinds.SUCCESS}
+                        title={formatDateTime(
+                          update.installedOn,
+                          longDateFormat,
+                          timeFormat
+                        )}
+                      >
+                        {translate('CurrentlyInstalled')}
+                      </Label>
+                    ) : null}
+
+                    {update.version !== currentVersion && update.installedOn ? (
+                      <Label
+                        className={styles.label}
+                        kind={kinds.INVERSE}
+                        title={formatDateTime(
+                          update.installedOn,
+                          longDateFormat,
+                          timeFormat
+                        )}
+                      >
+                        {translate('PreviouslyInstalled')}
+                      </Label>
+                    ) : null}
+                  </div>
+
+                  {update.changes ? (
+                    <div>
+                      <UpdateChanges
+                        title={translate('New')}
+                        changes={update.changes.new}
+                      />
+
+                      <UpdateChanges
+                        title={translate('Fixed')}
+                        changes={update.changes.fixed}
+                      />
+                    </div>
+                  ) : (
+                    <div>{translate('MaintenanceRelease')}</div>
+                  )}
+                </div>
+              );
+            })}
+          </div>
+        )}
+
+        {updatesError ? (
+          <Alert kind={kinds.WARNING}>
+            {translate('FailedToFetchUpdates')}
+          </Alert>
+        ) : null}
+
+        {generalSettingsError ? (
+          <Alert kind={kinds.DANGER}>
+            {translate('FailedToFetchSettings')}
+          </Alert>
+        ) : null}
+
+        <ConfirmModal
+          isOpen={isMajorUpdateModalOpen}
+          kind={kinds.WARNING}
+          title={translate('InstallMajorVersionUpdate')}
+          message={
+            <div>
+              <div>{translate('InstallMajorVersionUpdateMessage')}</div>
+              <div>
+                <InlineMarkdown
+                  data={translate('InstallMajorVersionUpdateMessageLink', {
+                    domain: 'readarr.com',
+                    url: 'https://readarr.com/#downloads',
+                  })}
+                />
+              </div>
+            </div>
+          }
+          confirmLabel={translate('Install')}
+          onConfirm={handleInstallLatestMajorVersionPress}
+          onCancel={handleCancelMajorVersionPress}
+        />
+      </PageContentBody>
+    </PageContent>
+  );
+}
+
+export default Updates;
--- a/frontend/src/Utilities/String/translate.ts
+++ b/frontend/src/Utilities/String/translate.ts
@@ -27,6 +27,12 @@ export default function translate(
  key: string,
  tokens: Record<string, string | number | boolean> = {}
 ) {
+  const { isProduction = true } = window.Readarr;
+
+  if (!isProduction && !(key in translations)) {
+    console.warn(`Missing translation for key: ${key}`);
+  }
+
  const translation = translations[key] || key;

  tokens.appName = 'Readarr';
--- a/frontend/src/Wanted/CutoffUnmet/CutoffUnmetConnector.js
+++ b/frontend/src/Wanted/CutoffUnmet/CutoffUnmetConnector.js
@@ -131,13 +131,15 @@ class CutoffUnmetConnector extends Component {
  onSearchSelectedPress = (selected) => {
    this.props.executeCommand({
      name: commandNames.BOOK_SEARCH,
-      bookIds: selected
+      bookIds: selected,
+      commandFinished: this.repopulate
    });
  };

  onSearchAllCutoffUnmetPress = () => {
    this.props.executeCommand({
-      name: commandNames.CUTOFF_UNMET_BOOK_SEARCH
+      name: commandNames.CUTOFF_UNMET_BOOK_SEARCH,
+      commandFinished: this.repopulate
    });
  };

--- a/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.js
+++ b/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.js
@@ -16,6 +16,7 @@ function CutoffUnmetRow(props) {
    releaseDate,
    titleSlug,
    title,
+    lastSearchTime,
    disambiguation,
    isSelected,
    columns,
@@ -68,6 +69,15 @@ function CutoffUnmetRow(props) {
            );
          }

+          if (name === 'books.lastSearchTime') {
+            return (
+              <RelativeDateCellConnector
+                key={name}
+                date={lastSearchTime}
+              />
+            );
+          }
+
          if (name === 'releaseDate') {
            return (
              <RelativeDateCellConnector
@@ -105,6 +115,7 @@ CutoffUnmetRow.propTypes = {
  releaseDate: PropTypes.string.isRequired,
  titleSlug: PropTypes.string.isRequired,
  title: PropTypes.string.isRequired,
+  lastSearchTime: PropTypes.string,
  disambiguation: PropTypes.string,
  isSelected: PropTypes.bool,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
--- a/frontend/src/Wanted/Missing/MissingConnector.js
+++ b/frontend/src/Wanted/Missing/MissingConnector.js
@@ -121,13 +121,15 @@ class MissingConnector extends Component {
  onSearchSelectedPress = (selected) => {
    this.props.executeCommand({
      name: commandNames.BOOK_SEARCH,
-      bookIds: selected
+      bookIds: selected,
+      commandFinished: this.repopulate
    });
  };

  onSearchAllMissingPress = () => {
    this.props.executeCommand({
-      name: commandNames.MISSING_BOOK_SEARCH
+      name: commandNames.MISSING_BOOK_SEARCH,
+      commandFinished: this.repopulate
    });
  };

--- a/frontend/src/Wanted/Missing/MissingRow.js
+++ b/frontend/src/Wanted/Missing/MissingRow.js
@@ -16,6 +16,7 @@ function MissingRow(props) {
    releaseDate,
    titleSlug,
    title,
+    lastSearchTime,
    disambiguation,
    isSelected,
    columns,
@@ -77,6 +78,15 @@ function MissingRow(props) {
            );
          }

+          if (name === 'books.lastSearchTime') {
+            return (
+              <RelativeDateCellConnector
+                key={name}
+                date={lastSearchTime}
+              />
+            );
+          }
+
          if (name === 'actions') {
            return (
              <BookSearchCellConnector
@@ -104,6 +114,7 @@ MissingRow.propTypes = {
  releaseDate: PropTypes.string.isRequired,
  titleSlug: PropTypes.string.isRequired,
  title: PropTypes.string.isRequired,
+  lastSearchTime: PropTypes.string,
  disambiguation: PropTypes.string,
  isSelected: PropTypes.bool,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
--- a/frontend/src/typings/Settings/General.ts
+++ b/frontend/src/typings/Settings/General.ts
@@ -0,0 +1,45 @@
+export type UpdateMechanism =
+  | 'builtIn'
+  | 'script'
+  | 'external'
+  | 'apt'
+  | 'docker';
+
+export default interface General {
+  bindAddress: string;
+  port: number;
+  sslPort: number;
+  enableSsl: boolean;
+  launchBrowser: boolean;
+  authenticationMethod: string;
+  authenticationRequired: string;
+  analyticsEnabled: boolean;
+  username: string;
+  password: string;
+  passwordConfirmation: string;
+  logLevel: string;
+  consoleLogLevel: string;
+  branch: string;
+  apiKey: string;
+  sslCertPath: string;
+  sslCertPassword: string;
+  urlBase: string;
+  instanceName: string;
+  applicationUrl: string;
+  updateAutomatically: boolean;
+  updateMechanism: UpdateMechanism;
+  updateScriptPath: string;
+  proxyEnabled: boolean;
+  proxyType: string;
+  proxyHostname: string;
+  proxyPort: number;
+  proxyUsername: string;
+  proxyPassword: string;
+  proxyBypassFilter: string;
+  proxyBypassLocalAddresses: boolean;
+  certificateValidation: string;
+  backupFolder: string;
+  backupInterval: number;
+  backupRetention: number;
+  id: number;
+}
--- a/frontend/src/typings/Settings/UiSettings.ts
+++ b/frontend/src/typings/Settings/UiSettings.ts
@@ -1,4 +1,5 @@
-export interface UiSettings {
+export default interface UiSettings {
+  theme: 'auto' | 'dark' | 'light';
  showRelativeDates: boolean;
  shortDateFormat: string;
  longDateFormat: string;
--- a/frontend/src/typings/SystemStatus.ts
+++ b/frontend/src/typings/SystemStatus.ts
@@ -0,0 +1,32 @@
+interface SystemStatus {
+  appData: string;
+  appName: string;
+  authentication: string;
+  branch: string;
+  buildTime: string;
+  instanceName: string;
+  isAdmin: boolean;
+  isDebug: boolean;
+  isDocker: boolean;
+  isLinux: boolean;
+  isNetCore: boolean;
+  isOsx: boolean;
+  isProduction: boolean;
+  isUserInteractive: boolean;
+  isWindows: boolean;
+  migrationVersion: number;
+  mode: string;
+  osName: string;
+  osVersion: string;
+  packageUpdateMechanism: string;
+  packageUpdateMechanismMessage: string;
+  runtimeName: string;
+  runtimeVersion: string;
+  sqliteVersion: string;
+  startTime: string;
+  startupPath: string;
+  urlBase: string;
+  version: string;
+}
+
+export default SystemStatus;
--- a/frontend/src/typings/Update.ts
+++ b/frontend/src/typings/Update.ts
@@ -0,0 +1,20 @@
+export interface Changes {
+  new: string[];
+  fixed: string[];
+}
+
+interface Update {
+  version: string;
+  branch: string;
+  releaseDate: string;
+  fileName: string;
+  url: string;
+  installed: boolean;
+  installedOn: string;
+  installable: boolean;
+  latest: boolean;
+  changes: Changes | null;
+  hash: string;
+}
+
+export default Update;
--- a/frontend/typings/Globals.d.ts
+++ b/frontend/typings/Globals.d.ts
@@ -7,5 +7,6 @@ interface Window {
    theme: string;
    urlBase: string;
    version: string;
+    isProduction: boolean;
  };
 }
--- a/package.json
+++ b/package.json
@@ -25,34 +25,33 @@
    "defaults"
  ],
  "dependencies": {
-    "@fortawesome/fontawesome-free": "6.4.0",
-    "@fortawesome/fontawesome-svg-core": "6.4.0",
-    "@fortawesome/free-regular-svg-icons": "6.4.0",
-    "@fortawesome/free-solid-svg-icons": "6.4.0",
-    "@fortawesome/react-fontawesome": "0.2.0",
+    "@fortawesome/fontawesome-free": "6.7.1",
+    "@fortawesome/fontawesome-svg-core": "6.7.1",
+    "@fortawesome/free-regular-svg-icons": "6.7.1",
+    "@fortawesome/free-solid-svg-icons": "6.7.1",
+    "@fortawesome/react-fontawesome": "0.2.2",
    "@microsoft/signalr": "6.0.25",
-    "@sentry/browser": "7.51.2",
-    "@sentry/integrations": "7.51.2",
-    "@types/node": "18.19.31",
+    "@sentry/browser": "7.119.1",
+    "@sentry/integrations": "7.119.1",
+    "@types/node": "20.16.11",
    "@types/react": "18.2.79",
    "@types/react-dom": "18.2.25",
-    "ansi-colors": "4.1.3",
-    "classnames": "2.3.2",
+    "classnames": "2.5.1",
    "clipboard": "2.0.11",
    "connected-react-router": "6.9.3",
    "element-class": "0.2.2",
-    "filesize": "10.0.7",
+    "filesize": "10.1.6",
    "fuse.js": "6.6.2",
    "history": "4.10.1",
    "jdu": "1.0.0",
-    "jquery": "3.7.0",
+    "jquery": "3.7.1",
    "lodash": "4.17.21",
    "mobile-detect": "1.4.5",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
    "mousetrap": "1.6.5",
    "normalize.css": "8.0.1",
    "prop-types": "15.8.1",
-    "qs": "6.11.1",
+    "qs": "6.13.0",
    "react": "17.0.2",
    "react-addons-shallow-compare": "15.6.3",
    "react-async-script": "1.2.0",
@@ -64,7 +63,7 @@
    "react-dnd-touch-backend": "14.1.1",
    "react-document-title": "2.0.3",
    "react-dom": "17.0.2",
-    "react-focus-lock": "2.5.2",
+    "react-focus-lock": "2.9.4",
    "react-google-recaptcha": "2.1.0",
    "react-lazyload": "3.2.0",
    "react-measure": "2.5.2",
@@ -73,80 +72,77 @@
    "react-redux": "7.2.4",
    "react-router": "5.2.0",
    "react-router-dom": "5.2.0",
-    "react-slider": "1.3.1",
-    "react-tabs": "3.2.2",
-    "react-text-truncate": "0.18.0",
+    "react-slider": "1.3.3",
+    "react-tabs": "4.3.0",
+    "react-text-truncate": "0.19.0",
    "react-virtualized": "9.21.1",
-    "redux": "4.1.0",
+    "redux": "4.2.1",
    "redux-actions": "2.6.5",
    "redux-batched-actions": "0.5.0",
    "redux-localstorage": "0.4.1",
-    "redux-thunk": "2.3.0",
+    "redux-thunk": "2.4.2",
    "reselect": "4.1.8",
    "stacktrace-js": "2.0.2",
    "typescript": "5.1.6"
  },
  "devDependencies": {
-    "@babel/core": "7.24.4",
-    "@babel/eslint-parser": "7.24.1",
-    "@babel/plugin-proposal-export-default-from": "7.24.1",
+    "@babel/core": "7.26.0",
+    "@babel/eslint-parser": "7.25.9",
+    "@babel/plugin-proposal-export-default-from": "7.25.9",
    "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/preset-env": "7.24.4",
-    "@babel/preset-react": "7.24.1",
-    "@babel/preset-typescript": "7.24.1",
+    "@babel/preset-env": "7.26.0",
+    "@babel/preset-react": "7.26.3",
+    "@babel/preset-typescript": "7.26.0",
    "@types/lodash": "4.14.195",
-    "@types/react-lazyload": "3.2.0",
-    "@types/redux-actions": "2.6.2",
+    "@types/react-lazyload": "3.2.3",
+    "@types/redux-actions": "2.6.5",
    "@typescript-eslint/eslint-plugin": "6.21.0",
    "@typescript-eslint/parser": "6.21.0",
-    "autoprefixer": "10.4.14",
-    "babel-loader": "9.1.3",
+    "autoprefixer": "10.4.20",
+    "babel-loader": "9.2.1",
    "babel-plugin-inline-classnames": "2.0.1",
    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "core-js": "3.37.0",
+    "core-js": "3.39.0",
    "css-loader": "6.8.1",
    "css-modules-typescript-loader": "4.0.1",
-    "eslint": "8.57.0",
+    "eslint": "8.57.1",
    "eslint-config-prettier": "8.10.0",
    "eslint-plugin-filenames": "1.3.2",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-json": "3.1.0",
+    "eslint-plugin-import": "2.31.0",
    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-react": "7.34.1",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-simple-import-sort": "12.1.0",
+    "eslint-plugin-react": "7.37.1",
+    "eslint-plugin-react-hooks": "4.6.2",
+    "eslint-plugin-simple-import-sort": "12.1.1",
    "file-loader": "6.2.0",
    "filemanager-webpack-plugin": "8.0.0",
    "fork-ts-checker-webpack-plugin": "8.0.0",
-    "html-webpack-plugin": "5.5.3",
+    "html-webpack-plugin": "5.6.0",
    "loader-utils": "^3.2.1",
-    "mini-css-extract-plugin": "2.7.6",
-    "postcss": "8.4.38",
+    "mini-css-extract-plugin": "2.9.1",
+    "postcss": "8.4.47",
    "postcss-color-function": "4.1.0",
    "postcss-loader": "7.3.0",
    "postcss-mixins": "9.0.4",
-    "postcss-nested": "6.0.1",
+    "postcss-nested": "6.2.0",
    "postcss-simple-vars": "7.0.1",
    "postcss-url": "10.1.3",
    "prettier": "2.8.8",
    "require-nocache": "1.0.0",
-    "rimraf": "4.4.1",
-    "run-sequence": "2.2.1",
-    "streamqueue": "1.1.2",
-    "style-loader": "3.3.3",
+    "rimraf": "6.0.1",
+    "style-loader": "3.3.4",
    "stylelint": "15.10.3",
-    "stylelint-order": "6.0.3",
-    "terser-webpack-plugin": "5.3.9",
-    "ts-loader": "9.4.4",
+    "stylelint-order": "6.0.4",
+    "terser-webpack-plugin": "5.3.10",
+    "ts-loader": "9.5.1",
    "typescript-plugin-css-modules": "5.0.1",
    "url-loader": "4.1.1",
-    "webpack": "5.88.2",
+    "webpack": "5.95.0",
    "webpack-cli": "5.1.4",
    "webpack-livereload-plugin": "3.0.2",
    "worker-loader": "3.0.8"
  },
  "volta": {
-    "node": "16.17.0",
+    "node": "20.11.1",
    "yarn": "1.22.19"
  }
 }
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -99,6 +99,35 @@
    <RootNamespace Condition="'$(ReadarrProject)'=='true'">$(MSBuildProjectName.Replace('Readarr','NzbDrone'))</RootNamespace>
  </PropertyGroup>

+  <ItemGroup Condition="'$(TestProject)'!='true'">
+    <!-- Annotates .NET assemblies with repository information including SHA -->
+    <!-- Sentry uses this to link directly to GitHub at the exact version/file/line -->
+    <!-- This is built-in on .NET 8 and can be removed once the project is updated -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" />
+  </ItemGroup>
+
+  <!-- Sentry specific configuration: Only in Release mode -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <!-- https://docs.sentry.io/platforms/dotnet/configuration/msbuild/ -->
+    <!-- OrgSlug, ProjectSlug and AuthToken are required. 
+    They can be set below, via argument to 'msbuild -p:' or environment variable -->
+    <SentryOrg></SentryOrg>
+    <SentryProject></SentryProject>
+    <SentryUrl></SentryUrl> <!--  If empty, assumed to be sentry.io -->
+    <SentryAuthToken></SentryAuthToken> <!-- Use env var instead: SENTRY_AUTH_TOKEN -->
+
+    <!-- Upload PDBs to Sentry, enabling stack traces with line numbers and file paths
+      without the need to deploy the application with PDBs -->
+    <SentryUploadSymbols>true</SentryUploadSymbols>
+
+    <!-- Source Link settings -->
+    <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#publishrepositoryurl -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!--  Embeds all source code in the respective PDB. This can make it a bit bigger but since it'll be uploaded
+      to Sentry and not distributed to run on the server, it helps debug crashes while making releases smaller -->
+    <EmbedAllSources>true</EmbedAllSources>
+  </PropertyGroup>
+
  <!-- Standard testing packages -->
  <ItemGroup Condition="'$(TestProject)'=='true'">
    <PackageReference Include="Microsoft.NET.Test.Sdk" />
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -4,26 +4,30 @@
    <PackageVersion Include="AutoFixture" Version="4.17.0" />
    <PackageVersion Include="coverlet.collector" Version="3.0.4-preview.27.ge7cb7c3b40" PrivateAssets="all" />
    <PackageVersion Include="Dapper" Version="2.0.151" />
+    <PackageVersion Include="Diacritical.Net" Version="1.0.4" />
    <PackageVersion Include="DryIoc.dll" Version="5.4.3" />
    <PackageVersion Include="DryIoc.Microsoft.DependencyInjection" Version="6.2.0" />
    <PackageVersion Include="Equ" Version="2.3.0" />
    <PackageVersion Include="FluentAssertions" Version="5.10.3" />
-    <PackageVersion Include="Polly" Version="8.4.1" />
+    <PackageVersion Include="IPAddressRange" Version="6.1.0" />
+    <PackageVersion Include="Polly" Version="8.5.2" />
    <PackageVersion Include="Servarr.FluentMigrator.Runner" Version="3.3.2.9" />
    <PackageVersion Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
    <PackageVersion Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" />
    <PackageVersion Include="FluentValidation" Version="9.5.4" />
-    <PackageVersion Include="Ical.Net" Version="4.2.0" />
+    <PackageVersion Include="Ical.Net" Version="4.3.1" />
    <PackageVersion Include="ImpromptuInterface" Version="7.0.1" />
    <PackageVersion Include="LazyCache" Version="2.4.0" />
-    <PackageVersion Include="Mailkit" Version="3.6.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.32" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+    <PackageVersion Include="Mailkit" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.35" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="2.1.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
    <PackageVersion Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr22" />
    <PackageVersion Include="Moq" Version="4.17.2" />
@@ -33,36 +37,36 @@
    <PackageVersion Include="NLog.Extensions.Logging" Version="5.2.3" />
    <PackageVersion Include="NLog" Version="5.1.4" />
    <PackageVersion Include="NLog.Targets.Syslog" Version="7.0.0" />
-    <PackageVersion Include="Npgsql" Version="7.0.7" />
+    <PackageVersion Include="Npgsql" Version="7.0.10" />
    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
    <PackageVersion Include="NUnit" Version="3.14.0" />
    <PackageVersion Include="NunitXml.TestLogger" Version="3.0.117" />
-    <PackageVersion Include="PdfSharpCore" Version="1.3.32" />
+    <PackageVersion Include="PdfSharpCore" Version="1.3.65" />
    <PackageVersion Include="RestSharp.Serializers.SystemTextJson" Version="106.15.0" />
    <PackageVersion Include="RestSharp" Version="106.15.0" />
    <PackageVersion Include="Selenium.Support" Version="3.141.0" />
-    <PackageVersion Include="Selenium.WebDriver.ChromeDriver" Version="91.0.4472.10100" />
-    <PackageVersion Include="Sentry" Version="3.31.0" />
+    <PackageVersion Include="Selenium.WebDriver.ChromeDriver" Version="134.0.6998.16500" />
+    <PackageVersion Include="Sentry" Version="4.0.2" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.7" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
    <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
-    <PackageVersion Include="System.Buffers" Version="4.5.1" />
+    <PackageVersion Include="System.Buffers" Version="4.6.0" />
    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
    <PackageVersion Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.0.24" />
    <PackageVersion Include="System.IO.Abstractions" Version="17.0.24" />
    <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Memory" Version="4.6.2" />
    <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
    <PackageVersion Include="System.Resources.Extensions" Version="6.0.0" />
    <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
    <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="6.0.1" />
    <PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="6.0.9" />
-    <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
+    <PackageVersion Include="System.Text.Json" Version="6.0.10" />
+    <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
    <PackageVersion Include="TagLibSharp-Lidarr" Version="2.2.0.19" />
  </ItemGroup>
 </Project>
--- a/src/NzbDrone.Common.Test/ExtensionTests/IPAddressExtensionsFixture.cs
+++ b/src/NzbDrone.Common.Test/ExtensionTests/IPAddressExtensionsFixture.cs
@@ -21,9 +21,28 @@ namespace NzbDrone.Common.Test.ExtensionTests
        [TestCase("1.2.3.4")]
        [TestCase("172.55.0.1")]
        [TestCase("192.55.0.1")]
+        [TestCase("100.64.0.1")]
+        [TestCase("100.127.255.254")]
        public void should_return_false_for_public_ip_address(string ipAddress)
        {
            IPAddress.Parse(ipAddress).IsLocalAddress().Should().BeFalse();
        }
+
+        [TestCase("100.64.0.1")]
+        [TestCase("100.127.255.254")]
+        [TestCase("100.100.100.100")]
+        public void should_return_true_for_cgnat_ip_address(string ipAddress)
+        {
+            IPAddress.Parse(ipAddress).IsCgnatIpAddress().Should().BeTrue();
+        }
+
+        [TestCase("1.2.3.4")]
+        [TestCase("192.168.5.1")]
+        [TestCase("100.63.255.255")]
+        [TestCase("100.128.0.0")]
+        public void should_return_false_for_non_cgnat_ip_address(string ipAddress)
+        {
+            IPAddress.Parse(ipAddress).IsCgnatIpAddress().Should().BeFalse();
+        }
    }
 }
--- a/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
@@ -89,6 +89,10 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        [TestCase(@"https://discord.com/api/webhooks/mySecret")]
        [TestCase(@"https://discord.com/api/webhooks/mySecret/01233210")]

+        // Telegram
+        [TestCase(@"https://api.telegram.org/bot1234567890:mySecret/sendmessage: chat_id=123456&parse_mode=HTML&text=<text>")]
+        [TestCase(@"https://api.telegram.org/bot1234567890:mySecret/")]
+
        public void should_clean_message(string message)
        {
            var cleansedMessage = CleanseLogMessage.Cleanse(message);
--- a/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using FluentAssertions;
 using NLog;
 using NUnit.Framework;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation.Sentry;
 using NzbDrone.Test.Common;

@@ -27,7 +28,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        [SetUp]
        public void Setup()
        {
-            _subject = new SentryTarget("https://aaaaaaaaaaaaaaaaaaaaaaaaaa@sentry.io/111111");
+            _subject = new SentryTarget("https://aaaaaaaaaaaaaaaaaaaaaaaaaa@sentry.io/111111", Mocker.GetMock<IAppFolderInfo>().Object);
        }

        private LogEventInfo GivenLogEvent(LogLevel level, Exception ex, string message)
--- a/src/NzbDrone.Common/ArchiveService.cs
+++ b/src/NzbDrone.Common/ArchiveService.cs
@@ -42,17 +42,18 @@ namespace NzbDrone.Common

        public void CreateZip(string path, IEnumerable<string> files)
        {
-            using (var zipFile = ZipFile.Create(path))
+            _logger.Debug("Creating archive {0}", path);
+
+            using var zipFile = ZipFile.Create(path);
+
+            zipFile.BeginUpdate();
+
+            foreach (var file in files)
            {
-                zipFile.BeginUpdate();
-
-                foreach (var file in files)
-                {
-                    zipFile.Add(file, Path.GetFileName(file));
-                }
-
-                zipFile.CommitUpdate();
+                zipFile.Add(file, Path.GetFileName(file));
            }
+
+            zipFile.CommitUpdate();
        }

        private void ExtractZip(string compressedFile, string destination)
--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
+using System.Threading;
 using NLog;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.EnvironmentInfo;
@@ -306,9 +307,26 @@ namespace NzbDrone.Common.Disk
        {
            Ensure.That(path, () => path).IsValidPath(PathValidationType.CurrentOs);

-            var files = GetFiles(path, recursive);
+            var files = GetFiles(path, recursive).ToList();

-            files.ToList().ForEach(RemoveReadOnly);
+            files.ForEach(RemoveReadOnly);
+
+            var attempts = 0;
+
+            while (attempts < 3 && files.Any())
+            {
+                EmptyFolder(path);
+
+                if (GetFiles(path, recursive).Any())
+                {
+                    // Wait for IO operations to complete  after emptying the folder since they aren't always
+                    // instantly removed and it can lead to false positives that files are still present.
+                    Thread.Sleep(3000);
+                }
+
+                attempts++;
+                files = GetFiles(path, recursive).ToList();
+            }

            _fileSystem.Directory.Delete(path, recursive);
        }
--- a/src/NzbDrone.Common/Disk/DiskTransferService.cs
+++ b/src/NzbDrone.Common/Disk/DiskTransferService.cs
@@ -342,10 +342,11 @@ namespace NzbDrone.Common.Disk

            var isCifs = targetDriveFormat == "cifs";
            var isBtrfs = sourceDriveFormat == "btrfs" && targetDriveFormat == "btrfs";
+            var isZfs = sourceDriveFormat == "zfs" && targetDriveFormat == "zfs";

            if (mode.HasFlag(TransferMode.Copy))
            {
-                if (isBtrfs)
+                if (isBtrfs || isZfs)
                {
                    if (_diskProvider.TryCreateRefLink(sourcePath, targetPath))
                    {
@@ -359,7 +360,7 @@ namespace NzbDrone.Common.Disk

            if (mode.HasFlag(TransferMode.Move))
            {
-                if (isBtrfs)
+                if (isBtrfs || isZfs)
                {
                    if (isSameMount && _diskProvider.TryRenameFile(sourcePath, targetPath))
                    {
--- a/src/NzbDrone.Common/Extensions/IpAddressExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/IpAddressExtensions.cs
@@ -39,18 +39,24 @@ namespace NzbDrone.Common.Extensions
        private static bool IsLocalIPv4(byte[] ipv4Bytes)
        {
            // Link local (no IP assigned by DHCP): 169.254.0.0 to 169.254.255.255 (169.254.0.0/16)
-            bool IsLinkLocal() => ipv4Bytes[0] == 169 && ipv4Bytes[1] == 254;
+            var isLinkLocal = ipv4Bytes[0] == 169 && ipv4Bytes[1] == 254;

            // Class A private range: 10.0.0.0 – 10.255.255.255 (10.0.0.0/8)
-            bool IsClassA() => ipv4Bytes[0] == 10;
+            var isClassA = ipv4Bytes[0] == 10;

            // Class B private range: 172.16.0.0 – 172.31.255.255 (172.16.0.0/12)
-            bool IsClassB() => ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31;
+            var isClassB = ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31;

            // Class C private range: 192.168.0.0 – 192.168.255.255 (192.168.0.0/16)
-            bool IsClassC() => ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168;
+            var isClassC = ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168;

-            return IsLinkLocal() || IsClassA() || IsClassC() || IsClassB();
+            return isLinkLocal || isClassA || isClassC || isClassB;
+        }
+
+        public static bool IsCgnatIpAddress(this IPAddress ipAddress)
+        {
+            var bytes = ipAddress.GetAddressBytes();
+            return bytes.Length == 4 && bytes[0] == 100 && bytes[1] >= 64 && bytes[1] <= 127;
        }
    }
 }
--- a/src/NzbDrone.Common/Extensions/PathExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs
@@ -108,6 +108,15 @@ namespace NzbDrone.Common.Extensions
            return Directory.GetParent(cleanPath)?.FullName;
        }

+        public static string GetCleanPath(this string path)
+        {
+            var cleanPath = OsInfo.IsWindows
+                ? PARENT_PATH_END_SLASH_REGEX.Replace(path, "")
+                : path.TrimEnd(Path.DirectorySeparatorChar);
+
+            return cleanPath;
+        }
+
        public static bool IsParentPath(this string parentPath, string childPath)
        {
            if (parentPath != "/" && !parentPath.EndsWith(":\\"))
--- a/src/NzbDrone.Common/Http/Proxy/HttpProxySettings.cs
+++ b/src/NzbDrone.Common/Http/Proxy/HttpProxySettings.cs
@@ -1,3 +1,4 @@
+using System;
 using NzbDrone.Common.Extensions;

 namespace NzbDrone.Common.Http.Proxy
@@ -29,7 +30,8 @@ namespace NzbDrone.Common.Http.Proxy
            {
                if (!string.IsNullOrWhiteSpace(BypassFilter))
                {
-                    var hostlist = BypassFilter.Split(',');
+                    var hostlist = BypassFilter.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+
                    for (var i = 0; i < hostlist.Length; i++)
                    {
                        if (hostlist[i].StartsWith("*"))
@@ -41,7 +43,7 @@ namespace NzbDrone.Common.Http.Proxy
                    return hostlist;
                }

-                return new string[] { };
+                return Array.Empty<string>();
            }
        }

--- a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
@@ -54,7 +54,10 @@ namespace NzbDrone.Common.Instrumentation
            new (@"api/v[0-9]/notification/readarr/(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

            // Discord
-            new (@"discord.com/api/webhooks/((?<secret>[\w-]+)/)?(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase)
+            new (@"discord.com/api/webhooks/((?<secret>[\w-]+)/)?(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+
+            // Telegram
+            new (@"api.telegram.org/bot(?<id>[\d]+):(?<secret>[\w-]+)/", RegexOptions.Compiled | RegexOptions.IgnoreCase)
        };

        private static readonly Regex CleanseRemoteIPRegex = new (@"(?:Auth-\w+(?<!Failure|Unauthorized) ip|from) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})", RegexOptions.Compiled);
--- a/src/NzbDrone.Common/Instrumentation/Extensions/LoggerExtensions.cs
+++ b/src/NzbDrone.Common/Instrumentation/Extensions/LoggerExtensions.cs
@@ -4,27 +4,27 @@ namespace NzbDrone.Common.Instrumentation.Extensions
 {
    public static class LoggerExtensions
    {
+        [MessageTemplateFormatMethod("message")]
        public static void ProgressInfo(this Logger logger, string message, params object[] args)
        {
-            var formattedMessage = string.Format(message, args);
-            LogProgressMessage(logger, LogLevel.Info, formattedMessage);
+            LogProgressMessage(logger, LogLevel.Info, message, args);
        }

+        [MessageTemplateFormatMethod("message")]
        public static void ProgressDebug(this Logger logger, string message, params object[] args)
        {
-            var formattedMessage = string.Format(message, args);
-            LogProgressMessage(logger, LogLevel.Debug, formattedMessage);
+            LogProgressMessage(logger, LogLevel.Debug, message, args);
        }

+        [MessageTemplateFormatMethod("message")]
        public static void ProgressTrace(this Logger logger, string message, params object[] args)
        {
-            var formattedMessage = string.Format(message, args);
-            LogProgressMessage(logger, LogLevel.Trace, formattedMessage);
+            LogProgressMessage(logger, LogLevel.Trace, message, args);
        }

-        private static void LogProgressMessage(Logger logger, LogLevel level, string message)
+        private static void LogProgressMessage(Logger logger, LogLevel level, string message, object[] parameters)
        {
-            var logEvent = new LogEventInfo(level, logger.Name, message);
+            var logEvent = new LogEventInfo(level, logger.Name, null, message, parameters);
            logEvent.Properties.Add("Status", "");

            logger.Log(logEvent);
--- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
+++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
@@ -41,7 +41,7 @@ namespace NzbDrone.Common.Instrumentation
                RegisterDebugger();
            }

-            RegisterSentry(updateApp);
+            RegisterSentry(updateApp, appFolderInfo);

            if (updateApp)
            {
@@ -62,7 +62,7 @@ namespace NzbDrone.Common.Instrumentation
            LogManager.ReconfigExistingLoggers();
        }

-        private static void RegisterSentry(bool updateClient)
+        private static void RegisterSentry(bool updateClient, IAppFolderInfo appFolderInfo)
        {
            string dsn;

@@ -77,7 +77,7 @@ namespace NzbDrone.Common.Instrumentation
                    : "https://31e00a6c63ea42c8b5fe70358526a30d@sentry.servarr.com/4";
            }

-            var target = new SentryTarget(dsn)
+            var target = new SentryTarget(dsn, appFolderInfo)
            {
                Name = "sentryTarget",
                Layout = "${message}"
--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
@@ -9,6 +9,7 @@ using NLog;
 using NLog.Common;
 using NLog.Targets;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using Sentry;

 namespace NzbDrone.Common.Instrumentation.Sentry
@@ -99,7 +100,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
        public bool FilterEvents { get; set; }
        public bool SentryEnabled { get; set; }

-        public SentryTarget(string dsn)
+        public SentryTarget(string dsn, IAppFolderInfo appFolderInfo)
        {
            _sdk = SentrySdk.Init(o =>
                                  {
@@ -107,9 +108,33 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                                      o.AttachStacktrace = true;
                                      o.MaxBreadcrumbs = 200;
                                      o.Release = $"{BuildInfo.AppName}@{BuildInfo.Release}";
-                                      o.BeforeSend = x => SentryCleanser.CleanseEvent(x);
-                                      o.BeforeBreadcrumb = x => SentryCleanser.CleanseBreadcrumb(x);
+                                      o.SetBeforeSend(x => SentryCleanser.CleanseEvent(x));
+                                      o.SetBeforeBreadcrumb(x => SentryCleanser.CleanseBreadcrumb(x));
                                      o.Environment = BuildInfo.Branch;
+
+                                      // Crash free run statistics (sends a ping for healthy and for crashes sessions)
+                                      o.AutoSessionTracking = false;
+
+                                      // Caches files in the event device is offline
+                                      // Sentry creates a 'sentry' sub directory, no need to concat here
+                                      o.CacheDirectoryPath = appFolderInfo.GetAppDataPath();
+
+                                      // default environment is production
+                                      if (!RuntimeInfo.IsProduction)
+                                      {
+                                          if (RuntimeInfo.IsDevelopment)
+                                          {
+                                              o.Environment = "development";
+                                          }
+                                          else if (RuntimeInfo.IsTesting)
+                                          {
+                                              o.Environment = "testing";
+                                          }
+                                          else
+                                          {
+                                              o.Environment = "other";
+                                          }
+                                      }
                                  });

            InitializeScope();
@@ -127,7 +152,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
        {
            SentrySdk.ConfigureScope(scope =>
            {
-                scope.User = new User
+                scope.User = new SentryUser
                {
                    Id = HashUtil.AnonymousToken()
                };
@@ -169,9 +194,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry

        private void OnError(Exception ex)
        {
-            var webException = ex as WebException;
-
-            if (webException != null)
+            if (ex is WebException webException)
            {
                var response = webException.Response as HttpWebResponse;
                var statusCode = response?.StatusCode;
@@ -290,13 +313,21 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                    }
                }

+                var level = LoggingLevelMap[logEvent.Level];
                var sentryEvent = new SentryEvent(logEvent.Exception)
                {
-                    Level = LoggingLevelMap[logEvent.Level],
+                    Level = level,
                    Logger = logEvent.LoggerName,
                    Message = logEvent.FormattedMessage
                };

+                if (level is SentryLevel.Fatal && logEvent.Exception is not null)
+                {
+                    // Usages of 'fatal' here indicates the process will crash. In Sentry this is represented with
+                    // the 'unhandled' exception flag
+                    logEvent.Exception.SetSentryMechanism("Logger.Fatal", "Logger.Fatal was called", false);
+                }
+
                sentryEvent.SetExtras(extras);
                sentryEvent.SetFingerprint(fingerPrint);

--- a/src/NzbDrone.Common/Options/AuthOptions.cs
+++ b/src/NzbDrone.Common/Options/AuthOptions.cs
@@ -6,4 +6,5 @@ public class AuthOptions
    public bool? Enabled { get; set; }
    public string Method { get; set; }
    public string Required { get; set; }
+    public bool? TrustCgnatIpAddresses { get; set; }
 }
--- a/src/NzbDrone.Common/Processes/ProcessProvider.cs
+++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs
@@ -6,6 +6,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Model;
@@ -117,7 +118,9 @@ namespace NzbDrone.Common.Processes
                UseShellExecute = false,
                RedirectStandardError = true,
                RedirectStandardOutput = true,
-                RedirectStandardInput = true
+                RedirectStandardInput = true,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8
            };

            if (environmentVariables != null)
@@ -313,7 +316,7 @@ namespace NzbDrone.Common.Processes
                processInfo = new ProcessInfo();
                processInfo.Id = process.Id;
                processInfo.Name = process.ProcessName;
-                processInfo.StartPath = process.MainModule.FileName;
+                processInfo.StartPath = process.MainModule?.FileName;

                if (process.Id != GetCurrentProcessId() && process.HasExited)
                {
--- a/src/NzbDrone.Common/Readarr.Common.csproj
+++ b/src/NzbDrone.Common/Readarr.Common.csproj
@@ -6,6 +6,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="DryIoc.dll" />
+    <PackageReference Include="IPAddressRange" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
 	<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
    <PackageReference Include="NLog.Extensions.Logging" />
--- a/src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs
@@ -200,17 +200,9 @@ namespace NzbDrone.Core.Test.Download
            var seriesTags = new HashSet<int> { 2 };
            var clientTags = new HashSet<int> { 1 };

-            WithTorrentClient(0, clientTags);
-            WithTorrentClient(0, clientTags);
-            WithTorrentClient(0, clientTags);
            WithTorrentClient(0, clientTags);

-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-
-            Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags).Should().BeNull();
+            Assert.Throws<DownloadClientUnavailableException>(() => Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags));
        }

        [Test]
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs
@@ -312,11 +312,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
        [Test]
        public void should_return_status_with_outputdirs()
        {
-            var configItems = new Dictionary<string, object>();
-
-            configItems.Add("download_location", @"C:\Downloads\Downloading\deluge".AsOsAgnostic());
-            configItems.Add("move_completed_path", @"C:\Downloads\Finished\deluge".AsOsAgnostic());
-            configItems.Add("move_completed", true);
+            var configItems = new Dictionary<string, object>
+            {
+                { "download_location", @"C:\Downloads\Downloading\deluge".AsOsAgnostic() },
+                { "move_completed_path", @"C:\Downloads\Finished\deluge".AsOsAgnostic() },
+                { "move_completed", true }
+            };

            Mocker.GetMock<IDelugeProxy>()
                .Setup(v => v.GetConfig(It.IsAny<DelugeSettings>()))
@@ -328,5 +329,18 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
            result.OutputRootFolders.Should().NotBeNull();
            result.OutputRootFolders.First().Should().Be(@"C:\Downloads\Finished\deluge".AsOsAgnostic());
        }
+
+        [Test]
+        public void should_return_status_with_outputdirs_for_directories_in_settings()
+        {
+            Subject.Definition.Settings.As<DelugeSettings>().DownloadDirectory =  @"D:\Downloads\Downloading\deluge".AsOsAgnostic();
+            Subject.Definition.Settings.As<DelugeSettings>().CompletedDirectory =  @"D:\Downloads\Finished\deluge".AsOsAgnostic();
+
+            var result = Subject.GetStatus();
+
+            result.IsLocalhost.Should().BeTrue();
+            result.OutputRootFolders.Should().NotBeNull();
+            result.OutputRootFolders.First().Should().Be(@"D:\Downloads\Finished\deluge".AsOsAgnostic());
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
@@ -178,8 +178,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            VerifyWarning(item);
        }

-        [Test]
-        public void paused_item_should_have_required_properties()
+        [TestCase("pausedDL")]
+        [TestCase("stoppedDL")]
+        public void paused_item_should_have_required_properties(string state)
        {
            var torrent = new QBittorrentTorrent
            {
@@ -188,7 +189,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 0.7,
                Eta = 8640000,
-                State = "pausedDL",
+                State = state,
                Label = "",
                SavePath = ""
            };
@@ -200,6 +201,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
        }

        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
        [TestCase("queuedUP")]
        [TestCase("uploading")]
        [TestCase("stalledUP")]
@@ -397,8 +399,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            result.OutputPath.FullPath.Should().Be(Path.Combine(torrent.SavePath, "Droned.S01.12"));
        }

-        [Test]
-        public void api_261_should_use_content_path()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void api_261_should_use_content_path(string state)
        {
            var torrent = new QBittorrentTorrent
            {
@@ -407,7 +410,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 0.7,
                Eta = 8640000,
-                State = "pausedUP",
+                State = state,
                Label = "",
                SavePath = @"C:\Torrents".AsOsAgnostic(),
                ContentPath = @"C:\Torrents\Droned.S01.12".AsOsAgnostic()
@@ -684,44 +687,96 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            item.CanMoveFiles.Should().BeFalse();
        }

-        [Test]
-        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_is_not_set()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_is_not_set(string state)
        {
            GivenGlobalSeedLimits(-1);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f);
+            GivenCompletedTorrent(state, ratio: 1.0f);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
            item.CanMoveFiles.Should().BeFalse();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_ratio_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_ratio_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(1.0f);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f);
+            GivenCompletedTorrent(state, ratio: 1.0f);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_overridden_max_ratio_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_ratio_reached_after_rounding_and_paused(string state)
+        {
+            GivenGlobalSeedLimits(1.0f);
+            GivenCompletedTorrent(state, ratio: 1.1006066990976857f);
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
+        }
+
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_just_under_max_ratio_reached_after_rounding_and_paused(string state)
+        {
+            GivenGlobalSeedLimits(1.0f);
+            GivenCompletedTorrent(state, ratio: 0.9999f);
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
+        }
+
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_ratio_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(2.0f);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, ratioLimit: 0.8f);
+            GivenCompletedTorrent(state, ratio: 1.0f, ratioLimit: 0.8f);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_not_be_removable_if_overridden_max_ratio_not_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_ratio_reached_after_rounding_and_paused(string state)
+        {
+            GivenGlobalSeedLimits(2.0f);
+            GivenCompletedTorrent(state, ratio: 1.1006066990976857f, ratioLimit: 1.1f);
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
+        }
+
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_just_under_overridden_max_ratio_reached_after_rounding_and_paused(string state)
+        {
+            GivenGlobalSeedLimits(2.0f);
+            GivenCompletedTorrent(state, ratio: 0.9999f, ratioLimit: 1.0f);
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
+        }
+
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_if_overridden_max_ratio_not_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(0.2f);
-            GivenCompletedTorrent("pausedUP", ratio: 0.5f, ratioLimit: 0.8f);
+            GivenCompletedTorrent(state, ratio: 0.5f, ratioLimit: 0.8f);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
@@ -739,33 +794,36 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            item.CanMoveFiles.Should().BeFalse();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 20);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_overridden_max_seedingtime_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, 40);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20, seedingTimeLimit: 10);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 20, seedingTimeLimit: 10);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_not_be_removable_if_overridden_max_seedingtime_not_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_if_overridden_max_seedingtime_not_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 30, seedingTimeLimit: 40);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 30, seedingTimeLimit: 40);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
@@ -783,66 +841,72 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            item.CanMoveFiles.Should().BeFalse();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, ratio: 2.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_overridden_max_inactive_seedingtime_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_inactive_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 40);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20, inactiveSeedingTimeLimit: 10, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(15)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 20, inactiveSeedingTimeLimit: 10, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(15)).ToUnixTimeSeconds());

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_not_be_removable_if_overridden_max_inactive_seedingtime_not_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_if_overridden_max_inactive_seedingtime_not_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 30, inactiveSeedingTimeLimit: 40, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(30)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 30, inactiveSeedingTimeLimit: 40, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(30)).ToUnixTimeSeconds());

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
            item.CanMoveFiles.Should().BeFalse();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_but_ratio_not_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_but_ratio_not_and_paused(string state)
        {
            GivenGlobalSeedLimits(2.0f, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, seedingTime: 30);
+            GivenCompletedTorrent(state, ratio: 1.0f, seedingTime: 30);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_but_ratio_not_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_but_ratio_not_and_paused(string state)
        {
            GivenGlobalSeedLimits(2.0f, maxInactiveSeedingTime: 20);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, ratio: 1.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_not_fetch_details_twice()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_fetch_details_twice(string state)
        {
            GivenGlobalSeedLimits(-1, 30);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 20);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
@@ -854,8 +918,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                  .Verify(p => p.GetTorrentProperties(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()), Times.Once());
        }

-        [Test]
-        public void should_get_category_from_the_category_if_set()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_get_category_from_the_category_if_set(string state)
        {
            const string category = "music-readarr";
            GivenGlobalSeedLimits(1.0f);
@@ -867,7 +932,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 1.0,
                Eta = 8640000,
-                State = "pausedUP",
+                State = state,
                Category = category,
                SavePath = "",
                Ratio = 1.0f
@@ -879,8 +944,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            item.Category.Should().Be(category);
        }

-        [Test]
-        public void should_get_category_from_the_label_if_the_category_is_not_available()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_get_category_from_the_label_if_the_category_is_not_available(string state)
        {
            const string category = "music-readarr";
            GivenGlobalSeedLimits(1.0f);
@@ -892,7 +958,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 1.0,
                Eta = 8640000,
-                State = "pausedUP",
+                State = state,
                Label = category,
                SavePath = "",
                Ratio = 1.0f
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
@@ -478,6 +478,37 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
            downloadClientInfo.RemovesCompletedDownloads.Should().BeTrue();
        }

+        [TestCase("all", 0)]
+        [TestCase("days-archive", 15)]
+        [TestCase("days-delete", 15)]
+        public void should_set_history_removes_completed_downloads_false_for_separate_properties(string option, int number)
+        {
+            _config.Misc.history_retention_option = option;
+            _config.Misc.history_retention_number = number;
+
+            var downloadClientInfo = Subject.GetStatus();
+
+            downloadClientInfo.RemovesCompletedDownloads.Should().BeFalse();
+        }
+
+        [TestCase("number-archive", 10)]
+        [TestCase("number-delete", 10)]
+        [TestCase("number-archive", 0)]
+        [TestCase("number-delete", 0)]
+        [TestCase("days-archive", 3)]
+        [TestCase("days-delete", 3)]
+        [TestCase("all-archive", 0)]
+        [TestCase("all-delete", 0)]
+        public void should_set_history_removes_completed_downloads_true_for_separate_properties(string option, int number)
+        {
+            _config.Misc.history_retention_option = option;
+            _config.Misc.history_retention_number = number;
+
+            var downloadClientInfo = Subject.GetStatus();
+
+            downloadClientInfo.RemovesCompletedDownloads.Should().BeTrue();
+        }
+
        [TestCase(@"Y:\nzbget\root", @"completed\downloads", @"vv", @"Y:\nzbget\root\completed\downloads", @"Y:\nzbget\root\completed\downloads\vv")]
        [TestCase(@"Y:\nzbget\root", @"completed", @"vv", @"Y:\nzbget\root\completed", @"Y:\nzbget\root\completed\vv")]
        [TestCase(@"/nzbget/root", @"completed/downloads", @"vv", @"/nzbget/root/completed/downloads", @"/nzbget/root/completed/downloads/vv")]
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
@@ -49,10 +49,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
        }

        [Test]
-        public void magnet_download_should_not_return_the_item()
+        public void magnet_download_should_be_returned_as_queued()
        {
            PrepareClientToReturnMagnetItem();
-            Subject.GetItems().Count().Should().Be(0);
+
+            var item = Subject.GetItems().Single();
+
+            item.Status.Should().Be(DownloadItemStatus.Queued);
        }

        [Test]
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs
@@ -60,7 +60,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
        public void magnet_download_should_not_return_the_item()
        {
            PrepareClientToReturnMagnetItem();
-            Subject.GetItems().Count().Should().Be(0);
+
+            var item = Subject.GetItems().Single();
+
+            item.Status.Should().Be(DownloadItemStatus.Queued);
        }

        [Test]
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
@@ -7,6 +7,7 @@ using NzbDrone.Core.HealthCheck.Checks;
 using NzbDrone.Core.Localization;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Update;
+using NzbDrone.Test.Common;

 namespace NzbDrone.Core.Test.HealthCheck.Checks
 {
@@ -21,28 +22,10 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                  .Returns("Some Warning Message");
        }

-        [Test]
-        public void should_return_error_when_app_folder_is_write_protected()
-        {
-            WindowsOnly();
-
-            Mocker.GetMock<IAppFolderInfo>()
-                  .Setup(s => s.StartUpFolder)
-                  .Returns(@"C:\NzbDrone");
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(c => c.FolderWritable(It.IsAny<string>()))
-                  .Returns(false);
-
-            Subject.Check().ShouldBeError();
-        }
-
        [Test]
        public void should_return_error_when_app_folder_is_write_protected_and_update_automatically_is_enabled()
        {
-            PosixOnly();
-
-            const string startupFolder = @"/opt/nzbdrone";
+            var startupFolder = @"C:\NzbDrone".AsOsAgnostic();

            Mocker.GetMock<IConfigFileProvider>()
                  .Setup(s => s.UpdateAutomatically)
@@ -62,10 +45,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
        [Test]
        public void should_return_error_when_ui_folder_is_write_protected_and_update_automatically_is_enabled()
        {
-            PosixOnly();
-
-            const string startupFolder = @"/opt/nzbdrone";
-            const string uiFolder = @"/opt/nzbdrone/UI";
+            var startupFolder = @"C:\NzbDrone".AsOsAgnostic();
+            var uiFolder = @"C:\NzbDrone\UI".AsOsAgnostic();

            Mocker.GetMock<IConfigFileProvider>()
                  .Setup(s => s.UpdateAutomatically)
@@ -89,7 +70,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
        [Test]
        public void should_not_return_error_when_app_folder_is_write_protected_and_external_script_enabled()
        {
-            PosixOnly();
+            var startupFolder = @"C:\NzbDrone".AsOsAgnostic();

            Mocker.GetMock<IConfigFileProvider>()
                  .Setup(s => s.UpdateAutomatically)
@@ -101,7 +82,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks

            Mocker.GetMock<IAppFolderInfo>()
                  .Setup(s => s.StartUpFolder)
-                  .Returns(@"/opt/nzbdrone");
+                  .Returns(startupFolder);

            Mocker.GetMock<IDiskProvider>()
                  .Verify(c => c.FolderWritable(It.IsAny<string>()), Times.Never());
--- a/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
@@ -12,7 +12,7 @@ namespace NzbDrone.Core.Test.Http
    {
        private HttpProxySettings GetProxySettings()
        {
-            return new HttpProxySettings(ProxyType.Socks5, "localhost", 8080, "*.httpbin.org,google.com", true, null, null);
+            return new HttpProxySettings(ProxyType.Socks5, "localhost", 8080, "*.httpbin.org,google.com,172.16.0.0/12", true, null, null);
        }

        [Test]
@@ -23,6 +23,7 @@ namespace NzbDrone.Core.Test.Http
            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://eu.httpbin.org/get")).Should().BeTrue();
            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://google.com/get")).Should().BeTrue();
            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://localhost:8654/get")).Should().BeTrue();
+            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://172.21.0.1:8989/api/v3/indexer/schema")).Should().BeTrue();
        }

        [Test]
@@ -31,6 +32,7 @@ namespace NzbDrone.Core.Test.Http
            var settings = GetProxySettings();

            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://bing.com/get")).Should().BeFalse();
+            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://172.3.0.1:8989/api/v3/indexer/schema")).Should().BeFalse();
        }
    }
 }
--- a/src/NzbDrone.Core.Test/MetadataSource/BookInfo/BookInfoProxyFixture.cs
+++ b/src/NzbDrone.Core.Test/MetadataSource/BookInfo/BookInfoProxyFixture.cs
@@ -13,7 +13,7 @@ using NzbDrone.Core.Test.Framework;
 namespace NzbDrone.Core.Test.MetadataSource.Goodreads
 {
    [TestFixture]
-    [Ignore("Waiting for metadata to be back again", Until = "2024-08-15 00:00:00Z")]
+    [Ignore("Waiting for metadata to be back again", Until = "2025-05-15 00:00:00Z")]
    public class BookInfoProxyFixture : CoreTest<BookInfoProxy>
    {
        private MetadataProfile _metadataProfile;
--- a/Show More
+++ b/Show More