diff --git a/addons/board/static/src/add_to_board/add_to_board.js b/addons/board/static/src/add_to_board/add_to_board.js
index d20545a0df0..f7a777e5f0d 100644
--- a/addons/board/static/src/add_to_board/add_to_board.js
+++ b/addons/board/static/src/add_to_board/add_to_board.js
@@ -35,9 +35,10 @@ export class AddToBoard extends Component {
     //---------------------------------------------------------------------
 
     async addToBoard() {
-        const { domain } = this.env.searchModel;
+        const { domain, globalContext } = this.env.searchModel;
         const { context } = this.env.searchModel.getIrFilterValues();
         const contextToSave = {
+            ...globalContext,
             ...context,
             orderedBy: this.env.searchModel.orderBy,
             dashboard_merge_domains_contexts: false,
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index 2def70e7071..0ed4ba4ef8c 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -88,6 +88,9 @@
             'project/static/src/scss/project_rightpanel.scss',
             'project/static/src/scss/project_widgets.scss',
         ],
+        "web.assets_backend_legacy_lazy": [
+            'project/static/src/js/*_legacy.js',
+        ],
         'web.assets_frontend': [
             'project/static/src/scss/portal_rating.scss',
             'project/static/src/js/portal_rating.js',
diff --git a/addons/project/static/src/js/project_graph_legacy.js b/addons/project/static/src/js/project_graph_legacy.js
new file mode 100644
index 00000000000..34ec8df3a4b
--- /dev/null
+++ b/addons/project/static/src/js/project_graph_legacy.js
@@ -0,0 +1,13 @@
+/** @odoo-module **/
+
+import GraphView from 'web.GraphView';
+import { ProjectControlPanel } from '@project/js/project_control_panel';
+import viewRegistry from 'web.view_registry';
+
+export const ProjectGraphView = GraphView.extend({
+  config: Object.assign({}, GraphView.prototype.config, {
+    ControlPanel: ProjectControlPanel,
+  }),
+});
+
+viewRegistry.add('project_graph', ProjectGraphView);
diff --git a/addons/project/static/src/js/project_pivot_legacy.js b/addons/project/static/src/js/project_pivot_legacy.js
new file mode 100644
index 00000000000..54676aa2558
--- /dev/null
+++ b/addons/project/static/src/js/project_pivot_legacy.js
@@ -0,0 +1,13 @@
+/** @odoo-module **/
+
+import PivotView from 'web.PivotView';
+import { ProjectControlPanel } from '@project/js/project_control_panel';
+import viewRegistry from 'web.view_registry';
+
+export const ProjectPivotView = PivotView.extend({
+  config: Object.assign({}, PivotView.prototype.config, {
+    ControlPanel: ProjectControlPanel,
+  }),
+});
+
+viewRegistry.add('project_pivot', ProjectPivotView);