diff --git a/web/api/js/codechecker-api-node/dist/codechecker-api-6.42.0.tgz b/web/api/js/codechecker-api-node/dist/codechecker-api-6.42.0.tgz
deleted file mode 100644
index 2e8422d6f6..0000000000
Binary files a/web/api/js/codechecker-api-node/dist/codechecker-api-6.42.0.tgz and /dev/null differ
diff --git a/web/api/js/codechecker-api-node/dist/codechecker-api-6.43.0.tgz b/web/api/js/codechecker-api-node/dist/codechecker-api-6.43.0.tgz
new file mode 100644
index 0000000000..a7d04ace42
Binary files /dev/null and b/web/api/js/codechecker-api-node/dist/codechecker-api-6.43.0.tgz differ
diff --git a/web/api/js/codechecker-api-node/package.json b/web/api/js/codechecker-api-node/package.json
index 125e16f872..f2cd12486c 100644
--- a/web/api/js/codechecker-api-node/package.json
+++ b/web/api/js/codechecker-api-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codechecker-api",
-  "version": "6.42.0",
+  "version": "6.43.0",
   "description": "Generated node.js compatible API stubs for CodeChecker server.",
   "main": "lib",
   "homepage": "https://github.com/Ericsson/codechecker",
diff --git a/web/api/py/codechecker_api/dist/codechecker_api.tar.gz b/web/api/py/codechecker_api/dist/codechecker_api.tar.gz
index ea5713df64..d2fc49811d 100644
Binary files a/web/api/py/codechecker_api/dist/codechecker_api.tar.gz and b/web/api/py/codechecker_api/dist/codechecker_api.tar.gz differ
diff --git a/web/api/py/codechecker_api/setup.py b/web/api/py/codechecker_api/setup.py
index 0944da0799..e31fef3eb2 100644
--- a/web/api/py/codechecker_api/setup.py
+++ b/web/api/py/codechecker_api/setup.py
@@ -8,7 +8,7 @@
 with open('README.md', encoding='utf-8', errors="ignore") as f:
     long_description = f.read()
 
