Merge remote-tracking branch 'origin/634-node-documents-in-the-settings-popin-remove-the-upload-button' into dev