Merge branch 'master'

Feature #14013

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --cc src/views/workbench/workbench.tsx
index df304aecde4646b25b4b1e40e487c7c8267ba550,5cf632faf174b655b91b29e456efaceba68d6849..01a92ab4da840004a39c4dbef847a557c743a143
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -246,7 -246,7 +247,8 @@@ export const Workbench = withStyles(sty
                          <FileRemoveDialog />
                          <MultipleFilesRemoveDialog />
                          <UpdateCollectionDialog />
 +                        <UploadCollectionFilesDialog />
+                         <UpdateProjectDialog />
                          <CurrentTokenDialog
                              currentToken={this.props.currentToken}
                              open={this.state.isCurrentTokenDialogOpen}