-api_version = '6.42.0'
+api_version = '6.43.0'
 
 setup(
     name='codechecker_api',
diff --git a/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz b/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz
index adc9366d0d..461c57ba28 100644
Binary files a/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz and b/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz differ
diff --git a/web/api/py/codechecker_api_shared/setup.py b/web/api/py/codechecker_api_shared/setup.py
index afcf9be488..2cd6dedf94 100644
--- a/web/api/py/codechecker_api_shared/setup.py
+++ b/web/api/py/codechecker_api_shared/setup.py
@@ -8,7 +8,7 @@
 with open('README.md', encoding='utf-8', errors="ignore") as f:
     long_description = f.read()
 
-api_version = '6.42.0'
+api_version = '6.43.0'
 
 setup(
     name='codechecker_api_shared',
diff --git a/web/api/report_server.thrift b/web/api/report_server.thrift
index deaa6a1f73..5d2df80d3d 100644
--- a/web/api/report_server.thrift
+++ b/web/api/report_server.thrift
@@ -288,6 +288,7 @@ struct ReportFilter {
   16: optional ReportDate         date,          // Dates of the report.
   17: optional list<string>       analyzerNames, // Names of the code analyzers.
   18: optional i64                openReportsDate, // Open reports date in unix time format.
+  19: optional list<string>       cleanupPlanNames, // Cleanup plan names.
 }
 
 struct RunReportCount {
@@ -405,6 +406,22 @@ struct BlameInfo {
   2: list<BlameData>         blame,
 }
 
+struct CleanupPlan {
+  1: i64          id,
+  2: string       name,
+  3: i64          dueDate, // Unix (epoch) time.
+  4: string       description,
+  5: i64          closedAt, // Unix (epoch) time.
+  6: list<string> reportHashes,
+}
+typedef list<CleanupPlan> CleanupPlans
+
+struct CleanupPlanFilter {
+  1: list<i64>    ids,
+  2: list<string> names,
+  3: bool         isOpen,
+}
+
 service codeCheckerDBAccess {
 
   // Gives back all analyzed runs.
@@ -790,5 +807,60 @@ service codeCheckerDBAccess {
   // Import data from the server.
   // PERMISSION: PRODUCT_ADMIN
   bool importData(1: ExportData exportData)
-                  throws (1: codechecker_api_shared.RequestFailed requestError),  
+                  throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Add a new cleanup plan.
+  // Returns the cleanup plan id if the cleanup plan was successfully created.
+  // PERMISSION: PRODUCT_ADMIN
+  i64 addCleanupPlan(1: string name,
+                     2: string description,
+                     3: i64 dueDate)
+                     throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Update a cleanup plan.
+  // Returns 'true' if cleanup plan was successfully updated.
+  // PERMISSION: PRODUCT_ADMIN
+  bool updateCleanupPlan(1: i64    id,
+                         2: string name,
+                         3: string description,
+                         4: i64    dueDate)
+                         throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Get cleanup plans.
+  // Returns a list of cleanup plans.
+  // PERMISSION: PRODUCT_VIEW
+  CleanupPlans getCleanupPlans(1: CleanupPlanFilter filter)
+                               throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Remove a cleanup plan.
+  // Returns 'true' if cleanup plan was successfully removed.
+  // PERMISSION: PRODUCT_ADMIN
+  bool removeCleanupPlan(1: i64 cleanupPlanId)
+                         throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Close a cleanup plan.
+  // Returns 'true' if cleanup plan was successfully closed.
+  // PERMISSION: PRODUCT_ADMIN
+  bool closeCleanupPlan(1: i64 cleanupPlanId)
+                        throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Reopen a cleanup plan.
+  // Returns 'true' if cleanup plan was successfully reopened.
+  // PERMISSION: PRODUCT_ADMIN
+  bool reopenCleanupPlan(1: i64 cleanupPlanId)
+                         throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Add report hashes to the given cleanup plan.
+  // Returns 'true' if report hashes are set for the given cleanup plan.
+  // PERMISSION: PRODUCT_ADMIN
+  bool setCleanupPlan(1: i64          cleanupPlanId,
+                      2: list<string> reportHashes)
+                      throws (1: codechecker_api_shared.RequestFailed requestError),
+
+  // Remove report hashes from the given cleanup plan.
+  // Returns 'true' if report hashes are removed from the given cleanup plan.
+  // PERMISSION: PRODUCT_ADMIN
+  bool unsetCleanupPlan(1: i64          cleanupPlanId,
+                        2: list<string> reportHashes)
+                        throws (1: codechecker_api_shared.RequestFailed requestError),
 }
diff --git a/web/codechecker_web/shared/version.py b/web/codechecker_web/shared/version.py
index 86f4bd4287..cd0025da34 100644
--- a/web/codechecker_web/shared/version.py
+++ b/web/codechecker_web/shared/version.py
@@ -18,7 +18,7 @@
 # The newest supported minor version (value) for each supported major version
 # (key) in this particular build.
 SUPPORTED_VERSIONS = {
-    6: 42
+    6: 43
 }
 
 # Used by the client to automatically identify the latest major and minor
diff --git a/web/server/codechecker_server/api/report_server.py b/web/server/codechecker_server/api/report_server.py
index b1829f7bd3..2dbd57aa49 100644
--- a/web/server/codechecker_server/api/report_server.py
+++ b/web/server/codechecker_server/api/report_server.py
@@ -14,11 +14,12 @@
 import os
 import re
 import shlex
+import time
 import zlib
 
 from collections import defaultdict
 from datetime import datetime, timedelta
-from typing import List, Optional
+from typing import Dict, List, Optional
 
 import sqlalchemy
 from sqlalchemy.sql.expression import or_, and_, not_, func, \
@@ -46,10 +47,10 @@
 from ..database.config_db_model import Product
 from ..database.database import conv, DBSession, escape_like
 from ..database.run_db_model import \
-    AnalysisInfo, AnalyzerStatistic, BugPathEvent, BugReportPoint, Comment, \
-    ExtendedReportData, File, FileContent, Report, ReportAnalysisInfo, \
-    ReviewStatus, Run, RunHistory, RunHistoryAnalysisInfo, RunLock, \
-    SourceComponent
+    AnalysisInfo, AnalyzerStatistic, BugPathEvent, BugReportPoint, \
+    CleanupPlan, CleanupPlanReportHash, Comment, ExtendedReportData, File, \
+    FileContent, Report, ReportAnalysisInfo, ReviewStatus, Run, RunHistory, \
+    RunHistoryAnalysisInfo, RunLock, SourceComponent
 
 from .thrift_enum_helper import detection_status_enum, \
     detection_status_str, review_status_enum, review_status_str, \
@@ -241,6 +242,22 @@ def process_report_filter(session, run_ids, report_filter, cmp_data=None):
 
         AND.append(or_(*OR))
 
+    if report_filter.cleanupPlanNames:
+        OR = []
+        for cleanup_plan_name in report_filter.cleanupPlanNames:
+            q = select([CleanupPlanReportHash.bug_hash]) \
+                .where(
+                    CleanupPlanReportHash.cleanup_plan_id.in_(
+                        select([CleanupPlan.id])
+                        .where(CleanupPlan.name == cleanup_plan_name)
+                        .distinct()
+                    )) \
+                .distinct()
+
+            OR.append(Report.bug_id.in_(q))
+
+        AND.append(or_(*OR))
+
     if report_filter.severity:
         AND.append(Report.severity.in_(report_filter.severity))
 
@@ -966,6 +983,41 @@ def get_commit_url(
             return url
 
 
+def get_cleanup_plan(session, cleanup_plan_id: int) -> CleanupPlan:
+    """
+    Check if the given cleanup id exists in the database and returns
+    the cleanup. Otherwise it will raise an exception.
+    """
+    cleanup_plan = session.query(CleanupPlan).get(cleanup_plan_id)
+
+    if not cleanup_plan:
+        raise codechecker_api_shared.ttypes.RequestFailed(
+            codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+            f"Cleanup plan '{cleanup_plan_id}' was not found in the database.")
+
+    return cleanup_plan
+
+
+def get_cleanup_plan_report_hashes(
+    session,
+    cleanup_plan_ids: List[int]
+) -> Dict[int, List[str]]:
+    """ Get report hashes for the given cleanup plan ids. """
+    cleanup_plan_hashes = defaultdict(list)
+
+    q = session \
+        .query(
+            CleanupPlanReportHash.cleanup_plan_id,
+            CleanupPlanReportHash.bug_hash) \
+        .filter(CleanupPlanReportHash.cleanup_plan_id.in_(
+            cleanup_plan_ids))
+
+    for cleanup_plan_id, report_hash in q:
+        cleanup_plan_hashes[cleanup_plan_id].append(report_hash)
+
+    return cleanup_plan_hashes
+
+
 class ThriftRequestHandler:
     """
     Connect to database and handle thrift client requests.
@@ -2977,3 +3029,181 @@ def importData(self, exportData):
 
             session.commit()
             return True
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def addCleanupPlan(self, name, description, dueDate):
+        self.__require_admin()
+
+        with DBSession(self._Session) as session:
+            cleanup_plan = session.query(CleanupPlan) \
+                .filter(CleanupPlan.name == name) \
+                .one_or_none()
+
+            if cleanup_plan:
+                raise codechecker_api_shared.ttypes.RequestFailed(
+                    codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                    f"Cleanup plan '{name}' already exists.")
+
+            cleanup_plan = CleanupPlan(name)
+            cleanup_plan.description = description
+            cleanup_plan.due_date = \
+                datetime.fromtimestamp(dueDate) if dueDate else None
+
+            session.add(cleanup_plan)
+            session.commit()
+
+            LOG.info("New cleanup plan '%s' has been created by '%s'",
+                     name, self._get_username())
+
+            return cleanup_plan.id
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def updateCleanupPlan(self, cleanup_plan_id, name, description, dueDate):
+        self.__require_admin()
+
+        with DBSession(self._Session) as session:
+            cleanup_plan = get_cleanup_plan(session, cleanup_plan_id)
+            cleanup_plan.name = name
+            cleanup_plan.description = description
+            cleanup_plan.due_date = \
+                datetime.fromtimestamp(dueDate) if dueDate else None
+
+            session.add(cleanup_plan)
+            session.commit()
+
+            LOG.info("Cleanup plan '%d' has been updated by '%s'",
+                     cleanup_plan_id, self._get_username())
+
+            return True
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def getCleanupPlans(self, cleanup_plan_filter):
+        self.__require_view()
+        with DBSession(self._Session) as session:
+            q = session \
+                .query(CleanupPlan) \
+                .order_by(CleanupPlan.name)
+
+            if cleanup_plan_filter:
+                if cleanup_plan_filter.ids:
+                    q = q.filter(CleanupPlan.id.in_(
+                        cleanup_plan_filter.ids))
+
+                if cleanup_plan_filter.names:
+                    q = q.filter(CleanupPlan.name.in_(
+                        cleanup_plan_filter.names))
+
+                if cleanup_plan_filter.isOpen is not None:
+                    if cleanup_plan_filter.isOpen:
+                        q = q.filter(CleanupPlan.closed_at.is_(None))
+                    else:
+                        q = q.filter(CleanupPlan.closed_at.isnot(None))
+
+            cleanup_plans = q.all()
+
+            cleanup_plan_hashes = get_cleanup_plan_report_hashes(
+                session, [c.id for c in cleanup_plans])
+
+            return [ttypes.CleanupPlan(
+                id=cp.id,
+                name=cp.name,
+                description=cp.description,
+                dueDate=int(time.mktime(
+                    cp.due_date.timetuple())) if cp.due_date else None,
+                closedAt=int(time.mktime(
+                    cp.closed_at.timetuple())) if cp.closed_at else None,
+                reportHashes=cleanup_plan_hashes[cp.id]) for cp in q]
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def removeCleanupPlan(self, cleanup_plan_id):
+        self.__require_admin()
+        with DBSession(self._Session) as session:
+            cleanup_plan = get_cleanup_plan(session, cleanup_plan_id)
+            name = cleanup_plan.name
+
+            session.delete(cleanup_plan)
+            session.commit()
+
+            LOG.info("Cleanup plan '%s' has been removed by '%s'",
+                     name, self._get_username())
+
+            return True
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def closeCleanupPlan(self, cleanup_plan_id):
+        self.__require_admin()
+
+        with DBSession(self._Session) as session:
+            cleanup_plan = get_cleanup_plan(session, cleanup_plan_id)
+
+            cleanup_plan.closed_at = datetime.now()
+            session.add(cleanup_plan)
+            session.commit()
+
+            LOG.info("Cleanup plan '%s' has been closed by '%s'",
+                     cleanup_plan.name, self._get_username())
+
+            return True
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def reopenCleanupPlan(self, cleanup_plan_id):
+        self.__require_admin()
+
+        with DBSession(self._Session) as session:
+            cleanup_plan = get_cleanup_plan(session, cleanup_plan_id)
+
+            cleanup_plan.closed_at = None
+            session.add(cleanup_plan)
+            session.commit()
+            LOG.info("Cleanup plan '%s' has been reopened by '%s'",
+                     cleanup_plan.name, self._get_username())
+            return True
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def setCleanupPlan(self, cleanup_plan_id, reportHashes):
+        self.__require_admin()
+
+        with DBSession(self._Session) as session:
+            cleanup_plan = get_cleanup_plan(session, cleanup_plan_id)
+
+            q = session \
+                .query(CleanupPlanReportHash.bug_hash) \
+                .filter(
+                    CleanupPlanReportHash.cleanup_plan_id == cleanup_plan.id) \
+                .filter(CleanupPlanReportHash.bug_hash.in_(reportHashes))
+            new_report_hashes = set(reportHashes) - set(b[0] for b in q)
+
+            for report_hash in new_report_hashes:
+                session.add(CleanupPlanReportHash(
+                    cleanup_plan_id=cleanup_plan.id, bug_hash=report_hash))
+
+            session.commit()
+
+            return True
+
+    @exc_to_thrift_reqfail
+    @timeit
+    def unsetCleanupPlan(self, cleanup_plan_id, reportHashes):
+        self.__require_admin()
+
+        with DBSession(self._Session) as session:
+            cleanup_plan = get_cleanup_plan(session, cleanup_plan_id)
+
+            session \
+                .query(CleanupPlanReportHash) \
+                .filter(
+                    CleanupPlanReportHash.cleanup_plan_id == cleanup_plan.id) \
+                .filter(CleanupPlanReportHash.bug_hash.in_(reportHashes)) \
+                .delete(synchronize_session=False)
+
+            session.commit()
+            session.close()
+
+            return True
diff --git a/web/server/codechecker_server/database/run_db_model.py b/web/server/codechecker_server/database/run_db_model.py
index 1791f28051..5fe04642d4 100644
--- a/web/server/codechecker_server/database/run_db_model.py
+++ b/web/server/codechecker_server/database/run_db_model.py
@@ -456,6 +456,40 @@ def __init__(self, name, value, description=None, user_name=None):
         self.username = user_name
 
 
+class CleanupPlan(Base):
+    __tablename__ = 'cleanup_plans'
+
+    __table_args__ = (
+        UniqueConstraint('name'),
+    )
+
+    id = Column(Integer, autoincrement=True, primary_key=True)
+    name = Column(String, nullable=False)
+    due_date = Column(DateTime, nullable=True)
+    description = Column(String, nullable=True)
+    closed_at = Column(DateTime, nullable=True)
+
+    def __init__(self, name, due_date=None, description=None, closed_at=None):
+        self.name = name
+        self.due_date = due_date
+        self.description = description
+        self.closed_at = closed_at
+
+
+class CleanupPlanReportHash(Base):
+    __tablename__ = 'cleanup_plan_report_hashes'
+
+    cleanup_plan_id = Column(
+        Integer,
+        ForeignKey('cleanup_plans.id',
+                   deferrable=True,
+                   initially="DEFERRED",
+                   ondelete="CASCADE"),
+        index=True)
+
+    bug_hash = Column(String, primary_key=True)
+
+
 IDENTIFIER = {
     'identifier': "RunDatabase",
     'orm_meta': CC_META
diff --git a/web/server/codechecker_server/migrations/report/versions/fb356f0eefed_cleanup_plan.py b/web/server/codechecker_server/migrations/report/versions/fb356f0eefed_cleanup_plan.py
new file mode 100644
index 0000000000..e54834c55e
--- /dev/null
+++ b/web/server/codechecker_server/migrations/report/versions/fb356f0eefed_cleanup_plan.py
@@ -0,0 +1,58 @@
+"""Cleanup plan
+
+Revision ID: fb356f0eefed
+Revises: ad2a567e513a
+Create Date: 2021-09-06 10:55:43.093729
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'fb356f0eefed'
+down_revision = 'ad2a567e513a'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.create_table('cleanup_plans',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('name', sa.String(), nullable=False),
+        sa.Column('due_date', sa.DateTime(), nullable=True),
+        sa.Column('description', sa.String(), nullable=True),
+        sa.Column('closed_at', sa.DateTime(), nullable=True),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_cleanup_plans')),
+        sa.UniqueConstraint('name', name=op.f('uq_cleanup_plans_name'))
+    )
+
+    op.create_table('cleanup_plan_report_hashes',
+        sa.Column('cleanup_plan_id', sa.Integer(), nullable=True),
+        sa.Column('bug_hash', sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['cleanup_plan_id'],
+            ['cleanup_plans.id'],
+            name=op.f('fk_cleanup_plan_report_hashes_cleanup_plan_id_cleanup_plans'),
+            ondelete='CASCADE',
+            initially='DEFERRED',
+            deferrable=True),
+        sa.PrimaryKeyConstraint(
+            'bug_hash',
+            name=op.f('pk_cleanup_plan_report_hashes'))
+    )
+
+    op.create_index(
+        op.f('ix_cleanup_plan_report_hashes_cleanup_plan_id'),
+        'cleanup_plan_report_hashes',
+        ['cleanup_plan_id'],
+        unique=False)
+
+
+def downgrade():
+    op.drop_index(
+        op.f('ix_cleanup_plan_report_hashes_cleanup_plan_id'),
+        table_name='cleanup_plan_report_hashes')
+
+    op.drop_table('cleanup_plan_report_hashes')
+    op.drop_table('cleanup_plans')
diff --git a/web/server/vue-cli/e2e/pages/report.js b/web/server/vue-cli/e2e/pages/report.js
index 0938c71c92..2b136326f4 100644
--- a/web/server/vue-cli/e2e/pages/report.js
+++ b/web/server/vue-cli/e2e/pages/report.js
@@ -122,7 +122,10 @@ module.exports = {
     progressBar: ".v-data-table__progress",
     clearAllFilterBtn: "#clear-all-filter-btn",
     uniqueReports: ".unique-filter .v-input--checkbox",
+    setCleanupPlanBtn: ".set-cleanup-plan-btn",
     expandBtn: "button.v-data-table__expand-icon",
+    selectReportCheckbox: "tbody .v-simple-checkbox",
+    selectAllReportCheckbox: "thead .v-simple-checkbox"
   },
   sections: {
     baselineRunFilter: createRunFilterSection("#run"),
@@ -204,6 +207,56 @@ module.exports = {
         cancelBtn: ".cancel-btn",
       }
     },
+    cleanupPlanFilter: {
+      selector: "#cleanup-plan",
+      elements: {
+        expansionBtn: ".expansion-btn",
+        manageBtn: ".manage-cleanup-plan-btn",
+        settings: ".settings-btn",
+        clearBtn: ".clear-btn",
+        selectedItems: ".selected-item"
+      },
+      commands: [ filterCommands ]
+    },
+    cleanupPlanDialog: {
+      selector: ".manage-cleanup-plan-dialog.v-dialog--active",
+      elements: {
+        newCleanupPlanBtn: ".new-cleanup-plan-btn",
+        tableRows: ".v-data-table tbody tr",
+        emptyTable: ".v-data-table tbody .v-data-table__empty-wrapper",
+        closeBtn: ".v-card__title .close-btn",
+        editCleanupPlanBtn: ".v-data-table .edit-btn",
+        removeCleanupPlanBtn: ".v-data-table .remove-btn",
+        closeCleanupPlanBtn: ".v-data-table .close-btn",
+        reopenCleanupPlanBtn: ".v-data-table .reopen-btn",
+        openCleanupPlansTab: ".v-tabs-bar__content .v-tab:nth-child(2)",
+        closedCleanupPlansTab: ".v-tabs-bar__content .v-tab:nth-child(3)",
+      }
+    },
+    newCleanupPlanDialog: {
+      selector: ".edit-cleanup-plan-dialog.v-dialog--active",
+      elements: {
+        name: ".cleanup-plan-name input[type='text']",
+        description: ".cleanup-plan-description textarea",
+        saveBtn: ".save-btn",
+        cancelBtn: ".cancel-btn",
+      }
+    },
+    removeCleanupPlanDialog: {
+      selector: ".remove-cleanup-plan-dialog.v-dialog--active",
+      elements: {
+        confirmBtn: ".confirm-btn",
+        cancelBtn: ".cancel-btn",
+      }
+    },
+    setCleanupPlanDialog: {
+      selector: ".set-cleanup-plan-dialog.menuable__content__active",
+      elements: {
+        item: ".v-list-item",
+        activeItem: ".mdi-check",
+        notAllSelectedItem: ".mdi-minus"
+      }
+    },
     dateFilters: {
       selector: "#date-filters",
       elements: {
diff --git a/web/server/vue-cli/e2e/specs/reports.js b/web/server/vue-cli/e2e/specs/reports.js
index 11890dd6ae..6939d92b43 100644
--- a/web/server/vue-cli/e2e/specs/reports.js
+++ b/web/server/vue-cli/e2e/specs/reports.js
@@ -32,6 +32,7 @@ module.exports = {
       reportPage.section.reviewStatusFilter,
       reportPage.section.detectionStatusFilter,
       reportPage.section.sourceComponentFilter,
+      reportPage.section.cleanupPlanFilter,
       reportPage.section.checkerMessageFilter,
       reportPage.section.checkerMessageFilter,
       reportPage.section.reportHashFilter,
@@ -76,7 +77,7 @@ module.exports = {
   "sort reports by bug path length" (browser) {
     const reportPage = browser.page.report();
 
-    const colIdx = 8;
+    const colIdx = 9;
 
     // Sort reports in ascending order by bug path length.
     reportPage.sortReports(colIdx, (data) => {
@@ -504,6 +505,149 @@ module.exports = {
       .click("@closeBtn");
   },
 
+  "manage cleanup plans" (browser) {
+    const reportPage = browser.page.report();
+    const section = reportPage.section.cleanupPlanFilter;
+    const dialogSection = reportPage.section.cleanupPlanDialog;
+    const newCleanupPlanDialog = reportPage.section.newCleanupPlanDialog;
+    const removeCleanupPlanDialog = reportPage.section.removeCleanupPlanDialog;
+    const setCleanupPlanDialog = reportPage.section.setCleanupPlanDialog;
+
+    // Clear all filters so we will be able to select multiple reports.
+    reportPage.click("@clearAllFilterBtn");
+    reportPage
+      .pause(500)
+      .waitForElementNotPresent("@progressBar");
+
+    section.click("@manageBtn");
+
+    reportPage.expect.section(dialogSection).to.be.visible.before(5000);
+
+    dialogSection.pause(500);
+
+    // Add a new cleanup plan.
+    dialogSection.waitForElementVisible("@newCleanupPlanBtn")
+    dialogSection.click("@newCleanupPlanBtn");
+    reportPage.expect.section(newCleanupPlanDialog).to.be.visible.before(5000);
+
+    let [ name, description ] = [ "e2e", "Test" ];
+    newCleanupPlanDialog
+      .clearAndSetValue("@name", name, newCleanupPlanDialog)
+      .clearAndSetValue("@description", description, newCleanupPlanDialog)
+      .click("@saveBtn");
+
+    dialogSection.api.elements("@tableRows", (elements) => {
+      browser.assert.ok(elements.result.value.length === 1);
+    });
+
+    // Edit cleanup plan.
+    dialogSection.click({ selector: "@editCleanupPlanBtn", index: 0 });
+    reportPage.expect.section(newCleanupPlanDialog).to.be.visible.before(5000);
+
+    [ description ] = [ "Renamed" ];
+    newCleanupPlanDialog
+      .clearAndSetValue("@description", description, newCleanupPlanDialog)
+      .click("@saveBtn");
+
+    dialogSection.api.elements("@tableRows", (elements) => {
+      browser.assert.ok(elements.result.value.length === 1);
+    });
+
+    dialogSection.click("@closeBtn");
+
+    reportPage.assert.cssClassPresent(
+      "@setCleanupPlanBtn", "v-btn--disabled");
+
+    // Assign report to cleanup plan.
+    reportPage.click("@selectReportCheckbox");
+
+    reportPage.assert.not.cssClassPresent(
+      "@setCleanupPlanBtn", "v-btn--disabled");
+
+    reportPage.click("@setCleanupPlanBtn");
+
+    reportPage.expect.section(setCleanupPlanDialog)
+      .to.be.visible.before(5000);
+
+    setCleanupPlanDialog
+      .click({ selector: "@item", index: 0 })
+      .waitForElementVisible("@activeItem");
+
+    // Select filter item.
+    section.openFilterSettings();
+
+    reportPage.section.settingsMenu
+      .toggleMenuItem(0)
+      .applyFilter();
+
+    reportPage.expect.section("@settingsMenu").to.not.be.present.before(5000);
+
+    section.api.elements("@selectedItems", ({result}) => {
+      browser.assert.ok(result.value.length === 1);
+    });
+
+    reportPage.getTableRows("@tableRows", (data) => {
+      browser.assert.ok(
+        [...new Set(data.map(r => r[2]))].filter(d => d).length === 1);
+    });
+
+    // Clear the filter.
+    section.click("@clearBtn");
+
+    section.api.elements("@selectedItems", ({result}) => {
+      browser.assert.ok(result.value.length === 0);
+    });
+
+    // Unset cleanup.
+    reportPage
+      .click("@selectAllReportCheckbox")
+      .click("@setCleanupPlanBtn");
+
+    reportPage.expect.section(setCleanupPlanDialog)
+      .to.be.visible.before(5000);
+
+    setCleanupPlanDialog.waitForElementVisible("@notAllSelectedItem");
+
+    setCleanupPlanDialog
+      .click({ selector: "@item", index: 0 })
+      .waitForElementVisible("@activeItem")
+      .click({ selector: "@item", index: 0 })
+      .waitForElementNotPresent("@activeItem");
+
+    reportPage.click("@setCleanupPlanBtn");
+
+    // Close cleanup plan.
+    section.click("@manageBtn");
+    reportPage.expect.section(dialogSection).to.be.visible.before(5000);
+    dialogSection.pause(500);
+
+    dialogSection.api.elements("@tableRows", (elements) => {
+      browser.assert.ok(elements.result.value.length === 1);
+    });
+
+    dialogSection
+      .click("@closeCleanupPlanBtn")
+      .waitForElementNotPresent("@closeCleanupPlanBtn")
+      .click("@closedCleanupPlansTab")
+      .waitForElementVisible("@reopenCleanupPlanBtn")
+      .click("@reopenCleanupPlanBtn")
+      .waitForElementNotPresent("@reopenCleanupPlanBtn")
+      .click("@openCleanupPlansTab")
+      .waitForElementVisible("@closeCleanupPlanBtn")
+
+    // Remove the cleanup plan.
+    dialogSection.waitForElementVisible("@removeCleanupPlanBtn");
+    dialogSection.click({ selector: "@removeCleanupPlanBtn", index: 0 });
+    reportPage.expect.section(removeCleanupPlanDialog)
+      .to.be.visible.before(5000);
+
+    removeCleanupPlanDialog.click("@confirmBtn");
+
+    dialogSection
+      .waitForElementVisible("@emptyTable")
+      .click("@closeBtn");
+  },
+
   "set checker message filter" (browser) {
     const reportPage = browser.page.report();
     const section = reportPage.section.checkerMessageFilter;
diff --git a/web/server/vue-cli/package-lock.json b/web/server/vue-cli/package-lock.json
index 84b3ed3529..924093eecc 100644
--- a/web/server/vue-cli/package-lock.json
+++ b/web/server/vue-cli/package-lock.json
@@ -6332,8 +6332,8 @@
       "dev": true
     },
     "codechecker-api": {
-      "version": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.42.0.tgz",
-      "integrity": "sha512-ub7L43hb/QClA7YDB9YNzENOt1eBoIolJ8RC8fVmQ7YXwPFcKS31ZE2nQBtkRlixRAkOVZG0veXDMSm+vtFBbg==",
+      "version": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.43.0.tgz",
+      "integrity": "sha512-kxLmJ9R3+tNrj4Zt8hL+uRRdtbni2Gmi1yyUBB7jzmcwbxxJYKDIV1Dagcrzx9l2Ln0tOo72PEbNERvw2d0BSw==",
       "requires": {
         "thrift": "0.13.0-hotfix.1"
       }
diff --git a/web/server/vue-cli/package.json b/web/server/vue-cli/package.json
index c3cd140541..39903b5564 100644
--- a/web/server/vue-cli/package.json
+++ b/web/server/vue-cli/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@mdi/font": "^5.9.55",
-    "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.42.0.tgz",
+    "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.43.0.tgz",
     "chart.js": "^2.9.4",
     "chartjs-plugin-datalabels": "^0.7.0",
     "codemirror": "^5.60.0",
diff --git a/web/server/vue-cli/src/assets/userguide/images/reports/assign_report_to_cleanup_plan.png b/web/server/vue-cli/src/assets/userguide/images/reports/assign_report_to_cleanup_plan.png
new file mode 100644
index 0000000000..232303cbb5
Binary files /dev/null and b/web/server/vue-cli/src/assets/userguide/images/reports/assign_report_to_cleanup_plan.png differ
diff --git a/web/server/vue-cli/src/assets/userguide/images/reports/assign_reports_to_cleanup_plan.png b/web/server/vue-cli/src/assets/userguide/images/reports/assign_reports_to_cleanup_plan.png
new file mode 100644
index 0000000000..b135670386
Binary files /dev/null and b/web/server/vue-cli/src/assets/userguide/images/reports/assign_reports_to_cleanup_plan.png differ
diff --git a/web/server/vue-cli/src/assets/userguide/images/reports/cleanup_plan_filter.png b/web/server/vue-cli/src/assets/userguide/images/reports/cleanup_plan_filter.png
new file mode 100644
index 0000000000..1f17c0c0b6
Binary files /dev/null and b/web/server/vue-cli/src/assets/userguide/images/reports/cleanup_plan_filter.png differ
diff --git a/web/server/vue-cli/src/assets/userguide/images/reports/list_of_cleanup_plans.png b/web/server/vue-cli/src/assets/userguide/images/reports/list_of_cleanup_plans.png
new file mode 100644
index 0000000000..8a0dbb78ec
Binary files /dev/null and b/web/server/vue-cli/src/assets/userguide/images/reports/list_of_cleanup_plans.png differ
diff --git a/web/server/vue-cli/src/assets/userguide/userguide.md b/web/server/vue-cli/src/assets/userguide/userguide.md
index dc67fa2810..47606f3170 100644
--- a/web/server/vue-cli/src/assets/userguide/userguide.md
+++ b/web/server/vue-cli/src/assets/userguide/userguide.md
@@ -622,6 +622,45 @@ Each line should begin with a `+` or a `-`, followed by a path glob pattern:
 
 For more information [see](https://github.com/Ericsson/codechecker/blob/master/docs/web/user_guide.md#format-of-component-file).
 
+## Manage cleanup plans
+You can use **cleanup plans** to track progress of reports in your product.
+Clenup plans can be managed only by *administrators* after clicking on the
+*pencil icon* at the *Cleanup plans* filter.
+
+![Manage cleanup plans](images/reports/cleanup_plan_filter.png)
+
+A pop-up window will be opened where you can add, edit, close or remove
+existing cleanup plans.
+
+![List of cleanup plans](images/reports/list_of_cleanup_plans.png)
+
+## Assign reports to cleanup plans
+You can assign multiple reports to a cleanup plan on the **Reports view**. For
+this you have to select at least one report by using check boxes on the first
+column of the report list table.
+
+After reports are selected the **Set cleanup plan** above the reports table
+will be active and you can select a cleanup plan here by clicking on the
+cleanup plan name.
+
+You can remove reports from a cleanup plan the same way by clicking on the
+cleanup plan name.
+
+Notes:
+- You can select all reports on the current page by using the checkbox in
+the first column of the header bar.
+- If multiple reports are selected and at least one report can be found in a
+cleanup plan but not all of them, after clicking on the **Set cleanup plan**
+button beside the cleanup plan a minus sign (**-**) will be shown. Clicking
+on the cleanup plan name in this case will assign every selected report to
+the cleanup.
+
+![Assign reports to cleanup plan](images/reports/assign_reports_to_cleanup_plan.png)
+
+You can also assign current report to a cleanup plan on the **Report detail**
+view:
+![Assign reports to cleanup plan](images/reports/assign_report_to_cleanup_plan.png)
+
 # Report details
 ## Report Navigation Tree
 Report Navigation Tree shows the found reports at the currently opened file.
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanList.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanList.vue
new file mode 100644
index 0000000000..2f06912569
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanList.vue
@@ -0,0 +1,74 @@
+<template>
+  <v-list v-if="value && value.length">
+    <template v-for="(cleanupPlan, idx) in value">
+      <v-list-item
+        :key="cleanupPlan.id.toNumber()"
+        :value="cleanupPlan.id.toNumber()"
+      >
+        <template v-slot:default="{ active }">
+          <v-list-item-action class="ma-1 mr-5">
+            <v-icon v-if="active">
+              mdi-check
+            </v-icon>
+
+            <v-icon v-else-if="notAllSelected[cleanupPlan.id]">
+              mdi-minus
+            </v-icon>
+          </v-list-item-action>
+
+          <v-list-item-content class="py-1">
+            <v-list-item-title class="font-weight-bold">
+              {{ cleanupPlan.name }}
+            </v-list-item-title>
+
+            <v-list-item-subtitle
+              v-if="cleanupPlan.closedAt"
+            >
+              <v-icon small>
+                mdi-calendar-blank
+              </v-icon>
+              Closed on
+              {{ cleanupPlan.closedAt | fromUnixTime("yyyy-MM-dd") }}
+            </v-list-item-subtitle>
+
+            <v-list-item-subtitle
+              v-else-if="cleanupPlan.dueDate"
+            >
+              <due-date :value="cleanupPlan.dueDate" />
+            </v-list-item-subtitle>
+
+            <v-list-item-subtitle v-else>
+              No due date
+            </v-list-item-subtitle>
+          </v-list-item-content>
+        </template>
+      </v-list-item>
+
+      <v-divider
+        v-if="idx < value.length - 1"
+        :key="idx"
+      />
+    </template>
+  </v-list>
+
+  <v-list v-else disabled>
+    <v-list-item>
+      No cleanup plan.
+    </v-list-item>
+  </v-list>
+</template>
+
+<script>
+import DueDate from "./DueDate";
+
+export default {
+  name: "CleanupPlanList",
+  components: {
+    DueDate
+  },
+  props: {
+    value: { type: Array, default: null },
+    notAllSelected: { type: Object, default: () => ({}) }
+  },
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanTab.mixin.js b/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanTab.mixin.js
new file mode 100644
index 0000000000..3082b2f651
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanTab.mixin.js
@@ -0,0 +1,57 @@
+import { ccService, handleThriftError } from "@cc-api";
+import { CleanupPlanFilter } from "@cc/report-server-types";
+
+export default {
+  name: "CleanupPlanTabMixin",
+  data() {
+    return {
+      tab: null,
+      loading: false,
+      openCleanupPlans: null,
+      closedCleanupPlans: null,
+    };
+  },
+
+  watch: {
+    tab() {
+      this.fetchCleanupPlans(false);
+    }
+  },
+
+  methods: {
+    onFetchFinished(/* cleanupPlans */) {
+
+    },
+
+    fetchCleanupPlans(force=true) {
+      if (!this.tab && (!this.openCleanupPlans || force)) {
+        this.fetchOpenCleanupPlans();
+      } else if (!this.closedCleanupPlans || force) {
+        this.fetchClosedCleanupPlans();
+      }
+    },
+
+    getCleanupPlans(filter) {
+      this.loading = true;
+      return new Promise(resolve => {
+        ccService.getClient().getCleanupPlans(filter,
+          handleThriftError(cleanupPlans => {
+            this.loading = false;
+            resolve(cleanupPlans);
+          }));
+      });
+    },
+
+    async fetchOpenCleanupPlans() {
+      const filter = new CleanupPlanFilter({ isOpen: true });
+      this.openCleanupPlans = await this.getCleanupPlans(filter);
+      this.onFetchFinished(this.openCleanupPlans);
+    },
+
+    async fetchClosedCleanupPlans() {
+      const filter = new CleanupPlanFilter({ isOpen: false });
+      this.closedCleanupPlans = await this.getCleanupPlans(filter);
+      this.onFetchFinished(this.closedCleanupPlans);
+    },
+  }
+};
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanTab.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanTab.vue
new file mode 100644
index 0000000000..27aef607af
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/CleanupPlanTab.vue
@@ -0,0 +1,42 @@
+<template>
+  <v-container>
+    <v-tabs v-model="tab">
+      <v-tab
+        v-for="item in ['Open', 'Closed']"
+        :key="item"
+        class="font-weight-bold subtitle-2 text-capitalize"
+      >
+        {{ item }}
+      </v-tab>
+    </v-tabs>
+
+    <v-tabs-items v-model="tab">
+      <v-tab-item>
+        <slot name="open" />
+      </v-tab-item>
+
+      <v-tab-item>
+        <slot name="closed" />
+      </v-tab-item>
+    </v-tabs-items>
+  </v-container>
+</template>
+
+<script>
+export default {
+  name: "CleanupPlanTab",
+  props: {
+    value: { type: Number, default: null }
+  },
+  computed: {
+    tab: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit("input", val);
+      }
+    }
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/DueDate.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/DueDate.vue
new file mode 100644
index 0000000000..60dfd7f418
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/DueDate.vue
@@ -0,0 +1,40 @@
+<template>
+  <span :class="{ 'red--text': expired, 'font-weight-bold': expired }">
+    <span v-if="expired">
+      <v-icon small color="red">
+        mdi-alert-outline
+      </v-icon>
+      Past due by
+    </span>
+
+    <span v-else-if="!hideLabel">
+      <v-icon small>
+        mdi-calendar-blank
+      </v-icon>
+      Due by
+    </span>
+
+    {{ dueDate }}
+  </span>
+</template>
+
+<script>
+import { fromUnixTime as fromUnixTimestamp, startOfToday } from "date-fns";
+import fromUnixTime from "@/filters/from-unix-time";
+
+export default {
+  name: "DueDate",
+  props: {
+    value: { type: Object, required: true },
+    hideLabel: { type: Boolean, default: false }
+  },
+  computed: {
+    dueDate() {
+      return fromUnixTime(this.value, "yyyy-MM-dd");
+    },
+    expired() {
+      return startOfToday() > fromUnixTimestamp(this.value);
+    }
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/DueDateMenu.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/DueDateMenu.vue
new file mode 100644
index 0000000000..1a9ca79831
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/DueDateMenu.vue
@@ -0,0 +1,56 @@
+<template>
+  <v-menu
+    v-model="menu"
+    :close-on-content-click="false"
+    :nudge-right="40"
+    transition="scale-transition"
+    offset-y
+    min-width="auto"
+  >
+    <template v-slot:activator="{ on, attrs }">
+      <v-text-field
+        :value="date"
+        label="Due date"
+        append-icon="mdi-calendar"
+        readonly
+        outlined
+        v-bind="attrs"
+        v-on="on"
+      />
+    </template>
+
+    <v-date-picker v-model="date" />
+  </v-menu>
+</template>
+
+<script>
+import { format, fromUnixTime, getUnixTime, parse } from "date-fns";
+
+export default {
+  name: "DueDateMenu",
+  props: {
+    value: { type: Number, default: null },
+  },
+  data() {
+    return {
+      menu: false,
+      format: "yyyy-MM-dd"
+    };
+  },
+  computed: {
+    date: {
+      get() {
+        return this.value
+          ? format(fromUnixTime(this.value), this.format, new Date)
+          : null;
+      },
+      set(val) {
+        this.$emit("update:value",
+          val ? getUnixTime(parse(val, this.format, new Date)) : null);
+
+        this.menu = false;
+      }
+    }
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/EditCleanupPlanDialog.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/EditCleanupPlanDialog.vue
new file mode 100644
index 0000000000..dd6a6014fc
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/EditCleanupPlanDialog.vue
@@ -0,0 +1,181 @@
+<template>
+  <v-dialog
+    v-model="dialog"
+    content-class="edit-cleanup-plan-dialog"
+    max-width="600px"
+    scrollable
+  >
+    <template v-slot:activator="{}">
+      <slot />
+    </template>
+
+    <v-card>
+      <v-card-title
+        class="headline primary white--text"
+        primary-title
+      >
+        <div
+          v-if="cleanupPlan"
+        >
+          Edit cleanup plan
+        </div>
+        <div
+          v-else
+        >
+          New cleanup plan
+          <div class="subtitle-1">
+            Create a new cleanup plan which helps you to fix legacy reports.
+          </div>
+        </div>
+
+        <v-spacer />
+
+        <v-btn class="close-btn" icon dark @click="dialog = false">
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-card-title>
+
+      <v-card-text class="pa-0">
+        <v-container>
+          <v-form ref="form">
+            <v-text-field
+              v-model.trim="name"
+              class="cleanup-plan-name"
+              label="Name*"
+              autofocus
+              outlined
+              required
+              :rules="rules.name"
+            />
+
+            <due-date-menu
+              :value.sync="dueDate"
+            />
+
+            <v-textarea
+              v-model.trim="description"
+              class="cleanup-plan-description "
+              label="Description"
+              outlined
+            />
+          </v-form>
+        </v-container>
+      </v-card-text>
+
+      <v-divider />
+
+      <v-card-actions>
+        <v-spacer />
+
+        <v-btn
+          class="cancel-btn"
+          color="error"
+          text
+          @click="dialog = false"
+        >
+          Cancel
+        </v-btn>
+
+        <v-btn
+          class="save-btn"
+          color="primary"
+          text
+          @click="saveCleanupPlan"
+        >
+          Save
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import { ccService, handleThriftError } from "@cc-api";
+
+import DueDateMenu from "./DueDateMenu";
+
+export default {
+  name: "NewCleanupPlanDialog",
+  components: {
+    DueDateMenu
+  },
+  props: {
+    value: { type: Boolean, default: false },
+    cleanupPlan: { type: Object, default: () => null },
+  },
+  data() {
+    return {
+      description: null,
+      dueDate: null,
+      name: null,
+      dueDateMenu: false,
+      rules: {
+        name: [ v => !!v || "Name is required" ],
+        value: [
+          v => !!v || "Value is required"
+        ]
+      }
+    };
+  },
+  computed: {
+    dialog: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      }
+    }
+  },
+
+  watch: {
+    dialog() {
+      if (!this.dialog) return;
+
+      this.description = this.cleanupPlan?.description || null;
+      this.dueDate = this.cleanupPlan?.dueDate?.toNumber() || null;
+      this.name = this.cleanupPlan?.name || null;
+    }
+  },
+
+  methods: {
+    async saveCleanupPlan() {
+      if (!this.$refs.form.validate()) return;
+
+      if (this.cleanupPlan) {
+        // Edit an existing cleanup plan.
+        ccService.getClient().updateCleanupPlan(
+          this.cleanupPlan.id, this.name,
+          this.description, this.dueDate,
+          handleThriftError(async success => {
+            if (success) {
+              this.$emit("save:cleanup-plan");
+              this.dialog = false;
+            }
+          }));
+      } else {
+        // Add new cleanup plan.
+        ccService.getClient().addCleanupPlan(
+          this.name, this.description, this.dueDate,
+          handleThriftError(async () => {
+            this.$emit("save:cleanup-plan");
+            this.dialog = false;
+          }));
+      }
+    },
+
+    onAPIOperationFinished(success) {
+      if (success) {
+        this.$emit("save:cleanup-plan");
+        this.dialog = false;
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.value textarea::placeholder {
+  opacity: 0.5;
+}
+</style>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/ListCleanupPlans.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/ListCleanupPlans.vue
new file mode 100644
index 0000000000..425110843f
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/ListCleanupPlans.vue
@@ -0,0 +1,137 @@
+<template>
+  <v-container>
+    <edit-cleanup-plan-dialog
+      :value.sync="editDialog"
+      :cleanup-plan="selected"
+      @save:cleanup-plan="fetchCleanupPlans"
+    />
+
+    <remove-cleanup-plan-dialog
+      :value.sync="removeDialog"
+      :cleanup-plan="selected"
+      @on:confirm="fetchCleanupPlans"
+    />
+
+    <v-toolbar flat>
+      <v-row>
+        <v-col class="pa-0" align="right">
+          <v-btn
+            icon
+            title="Reload cleanup plans"
+            color="primary"
+            @click="fetchCleanupPlans"
+          >
+            <v-icon>mdi-refresh</v-icon>
+          </v-btn>
+
+          <v-btn
+            color="primary"
+            class="new-cleanup-plan-btn mr-2"
+            outlined
+            @click="newCleanupPlan"
+          >
+            New
+          </v-btn>
+        </v-col>
+      </v-row>
+    </v-toolbar>
+
+    <cleanup-plan-tab v-model="tab">
+      <template v-slot:open>
+        <list-cleanup-plans-table
+          :value="openCleanupPlans || []"
+          :loading="loading"
+          :hide-cols="[ 'closedAt' ]"
+          @edit="editCleanupPlan"
+          @reopen="reopenCleanupPlan"
+          @close="closeCleanupPlan"
+          @remove="removeCleanupPlan"
+        />
+      </template>
+      <template v-slot:closed>
+        <list-cleanup-plans-table
+          :value="closedCleanupPlans || []"
+          :loading="loading"
+          :hide-cols="[ 'dueDate' ]"
+          @edit="editCleanupPlan"
+          @reopen="reopenCleanupPlan"
+          @close="closeCleanupPlan"
+          @remove="removeCleanupPlan"
+        />
+      </template>
+    </cleanup-plan-tab>
+  </v-container>
+</template>
+
+<script>
+import { ccService, handleThriftError } from "@cc-api";
+
+import CleanupPlanTab from "./CleanupPlanTab";
+import CleanupPlanTabMixin from "./CleanupPlanTab.mixin";
+import EditCleanupPlanDialog from "./EditCleanupPlanDialog";
+import RemoveCleanupPlanDialog from "./RemoveCleanupPlanDialog";
+import ListCleanupPlansTable from "./ListCleanupPlansTable.vue";
+
+export default {
+  name: "ListCleanupPlans",
+  components: {
+    CleanupPlanTab,
+    EditCleanupPlanDialog,
+    ListCleanupPlansTable,
+    RemoveCleanupPlanDialog
+  },
+  mixins: [ CleanupPlanTabMixin ],
+  data() {
+    return {
+      selected: null,
+      editDialog: false,
+      removeDialog: false,
+    };
+  },
+
+  created() {
+    this.fetchCleanupPlans();
+  },
+
+  methods: {
+    editCleanupPlan(cleanupPlan) {
+      this.selected = cleanupPlan;
+      this.editDialog = true;
+    },
+
+    newCleanupPlan() {
+      this.selected = null;
+      this.editDialog = true;
+    },
+
+    removeCleanupPlan(cleanupPlan) {
+      this.selected = cleanupPlan;
+      this.removeDialog = true;
+    },
+
+    closeCleanupPlan(cleanupPlan) {
+      this.loading = true;
+      ccService.getClient().closeCleanupPlan(cleanupPlan.id,
+        handleThriftError(() => {
+          this.loading = false;
+          this.fetchCleanupPlans();
+
+          // If a cleanup is reopened, we need to reload the closed cleanups.
+          this.closedCleanupPlans = null;
+        }));
+    },
+
+    reopenCleanupPlan(cleanupPlan) {
+      this.loading = true;
+      ccService.getClient().reopenCleanupPlan(cleanupPlan.id,
+        handleThriftError(() => {
+          this.loading = false;
+          this.fetchCleanupPlans();
+
+          // If a cleanup is reopened, we need to reload the opened cleanups.
+          this.openCleanupPlans = null;
+        }));
+    },
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/ListCleanupPlansTable.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/ListCleanupPlansTable.vue
new file mode 100644
index 0000000000..751fcf4467
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/ListCleanupPlansTable.vue
@@ -0,0 +1,124 @@
+<template>
+  <v-data-table
+    :headers="headers"
+    :items="value"
+    :loading="loading"
+    loading-text="Loading cleanup plans..."
+    no-data-text="There aren't any cleanup plan that match."
+    item-key="name"
+  >
+    <template v-slot:item.dueDate="{ item }">
+      <span v-if="item.dueDate">
+        <due-date
+          :value="item.dueDate"
+          :hide-label="true"
+        />
+      </span>
+    </template>
+
+    <template v-slot:item.closedAt="{ item }">
+      <span v-if="item.closedAt">
+        {{ item.closedAt | fromUnixTime }}
+      </span>
+    </template>
+
+    <template v-slot:item.actions="{ item }">
+      <v-btn
+        class="edit-btn"
+        color="primary"
+        small
+        @click="$emit('edit', item)"
+      >
+        <v-icon small class="mr-1">
+          mdi-pencil
+        </v-icon>
+        Edit
+      </v-btn>
+
+      <v-btn
+        v-if="item.closedAt"
+        class="reopen-btn white--text"
+        small
+        color="green"
+        @click="$emit('reopen', item)"
+      >
+        <v-icon small class="mr-1">
+          mdi-refresh-circle
+        </v-icon>
+        Reopen
+      </v-btn>
+
+      <v-btn
+        v-else
+        class="close-btn white--text"
+        small
+        color="green"
+        @click="$emit('close', item)"
+      >
+        <v-icon small class="mr-1">
+          mdi-close-circle
+        </v-icon>
+        Close
+      </v-btn>
+
+      <v-btn
+        class="remove-btn"
+        small
+        color="error"
+        @click="$emit('remove', item)"
+      >
+        <v-icon small class="mr-1">
+          mdi-trash-can-outline
+        </v-icon>
+        Delete
+      </v-btn>
+    </template>
+  </v-data-table>
+</template>
+
+<script>
+import DueDate from "./DueDate";
+
+export default {
+  name: "ListCleanupPlansTable",
+  components: {
+    DueDate
+  },
+  props: {
+    value: { type: Array, required: true },
+    loading: { type: Boolean, default: false },
+    hideCols: { type: Array, default: () => [] }
+  },
+  computed: {
+    headers() {
+      return [
+        {
+          text: "Name",
+          value: "name",
+          sortable: true
+        },
+        {
+          text: "Description",
+          value: "description",
+          sortable: true
+        },
+        {
+          text: "Due date",
+          value: "dueDate",
+          sortable: true
+        },
+        {
+          text: "Closed at",
+          value: "closedAt",
+          sortable: true
+        },
+        {
+          text: "Actions",
+          value: "actions",
+          sortable: false
+        },
+      ].filter(c => !this.hideCols.includes(c.value));
+    }
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/ManageCleanupPlanDialog.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/ManageCleanupPlanDialog.vue
new file mode 100644
index 0000000000..f0143ebcba
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/ManageCleanupPlanDialog.vue
@@ -0,0 +1,82 @@
+<template>
+  <v-dialog
+    v-model="dialog"
+    content-class="manage-cleanup-plan-dialog"
+    max-width="600px"
+    transition="dialog-bottom-transition"
+    fullscreen
+    hide-overlay
+    scrollable
+  >
+    <template v-slot:activator="{}">
+      <slot />
+    </template>
+
+    <v-card>
+      <v-card-title
+        class="headline primary white--text"
+        primary-title
+      >
+        <v-container>
+          <v-row>
+            Manage cleanup plans
+          </v-row>
+
+          <v-row class="subtitle-1">
+            Use cleanup plans to track progress of reports in your product.
+          </v-row>
+        </v-container>
+
+        <v-spacer />
+
+        <v-btn class="close-btn" icon dark @click="dialog = false">
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-card-title>
+
+      <v-card-text class="pa-0">
+        <v-container>
+          <list-cleanup-plans />
+        </v-container>
+      </v-card-text>
+
+      <v-divider />
+
+      <v-card-actions>
+        <v-spacer />
+
+        <v-btn
+          color="error"
+          text
+          @click="dialog = false"
+        >
+          Cancel
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import ListCleanupPlans from "./ListCleanupPlans";
+
+export default {
+  name: "ManageCleanupPlanDialog",
+  components: {
+    ListCleanupPlans
+  },
+  props: {
+    value: { type: Boolean, default: false },
+  },
+  computed: {
+    dialog: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      }
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/RemoveCleanupPlanDialog.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/RemoveCleanupPlanDialog.vue
new file mode 100644
index 0000000000..b3718296d9
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/RemoveCleanupPlanDialog.vue
@@ -0,0 +1,60 @@
+<template>
+  <confirm-dialog
+    v-model="dialog"
+    max-width="600px"
+    cancel-btn-color="primary"
+    confirm-btn-label="Remove"
+    confirm-btn-color="error"
+    content-class="remove-cleanup-plan-dialog"
+    @confirm="removeCleanupPlan"
+  >
+    <template v-slot:title>
+      Remove cleanup plan
+    </template>
+
+    <template v-if="cleanupPlan" v-slot:content>
+      Are you sure that you would like to remove
+      <b>{{ cleanupPlan.name }}</b> cleanup plan?
+    </template>
+  </confirm-dialog>
+</template>
+
+<script>
+import { ccService, handleThriftError } from "@cc-api";
+
+import ConfirmDialog from "@/components/ConfirmDialog";
+
+export default {
+  name: "RemoveCleanupPlanDialog",
+  components: {
+    ConfirmDialog
+  },
+  props: {
+    value: { type: Boolean, default: false },
+    cleanupPlan: { type: Object, default: () => null }
+  },
+
+  computed: {
+    dialog: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      }
+    }
+  },
+
+  methods: {
+    removeCleanupPlan() {
+      ccService.getClient().removeCleanupPlan(this.cleanupPlan.id,
+        handleThriftError(success => {
+          if (success) {
+            this.$emit("on:confirm");
+            this.dialog = false;
+          }
+        }));
+    }
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/SetCleanupPlanBtn.vue b/web/server/vue-cli/src/components/Report/CleanupPlan/SetCleanupPlanBtn.vue
new file mode 100644
index 0000000000..8bd125ee67
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/SetCleanupPlanBtn.vue
@@ -0,0 +1,203 @@
+<template>
+  <v-menu
+    v-model="menu"
+    content-class="set-cleanup-plan-dialog"
+    :close-on-content-click="false"
+    :nudge-width="100"
+    offset-y
+  >
+    <template v-slot:activator="{ on, attrs }">
+      <v-btn
+        color="primary"
+        class="set-cleanup-plan-btn"
+        outlined
+        small
+        :disabled="!selectedReportHashes.length"
+        :loading="loading"
+        v-bind="attrs"
+        v-on="on"
+      >
+        <v-icon class="mr-1" small>
+          mdi-sign-direction
+        </v-icon>
+        Set cleanup plan
+      </v-btn>
+
+      <tooltip-help-icon>
+        You can use <b>cleanup plans</b> to track progress of reports in your
+        product.
+        <ul>
+          <li>
+            You can manage cleanup plans from the report filter bar by clicking
+            on the pencil icon
+            (<v-icon color="white" small>
+              mdi-pencil
+            </v-icon>)
+            beside the <i>Cleanup plan</i> filter.
+          </li>
+          <li>
+            After you created a cleanup plan, with this button you can
+            associate it with selected / current report(s).
+          </li>
+          <li>
+            You can list reports associated with a cleanup plan by using the
+            <i>Cleanup plan</i> filter.
+          </li>
+        </ul>
+      </tooltip-help-icon>
+    </template>
+
+    <v-card>
+      <v-list-item-group
+        :value="changedSelectedItems"
+        multiple
+        @change="updateSelectedCleanupPlans"
+      >
+        <cleanup-plan-tab v-model="tab">
+          <template v-slot:open>
+            <cleanup-plan-list
+              :value="openCleanupPlans"
+              :not-all-selected="changedNotAllSelected"
+            />
+          </template>
+
+          <template v-slot:closed>
+            <cleanup-plan-list
+              :value="closedCleanupPlans"
+              :not-all-selected="changedNotAllSelected"
+            />
+          </template>
+        </cleanup-plan-tab>
+      </v-list-item-group>
+    </v-card>
+  </v-menu>
+</template>
+
+<script>
+import { ccService, handleThriftError } from "@cc-api";
+
+import TooltipHelpIcon from "@/components/TooltipHelpIcon";
+import CleanupPlanTab from "./CleanupPlanTab";
+import CleanupPlanTabMixin from "./CleanupPlanTab.mixin";
+import CleanupPlanList from "./CleanupPlanList";
+
+export default {
+  name: "SetCleanupPlanBtn",
+  components: {
+    CleanupPlanList,
+    CleanupPlanTab,
+    TooltipHelpIcon,
+  },
+  mixins: [ CleanupPlanTabMixin ],
+  props: {
+    value: { type: Array, required: true }
+  },
+  data() {
+    return {
+      menu: false,
+      origSelectedItems: [],
+      changedSelectedItems: [],
+      origNotAllSelected: {},
+      changedNotAllSelected: {}
+    };
+  },
+  computed: {
+    selectedReportHashes() {
+      return [ ...new Set(this.value.map(v => v.bugHash)) ];
+    }
+  },
+  watch: {
+    menu() {
+      if (!this.menu) {
+        this.save();
+        this.reset();
+      } else {
+        this.fetchCleanupPlans();
+      }
+    }
+  },
+  methods: {
+    reset() {
+      this.openCleanupPlans = null;
+      this.closedCleanupPlans = null;
+      this.origSelectedItems = [];
+      this.changedSelectedItems = [];
+      this.origNotAllSelected = {};
+      this.changedNotAllSelected = {};
+    },
+
+    save() {
+      this.getCheckedCleanups().forEach(cleanupPlanId => {
+        ccService.getClient().setCleanupPlan(cleanupPlanId,
+          this.selectedReportHashes, handleThriftError());
+      });
+
+      this.getUncheckedCleanups().forEach(cleanupPlanId => {
+        ccService.getClient().unsetCleanupPlan(cleanupPlanId,
+          this.selectedReportHashes, handleThriftError());
+      });
+    },
+
+    getCheckedCleanups() {
+      return this.changedSelectedItems.filter(s =>
+        !this.origSelectedItems.includes(s));
+    },
+
+    getUncheckedCleanups() {
+      const removeFromCleanups = [];
+
+      this.origSelectedItems.forEach(s => {
+        if (!this.changedSelectedItems.includes(s)) {
+          removeFromCleanups.push(s);
+        }
+      });
+      Object.keys(this.origNotAllSelected).forEach(s => {
+        if (
+          !(s in this.changedNotAllSelected) &&
+          !this.changedSelectedItems.includes(s)
+        ) {
+          removeFromCleanups.push(s);
+        }
+      });
+
+      return removeFromCleanups;
+    },
+
+    // Initialize selected items.
+    onFetchFinished(cleanupPlans) {
+      cleanupPlans.forEach(cleanupPlan => {
+        const id = cleanupPlan.id.toNumber();
+
+        const commonReportHashes = this.selectedReportHashes.filter(
+          reportHash => cleanupPlan.reportHashes.includes(reportHash));
+
+        if (
+          commonReportHashes.length === this.selectedReportHashes.length
+        ) {
+          // Every selected report hashes are in the current cleanup plan so
+          // mark it as active.
+          if (!this.origSelectedItems.includes(id)) {
+            this.origSelectedItems.push(id);
+            this.changedSelectedItems.push(id);
+          }
+        } else if (commonReportHashes.length !== 0) {
+          // Not all selected report hashes are in the cleanup plan, so mark
+          // it differently.
+          this.origNotAllSelected[id] = true;
+          this.changedNotAllSelected[id] = true;
+        }
+      });
+    },
+
+    updateSelectedCleanupPlans(cleanupPlanIds) {
+      cleanupPlanIds.forEach(id => {
+        if (!this.changedSelectedItems.includes(id)) {
+          delete this.changedNotAllSelected[id];
+        }
+      });
+
+      this.changedSelectedItems = cleanupPlanIds;
+    }
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/CleanupPlan/index.js b/web/server/vue-cli/src/components/Report/CleanupPlan/index.js
new file mode 100644
index 0000000000..72a66b993a
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/CleanupPlan/index.js
@@ -0,0 +1,13 @@
+import EditCleanupPlanDialog from "./EditCleanupPlanDialog";
+import ListCleanupPlans from "./ListCleanupPlans";
+import ManageCleanupPlanDialog from "./ManageCleanupPlanDialog";
+import RemoveCleanupPlanDialog from "./RemoveCleanupPlanDialog";
+import SetCleanupPlanBtn from "./SetCleanupPlanBtn";
+
+export {
+  EditCleanupPlanDialog,
+  ListCleanupPlans,
+  ManageCleanupPlanDialog,
+  RemoveCleanupPlanDialog,
+  SetCleanupPlanBtn
+};
diff --git a/web/server/vue-cli/src/components/Report/Report.vue b/web/server/vue-cli/src/components/Report/Report.vue
index ee69ab18fd..6ce69ca375 100644
--- a/web/server/vue-cli/src/components/Report/Report.vue
+++ b/web/server/vue-cli/src/components/Report/Report.vue
@@ -38,6 +38,16 @@
             />
           </v-col>
 
+          <v-col
+            cols="auto"
+            class="pa-0 mr-2"
+            align-self="center"
+          >
+            <set-cleanup-plan-btn
+              :value="report ? [report] : []"
+            />
+          </v-col>
+
           <v-col
             cols="auto"
             class="review-status-wrapper pa-0"
@@ -286,6 +296,7 @@ import { AnalysisInfoDialog, CopyBtn } from "@/components";
 import { UserIcon } from "@/components/Icons";
 
 import ReportTreeKind from "@/components/Report/ReportTree/ReportTreeKind";
+import { SetCleanupPlanBtn } from "@/components/Report/CleanupPlan";
 
 import AnalysisInfoBtn from "./AnalysisInfoBtn";
 import CheckerDocumentationDialog from
@@ -311,6 +322,7 @@ export default {
     ReportInfoButton,
     SelectReviewStatus,
     SelectSameReport,
+    SetCleanupPlanBtn,
     ShowReportInfoDialog,
     ToggleBlameViewBtn,
     UserIcon
diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/CleanupPlanFilter.vue b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/CleanupPlanFilter.vue
new file mode 100644
index 0000000000..47b52b82a8
--- /dev/null
+++ b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/CleanupPlanFilter.vue
@@ -0,0 +1,101 @@
+<template>
+  <manage-cleanup-plan-dialog
+    :value.sync="dialog"
+  >
+    <select-option
+      :id="id"
+      title="Cleanup plan"
+      :bus="bus"
+      :fetch-items="fetchItems"
+      :selected-items="selectedItems"
+      :loading="loading"
+      :panel="panel"
+      @clear="clear(true)"
+      @input="setSelectedItems"
+    >
+      <template v-slot:prepend-toolbar-items>
+        <v-btn
+          class="manage-cleanup-plan-btn"
+          icon
+          small
+          @click.stop="dialog = true"
+        >
+          <v-icon>mdi-pencil</v-icon>
+        </v-btn>
+      </template>
+
+      <template v-slot:icon>
+        <v-icon color="grey">
+          mdi-sign-direction
+        </v-icon>
+      </template>
+    </select-option>
+  </manage-cleanup-plan-dialog>
+</template>
+
+<script>
+import { ccService, handleThriftError } from "@cc-api";
+
+import {
+  ManageCleanupPlanDialog
+} from "@/components/Report/CleanupPlan";
+
+import SelectOption from "./SelectOption/SelectOption";
+import BaseSelectOptionFilterMixin from "./BaseSelectOptionFilter.mixin";
+
+export default {
+  name: "SourceComponentFilter",
+  components: {
+    ManageCleanupPlanDialog,
+    SelectOption
+  },
+  mixins: [ BaseSelectOptionFilterMixin ],
+
+  data() {
+    return {
+      id: "cleanup-plan",
+      dialog: false
+    };
+  },
+
+  watch: {
+    dialog(value) {
+      if (value) return;
+
+      // If the source component manager dialog is closed we need to update
+      // the filter items to make sure that new items will be shown.
+      this.bus.$emit("update");
+    }
+  },
+
+  methods: {
+    updateReportFilter() {
+      this.setReportFilter({
+        cleanupPlanNames: this.selectedItems.map(item => item.id)
+      });
+    },
+
+    onReportFilterChange(key) {
+      if (key === "cleanupPlanNames") return;
+      this.update();
+    },
+
+    fetchItems() {
+      this.loading = true;
+
+      return new Promise(resolve => {
+        ccService.getClient().getCleanupPlans(null, handleThriftError(res => {
+          resolve(res.map(cleanupPlan => {
+            return {
+              id : cleanupPlan.name,
+              title: cleanupPlan.name,
+              value: cleanupPlan.description
+            };
+          }));
+          this.loading = false;
+        }));
+      });
+    }
+  }
+};
+</script>
diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/index.js b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/index.js
index 23b6e8ac73..1174d5642c 100644
--- a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/index.js
+++ b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/index.js
@@ -3,6 +3,7 @@ import UniqueFilter from "./UniqueFilter";
 import ReportHashFilter from "./ReportHashFilter";
 import BaselineOpenReportsDateFilter from  "./BaselineOpenReportsDateFilter";
 import BaselineRunFilter from "./BaselineRunFilter";
+import CleanupPlanFilter from "./CleanupPlanFilter";
 import ComparedToDiffTypeFilter from "./ComparedToDiffTypeFilter";
 import ComparedToOpenReportsDateFilter from
   "./ComparedToOpenReportsDateFilter";
@@ -25,6 +26,7 @@ export {
   ReportHashFilter,
   BaselineOpenReportsDateFilter,
   BaselineRunFilter,
+  CleanupPlanFilter,
   ComparedToDiffTypeFilter,
   ComparedToOpenReportsDateFilter,
   ComparedToRunFilter,
diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/ReportFilter.vue b/web/server/vue-cli/src/components/Report/ReportFilter/ReportFilter.vue
index 4b006b89a8..4c59802b20 100644
--- a/web/server/vue-cli/src/components/Report/ReportFilter/ReportFilter.vue
+++ b/web/server/vue-cli/src/components/Report/ReportFilter/ReportFilter.vue
@@ -204,6 +204,18 @@
 
       <v-divider />
 
+      <v-list-item class="pl-1">
+        <v-list-item-content class="pa-0">
+          <cleanup-plan-filter
+            ref="filters"
+            :namespace="namespace"
+            @update:url="updateUrl"
+          />
+        </v-list-item-content>
+      </v-list-item>
+
+      <v-divider />
+
       <v-list-item class="pl-1">
         <v-list-item-content class="pa-0">
           <checker-message-filter
@@ -299,6 +311,7 @@ import {
   BugPathLengthFilter,
   CheckerMessageFilter,
   CheckerNameFilter,
+  CleanupPlanFilter,
   ComparedToDiffTypeFilter,
   ComparedToOpenReportsDateFilter,
   ComparedToRunFilter,
@@ -327,6 +340,7 @@ export default {
     ReportHashFilter,
     BaselineRunFilter,
     BaselineOpenReportsDateFilter,
+    CleanupPlanFilter,
     ComparedToDiffTypeFilter,
     ComparedToOpenReportsDateFilter,
     ComparedToRunFilter,
diff --git a/web/server/vue-cli/src/filters/from-unix-time.js b/web/server/vue-cli/src/filters/from-unix-time.js
new file mode 100644
index 0000000000..2e846c84c3
--- /dev/null
+++ b/web/server/vue-cli/src/filters/from-unix-time.js
@@ -0,0 +1,8 @@
+import { format, fromUnixTime as fromUnixTimestamp } from "date-fns";
+
+export default function fromUnixTime(
+  timestamp,
+  dateFormat="yyyy-MM-dd HH:mm:ss"
+) {
+  return format(fromUnixTimestamp(timestamp), dateFormat);
+}
diff --git a/web/server/vue-cli/src/filters/index.js b/web/server/vue-cli/src/filters/index.js
index 1571126611..f7a91cca94 100644
--- a/web/server/vue-cli/src/filters/index.js
+++ b/web/server/vue-cli/src/filters/index.js
@@ -1,8 +1,10 @@
+import fromUnixTime from "./from-unix-time";
 import prettifyDate from "./prettify-date";
 import truncate from "./truncate";
 
 export default {
   install(Vue) {
+    Vue.filter("fromUnixTime", fromUnixTime);
     Vue.filter("prettifyDate", prettifyDate);
     Vue.filter("truncate", truncate);
   }
diff --git a/web/server/vue-cli/src/views/Reports.vue b/web/server/vue-cli/src/views/Reports.vue
index c439d7f213..1318a095eb 100644
--- a/web/server/vue-cli/src/views/Reports.vue
+++ b/web/server/vue-cli/src/views/Reports.vue
@@ -15,6 +15,7 @@
       />
 
       <v-data-table
+        v-model="selected"
         v-fill-height
         :headers="tableHeaders"
         :items="formattedReports"
@@ -26,10 +27,21 @@
         :must-sort="true"
         :expanded.sync="expanded"
         show-expand
+        show-select
         :mobile-breakpoint="1100"
         item-key="$id"
         @item-expanded="itemExpanded"
       >
+        <template v-slot:top>
+          <v-toolbar flat class="report-filter-toolbar" dense>
+            <v-row>
+              <v-col class="pa-0" align="right">
+                <set-cleanup-plan-btn :value="selected" />
+              </v-col>
+            </v-row>
+          </v-toolbar>
+        </template>
+
         <template v-slot:expanded-item="{ item }">
           <td
             class="pa-0"
@@ -162,6 +174,7 @@ import {
 import CheckerDocumentationDialog from
   "@/components/CheckerDocumentationDialog";
 import { ReportFilter } from "@/components/Report/ReportFilter";
+import { SetCleanupPlanBtn } from "@/components/Report/CleanupPlan";
 
 const namespace = "report";
 
@@ -174,7 +187,8 @@ export default {
     DetectionStatusIcon,
     ReviewStatusIcon,
     SeverityIcon,
-    ReportFilter
+    ReportFilter,
+    SetCleanupPlanBtn
   },
   directives: { FillHeight },
   mixins: [ BugPathLengthColorMixin, DetectionStatusMixin ],
@@ -246,6 +260,7 @@ export default {
         }
       ],
       reports: [],
+      selected: [],
       namespace: namespace,
       pagination: {
         page: page,
diff --git a/web/tests/functional/cleanup_plan/__init__.py b/web/tests/functional/cleanup_plan/__init__.py
new file mode 100644
index 0000000000..b5b84366bc
--- /dev/null
+++ b/web/tests/functional/cleanup_plan/__init__.py
@@ -0,0 +1,87 @@
+# coding=utf-8
+# -------------------------------------------------------------------------
+#
+#  Part of the CodeChecker project, under the Apache License v2.0 with
+#  LLVM Exceptions. See LICENSE for license information.
+#  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# -------------------------------------------------------------------------
+"""Setup for the test package cleanup plan."""
+
+
+import os
+import shutil
+import sys
+import uuid
+
+from libtest import codechecker
+from libtest import env
+from libtest import project
+
+# Test workspace should be initialized in this module.
+TEST_WORKSPACE = None
+
+
+def setup_package():
+    """Setup the environment for the tests. """
+
+    global TEST_WORKSPACE
+    TEST_WORKSPACE = env.get_workspace('cleanup_plan')
+
+    os.environ['TEST_WORKSPACE'] = TEST_WORKSPACE
+
+    test_project = 'cpp'
+
+    test_project_path = project.path(test_project)
+
+    test_config = {}
+
+    project_info = project.get_info(test_project)
+
+    test_config['test_project'] = project_info
+    test_env = env.test_env(TEST_WORKSPACE)
+
+    codechecker_cfg = {
+        'check_env': test_env,
+        'workspace': TEST_WORKSPACE,
+        'reportdir': os.path.join(TEST_WORKSPACE, 'reports'),
+        'checkers': []
+    }
+
+    # Start or connect to the running CodeChecker server and get connection
+    # details.
+    print("This test uses a CodeChecker server... connecting...")
+    server_access = codechecker.start_or_get_server()
+    server_access['viewer_product'] = 'cleanup_plan'
+    codechecker.add_test_package_product(server_access, TEST_WORKSPACE)
+
+    # Extend the checker configuration with the server access.
+    codechecker_cfg.update(server_access)
+
+    # Check the test project for the first time.
+    test_project_name = project_info['name'] + '_' + uuid.uuid4().hex
+    ret = codechecker.check_and_store(codechecker_cfg,
+                                      test_project_name,
+                                      test_project_path)
+    if ret:
+        sys.exit(1)
+    print("Analyzing test project was successful.")
+
+    codechecker_cfg['run_names'] = [test_project_name]
+    test_config['codechecker_cfg'] = codechecker_cfg
+    env.export_test_cfg(TEST_WORKSPACE, test_config)
+
+
+def teardown_package():
+    """Clean up after the test."""
+
+    # TODO: If environment variable is set keep the workspace
+    # and print out the path.
+    global TEST_WORKSPACE
+
+    check_env = env.import_test_cfg(TEST_WORKSPACE)[
+        'codechecker_cfg']['check_env']
+    codechecker.remove_test_package_product(TEST_WORKSPACE, check_env)
+
+    print("Removing: " + TEST_WORKSPACE)
+    shutil.rmtree(TEST_WORKSPACE, ignore_errors=True)
diff --git a/web/tests/functional/cleanup_plan/test_cleanup_plan.py b/web/tests/functional/cleanup_plan/test_cleanup_plan.py
new file mode 100644
index 0000000000..9780f01af8
--- /dev/null
+++ b/web/tests/functional/cleanup_plan/test_cleanup_plan.py
@@ -0,0 +1,184 @@
+#
+# -------------------------------------------------------------------------
+#
+#  Part of the CodeChecker project, under the Apache License v2.0 with
+#  LLVM Exceptions. See LICENSE for license information.
+#  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# -------------------------------------------------------------------------
+"""
+Report commenting tests.
+"""
+
+
+import datetime
+import os
+import time
+import unittest
+
+from codechecker_api.codeCheckerDBAccess_v6.ttypes import CleanupPlanFilter, \
+    ReportFilter
+
+from libtest import env
+from libtest.thrift_client_to_db import get_all_run_results
+
+
+class TestComment(unittest.TestCase):
+
+    def setUp(self):
+        self._test_workspace = os.environ.get('TEST_WORKSPACE')
+
+        test_class = self.__class__.__name__
+        print('Running ' + test_class + ' tests in ' + self._test_workspace)
+
+        self._testproject_data = env.setup_test_proj_cfg(self._test_workspace)
+        self.assertIsNotNone(self._testproject_data)
+
+        self._cc_client = env.setup_viewer_client(self._test_workspace)
+        self.assertIsNotNone(self._cc_client)
+
+    def test_managing_cleanup_plans(self):
+        """ Test managing cleanup plans. """
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        self.assertFalse(cleanup_plans)
+
+        due_date = datetime.date.today() + datetime.timedelta(days=1)
+        due_date_timestamp = int(time.mktime(due_date.timetuple()))
+
+        data = [
+            ("Test", "Test description", due_date_timestamp),
+            ("Dummy", None, None),
+        ]
+
+        cleanup_plan_id = {}
+        for name, description, due_date in data:
+            cleanup_plan_id[name] = self._cc_client.addCleanupPlan(
+                name, description, due_date)
+
+        # Get all cleanup plans.
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        self.assertEqual(len(cleanup_plans), 2)
+
+        self.assertEqual(cleanup_plans[0].name, data[1][0])
+        self.assertEqual(cleanup_plans[0].description, data[1][1])
+        self.assertEqual(cleanup_plans[0].dueDate, data[1][2])
+        self.assertEqual(cleanup_plans[0].closedAt, None)
+        self.assertEqual(cleanup_plans[0].reportHashes, [])
+
+        self.assertEqual(cleanup_plans[1].name, data[0][0])
+        self.assertEqual(cleanup_plans[1].description, data[0][1])
+        self.assertEqual(cleanup_plans[1].dueDate, data[0][2])
+        self.assertEqual(cleanup_plans[1].closedAt, None)
+        self.assertEqual(cleanup_plans[1].reportHashes, [])
+
+        # Filter cleanup plans.
+        cleanup_plan_filter = CleanupPlanFilter(names=[data[0][0]])
+        cleanup_plans = self._cc_client.getCleanupPlans(cleanup_plan_filter)
+        self.assertEqual(len(cleanup_plans), 1)
+        self.assertEqual(cleanup_plans[0].name, data[0][0])
+
+        # Close a cleanup plan and filter out closed cleanup plans.
+        success = self._cc_client.closeCleanupPlan(cleanup_plan_id[data[0][0]])
+        self.assertTrue(success)
+
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        self.assertEqual(len(cleanup_plans), 2)
+
+        cleanup_plan_filter = CleanupPlanFilter(
+            names=[data[0][0]], isOpen=False)
+        cleanup_plans = self._cc_client.getCleanupPlans(cleanup_plan_filter)
+        self.assertEqual(len(cleanup_plans), 1)
+        self.assertTrue(cleanup_plans[0].closedAt)
+
+        # Reopen cleanup plan.
+        success = self._cc_client.reopenCleanupPlan(
+            cleanup_plan_id[data[0][0]])
+        self.assertTrue(success)
+
+        cleanup_plan_filter = CleanupPlanFilter(names=[data[0][0]])
+        cleanup_plans = self._cc_client.getCleanupPlans(cleanup_plan_filter)
+        self.assertEqual(len(cleanup_plans), 1)
+        self.assertEqual(cleanup_plans[0].name, data[0][0])
+        self.assertFalse(cleanup_plans[0].closedAt)
+
+        # Remove cleanups.
+        success = self._cc_client.removeCleanupPlan(
+            cleanup_plan_id[data[0][0]])
+        self.assertTrue(success)
+
+        success = self._cc_client.removeCleanupPlan(
+            cleanup_plan_id[data[1][0]])
+        self.assertTrue(success)
+
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        self.assertFalse(len(cleanup_plans))
+
+    def test_assign_reports_to_cleanup_plans(self):
+        """ Test assigning reports to cleanup plans. """
+        name = "Test"
+        description = None
+        due_date = None
+
+        cleanup_plan_id = self._cc_client.addCleanupPlan(
+            name, description, due_date)
+
+        # Get all cleanup plans.
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        self.assertEqual(len(cleanup_plans), 1)
+
+        cleanup_plan = cleanup_plans[0]
+        self.assertEqual(cleanup_plan.reportHashes, [])
+
+        # Get results from the database.
+        run_results = get_all_run_results(self._cc_client)
+        self.assertTrue(run_results)
+
+        uniqued_report_hashes = set(r.bugHash for r in run_results)
+        self.assertTrue(len(uniqued_report_hashes) > 2)
+
+        it = iter(uniqued_report_hashes)
+        report_hash_1 = next(it)
+        report_hash_2 = next(it)
+        report_hashes = [report_hash_1, report_hash_2]
+
+        # Assign report to cleanup.
+        success = self._cc_client.setCleanupPlan(
+            cleanup_plan_id, report_hashes)
+        self.assertTrue(success)
+
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        cleanup_plan = cleanup_plans[0]
+        self.assertCountEqual(
+            cleanup_plan.reportHashes, report_hashes)
+
+        # Filter reports based on cleanup plan.
+        report_filter = ReportFilter(cleanupPlanNames=[name])
+        run_results = get_all_run_results(
+            self._cc_client, filters=report_filter)
+        self.assertTrue(run_results)
+
+        for report in run_results:
+            self.assertTrue(report.bugHash in report_hashes,
+                            f"{report.bugHash} not found in cleanup plan.")
+
+        # Remove report hash from cleanup plan.
+        success = self._cc_client.unsetCleanupPlan(
+            cleanup_plan_id, [report_hash_2])
+        self.assertTrue(success)
+
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        cleanup_plan = cleanup_plans[0]
+        self.assertCountEqual(
+            cleanup_plan.reportHashes, [report_hash_1])
+
+        success = self._cc_client.unsetCleanupPlan(
+            cleanup_plan_id, [report_hash_1])
+        self.assertTrue(success)
+
+        cleanup_plans = self._cc_client.getCleanupPlans(None)
+        cleanup_plan = cleanup_plans[0]
+        self.assertFalse(cleanup_plan.reportHashes)
+
+        # Remove cleanup.
+        success = self._cc_client.removeCleanupPlan(cleanup_plan_id)
+        self.assertTrue(success)
diff --git a/web/tests/libtest/thrift_client_to_db.py b/web/tests/libtest/thrift_client_to_db.py
index 7e3c337b48..b1e6b3f9de 100644
--- a/web/tests/libtest/thrift_client_to_db.py
+++ b/web/tests/libtest/thrift_client_to_db.py
@@ -239,7 +239,7 @@ def __getattr__(self, attr):
         return partial(self._thrift_client_call, attr)
 
 
-def get_all_run_results(client, run_id, sort_mode=None, filters=None):
+def get_all_run_results(client, run_id=None, sort_mode=None, filters=None):
     """
     Get all the results for a run.
     Query limit limits the number of results can be got from the
@@ -253,14 +253,10 @@ def get_all_run_results(client, run_id, sort_mode=None, filters=None):
     if not sort_mode:
         sort_mode = []
 
+    run_ids = [run_id] if run_id else None
     while True:
-        partial_res = client.getRunResults([run_id],
-                                           query_limit,
-                                           offset,
-                                           sort_mode,
-                                           filters,
-                                           None,
-                                           False)
+        partial_res = client.getRunResults(
+            run_ids, query_limit, offset, sort_mode, filters, None, False)
 
         offset += len(partial_res)
         if not partial_res: