diff --git a/doc/release-notes/6485-multiple-stores.md b/doc/release-notes/6485-multiple-stores.md
new file mode 100644
index 00000000000..ea2d224d612
--- /dev/null
+++ b/doc/release-notes/6485-multiple-stores.md
@@ -0,0 +1,36 @@
+# Multiple Store Support
+Dataverse can now be configured to store files in more than one place at the same time (multiple file, s3, and/or swift stores). 
+
+General information about this capability can be found in the <a href="http://guides.dataverse.org/en/latest/installation/config.html">Configuration Guide</a> - File Storage section.
+
+**Upgrade Information:** 
+
+**Existing installations will need to make configuration changes to adopt this version, regardless of whether additional stores are to be added or not.**
+
+Multistore support requires that each store be assigned a label, id, and type - see the documentation for a more complete explanation. For an existing store, the recommended upgrade path is to assign the store id based on it's type, i.e. a 'file' store would get id 'file', an 's3' store would have the id 's3'. 
+
+With this choice, no manual changes to datafile 'storageidentifier' entries are needed in the database. (If you do not name your existing store using this convention, you will need to edit the database to maintain access to existing files!).
+
+The following set of commands to change the Glassfish JVM options will adapt an existing file or s3 store for this upgrade:
+For a file store:
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.type=file"
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.label=file"
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.directory=<your directory>"
+    
+For an s3 store:
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3.type=s3"
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3.label=s3"
+    ./asadmin delete-jvm-options "-Ddataverse.files.s3-bucket-name=<your_bucket_name>"
+    ./asadmin create-jvm-options "-Ddataverse.files.s3.bucket-name=<your_bucket_name>"
+    
+Any additional S3 options you have set will need to be replaced as well, following the pattern in the last two lines above - delete the option including a '-' after 's3' and creating the same option with the '-' replaced by a '.', using the same value you currently have configured.  
+
+Once these options are set, restarting the glassfish service is all that is needed to complete the change.  
+
+<<<<<<< HEAD
+Note that the "\-Ddataverse.files.directory", if defined, continues to control where temporary files are stored (in the /temp subdir of that directory), independent of the location of any 'file' store defined above.
+=======
+Note that the "\-Ddataverse.files.directory", if defined, continues to control where temporary files are stored (in the /temp subdir of that directory), independent of the location of any 'file' store defined above.
+>>>>>>> branch 'IQSS/6485' of https://github.com/TexasDigitalLibrary/dataverse.git
diff --git a/doc/sphinx-guides/source/admin/dataverses-datasets.rst b/doc/sphinx-guides/source/admin/dataverses-datasets.rst
index e542dee2d83..a4bea9f53e7 100644
--- a/doc/sphinx-guides/source/admin/dataverses-datasets.rst
+++ b/doc/sphinx-guides/source/admin/dataverses-datasets.rst
@@ -38,7 +38,27 @@ Add Dataverse RoleAssignments to Child Dataverses
 
 Recursively assigns the users and groups having a role(s),that are in the set configured to be inheritable via the :InheritParentRoleAssignments setting, on a specified dataverse to have the same role assignments on all of the dataverses that have been created within it. The response indicates success or failure and lists the individuals/groups and dataverses involved in the update. Only accessible to superusers. ::
  
-    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias//addRoleAssignmentsToChildren
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias/addRoleAssignmentsToChildren
+    
+Configure a Dataverse to store all new files in a specific file store
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To direct new files (uploaded when datasets are created or edited) for all datasets in a given dataverse, the store can be specified via the API as shown below, or by editing the 'General Information' for a Dataverse on the Dataverse page. Only accessible to superusers. ::
+ 
+    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT -d $storageDriverLabel http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver
+    
+The current driver can be seen using:
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver
+
+and can be reset to the default store with:
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver
+    
+The available drivers can be listed with:
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/storageDrivers
+    
 
 Datasets
 --------
diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst
index 37a794e804e..bb16dd9133d 100644
--- a/doc/sphinx-guides/source/developers/big-data-support.rst
+++ b/doc/sphinx-guides/source/developers/big-data-support.rst
@@ -18,7 +18,7 @@ Install a DCM
 
 Installation instructions can be found at https://github.com/sbgrid/data-capture-module/blob/master/doc/installation.md. Note that shared storage (posix or AWS S3) between Dataverse and your DCM is required. You cannot use a DCM with Swift at this point in time.
 
-.. FIXME: Explain what ``dataverse.files.dcm-s3-bucket-name`` is for and what it has to do with ``dataverse.files.s3-bucket-name``.
+.. FIXME: Explain what ``dataverse.files.dcm-s3-bucket-name`` is for and what it has to do with ``dataverse.files.s3.bucket-name``.
 
 Once you have installed a DCM, you will need to configure two database settings on the Dataverse side. These settings are documented in the :doc:`/installation/config` section of the Installation Guide:
 
@@ -100,6 +100,7 @@ Optional steps for setting up the S3 Docker DCM Variant
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Before: the default bucket for DCM to hold files in S3 is named test-dcm. It is coded into `post_upload_s3.bash` (line 30). Change to a different bucket if needed.
+- Also Note: With the new support for multiple file store in Dataverse, DCM requires a store with id="s3" and DCM will only work with this store.
 
   - Add AWS bucket info to dcmsrv
     - Add AWS credentials to ``~/.aws/credentials``
@@ -115,6 +116,9 @@ Optional steps for setting up the S3 Docker DCM Variant
     - ``cd /opt/glassfish4/bin/``
     - ``./asadmin delete-jvm-options "\-Ddataverse.files.storage-driver-id=file"``
     - ``./asadmin create-jvm-options "\-Ddataverse.files.storage-driver-id=s3"``
+    - ``./asadmin create-jvm-options "\-Ddataverse.files.s3.type=s3"``
+    - ``./asadmin create-jvm-options "\-Ddataverse.files.s3.label=s3"``
+    
 
   - Add AWS bucket info to Dataverse
     - Add AWS credentials to ``~/.aws/credentials``
@@ -132,7 +136,7 @@ Optional steps for setting up the S3 Docker DCM Variant
 
     - S3 bucket for Dataverse
 
-      - ``/usr/local/glassfish4/glassfish/bin/asadmin create-jvm-options "-Ddataverse.files.s3-bucket-name=iqsstestdcmbucket"``
+      - ``/usr/local/glassfish4/glassfish/bin/asadmin create-jvm-options "-Ddataverse.files.s3.bucket-name=iqsstestdcmbucket"``
 
     - S3 bucket for DCM (as Dataverse needs to do the copy over)
 
diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 6bbfb788943..d6358e20347 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -215,10 +215,46 @@ As for the "Remote only" authentication mode, it means that:
 - ``:DefaultAuthProvider`` has been set to use the desired authentication provider
 - The "builtin" authentication provider has been disabled (:ref:`api-toggle-auth-provider`). Note that disabling the "builtin" authentication provider means that the API endpoint for converting an account from a remote auth provider will not work. Converting directly from one remote authentication provider to another (i.e. from GitHub to Google) is not supported. Conversion from remote is always to "builtin". Then the user initiates a conversion from "builtin" to remote. Note that longer term, the plan is to permit multiple login options to the same Dataverse account per https://github.com/IQSS/dataverse/issues/3487 (so all this talk of conversion will be moot) but for now users can only use a single login option, as explained in the :doc:`/user/account` section of the User Guide. In short, "remote only" might work for you if you only plan to use a single remote authentication provider such that no conversion between remote authentication providers will be necessary.
 
-File Storage: Local Filesystem vs. Swift vs. S3
------------------------------------------------
+File Storage: Using a Local Filesystem and/or Swift and/or S3 object stores
+---------------------------------------------------------------------------
 
-By default, a Dataverse installation stores data files (files uploaded by end users) on the filesystem at ``/usr/local/glassfish4/glassfish/domains/domain1/files`` but this path can vary based on answers you gave to the installer (see the :ref:`dataverse-installer` section of the Installation Guide) or afterward by reconfiguring the ``dataverse.files.directory`` JVM option described below.
+By default, a Dataverse installation stores all data files (files uploaded by end users) on the filesystem at ``/usr/local/glassfish4/glassfish/domains/domain1/files``. This path can vary based on answers you gave to the installer (see the :ref:`dataverse-installer` section of the Installation Guide) or afterward by reconfiguring the ``dataverse.files.directory`` JVM option described below.
+
+Dataverse can alternately store files in a Swift or S3-compatible object store, and can now be configured to support multiple stores at once. With a multi-store configuration, the location for new files can be controlled on a per-dataverse basis.
+
+The following sections describe how to set up various types of stores and how to configure for multiple stores.
+
+Multi-store Basics
++++++++++++++++++
+
+To support multiple stores, Dataverse now requires an id, type, and label for each store (even for a single store configuration). These are configured by defining two required jvm options:
+
+.. code-block:: none
+
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.type=<type>"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.label=<label>"
+
+Out of the box, Dataverse is configured to use local file storage in the 'file' store by default. You can add additional stores and, as a superuser, configure specific dataverses to use them (by editing the 'General Information' for the dataverse as described in the :doc:`dataverses-datasets` section).
+
+Note that the "\-Ddataverse.files.directory", if defined, continues to control where temporary files are stored (in the /temp subdir of that directory), independent of the location of any 'file' store defined above.
+
+If you wish to change which store is used by default, you'll need to delete the existing default storage driver and set a new one using jvm options.
+
+::
+
+  ./asadmin $ASADMIN_OPTS delete-jvm-options "-Ddataverse.files.storage-driver-id=file"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.files.storage-driver-id=<id>"
+
+File Storage
+++++++++++++
+
+File stores have one option - the directory where files should be stored. This can be set using
+
+.. code-block:: none
+
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.directory=<file directory>"
+    
+Multiple file stores should specify different directories (which would nominally be the reason to use multiple file stores), but one may share the same directory as "\-Ddataverse.files.directory" option - this would result in temp files being stored in the /temp subdirectory within the file store's root directory.
 
 Swift Storage
 +++++++++++++
@@ -231,12 +267,13 @@ First, run all the following create commands with your Swift endpoint informatio
 
 .. code-block:: none
 
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.defaultEndpoint=endpoint1"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.authType.endpoint1=your-auth-type"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.authUrl.endpoint1=your-auth-url"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.tenant.endpoint1=your-tenant-name"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.username.endpoint1=your-username"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.endpoint.endpoint1=your-swift-endpoint"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.type=swift"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.defaultEndpoint=endpoint1"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.authType.endpoint1=your-auth-type"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.authUrl.endpoint1=your-auth-url"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.tenant.endpoint1=your-tenant-name"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.username.endpoint1=your-username"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.endpoint.endpoint1=your-swift-endpoint"
 
 ``auth_type`` can either be ``keystone``, ``keystone_v3``, or it will assumed to be ``basic``. ``auth_url`` should be your keystone authentication URL which includes the tokens (e.g. for keystone, ``https://openstack.example.edu:35357/v2.0/tokens`` and for keystone_v3, ``https://openstack.example.edu:35357/v3/auth/tokens``). ``swift_endpoint`` is a URL that looks something like ``http://rdgw.swift.example.org/swift/v1``.
 
@@ -274,8 +311,8 @@ You also have the option to set a custom expiration length, in seconds, for a ge
 In this example, you would be setting the expiration length for one hour.
 
 
-Setting up Compute
-+++++++++++++++++++
+Setting up Compute with Swift
+#############################
 
 Once you have configured a Swift Object Storage backend, you also have the option of enabling a connection to a computing environment. To do so, you need to configure the database settings for :ref:`:ComputeBaseUrl` and  :ref:`:CloudEnvironmentName`.
 
@@ -306,9 +343,7 @@ You can configure this redirect properly in your cloud environment to generate a
 Amazon S3 Storage (or Compatible)
 +++++++++++++++++++++++++++++++++
 
-For institutions and organizations looking to use some kind of S3-based object storage for files uploaded to Dataverse,
-this is entirely possible. You can either use Amazon Web Services or use some other, even on-site S3-compatible
-storage (like Minio, Ceph RADOS S3 Gateway and many more). 
+Dataverse supports Amazon S3 storage as well as other S3-compatible stores (like Minio, Ceph RADOS S3 Gateway and many more) for files uploaded to Dataverse. 
 
 The Dataverse S3 driver supports multipart upload for files over 4 GB.
 
@@ -372,24 +407,6 @@ Please make note of the following details:
 
     * Example: *dataverse*
 
-
-Reported Working S3-Compatible Storage
-######################################
-
-`Minio v2018-09-12 <http://minio.io>`_
-  Set ``dataverse.files.s3-path-style-access=true``, as Minio works path-based. Works pretty smooth, easy to setup.
-  **Can be used for quick testing, too:** just use the example values above. Uses the public (read: unsecure and
-  possibly slow) https://play.minio.io:9000 service.
-
-`Surf Object Store v2019-10-30 <https://www.surf.nl/en>`_
-  Set ``dataverse.files.s3-payload-signing=true`` and ``dataverse.files.s3-chunked-encoding=false`` to use Surf Object
-  Store.
-
-**HINT:** If you are successfully using an S3 storage implementation not yet listed above, please feel free to
-`open an issue at Github <https://github.com/IQSS/dataverse/issues/new>`_ and describe your setup.
-We will be glad to add it here.
-
-
 Manually Set Up Credentials File
 ################################
 
@@ -409,6 +426,19 @@ While using Amazon's service, you must also specify the AWS region in the ``~/.a
   [default]
   region = us-east-1
 
+
+Additional profiles can be added to these files by appending the relevant information in additional blocks:
+
+::
+
+  [default]
+  aws_access_key_id = <insert key, no brackets>
+  aws_secret_access_key = <insert secret key, no brackets>
+
+  [profilename2]
+  aws_access_key_id = <insert key, no brackets>
+  aws_secret_access_key = <insert secret key, no brackets>
+
 Place these two files in a folder named ``.aws`` under the home directory for the user running your Dataverse Glassfish
 instance. (From the `AWS Command Line Interface Documentation <http://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html>`_:
 "In order to separate credentials from less sensitive options, region and output format are stored in a separate file
@@ -436,26 +466,29 @@ The subsequent config steps after the access keys are up to you. For reference,
 Second: Configure Dataverse to use S3 Storage
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-With access to your bucket in place, we'll want to navigate to ``/usr/local/glassfish4/glassfish/bin/``
-and execute the following ``asadmin`` commands to set up the proper JVM options. Recall that out of the box, Dataverse
-is configured to use local file storage. You'll need to delete the existing storage driver before setting the new one.
+To set up an S3 store, you must define the id, type, and label as for any store:
+.. code-block:: none
 
-::
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.type=s3"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.label=<label>"
 
-  ./asadmin $ASADMIN_OPTS delete-jvm-options "-Ddataverse.files.storage-driver-id=file"
-  ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.files.storage-driver-id=s3"
+ 
+Then, we'll need to identify which S3 bucket we're using. Replace ``<your_bucket_name>`` with, of course, your bucket:
+
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.bucket-name=<your_bucket_name>"``
 
-Then, we'll need to identify which S3 bucket we're using. Replace ``your_bucket_name`` with, of course, your bucket:
+Optionally, you can have users download files from S3 directly rather than having files pass from S3 through Glassfish to your users. To accomplish this, set ``dataverse.files.<id>.download-redirect`` to ``true`` like this:
 
-``./asadmin create-jvm-options "-Ddataverse.files.s3-bucket-name=your_bucket_name"``
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.download-redirect=true"``
 
-Optionally, you can have users download files from S3 directly rather than having files pass from S3 through Glassfish to your users. To accomplish this, set ``dataverse.files.s3-download-redirect`` to ``true`` like this:
+If you enable ``dataverse.files.<id>.download-redirect`` as described above, note that the S3 URLs expire after an hour by default but you can configure the expiration time using the ``dataverse.files.<id>.url-expiration-minutes`` JVM option. Here's an example of setting the expiration time to 120 minutes:
 
-``./asadmin create-jvm-options "-Ddataverse.files.s3-download-redirect=true"``
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.url-expiration-minutes=120"``
 
-If you enable ``dataverse.files.s3-download-redirect`` as described above, note that the S3 URLs expire after an hour by default but you can configure the expiration time using the ``dataverse.files.s3-url-expiration-minutes`` JVM option. Here's an example of setting the expiration time to 120 minutes:
+By default, your store will use the [default] profile in you .aws configuration files. To use a different profile, which would be necessary if you have two s3 stores at different locations, you can specify the profile to use:
 
-``./asadmin create-jvm-options "-Ddataverse.files.s3-url-expiration-minutes=120"``
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.profile=<profilename>"``
+ 
 
 In case you would like to configure Dataverse to use a custom S3 service instead of Amazon S3 services, please
 add the options for the custom URL and region as documented below. Please read above if your desired combination has
@@ -466,19 +499,36 @@ Lastly, go ahead and restart your glassfish server. With Dataverse deployed and
 S3 Storage Options
 ##################
 
-=========================================  ==================  ==================================================================  =============
-JVM Option                                 Value               Description                                                         Default value
-=========================================  ==================  ==================================================================  =============
-dataverse.files.storage-driver-id          s3                  Enable S3 storage driver.                                           ``file``
-dataverse.files.s3-bucket-name             <?>                 The bucket name. See above.                                         (none)
-dataverse.files.s3-download-redirect       ``true``/``false``  Enable direct download or proxy through Dataverse.                  ``false``
-dataverse.files.s3-url-expiration-minutes  <?>                 If direct downloads: time until links expire. Optional.             60
-dataverse.files.s3-custom-endpoint-url     <?>                 Use custom S3 endpoint. Needs URL either with or without protocol.  (none)
-dataverse.files.s3-custom-endpoint-region  <?>                 Only used when using custom endpoint. Optional.                     ``dataverse``
-dataverse.files.s3-path-style-access       ``true``/``false``  Use path style buckets instead of subdomains. Optional.             ``false``
-dataverse.files.s3-payload-signing         ``true``/``false``  Enable payload signing. Optional                                    ``false``
-dataverse.files.s3-chunked-encoding        ``true``/``false``  Disable chunked encoding. Optional                                  ``true``
-=========================================  ==================  ==================================================================  =============
+=========================================    ==================  ==================================================================  =============
+JVM Option                                   Value               Description                                                         Default value
+=========================================    ==================  ==================================================================  =============
+dataverse.files.storage-driver-id            <id>                Enable <id> as the default storage driver.                          ``file``
+dataverse.files.<id>.bucket-name             <?>                 The bucket name. See above.                                         (none)
+dataverse.files.<id>.download-redirect       ``true``/``false``  Enable direct download or proxy through Dataverse.                  ``false``
+dataverse.files.<id>.url-expiration-minutes  <?>                 If direct downloads: time until links expire. Optional.             60
+dataverse.files.<id>.custom-endpoint-url     <?>                 Use custom S3 endpoint. Needs URL either with or without protocol.  (none)
+dataverse.files.<id>.custom-endpoint-region  <?>                 Only used when using custom endpoint. Optional.                     ``dataverse``
+dataverse.files.<id>.path-style-access       ``true``/``false``  Use path style buckets instead of subdomains. Optional.             ``false``
+dataverse.files.<id>.payload-signing         ``true``/``false``  Enable payload signing. Optional                                    ``false``
+dataverse.files.<id>.chunked-encoding        ``true``/``false``  Disable chunked encoding. Optional                                  ``true``
+=========================================    ==================  ==================================================================  =============
+
+Reported Working S3-Compatible Storage
+######################################
+
+`Minio v2018-09-12 <http://minio.io>`_
+  Set ``dataverse.files.<id>.path-style-access=true``, as Minio works path-based. Works pretty smooth, easy to setup.
+  **Can be used for quick testing, too:** just use the example values above. Uses the public (read: unsecure and
+  possibly slow) https://play.minio.io:9000 service.
+
+`Surf Object Store v2019-10-30 <https://www.surf.nl/en>`_
+  Set ``dataverse.files.<id>.payload-signing=true`` and ``dataverse.files.<id>.chunked-encoding=false`` to use Surf Object
+  Store.
+
+**HINT:** If you are successfully using an S3 storage implementation not yet listed above, please feel free to
+`open an issue at Github <https://github.com/IQSS/dataverse/issues/new>`_ and describe your setup.
+We will be glad to add it here.
+
 
 .. _Branding Your Installation:
 
diff --git a/scripts/installer/glassfish-setup.sh b/scripts/installer/glassfish-setup.sh
index 881a4e7fd8c..032c5489ac4 100755
--- a/scripts/installer/glassfish-setup.sh
+++ b/scripts/installer/glassfish-setup.sh
@@ -70,9 +70,13 @@ function preliminary_setup()
     ###
   # Add the necessary JVM options: 
   # 
-  # location of the datafiles directory: 
-  # (defaults to dataverse/files in the users home directory)
+  # location of the datafiles temp directory: 
+  # (defaults to dataverse/files in the users home directory, ${FILES_DIR}/temp if this is set)
   ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.directory=${FILES_DIR}"
+  # Backward compatible file store configuration
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.file.type=file"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.file.label=file"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.file.directory=${FILES_DIR}"
   # Rserve-related JVM options: 
   ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.host=${RSERVE_HOST}"
   ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.port=${RSERVE_PORT}"
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
index a35bfb0df15..54a88c27d91 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
@@ -1565,7 +1565,8 @@ public void finalizeFileDelete(Long dataFileId, String storageLocation) throws I
             throw new IOException("Attempted to permanently delete a physical file still associated with an existing DvObject "
                     + "(id: " + dataFileId + ", location: " + storageLocation);
         }
-        StorageIO directStorageAccess = DataAccess.getDirectStorageIO(storageLocation);
+        logger.info("deleting: " + storageLocation);
+        StorageIO<DvObject> directStorageAccess = DataAccess.getDirectStorageIO(storageLocation);
         directStorageAccess.delete();
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index 024281b0b96..4b53937a87f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -2,6 +2,7 @@
 
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearch;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.ArrayList;
@@ -147,6 +148,8 @@ public String getIndexableCategoryName() {
     }
 
     private String affiliation;
+    
+    private String storageDriver="";
 
 	// Note: We can't have "Remove" here, as there are role assignments that refer
     //       to this role. So, adding it would mean violating a forign key contstraint.
@@ -756,4 +759,25 @@ public boolean isAncestorOf( DvObject other ) {
         }
         return false;
     }
+
+	public String getEffectiveStorageDriverId() {
+		String id = storageDriver;
+		if(id == null) {
+			if(this.getOwner() != null) {
+				id = this.getOwner().getEffectiveStorageDriverId(); 
+			} else {
+				id= DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER;
+			}
+		}
+		return id;
+	}
+	
+	
+	public String getStorageDriverId() {
+		return storageDriver;
+	}
+
+	public void setStorageDriverId(String storageDriver) {
+		this.storageDriver = storageDriver;
+	}
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 5790af1c153..12f398c9c7d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -4,6 +4,7 @@
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataverse.DataverseUtil;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -35,10 +36,14 @@
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
+
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.faces.component.UIComponent;
@@ -1204,4 +1209,31 @@ public List<Dataverse> completeHostDataverseMenuList(String query) {
             return null;
         }
     }
+    
+    public Set<Entry<String, String>> getStorageDriverOptions() {
+    	HashMap<String, String> drivers =new HashMap<String, String>();
+    	drivers.putAll(DataAccess.getStorageDriverLabels());
+    	//Add an entry for the default (inherited from an ancestor or the system default)
+    	drivers.put(getDefaultStorageDriverLabel(), "");
+    	return drivers.entrySet();
+    }
+    
+    public String getDefaultStorageDriverLabel() {
+    	String storageDriverId = DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER;
+    	Dataverse parent = dataverse.getOwner();
+    	if(parent != null) {
+    		storageDriverId = parent.getEffectiveStorageDriverId();
+    	}
+    	boolean fromAncestor=false;
+   		if(!storageDriverId.equals(DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER)) {
+    			fromAncestor = true;
+    	}
+   		String label = DataAccess.getStorageDriverLabelFor(storageDriverId);
+   		if(fromAncestor) {
+   			label = label + " " + BundleUtil.getStringFromBundle("dataverse.storage.inherited");
+   		} else {
+   			label = label + " " + BundleUtil.getStringFromBundle("dataverse.storage.default");
+   		}
+   		return label;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
index 3c3da259f75..8425af60335 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -571,7 +571,7 @@ public String init() {
         }
         
         saveEnabled = true; 
-        if (mode == FileEditMode.UPLOAD && workingVersion.getFileMetadatas().isEmpty() && settingsWrapper.isRsyncUpload())  {
+        if (mode == FileEditMode.UPLOAD && workingVersion.getFileMetadatas().isEmpty() && rsyncUploadSupported())  {
             setUpRsync();
         }
 
@@ -2757,6 +2757,14 @@ public void saveAdvancedOptions() {
         fileMetadataSelectedForIngestOptionsPopup = null;
     }
 
+    public boolean rsyncUploadSupported() {
+    	// ToDo - rsync was written before multiple store support and currently is hardcoded to use the "s3" store. 
+    	// When those restrictions are lifted/rsync can be configured per store, this test should check that setting
+    	// instead of testing for the 's3" store.
+    	return settingsWrapper.isRsyncUpload() && dataset.getDataverseContext().getEffectiveStorageDriverId().equals("s3");
+    }
+    
+    
     private void populateFileMetadatas() {
         fileMetadatas = new ArrayList<>();
         if (selectedFileIdsList == null || selectedFileIdsList.isEmpty()) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java b/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
index f6f46e375ff..054ed61f320 100644
--- a/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
@@ -69,7 +69,7 @@ public void copyFromS3(Dataset dataset, String s3ImportPath) throws IOException
         
         String dcmBucketName = System.getProperty("dataverse.files.dcm-s3-bucket-name");
         String dcmDatasetKey = s3ImportPath;
-        String dvBucketName = System.getProperty("dataverse.files.s3-bucket-name");
+        String dvBucketName = System.getProperty("dataverse.files.s3.bucket-name");
 
         String dvDatasetKey = getS3DatasetKey(dataset);
         
@@ -137,7 +137,7 @@ public DataFile createPackageDataFile(Dataset dataset, String folderName, long t
         //This is a brittle calculation, changes of the dcm post_upload script will blow this up
         String rootPackageName = "package_" + folderName.replace("/", "");
 
-        String dvBucketName = System.getProperty("dataverse.files.s3-bucket-name");
+        String dvBucketName = System.getProperty("dataverse.files.s3.bucket-name");
         String dvDatasetKey = getS3DatasetKey(dataset);
 
         //getting the name of the .sha file via substring, ${packageName}.sha
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 931eb29eb61..c5f358e8f71 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -33,6 +33,7 @@
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailData;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailException;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailInitResponse;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
@@ -54,6 +55,7 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
@@ -66,6 +68,7 @@
 import javax.ws.rs.core.Response.Status;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import edu.harvard.iq.dataverse.authorization.AuthTestDataServiceBean;
@@ -1647,5 +1650,82 @@ public Response addRoleAssignementsToChildren(@PathParam("alias") String alias)
                 "InheritParentRoleAssignments does not list any roles on this instance");
     }
     
+    @GET
+    @Path("/dataverse/{alias}/storageDriver")
+    public Response getStorageDriver(@PathParam("alias") String alias) throws WrappedResponse {
+    	Dataverse dataverse = dataverseSvc.findByAlias(alias);
+    	if (dataverse == null) {
+    		return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+    	}
+    	try {
+    		AuthenticatedUser user = findAuthenticatedUserOrDie();
+    		if (!user.isSuperuser()) {
+    			return error(Response.Status.FORBIDDEN, "Superusers only.");
+    		}
+    	} catch (WrappedResponse wr) {
+    		return wr.getResponse();
+    	}
+    	//Note that this returns what's set directly on this dataverse. If null, the user would have to recurse the chain of parents to find the effective storageDriver
+    	return ok(dataverse.getStorageDriverId());
+    }
+    
+    @PUT
+    @Path("/dataverse/{alias}/storageDriver")
+    public Response setStorageDriver(@PathParam("alias") String alias, String label) throws WrappedResponse {
+    	Dataverse dataverse = dataverseSvc.findByAlias(alias);
+    	if (dataverse == null) {
+    		return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+    	}
+    	try {
+    		AuthenticatedUser user = findAuthenticatedUserOrDie();
+    		if (!user.isSuperuser()) {
+    			return error(Response.Status.FORBIDDEN, "Superusers only.");
+    		}
+    	} catch (WrappedResponse wr) {
+    		return wr.getResponse();
+    	}
+    	for (Entry<String, String> store: DataAccess.getStorageDriverLabels().entrySet()) {
+    		if(store.getKey().equals(label)) {
+    			dataverse.setStorageDriverId(store.getValue());
+    			return ok("Storage set to: " + store.getKey() + "/" + store.getValue());
+    		}
+    	}
+    	return error(Response.Status.BAD_REQUEST,
+    			"No Storage Driver found for : " + label);
+    }
 
+    @DELETE
+    @Path("/dataverse/{alias}/storageDriver")
+    public Response resetStorageDriver(@PathParam("alias") String alias) throws WrappedResponse {
+    	Dataverse dataverse = dataverseSvc.findByAlias(alias);
+    	if (dataverse == null) {
+    		return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+    	}
+    	try {
+    		AuthenticatedUser user = findAuthenticatedUserOrDie();
+    		if (!user.isSuperuser()) {
+    			return error(Response.Status.FORBIDDEN, "Superusers only.");
+    		}
+    	} catch (WrappedResponse wr) {
+    		return wr.getResponse();
+    	}
+    	dataverse.setStorageDriverId("");
+    	return ok("Storage reset to default: " + DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+    }
+    
+    @GET
+    @Path("/dataverse/storageDrivers")
+    public Response listStorageDrivers() throws WrappedResponse {
+    	try {
+    		AuthenticatedUser user = findAuthenticatedUserOrDie();
+    		if (!user.isSuperuser()) {
+    			return error(Response.Status.FORBIDDEN, "Superusers only.");
+    		}
+    	} catch (WrappedResponse wr) {
+    		return wr.getResponse();
+    	}
+    	JsonObjectBuilder bld = jsonObjectBuilder();
+    	DataAccess.getStorageDriverLabels().entrySet().forEach(s -> bld.add(s.getKey(), s.getValue()));
+		return ok(bld);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
index 388d22a8b29..740eeacf221 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
@@ -78,6 +78,8 @@
 import edu.harvard.iq.dataverse.S3PackageImporter;
 import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.S3AccessIO;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.UnforcedCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.GetDatasetStorageSizeCommand;
@@ -93,6 +95,7 @@
 import edu.harvard.iq.dataverse.util.ArchiverUtil;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.EjbUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
@@ -1299,11 +1302,12 @@ public Response receiveChecksumValidationResults(@PathParam("identifier") String
             if ("validation passed".equals(statusMessageFromDcm)) {
                logger.log(Level.INFO, "Checksum Validation passed for DCM."); 
 
-                String storageDriver = (System.getProperty("dataverse.files.storage-driver-id") != null) ? System.getProperty("dataverse.files.storage-driver-id") : "file";
+                String storageDriver = dataset.getDataverseContext().getEffectiveStorageDriverId();
                 String uploadFolder = jsonFromDcm.getString("uploadFolder");
                 int totalSize = jsonFromDcm.getInt("totalSize");
+                String storageDriverType = System.getProperty("dataverse.file." + storageDriver + ".type");
                 
-                if (storageDriver.equals("file")) {
+                if (storageDriverType.equals("file")) {
                     logger.log(Level.INFO, "File storage driver used for (dataset id={0})", dataset.getId());
 
                     ImportMode importMode = ImportMode.MERGE;
@@ -1319,7 +1323,7 @@ public Response receiveChecksumValidationResults(@PathParam("identifier") String
                         String message = wr.getMessage();
                         return error(Response.Status.INTERNAL_SERVER_ERROR, "Uploaded files have passed checksum validation but something went wrong while attempting to put the files into Dataverse. Message was '" + message + "'.");
                     }
-                } else if(storageDriver.equals("s3")) {
+                } else if(storageDriverType.equals("s3")) {
                     
                     logger.log(Level.INFO, "S3 storage driver used for DCM (dataset id={0})", dataset.getId());
                     try {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
index 8c480bdcc36..a9b4746299d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
@@ -228,7 +228,7 @@ public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
                         throw new NotFoundException("datafile access error: requested optional service (image scaling, format conversion, etc.) could not be performed on this datafile.");
                     }
                 } else {
-                    if (storageIO instanceof S3AccessIO && !(dataFile.isTabularData()) && isRedirectToS3()) {
+                    if (storageIO instanceof S3AccessIO && !(dataFile.isTabularData()) && ((S3AccessIO) storageIO).downloadRedirectEnabled()) {
                         // definitely close the (still open) S3 input stream, 
                         // since we are not going to use it. The S3 documentation
                         // emphasizes that it is very important not to leave these
@@ -445,13 +445,4 @@ private long getFileSize(DownloadInstance di, String extraHeader) {
         }
         return -1;
     }
-    
-    private boolean isRedirectToS3() {
-        String optionValue = System.getProperty("dataverse.files.s3-download-redirect");
-        if ("true".equalsIgnoreCase(optionValue)) {
-            return true;
-        }
-        return false;
-    }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java
index acb9336b5c6..1465506f9c9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java
@@ -21,14 +21,23 @@
 package edu.harvard.iq.dataverse.dataaccess;
 
 import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.util.StringUtil;
+
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.logging.Logger;
+import org.apache.commons.lang.StringUtils;
 /**
  *
  * @author Leonid Andreev
  */
 
+
 public class DataAccess {
 
+	private static final Logger logger = Logger.getLogger(DataAccess.class.getCanonicalName());
+	
     public DataAccess() {
 
     };
@@ -51,16 +60,22 @@ public static <T extends DvObject> StorageIO<T> getStorageIO(T dvObject, DataAcc
             || dvObject.getStorageIdentifier().isEmpty()) {
             throw new IOException("getDataAccessObject: null or invalid datafile.");
         }
-
-        if (dvObject.getStorageIdentifier().startsWith("file://")
-                || (!dvObject.getStorageIdentifier().matches("^[a-z][a-z0-9]*://.*"))) {
-            return new FileAccessIO<>(dvObject, req);
-        } else if (dvObject.getStorageIdentifier().startsWith("swift://")){
-            return new SwiftAccessIO<>(dvObject, req);
-        } else if (dvObject.getStorageIdentifier().startsWith("s3://")){
-            return new S3AccessIO<>(dvObject, req);
-        } else if (dvObject.getStorageIdentifier().startsWith("tmp://")) {
-            throw new IOException("DataAccess IO attempted on a temporary file that hasn't been permanently saved yet.");
+        String storageIdentifier = dvObject.getStorageIdentifier();
+        int separatorIndex = storageIdentifier.indexOf("://");
+    	String storageDriverId = "file"; //default
+        if(separatorIndex>0) {
+        	storageDriverId = storageIdentifier.substring(0,separatorIndex);
+        }
+        String storageType = getDriverType(storageDriverId);
+        switch(storageType) {
+        case "file":
+            return new FileAccessIO<>(dvObject, req, storageDriverId);
+        case "s3":
+            return new S3AccessIO<>(dvObject, req, storageDriverId);
+        case "swift":
+            return new SwiftAccessIO<>(dvObject, req, storageDriverId);
+        case "tmp":
+        	throw new IOException("DataAccess IO attempted on a temporary file that hasn't been permanently saved yet.");
         }
 
         // TODO:
@@ -69,60 +84,151 @@ public static <T extends DvObject> StorageIO<T> getStorageIO(T dvObject, DataAcc
         // "storage identifier".
         // -- L.A. 4.0.2
 
-
+        logger.warning("Could not find storage driver for: " + storageIdentifier);
         throw new IOException("getDataAccessObject: Unsupported storage method.");
     }
 
     // Experimental extension of the StorageIO system allowing direct access to
     // stored physical files that may not be associated with any DvObjects
 
-    public static StorageIO getDirectStorageIO(String storageLocation) throws IOException {
-        if (storageLocation.startsWith("file://")) {
-            return new FileAccessIO(storageLocation.substring(7));
-        } else if (storageLocation.startsWith("swift://")){
-            return new SwiftAccessIO<>(storageLocation.substring(8));
-        } else if (storageLocation.startsWith("s3://")){
-            return new S3AccessIO<>(storageLocation.substring(5));
+    public static StorageIO<DvObject> getDirectStorageIO(String fullStorageLocation) throws IOException {
+    	String[] response = getDriverIdAndStorageLocation(fullStorageLocation);
+    	String storageDriverId = response[0];
+    	String storageLocation=response[1];
+        String storageType = getDriverType(storageDriverId);
+        switch(storageType) {
+        case "file":
+            return new FileAccessIO<>(storageLocation, storageDriverId);
+        case "s3":
+            return new S3AccessIO<>(storageLocation, storageDriverId);
+        case "swift":
+            return new SwiftAccessIO<>(storageLocation, storageDriverId);
+        default:
+        	logger.warning("Could not find storage driver for: " + fullStorageLocation);
+        	throw new IOException("getDirectStorageIO: Unsupported storage method.");
         }
-
-        throw new IOException("getDirectStorageIO: Unsupported storage method.");
+    }
+    
+    public static String[] getDriverIdAndStorageLocation(String storageLocation) {
+    	//default if no prefix
+    	String storageIdentifier=storageLocation;
+        int separatorIndex = storageLocation.indexOf("://");
+    	String storageDriverId = ""; //default
+        if(separatorIndex>0) {
+        	storageDriverId = storageLocation.substring(0,separatorIndex);
+        	storageIdentifier = storageLocation.substring(separatorIndex + 3);
+        }
+		return new String[]{storageDriverId, storageIdentifier};
+    }
+    
+    public static String getStorarageIdFromLocation(String location) {
+    	return location.substring(location.lastIndexOf('/')+1);
+    }
+    
+    public static String getDriverType(String driverId) {
+    	if(driverId.isEmpty() || driverId.equals("tmp")) {
+    		return "tmp";
+    	}
+    	return System.getProperty("dataverse.files." + driverId + ".type", "Undefined");
     }
 
     // createDataAccessObject() methods create a *new*, empty DataAccess objects,
     // for saving new, not yet saved datafiles.
     public static <T extends DvObject> StorageIO<T> createNewStorageIO(T dvObject, String storageTag) throws IOException {
-
-        return createNewStorageIO(dvObject, storageTag, DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+        if (dvObject == null
+        		|| dvObject.getDataverseContext()==null
+                || storageTag == null
+                || storageTag.isEmpty()) {
+            throw new IOException("getDataAccessObject: null or invalid datafile.");
+        }
+        return createNewStorageIO(dvObject, storageTag, dvObject.getDataverseContext().getEffectiveStorageDriverId());
     }
 
-    public static <T extends DvObject> StorageIO<T> createNewStorageIO(T dvObject, String storageTag, String driverIdentifier) throws IOException {
+    public static <T extends DvObject> StorageIO<T> createNewStorageIO(T dvObject, String storageTag, String storageDriverId) throws IOException {
         if (dvObject == null
                 || storageTag == null
-            || storageTag.isEmpty()) {
+                || storageTag.isEmpty()) {
             throw new IOException("getDataAccessObject: null or invalid datafile.");
         }
 
         StorageIO<T> storageIO = null;
-
+        
         dvObject.setStorageIdentifier(storageTag);
 
-        if (driverIdentifier == null) {
-            driverIdentifier = "file";
+        if (StringUtils.isEmpty(storageDriverId)) {
+        	storageDriverId = "file";
         }
-
-        if (driverIdentifier.equals("file")) {
-            storageIO = new FileAccessIO<>(dvObject, null);
-        } else if (driverIdentifier.equals("swift")) {
-            storageIO = new SwiftAccessIO<>(dvObject, null);
-        } else if (driverIdentifier.equals("s3")) {
-            storageIO = new S3AccessIO<>(dvObject, null);
-        } else {
-            throw new IOException("createDataAccessObject: Unsupported storage method " + driverIdentifier);
+        String storageType = getDriverType(storageDriverId);
+        switch(storageType) {
+        case "file":
+        	storageIO = new FileAccessIO<>(dvObject, null, storageDriverId);
+        	break;
+        case "swift":
+        	storageIO = new SwiftAccessIO<>(dvObject, null, storageDriverId);
+        	break;
+        case "s3":
+        	storageIO = new S3AccessIO<>(dvObject, null, storageDriverId);
+        	break;
+        default:
+        	logger.warning("Could not find storage driver for: " + storageTag);
+        	throw new IOException("createDataAccessObject: Unsupported storage method " + storageDriverId);
         }
-
+        // Note: All storageIO classes must assure that dvObject instances' storageIdentifiers are prepended with 
+        // the <driverId>:// + any additional storageIO type information required (e.g. the bucketname for s3/swift)
+        // This currently happens when the storageIO is opened for write access
         storageIO.open(DataAccessOption.WRITE_ACCESS);
         return storageIO;
     }
 
+    static HashMap<String, String> drivers = null;
+    
+    public static String getStorageDriverId(String driverLabel) {
+    	if (drivers==null) {
+    		populateDrivers();
+    	}
+    	if(StringUtil.nonEmpty(driverLabel) && drivers.containsKey(driverLabel)) {
+    		return drivers.get(driverLabel);
+    	} 
+    	return DEFAULT_STORAGE_DRIVER_IDENTIFIER;
+    }
+
+    public static HashMap<String, String> getStorageDriverLabels() {
+    	if (drivers==null) {
+    		populateDrivers();
+    	}
+    	return drivers;
+    }
 
+    private static void populateDrivers() {
+    	drivers = new HashMap<String, String>();
+    	Properties p = System.getProperties();
+    	for(String property: p.stringPropertyNames()) {
+    		if(property.startsWith("dataverse.files.") && property.endsWith(".label")) {
+    			String driverId = property.substring(16); // "dataverse.files.".length
+    			driverId=driverId.substring(0,driverId.indexOf('.'));
+    			logger.info("Found Storage Driver: " + driverId + " for " + p.get(property).toString());
+    			drivers.put(p.get(property).toString(), driverId);
+    		}
+
+    	}
+    }
+
+    public static String getStorageDriverLabelFor(String storageDriverId) {
+    	String label = null;
+    	if(!StringUtils.isEmpty(storageDriverId)) {
+    		if (drivers==null) {
+    			populateDrivers();
+    		}
+
+    		if(drivers.containsValue(storageDriverId)) {
+    			for(String key: drivers.keySet()) {
+    				if(drivers.get(key).equals(storageDriverId)) {
+    					label = key;
+    					break;
+    				}
+    			}
+    		}
+    	}
+    	return label;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java
index 3afab58c1ce..629cf630936 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java
@@ -49,25 +49,23 @@
 
 public class FileAccessIO<T extends DvObject> extends StorageIO<T> {
 
-    public FileAccessIO () {
-        this((T)null);
-    }
-
-    public FileAccessIO(T dvObject) {
-        this (dvObject, null);
-        
-    }
+	public FileAccessIO() {
+		//Constructor only for testing
+		super(null, null, null);
+	}
+	
+    public FileAccessIO(T dvObject, DataAccessRequest req, String driverId ) {
 
-    public FileAccessIO(T dvObject, DataAccessRequest req) {
-
-        super(dvObject, req);
+        super(dvObject, req, driverId);
 
         this.setIsLocalFile(true);
     }
     
     // "Direct" File Access IO, opened on a physical file not associated with
     // a specific DvObject
-    public FileAccessIO(String storageLocation) {
+    public FileAccessIO(String storageLocation, String driverId) {
+    	super(storageLocation, driverId);
+    	this.setIsLocalFile(true);
         physicalPath = Paths.get(storageLocation);
     }
     
@@ -90,12 +88,12 @@ public void open (DataAccessOption... options) throws IOException {
         
         if (dvObject instanceof DataFile) {
             dataFile = this.getDataFile();
-
+            String storageIdentifier = dataFile.getStorageIdentifier();
             if (req != null && req.getParameter("noVarHeader") != null) {
                 this.setNoVarHeader(true);
             }
 
-            if (dataFile.getStorageIdentifier() == null || "".equals(dataFile.getStorageIdentifier())) {
+            if (storageIdentifier == null || "".equals(storageIdentifier)) {
                 throw new IOException("Data Access: No local storage identifier defined for this datafile.");
             }
 
@@ -122,9 +120,10 @@ public void open (DataAccessOption... options) throws IOException {
                 }
             } else if (isWriteAccess) {
                 // Creates a new directory as needed for a dataset.
-                if (dataFile.getOwner().getFileSystemDirectory() != null && !Files.exists(dataFile.getOwner().getFileSystemDirectory())) {
-                Files.createDirectories(dataFile.getOwner().getFileSystemDirectory());
-                }
+            	Path datasetPath=Paths.get(getDatasetDirectory());
+            	if (datasetPath != null && !Files.exists(datasetPath)) {
+            		Files.createDirectories(datasetPath);
+            	}
                 FileOutputStream fout = openLocalFileAsOutputStream();
 
                 if (fout == null) {
@@ -133,6 +132,9 @@ public void open (DataAccessOption... options) throws IOException {
 
                 this.setOutputStream(fout);
                 setChannel(fout.getChannel());
+                if (!storageIdentifier.startsWith(this.driverId + "://")) {
+                    dvObject.setStorageIdentifier(this.driverId + "://" + storageIdentifier);
+                }
             }
 
             this.setMimeType(dataFile.getContentType());
@@ -158,10 +160,11 @@ public void open (DataAccessOption... options) throws IOException {
 //                this.setInputStream(fin);  
               } else if (isWriteAccess) {
                 //this checks whether a directory for a dataset exists 
-                if (dataset.getFileSystemDirectory() != null && !Files.exists(dataset.getFileSystemDirectory())) {
-                    Files.createDirectories(dataset.getFileSystemDirectory());
-                }
-                dataset.setStorageIdentifier("file://"+dataset.getAuthority()+"/"+dataset.getIdentifier());
+            	  Path datasetPath=Paths.get(getDatasetDirectory());
+            	  if (datasetPath != null && !Files.exists(datasetPath)) {
+            		  Files.createDirectories(datasetPath);
+            	  }
+                dataset.setStorageIdentifier(this.driverId + "://"+dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage());
             }
 
         } else if (dvObject instanceof Dataverse) {
@@ -290,7 +293,7 @@ public Path getAuxObjectAsPath(String auxItemTag) throws IOException {
         }
         Path auxPath = null;
         if (dvObject instanceof DataFile) {
-            auxPath = Paths.get(datasetDirectory, dvObject.getStorageIdentifier() + "." + auxItemTag);
+            auxPath = Paths.get(datasetDirectory, stripDriverId(dvObject.getStorageIdentifier()) + "." + auxItemTag);
         } else if (dvObject instanceof Dataset) {
             auxPath = Paths.get(datasetDirectory, auxItemTag);
         } else if (dvObject instanceof Dataverse) {
@@ -305,7 +308,8 @@ public Path getAuxObjectAsPath(String auxItemTag) throws IOException {
         return auxPath;
     }
     
-    @Override 
+
+	@Override 
     public void backupAsAux(String auxItemTag) throws IOException {
         Path auxPath = getAuxObjectAsPath(auxItemTag);
         
@@ -369,7 +373,7 @@ public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) thr
         }
         
         List<String> cachedFileNames = new ArrayList<>();
-        String baseName = this.getDataFile().getStorageIdentifier() + ".";
+        String baseName = stripDriverId(this.getDataFile().getStorageIdentifier()) + ".";
         for (Path auxPath : cachedFiles) {
             cachedFileNames.add(auxPath.getFileName().toString().substring(baseName.length()));
         }
@@ -401,12 +405,12 @@ public void deleteAllAuxObjects() throws IOException {
     @Override
     public String getStorageLocation() {
         // For a local file, the "storage location" is a complete, absolute
-        // filesystem path, with the "file://" prefix:
+        // filesystem path, with the "<driverId>://" prefix:
         
         try {
             Path testPath = getFileSystemPath();
             if (testPath != null) {
-                return "file://" + testPath.toString();
+                return this.driverId + "://" + testPath.toString();
             }
         } catch (IOException ioex) {
             // just return null, below:
@@ -427,7 +431,7 @@ public Path getFileSystemPath() throws IOException {
             throw new IOException("Data Access: No local storage identifier defined for this datafile.");
         }
 
-        physicalPath = Paths.get(datasetDirectory, dvObject.getStorageIdentifier());
+        physicalPath = Paths.get(datasetDirectory, stripDriverId(dvObject.getStorageIdentifier()));
         return physicalPath;
 
     }
@@ -533,9 +537,9 @@ private String getDatasetDirectory() throws IOException {
         Path datasetDirectoryPath=null;
         
         if (dvObject instanceof Dataset) {
-            datasetDirectoryPath = this.getDataset().getFileSystemDirectory();
+            datasetDirectoryPath = Paths.get(this.getDataset().getAuthorityForFileStorage(), this.getDataset().getIdentifierForFileStorage());
         } else if (dvObject instanceof DataFile) {
-            datasetDirectoryPath = this.getDataFile().getOwner().getFileSystemDirectory();
+            datasetDirectoryPath = Paths.get(this.getDataFile().getOwner().getAuthorityForFileStorage(), this.getDataFile().getOwner().getIdentifierForFileStorage());
         } else if (dvObject instanceof Dataverse) {
             throw new IOException("FileAccessIO: Dataverses are not a supported dvObject");
         }
@@ -543,7 +547,7 @@ private String getDatasetDirectory() throws IOException {
         if (datasetDirectoryPath == null) {
             throw new IOException("Could not determine the filesystem directory of the parent dataset.");
         }
-        String datasetDirectory = datasetDirectoryPath.toString();
+        String datasetDirectory = Paths.get(getFilesRootDirectory(), datasetDirectoryPath.toString()).toString();
 
         if (dvObject.getStorageIdentifier() == null || dvObject.getStorageIdentifier().isEmpty()) {
             throw new IOException("Data Access: No local storage identifier defined for this datafile.");
@@ -552,6 +556,16 @@ private String getDatasetDirectory() throws IOException {
         return datasetDirectory;
     }
     
+    
+	private String getFilesRootDirectory() {
+		String filesRootDirectory = System.getProperty("dataverse.files." + this.driverId + ".directory");
+
+		if (filesRootDirectory == null || filesRootDirectory.equals("")) {
+			filesRootDirectory = "/tmp/files";
+		}
+		return filesRootDirectory;
+	}
+    
     private List<Path> listCachedFiles() throws IOException {
         List<Path> auxItems = new ArrayList<>();
 
@@ -571,7 +585,7 @@ private List<Path> listCachedFiles() throws IOException {
                 throw new IOException("Null or invalid DataFile in FileAccessIO object.");
             }
         
-            baseName = this.getDataFile().getStorageIdentifier();
+            baseName = stripDriverId(this.getDataFile().getStorageIdentifier());
 
             datasetDirectoryPath = this.getDataFile().getOwner().getFileSystemDirectory();
         }
@@ -612,5 +626,11 @@ public InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException
         }
         return in;
     }
-
+    private String stripDriverId(String storageIdentifier) {
+    	int separatorIndex = storageIdentifier.indexOf("://");
+    	if(separatorIndex>0) {
+        	return storageIdentifier.substring(separatorIndex + 3);
+        }
+		return storageIdentifier;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
index d2429f6ebe7..8194ab80c58 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
@@ -3,6 +3,7 @@
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.HttpMethod;
 import com.amazonaws.SdkClientException;
+import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
@@ -64,16 +65,9 @@ public class S3AccessIO<T extends DvObject> extends StorageIO<T> {
 
     private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.S3AccessIO");
 
-    public S3AccessIO() {
-        this((T)null);
-    }
-
-    public S3AccessIO(T dvObject) {
-        this(dvObject, null);
-    }
-
-    public S3AccessIO(T dvObject, DataAccessRequest req) {
-        super(dvObject, req);
+    public S3AccessIO(T dvObject, DataAccessRequest req, String driverId) {
+        super(dvObject, req, driverId);
+        readSettings();
         this.setIsLocalFile(false);
         
         try {
@@ -88,9 +82,10 @@ public S3AccessIO(T dvObject, DataAccessRequest req) {
             // Openstack SWIFT S3 implementations require "PayloadSigning" set to true. default = false
             s3CB.setPayloadSigningEnabled(s3payloadSigning);
             // Openstack SWIFT S3 implementations require "ChunkedEncoding" set to false. default = true
-            // Boolean is inverted, otherwise setting dataverse.files.s3-chunked-encoding=false would result in leaving Chunked Encoding enabled
+            // Boolean is inverted, otherwise setting dataverse.files.<id>.chunked-encoding=false would result in leaving Chunked Encoding enabled
             s3CB.setChunkedEncodingDisabled(!s3chunkedEncoding);
 
+            s3CB.setCredentials(new ProfileCredentialsProvider(s3profile));
             // let's build the client :-)
             this.s3 = s3CB.build();
 
@@ -105,50 +100,32 @@ public S3AccessIO(T dvObject, DataAccessRequest req) {
         }
     }
     
-    public S3AccessIO(String storageLocation) {
-        this((T)null);
-        
+
+	public S3AccessIO(String storageLocation, String driverId) {
+		this(null, null, driverId);
         // TODO: validate the storage location supplied
         bucketName = storageLocation.substring(0,storageLocation.indexOf('/'));
         key = storageLocation.substring(storageLocation.indexOf('/')+1);
     }
     
-    public S3AccessIO(T dvObject, DataAccessRequest req, @NotNull AmazonS3 s3client) {
-        super(dvObject, req);
+    public S3AccessIO(T dvObject, DataAccessRequest req, @NotNull AmazonS3 s3client, String driverId) {
+        super(dvObject, req, driverId);
+        readSettings();
         this.setIsLocalFile(false);
         this.s3 = s3client;
     }
-
-    public static String S3_IDENTIFIER_PREFIX = "s3";
     
     private AmazonS3 s3 = null;
     private TransferManager tm = null;
-    /**
-     * Pass in a URL pointing to your S3 compatible storage.
-     * For possible values see https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/client/builder/AwsClientBuilder.EndpointConfiguration.html
-     */
-    private String s3CEUrl = System.getProperty("dataverse.files.s3-custom-endpoint-url", "");
-    /**
-     * Pass in a region to use for SigV4 signing of requests.
-     * Defaults to "dataverse" as it is not relevant for custom S3 implementations.
-     */
-    private String s3CERegion = System.getProperty("dataverse.files.s3-custom-endpoint-region", "dataverse");
-    /**
-     * Pass in a boolean value if path style access should be used within the S3 client.
-     * Anything but case-insensitive "true" will lead to value of false, which is default value, too.
-     */
-    private boolean s3pathStyleAccess = Boolean.parseBoolean(System.getProperty("dataverse.files.s3-path-style-access", "false"));
-    /**
-     * Pass in a boolean value if payload signing should be used within the S3 client.
-     * Anything but case-insensitive "true" will lead to value of false, which is default value, too.
-     */
-    private boolean s3payloadSigning = Boolean.parseBoolean(System.getProperty("dataverse.files.s3-payload-signing","false"));
-    /**
-     * Pass in a boolean value if chunked encoding should not be used within the S3 client.
-     * Anything but case-insensitive "false" will lead to value of true, which is default value, too.
-     */
-    private boolean s3chunkedEncoding = Boolean.parseBoolean(System.getProperty("dataverse.files.s3-chunked-encoding","true"));
-    private String bucketName = System.getProperty("dataverse.files.s3-bucket-name");
+    //See readSettings() for the source of these values
+    private String s3CEUrl = null;
+    private String s3CERegion = null;
+    private boolean s3pathStyleAccess = false;
+    private boolean s3payloadSigning = false;
+    private boolean s3chunkedEncoding = true;
+    private String s3profile = "default";
+    private String bucketName = null;
+    
     private String key;
 
     @Override
@@ -212,11 +189,11 @@ public void open(DataAccessOption... options) throws IOException {
             } else if (isWriteAccess) {
                 key = dataFile.getOwner().getAuthorityForFileStorage() + "/" + this.getDataFile().getOwner().getIdentifierForFileStorage();
 
-                if (storageIdentifier.startsWith(S3_IDENTIFIER_PREFIX + "://")) {
+                if (storageIdentifier.startsWith(this.driverId + "://")) {
                     key += "/" + storageIdentifier.substring(storageIdentifier.lastIndexOf(":") + 1);
                 } else {
                     key += "/" + storageIdentifier;
-                    dvObject.setStorageIdentifier(S3_IDENTIFIER_PREFIX + "://" + bucketName + ":" + storageIdentifier);
+                    dvObject.setStorageIdentifier(this.driverId + "://" + bucketName + ":" + storageIdentifier);
                 }
 
             }
@@ -231,7 +208,7 @@ public void open(DataAccessOption... options) throws IOException {
         } else if (dvObject instanceof Dataset) {
             Dataset dataset = this.getDataset();
             key = dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage();
-            dataset.setStorageIdentifier(S3_IDENTIFIER_PREFIX + "://" + key);
+            dataset.setStorageIdentifier(this.driverId + "://" + key);
         } else if (dvObject instanceof Dataverse) {
             throw new IOException("Data Access: Storage driver does not support dvObject type Dataverse yet");
         } else {
@@ -688,7 +665,7 @@ public String getStorageLocation() throws IOException {
             throw new IOException("Failed to obtain the S3 key for the file");
         }
         
-        return S3_IDENTIFIER_PREFIX + "://" + bucketName + "/" + locationKey; 
+        return this.driverId + "://" + bucketName + "/" + locationKey; 
     }
 
     @Override
@@ -772,8 +749,8 @@ String getMainFileKey() throws IOException {
                 throw new FileNotFoundException("Data Access: No local storage identifier defined for this datafile.");
             }
 
-            if (storageIdentifier.startsWith(S3_IDENTIFIER_PREFIX + "://")) {
-                bucketName = storageIdentifier.substring((S3_IDENTIFIER_PREFIX + "://").length(), storageIdentifier.lastIndexOf(":"));
+            if (storageIdentifier.startsWith(this.driverId + "://")) {
+                bucketName = storageIdentifier.substring((this.driverId + "://").length(), storageIdentifier.lastIndexOf(":"));
                 key = baseKey + "/" + storageIdentifier.substring(storageIdentifier.lastIndexOf(":") + 1);
             } else {
                 throw new IOException("S3AccessIO: DataFile (storage identifier " + storageIdentifier + ") does not appear to be an S3 object.");
@@ -783,6 +760,14 @@ String getMainFileKey() throws IOException {
         return key;
     }
     
+    public boolean downloadRedirectEnabled() {
+    	String optionValue = System.getProperty("dataverse.files." + this.driverId + ".download-redirect");
+        if ("true".equalsIgnoreCase(optionValue)) {
+            return true;
+        }
+        return false;
+    }
+    
     public String generateTemporaryS3Url() throws IOException {
         //Questions:
         // Q. Should this work for private and public?
@@ -844,7 +829,7 @@ public String generateTemporaryS3Url() throws IOException {
     }
     
     int getUrlExpirationMinutes() {
-        String optionValue = System.getProperty("dataverse.files.s3-url-expiration-minutes"); 
+        String optionValue = System.getProperty("dataverse.files." + this.driverId + ".url-expiration-minutes"); 
         if (optionValue != null) {
             Integer num; 
             try {
@@ -858,4 +843,42 @@ int getUrlExpirationMinutes() {
         }
         return 60; 
     }
+    
+    private void readSettings() {
+        /**
+         * Pass in a URL pointing to your S3 compatible storage.
+         * For possible values see https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/client/builder/AwsClientBuilder.EndpointConfiguration.html
+         */
+        s3CEUrl = System.getProperty("dataverse.files." + this.driverId + ".custom-endpoint-url", "");
+        /**
+         * Pass in a region to use for SigV4 signing of requests.
+         * Defaults to "dataverse" as it is not relevant for custom S3 implementations.
+         */
+        s3CERegion = System.getProperty("dataverse.files." + this.driverId + ".custom-endpoint-region", "dataverse");
+        /**
+         * Pass in a boolean value if path style access should be used within the S3 client.
+         * Anything but case-insensitive "true" will lead to value of false, which is default value, too.
+         */
+        s3pathStyleAccess = Boolean.parseBoolean(System.getProperty("dataverse.files." + this.driverId + ".path-style-access", "false"));
+        /**
+         * Pass in a boolean value if payload signing should be used within the S3 client.
+         * Anything but case-insensitive "true" will lead to value of false, which is default value, too.
+         */
+        s3payloadSigning = Boolean.parseBoolean(System.getProperty("dataverse.files." + this.driverId + ".payload-signing","false"));
+        /**
+         * Pass in a boolean value if chunked encoding should not be used within the S3 client.
+         * Anything but case-insensitive "false" will lead to value of true, which is default value, too.
+         */
+        s3chunkedEncoding = Boolean.parseBoolean(System.getProperty("dataverse.files." + this.driverId + ".chunked-encoding","true"));
+        /**
+         * Pass in a string value if this storage driver should use a non-default AWS S3 profile.
+         * The default is "default" which should work when only one profile exists.
+         */
+        s3profile = System.getProperty("dataverse.files." + this.driverId + ".profile","default");
+       
+        bucketName = System.getProperty("dataverse.files." + this.driverId + ".bucket-name");
+        
+        
+	}
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
index 1043d3f44aa..9e0cf7e11b8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
@@ -53,17 +53,21 @@ public abstract class StorageIO<T extends DvObject> {
     public StorageIO() {
 
     }
-
-    public StorageIO(T dvObject) {
-        this(dvObject, null);
+    
+    public StorageIO(String storageLocation, String driverId) {
+      this.driverId=driverId;
     }
 
-    public StorageIO(T dvObject, DataAccessRequest req) {
+    public StorageIO(T dvObject, DataAccessRequest req, String driverId) {
         this.dvObject = dvObject;
         this.req = req;
+        this.driverId=driverId;
         if (this.req == null) {
             this.req = new DataAccessRequest();
         }
+        if (this.driverId == null) {
+            this.driverId = "file";
+        }
     }
 
     
@@ -183,6 +187,7 @@ public boolean canWrite() {
     private OutputStream out; 
     protected Channel channel;
     protected DvObject dvObject;
+    protected String driverId;
 
     /*private int status;*/
     private long size;
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
index 73ee28e17b9..3bc29cb9836 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
@@ -48,43 +48,48 @@ public class SwiftAccessIO<T extends DvObject> extends StorageIO<T> {
 
     private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.SwiftAccessIO");
 
-    public SwiftAccessIO() {
-        this((T)null);
-    }
-
-    public SwiftAccessIO(T dvObject) {
-        this(dvObject, null);
-    }
-
-    public SwiftAccessIO(T dvObject, DataAccessRequest req) {
-        super(dvObject, req);
-
+	public SwiftAccessIO() {
+		//Partially functional StorageIO object - constructor only for testing
+		super();
+	}
+	
+    public SwiftAccessIO(T dvObject, DataAccessRequest req, String driverId) {
+        super(dvObject, req, driverId);
+        readSettings();
         this.setIsLocalFile(false);
     }
     
-    public SwiftAccessIO(String swiftLocation) {
-        this((T)null);
+    public SwiftAccessIO(String swiftLocation, String driverId) {
+    	super(swiftLocation, driverId);
+    	readSettings();
         this.swiftLocation = swiftLocation;
+        this.setIsLocalFile(false);
     }
 
-    private Account account = null;
+    private void readSettings() {
+    	isPublicContainer = Boolean.parseBoolean(System.getProperty("dataverse.files." + this.driverId + ".isPublicContainer", "true"));
+        swiftFolderPathSeparator = System.getProperty("dataverse.files." + this.driverId + ".folderPathSeparator", "_");
+        swiftDefaultEndpoint = System.getProperty("dataverse.files." + this.driverId + ".defaultEndpoint");
+        tempUrlExpires = Integer.parseInt(System.getProperty("dataverse.files." + this.driverId + ".temporaryUrlExpiryTime", "60"));
+		
+	}
+
+	private Account account = null;
     private StoredObject swiftFileObject = null;
     private Container swiftContainer = null;
-    private boolean isPublicContainer = Boolean.parseBoolean(System.getProperty("dataverse.files.swift.isPublicContainer", "true"));
-    private String swiftFolderPathSeparator = System.getProperty("dataverse.files.swift.folderPathSeparator", "_");
-    private String swiftDefaultEndpoint = System.getProperty("dataverse.files.swift.defaultEndpoint");
+    private boolean isPublicContainer = true;
+    private String swiftFolderPathSeparator = "_";
+    private String swiftDefaultEndpoint = null;
 
     //for hash
     private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1";
     
     //TODO: should this be dynamically generated based on size of file?
     //Also, this is in seconds
-    private static int TEMP_URL_EXPIRES = Integer.parseInt(System.getProperty("dataverse.files.swift.temporaryUrlExpiryTime", "60"));
+    private int tempUrlExpires = 60;
 
     private static int LIST_PAGE_LIMIT = 100;
 
-    public static String SWIFT_IDENTIFIER_PREFIX = "swift";
-
     @Override
     public void open(DataAccessOption... options) throws IOException {
         DataAccessRequest req = this.getRequest();
@@ -503,7 +508,7 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
         if (dvObject instanceof DataFile) {
             Dataset owner = this.getDataFile().getOwner();
 
-            if (storageIdentifier.startsWith(SWIFT_IDENTIFIER_PREFIX + "://")) {
+            if (storageIdentifier.startsWith(this.driverId + "://")) {
                 // This is a call on an already existing swift object. 
 
                 String[] swiftStorageTokens = storageIdentifier.substring(8).split(":", 3);    
@@ -547,17 +552,17 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
                 //setSwiftContainerName(swiftFolderPath);
                 //swiftFileName = dataFile.getDisplayName();
                 //Storage Identifier is now updated after the object is uploaded on Swift.
-                dvObject.setStorageIdentifier(SWIFT_IDENTIFIER_PREFIX + "://" + swiftDefaultEndpoint + ":" + swiftFolderPath + ":" + swiftFileName);
+                dvObject.setStorageIdentifier(this.driverId + "://" + swiftDefaultEndpoint + ":" + swiftFolderPath + ":" + swiftFileName);
             } else {
                 throw new IOException("SwiftAccessIO: unknown access mode.");
             }
         } else if (dvObject instanceof Dataset) {
             Dataset dataset = this.getDataset();
 
-            if (storageIdentifier.startsWith(SWIFT_IDENTIFIER_PREFIX + "://")) {
+            if (storageIdentifier.startsWith(this.driverId + "://")) {
                 // This is a call on an already existing swift object. 
 
-                //TODO: determine how storage identifer will give us info
+                //TODO: determine how storage identifier will give us info
                 String[] swiftStorageTokens = storageIdentifier.substring(8).split(":", 3);
                 //number of tokens should be two because there is not main file
                 if (swiftStorageTokens.length != 2) {
@@ -596,7 +601,7 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
                     swiftPseudoFolderPathSeparator + dataset.getIdentifierForFileStorage();
 
                 swiftFileName = auxItemTag;
-                dvObject.setStorageIdentifier(SWIFT_IDENTIFIER_PREFIX + "://" + swiftEndPoint + ":" + swiftFolderPath);
+                dvObject.setStorageIdentifier(this.driverId + "://" + swiftEndPoint + ":" + swiftFolderPath);
             } else {
                 throw new IOException("SwiftAccessIO: unknown access mode.");
             }
@@ -623,7 +628,7 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
         other swiftContainerName Object Store pseudo-folder can be created, which is
         not provide by the joss Java swift library as of yet.
          */
-        if (storageIdentifier.startsWith(SWIFT_IDENTIFIER_PREFIX + "://")) {
+        if (storageIdentifier.startsWith(this.driverId + "://")) {
             // An existing swift object; the container must already exist as well.
             this.swiftContainer = account.getContainer(swiftContainerName);
         } else {
@@ -659,9 +664,9 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
             setRemoteUrl(getSwiftFileURI(fileObject));
             if (!this.isWriteAccess && !this.getDataFile().isIngestInProgress()) {
                 //otherwise this gets called a bunch on upload
-                setTemporarySwiftUrl(generateTemporarySwiftUrl(swiftEndPoint, swiftContainerName, swiftFileName, TEMP_URL_EXPIRES));
-                setTempUrlSignature(generateTempUrlSignature(swiftEndPoint, swiftContainerName, swiftFileName, TEMP_URL_EXPIRES));
-                setTempUrlExpiry(generateTempUrlExpiry(TEMP_URL_EXPIRES, System.currentTimeMillis()));
+                setTemporarySwiftUrl(generateTemporarySwiftUrl(swiftEndPoint, swiftContainerName, swiftFileName, tempUrlExpires));
+                setTempUrlSignature(generateTempUrlSignature(swiftEndPoint, swiftContainerName, swiftFileName, tempUrlExpires));
+                setTempUrlExpiry(generateTempUrlExpiry(tempUrlExpires, System.currentTimeMillis()));
             }
             setSwiftFileName(swiftFileName);
 
@@ -732,12 +737,12 @@ private StoredObject openSwiftAuxFile(boolean writeAccess, String auxItemTag) th
     }
 
     Account authenticateWithSwift(String swiftEndPoint) throws IOException {
-        String swiftEndPointAuthUrl = System.getProperty("dataverse.files.swift.authUrl." + swiftEndPoint);
-        String swiftEndPointUsername = System.getProperty("dataverse.files.swift.username." + swiftEndPoint);
-        String swiftEndPointSecretKey = System.getProperty("dataverse.files.swift.password." + swiftEndPoint);
-        String swiftEndPointTenantName = System.getProperty("dataverse.files.swift.tenant." + swiftEndPoint);
-        String swiftEndPointAuthMethod = System.getProperty("dataverse.files.swift.authType." + swiftEndPoint);
-        String swiftEndPointTenantId = System.getProperty("dataverse.files.swift.tenant." + swiftEndPoint);
+        String swiftEndPointAuthUrl = System.getProperty("dataverse.files." + this.driverId + ".authUrl." + swiftEndPoint);
+        String swiftEndPointUsername = System.getProperty("dataverse.files." + this.driverId + ".username." + swiftEndPoint);
+        String swiftEndPointSecretKey = System.getProperty("dataverse.files." + this.driverId + ".password." + swiftEndPoint);
+        String swiftEndPointTenantName = System.getProperty("dataverse.files." + this.driverId + ".tenant." + swiftEndPoint);
+        String swiftEndPointAuthMethod = System.getProperty("dataverse.files." + this.driverId + ".authType." + swiftEndPoint);
+        String swiftEndPointTenantId = System.getProperty("dataverse.files." + this.driverId + ".tenant." + swiftEndPoint);
 
         if (swiftEndPointAuthUrl == null || swiftEndPointUsername == null || swiftEndPointSecretKey == null
                 || "".equals(swiftEndPointAuthUrl) || "".equals(swiftEndPointUsername) || "".equals(swiftEndPointSecretKey)) {
@@ -806,9 +811,9 @@ private String getSwiftFileURI(StoredObject fileObject) throws IOException {
     private String hmac = null;
     public String generateTempUrlSignature(String swiftEndPoint, String containerName, String objectName, int duration) throws IOException {
         if (hmac == null || isExpiryExpired(generateTempUrlExpiry(duration, System.currentTimeMillis()), duration, System.currentTimeMillis())) {
-            String secretKey = System.getProperty("dataverse.files.swift.hashKey." + swiftEndPoint);
+            String secretKey = System.getProperty("dataverse.files." + this.driverId + ".hashKey." + swiftEndPoint);
             if (secretKey == null) {
-                throw new IOException("Please input a hash key under dataverse.files.swift.hashKey." + swiftEndPoint);
+                throw new IOException("Please input a hash key under dataverse.files." + this.driverId + ".hashKey." + swiftEndPoint);
             }
             String path = "/v1/" + containerName + "/" + objectName;
             Long expires = generateTempUrlExpiry(duration, System.currentTimeMillis());
@@ -833,7 +838,7 @@ public long generateTempUrlExpiry(int duration, long currentTime) {
 
     private String temporaryUrl = null;
     private String generateTemporarySwiftUrl(String swiftEndPoint, String containerName, String objectName, int duration) throws IOException {
-        String baseUrl = System.getProperty("dataverse.files.swift.endpoint." + swiftEndPoint);
+        String baseUrl = System.getProperty("dataverse.files." + this.driverId + ".endpoint." + swiftEndPoint);
         String path = "/v1/" + containerName + "/" + objectName;
         
         if (temporaryUrl == null || isExpiryExpired(generateTempUrlExpiry(duration, System.currentTimeMillis()), duration, System.currentTimeMillis())) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
index eb21f70f2cb..e4349a93953 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
@@ -96,15 +96,8 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             theDataset.setAuthority(ctxt.settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound));
         }
         if (theDataset.getStorageIdentifier() == null) {
-            try {
-                DataAccess.createNewStorageIO(theDataset, "placeholder");
-            } catch (IOException ioex) {
-                // if setting the storage identifier through createNewStorageIO fails, dataset creation
-                // does not have to fail. we just set the storage id to a default -SF
-                String storageDriver = (System.getProperty("dataverse.files.storage-driver-id") != null) ? System.getProperty("dataverse.files.storage-driver-id") : "file";
-                theDataset.setStorageIdentifier(storageDriver  + "://" + theDataset.getGlobalId().asString());
-                logger.log(Level.INFO, "Failed to create StorageIO. StorageIdentifier set to default. Not fatal.({0})", ioex.getMessage());
-            }
+        	String driverId = theDataset.getDataverseContext().getEffectiveStorageDriverId();
+        	theDataset.setStorageIdentifier(driverId  + "://" + theDataset.getAuthorityForFileStorage() + "/" + theDataset.getIdentifierForFileStorage());
         }
         if (theDataset.getIdentifier()==null) {
             theDataset.setIdentifier(ctxt.datasets().generateDatasetIdentifier(theDataset, idServiceBean));
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
index d00e9e9c3ea..b06877df2ae 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
@@ -36,10 +36,12 @@
 import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
 import edu.harvard.iq.dataverse.DatasetLock;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.MetadataBlock;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataaccess.TabularSubsetGenerator;
@@ -151,225 +153,254 @@ public class IngestServiceBean {
     // DataFileCategory objects, if any were already assigned to the files). 
     // It must be called before we attempt to permanently save the files in 
     // the database by calling the Save command on the dataset and/or version. 
-    public List<DataFile> saveAndAddFilesToDataset(DatasetVersion version, List<DataFile> newFiles) {
-        List<DataFile> ret = new ArrayList<>();
-        
-        if (newFiles != null && newFiles.size() > 0) {
-            //ret = new ArrayList<>();
-            // final check for duplicate file names; 
-            // we tried to make the file names unique on upload, but then 
-            // the user may have edited them on the "add files" page, and 
-            // renamed FOOBAR-1.txt back to FOOBAR.txt...
-
-            IngestUtil.checkForDuplicateFileNamesFinal(version, newFiles);
-
-            Dataset dataset = version.getDataset();
-
-            for (DataFile dataFile : newFiles) {
-                String tempFileLocation = FileUtil.getFilesTempDirectory() + "/" + dataFile.getStorageIdentifier();
-
-                // Try to save the file in its permanent location: 
-                String storageId = dataFile.getStorageIdentifier().replaceFirst("^tmp://", "");
-
-                Path tempLocationPath = Paths.get(FileUtil.getFilesTempDirectory() + "/" + storageId);
-                WritableByteChannel writeChannel = null;
-                FileChannel readChannel = null;
-
-                boolean unattached = false;
-                boolean savedSuccess = false;
-                StorageIO<DataFile> dataAccess = null;
-
-                try {
-                    logger.fine("Attempting to create a new storageIO object for " + storageId);
-                    if (dataFile.getOwner() == null) {
-                        unattached = true; 
-                        dataFile.setOwner(dataset);
-                    }
-                    dataAccess = DataAccess.createNewStorageIO(dataFile, storageId);
-
-                    logger.fine("Successfully created a new storageIO object.");
-                    /* 
-                         This commented-out code demonstrates how to copy bytes
-                         from a local InputStream (or a readChannel) into the
-                         writable byte channel of a Dataverse DataAccessIO object:
-                     */
-                    
-                    /*
-                        storageIO.open(DataAccessOption.WRITE_ACCESS);
-                                                
-                        writeChannel = storageIO.getWriteChannel();
-                        readChannel = new FileInputStream(tempLocationPath.toFile()).getChannel();
-                                                
-                        long bytesPerIteration = 16 * 1024; // 16K bytes
-                        long start = 0;
-                        while ( start < readChannel.size() ) {
-                            readChannel.transferTo(start, bytesPerIteration, writeChannel);
-                            start += bytesPerIteration;
-                        }
-                     */
-
-                    /* 
-                            But it's easier to use this convenience method from the
-                            DataAccessIO: 
-                            
-                            (if the underlying storage method for this file is 
-                            local filesystem, the DataAccessIO will simply copy 
-                            the file using Files.copy, like this:
-                        
-                            Files.copy(tempLocationPath, storageIO.getFileSystemLocation(), StandardCopyOption.REPLACE_EXISTING);
-                     */
-                    dataAccess.savePath(tempLocationPath);
-
-                    // Set filesize in bytes
-                    // 
-                    dataFile.setFilesize(dataAccess.getSize());
-                    savedSuccess = true;
-                    logger.fine("Success: permanently saved file " + dataFile.getFileMetadata().getLabel());
-
-                } catch (IOException ioex) {
+	public List<DataFile> saveAndAddFilesToDataset(DatasetVersion version, List<DataFile> newFiles) {
+		List<DataFile> ret = new ArrayList<>();
+
+		if (newFiles != null && newFiles.size() > 0) {
+			// ret = new ArrayList<>();
+			// final check for duplicate file names;
+			// we tried to make the file names unique on upload, but then
+			// the user may have edited them on the "add files" page, and
+			// renamed FOOBAR-1.txt back to FOOBAR.txt...
+
+			IngestUtil.checkForDuplicateFileNamesFinal(version, newFiles);
+
+			Dataset dataset = version.getDataset();
+
+			for (DataFile dataFile : newFiles) {
+				boolean unattached = false;
+				boolean savedSuccess = false;
+				if (dataFile.getOwner() == null) {
+					unattached = true;
+					dataFile.setOwner(dataset);
+				}
+
+
+
+				String[] storageInfo = DataAccess.getDriverIdAndStorageLocation(dataFile.getStorageIdentifier());
+				String driverType = DataAccess.getDriverType(storageInfo[0]);
+				String storageLocation = storageInfo[1];
+				if (driverType.equals("tmp")) {  //"tmp" is the default if no prefix or the "tmp://" driver
+					String tempFileLocation = FileUtil.getFilesTempDirectory() + "/" + storageLocation;
+
+					// Try to save the file in its permanent location:
+					Path tempLocationPath = Paths.get(FileUtil.getFilesTempDirectory() + "/" + storageLocation);
+					WritableByteChannel writeChannel = null;
+					FileChannel readChannel = null;
+
+					StorageIO<DataFile> dataAccess = null;
+
+					try {
+						logger.fine("Attempting to create a new storageIO object for " + storageLocation);
+						dataAccess = DataAccess.createNewStorageIO(dataFile, storageLocation);
+
+						logger.fine("Successfully created a new storageIO object.");
+						/*
+						 * This commented-out code demonstrates how to copy bytes from a local
+						 * InputStream (or a readChannel) into the writable byte channel of a Dataverse
+						 * DataAccessIO object:
+						 */
+
+						/*
+						 * storageIO.open(DataAccessOption.WRITE_ACCESS);
+						 * 
+						 * writeChannel = storageIO.getWriteChannel(); readChannel = new
+						 * FileInputStream(tempLocationPath.toFile()).getChannel();
+						 * 
+						 * long bytesPerIteration = 16 * 1024; // 16K bytes long start = 0; while (
+						 * start < readChannel.size() ) { readChannel.transferTo(start,
+						 * bytesPerIteration, writeChannel); start += bytesPerIteration; }
+						 */
+
+						/*
+						 * But it's easier to use this convenience method from the DataAccessIO:
+						 * 
+						 * (if the underlying storage method for this file is local filesystem, the
+						 * DataAccessIO will simply copy the file using Files.copy, like this:
+						 * 
+						 * Files.copy(tempLocationPath, storageIO.getFileSystemLocation(),
+						 * StandardCopyOption.REPLACE_EXISTING);
+						 */
+						dataAccess.savePath(tempLocationPath);
+
+						// Set filesize in bytes
+						//
+						dataFile.setFilesize(dataAccess.getSize());
+						savedSuccess = true;
+						logger.fine("Success: permanently saved file " + dataFile.getFileMetadata().getLabel());
+
+					} catch (IOException ioex) {
                     logger.warning("Failed to save the file, storage id " + dataFile.getStorageIdentifier() + " (" + ioex.getMessage() + ")");
-                } finally {
-                    if (readChannel != null) {
-                        try {
-                            readChannel.close();
-                        } catch (IOException e) {
-                        }
-                    }
-                    if (writeChannel != null) {
-                        try {
-                            writeChannel.close();
-                        } catch (IOException e) {
-                        }
-                    }
-                }
-                
-                // Since we may have already spent some CPU cycles scaling down image thumbnails, 
-                // we may as well save them, by moving these generated images to the permanent 
-                // dataset directory. We should also remember to delete any such files in the
-                // temp directory:
-                List<Path> generatedTempFiles = listGeneratedTempFiles(Paths.get(FileUtil.getFilesTempDirectory()), storageId);
-                if (generatedTempFiles != null) {
-                    for (Path generated : generatedTempFiles) {
-                        if (savedSuccess) { // no need to try to save this aux file permanently, if we've failed to save the main file!
-                            logger.fine("(Will also try to permanently save generated thumbnail file " + generated.toString() + ")");
-                            try {
-                                //Files.copy(generated, Paths.get(dataset.getFileSystemDirectory().toString(), generated.getFileName().toString()));
-                                int i = generated.toString().lastIndexOf("thumb");
-                                if (i > 1) {
-                                    String extensionTag = generated.toString().substring(i);
-                                    dataAccess.savePathAsAux(generated, extensionTag);
-                                    logger.fine("Saved generated thumbnail as aux object. \"preview available\" status: " + dataFile.isPreviewImageAvailable());
-                                } else {
-                                    logger.warning("Generated thumbnail file name does not match the expected pattern: " + generated.toString());
-                                }
-
-                            } catch (IOException ioex) {
-                                logger.warning("Failed to save generated file " + generated.toString());
-                            }
-                        }
-
-                        // ... but we definitely want to delete it:
-                        try {
-                            Files.delete(generated);
-                        } catch (IOException ioex) {
-                            logger.warning("Failed to delete generated file " + generated.toString());
-                        }
-                    }
-                }
-
-                if (unattached) {
-                    dataFile.setOwner(null);
-                }
-                // Any necessary post-processing: 
-                //performPostProcessingTasks(dataFile);
-                
-                if (savedSuccess) {
-                    // These are all brand new files, so they should all have 
-                    // one filemetadata total. -- L.A. 
-                    FileMetadata fileMetadata = dataFile.getFileMetadatas().get(0);
-                    String fileName = fileMetadata.getLabel();
-
-                    boolean metadataExtracted = false;
-                    if (FileUtil.canIngestAsTabular(dataFile)) {
-                        /*
-                         * Note that we don't try to ingest the file right away - 
-                         * instead we mark it as "scheduled for ingest", then at 
-                         * the end of the save process it will be queued for async. 
-                         * ingest in the background. In the meantime, the file 
-                         * will be ingested as a regular, non-tabular file, and 
-                         * appear as such to the user, until the ingest job is
-                         * finished with the Ingest Service.
-                         */
-                        dataFile.SetIngestScheduled();
-                    } else if (fileMetadataExtractable(dataFile)) {
-
-                        try {
-                            // FITS is the only type supported for metadata 
-                            // extraction, as of now. -- L.A. 4.0 
-                            dataFile.setContentType("application/fits");
-                            metadataExtracted = extractMetadata(tempFileLocation, dataFile, version);
-                        } catch (IOException mex) {
-                            logger.severe("Caught exception trying to extract indexable metadata from file " + fileName + ",  " + mex.getMessage());
-                        }
-                        if (metadataExtracted) {
-                            logger.fine("Successfully extracted indexable metadata from file " + fileName);
-                        } else {
-                            logger.fine("Failed to extract indexable metadata from file " + fileName);
-                        }
-                    } else if (FileUtil.MIME_TYPE_INGESTED_FILE.equals(dataFile.getContentType())) {
-                        // Make sure no *uningested* tab-delimited files are saved with the type "text/tab-separated-values"!
-                        // "text/tsv" should be used instead: 
-                        dataFile.setContentType(FileUtil.MIME_TYPE_TSV);
-                    }
-                    // temp dbug line
-                    //System.out.println("ADDING FILE: " + fileName + "; for dataset: " + dataset.getGlobalId());                    
-                    // Make sure the file is attached to the dataset and to the version, if this 
-                    // hasn't been done yet:
-                    if (dataFile.getOwner() == null) {
-                        dataFile.setOwner(dataset);
-
-                        version.getFileMetadatas().add(dataFile.getFileMetadata());
-                        dataFile.getFileMetadata().setDatasetVersion(version);
-                        dataset.getFiles().add(dataFile);
-                        
-                        if (dataFile.getFileMetadata().getCategories() != null) {
-                            ListIterator<DataFileCategory> dfcIt = dataFile.getFileMetadata().getCategories().listIterator();
-
-                            while (dfcIt.hasNext()) {
-                                DataFileCategory dataFileCategory = dfcIt.next();
-                                
-                                if (dataFileCategory.getDataset() == null) {
-                                    DataFileCategory newCategory = dataset.getCategoryByName(dataFileCategory.getName());
-                                    if (newCategory != null) {
-                                        newCategory.addFileMetadata(dataFile.getFileMetadata());
-                                        //dataFileCategory = newCategory;
-                                        dfcIt.set(newCategory);
-                                    } else { 
-                                        dfcIt.remove();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    
-                    ret.add(dataFile);
-                }
-
-                // ... and let's delete the main temp file:
-                try {
-                    logger.fine("Will attempt to delete the temp file " + tempLocationPath.toString());
-                    Files.delete(tempLocationPath);
-                } catch (IOException ex) {
-                    // (non-fatal - it's just a temp file.)
-                    logger.warning("Failed to delete temp file " + tempLocationPath.toString());
-                }
-
-            }
-            logger.fine("Done! Finished saving new files in permanent storage and adding them to the dataset.");
-        }
-        
-        return ret;
-    }
+					} finally {
+						if (readChannel != null) {
+							try {
+								readChannel.close();
+							} catch (IOException e) {
+							}
+						}
+						if (writeChannel != null) {
+							try {
+								writeChannel.close();
+							} catch (IOException e) {
+							}
+						}
+					}
+
+                    // Since we may have already spent some CPU cycles scaling down image thumbnails, 
+					// we may as well save them, by moving these generated images to the permanent
+					// dataset directory. We should also remember to delete any such files in the
+					// temp directory:
+					List<Path> generatedTempFiles = listGeneratedTempFiles(Paths.get(FileUtil.getFilesTempDirectory()),
+							storageLocation);
+					if (generatedTempFiles != null) {
+						for (Path generated : generatedTempFiles) {
+							if (savedSuccess) { // no need to try to save this aux file permanently, if we've failed to
+												// save the main file!
+								logger.fine("(Will also try to permanently save generated thumbnail file "
+										+ generated.toString() + ")");
+								try {
+									// Files.copy(generated, Paths.get(dataset.getFileSystemDirectory().toString(),
+									// generated.getFileName().toString()));
+									int i = generated.toString().lastIndexOf("thumb");
+									if (i > 1) {
+										String extensionTag = generated.toString().substring(i);
+										dataAccess.savePathAsAux(generated, extensionTag);
+										logger.fine(
+												"Saved generated thumbnail as aux object. \"preview available\" status: "
+														+ dataFile.isPreviewImageAvailable());
+									} else {
+										logger.warning(
+												"Generated thumbnail file name does not match the expected pattern: "
+														+ generated.toString());
+									}
+
+								} catch (IOException ioex) {
+									logger.warning("Failed to save generated file " + generated.toString());
+								}
+							}
+
+							// ... but we definitely want to delete it:
+							try {
+								Files.delete(generated);
+							} catch (IOException ioex) {
+								logger.warning("Failed to delete generated file " + generated.toString());
+							}
+						}
+					}
+
+					if (unattached) {
+						dataFile.setOwner(null);
+					}
+					// Any necessary post-processing:
+					// performPostProcessingTasks(dataFile);
+
+					if (savedSuccess) {
+						// These are all brand new files, so they should all have
+						// one filemetadata total. -- L.A.
+						FileMetadata fileMetadata = dataFile.getFileMetadatas().get(0);
+						String fileName = fileMetadata.getLabel();
+
+						boolean metadataExtracted = false;
+						if (FileUtil.canIngestAsTabular(dataFile)) {
+							/*
+							 * Note that we don't try to ingest the file right away - instead we mark it as
+							 * "scheduled for ingest", then at the end of the save process it will be queued
+							 * for async. ingest in the background. In the meantime, the file will be
+							 * ingested as a regular, non-tabular file, and appear as such to the user,
+							 * until the ingest job is finished with the Ingest Service.
+							 */
+							dataFile.SetIngestScheduled();
+						} else if (fileMetadataExtractable(dataFile)) {
+
+							try {
+								// FITS is the only type supported for metadata
+								// extraction, as of now. -- L.A. 4.0
+								dataFile.setContentType("application/fits");
+								metadataExtracted = extractMetadata(tempFileLocation, dataFile, version);
+							} catch (IOException mex) {
+								logger.severe("Caught exception trying to extract indexable metadata from file "
+										+ fileName + ",  " + mex.getMessage());
+							}
+							if (metadataExtracted) {
+								logger.fine("Successfully extracted indexable metadata from file " + fileName);
+							} else {
+								logger.fine("Failed to extract indexable metadata from file " + fileName);
+							}
+                        } else if (FileUtil.MIME_TYPE_INGESTED_FILE.equals(dataFile.getContentType())) {
+                            // Make sure no *uningested* tab-delimited files are saved with the type "text/tab-separated-values"!
+                            // "text/tsv" should be used instead: 
+                            dataFile.setContentType(FileUtil.MIME_TYPE_TSV);
+						}
+					}
+					// ... and let's delete the main temp file:
+					try {
+						logger.fine("Will attempt to delete the temp file " + tempLocationPath.toString());
+						Files.delete(tempLocationPath);
+					} catch (IOException ex) {
+						// (non-fatal - it's just a temp file.)
+						logger.warning("Failed to delete temp file " + tempLocationPath.toString());
+					}
+				} else {
+					try {
+						StorageIO<DvObject> dataAccess = DataAccess.getStorageIO(dataFile);
+						//Populate metadata
+						dataAccess.open(DataAccessOption.READ_ACCESS);
+						//set file size
+						dataFile.setFilesize(dataAccess.getSize());
+					} catch (IOException ioex) {
+						logger.warning("Failed to get file size, storage id " + dataFile.getStorageIdentifier() + " ("
+								+ ioex.getMessage() + ")");
+					}
+					savedSuccess = true;
+					logger.info("unattached: " + unattached);
+						dataFile.setOwner(null);
+					
+				}
+
+				logger.fine("Done! Finished saving new files in permanent storage and adding them to the dataset.");
+
+				if (savedSuccess) {
+					// temp dbug line
+					// System.out.println("ADDING FILE: " + fileName + "; for dataset: " +
+					// dataset.getGlobalId());
+					// Make sure the file is attached to the dataset and to the version, if this
+					// hasn't been done yet:
+					if (dataFile.getOwner() == null) {
+						dataFile.setOwner(dataset);
+
+						version.getFileMetadatas().add(dataFile.getFileMetadata());
+						dataFile.getFileMetadata().setDatasetVersion(version);
+						dataset.getFiles().add(dataFile);
+
+						if (dataFile.getFileMetadata().getCategories() != null) {
+							ListIterator<DataFileCategory> dfcIt = dataFile.getFileMetadata().getCategories()
+									.listIterator();
+
+							while (dfcIt.hasNext()) {
+								DataFileCategory dataFileCategory = dfcIt.next();
+
+								if (dataFileCategory.getDataset() == null) {
+									DataFileCategory newCategory = dataset
+											.getCategoryByName(dataFileCategory.getName());
+									if (newCategory != null) {
+										newCategory.addFileMetadata(dataFile.getFileMetadata());
+										// dataFileCategory = newCategory;
+										dfcIt.set(newCategory);
+									} else {
+										dfcIt.remove();
+									}
+								}
+							}
+						}
+					}
+				}
+
+				ret.add(dataFile);
+			}
+		}
+
+		return ret;
+	}
     
     public List<Path> listGeneratedTempFiles(Path tempDirectory, String baseName) {
         List<Path> generatedFiles = new ArrayList<>();
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
index 832043530fc..ec77e53d790 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
@@ -24,11 +24,13 @@
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFile.ChecksumType;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
-import static edu.harvard.iq.dataverse.dataaccess.S3AccessIO.S3_IDENTIFIER_PREFIX;
+import edu.harvard.iq.dataverse.dataaccess.S3AccessIO;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
 import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
@@ -80,6 +82,7 @@
 import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
 import org.apache.commons.io.FilenameUtils;
 
+import com.amazonaws.AmazonServiceException;
 
 /**
  * a 4.0 implementation of the DVN FileUtil;
@@ -1281,12 +1284,15 @@ public static String getFilesTempDirectory() {
     }
     
     public static void generateS3PackageStorageIdentifier(DataFile dataFile) {
-        String bucketName = System.getProperty("dataverse.files.s3-bucket-name");
-        String storageId = S3_IDENTIFIER_PREFIX + "://" + bucketName + ":" + dataFile.getFileMetadata().getLabel();
+    	String driverId = dataFile.getDataverseContext().getEffectiveStorageDriverId();
+		
+        String bucketName = System.getProperty("dataverse.files." + driverId + ".bucket-name");
+        String storageId = driverId + "://" + bucketName + ":" + dataFile.getFileMetadata().getLabel();
         dataFile.setStorageIdentifier(storageId);
     }
     
     public static void generateStorageIdentifier(DataFile dataFile) {
+    	//Is it true that this is only used for temp files and we could safely prepend "tmp://" to indicate that?
         dataFile.setStorageIdentifier(generateStorageIdentifier());
     }
     
@@ -1612,4 +1618,9 @@ public static boolean isPackageFile(DataFile dataFile) {
         return DataFileServiceBean.MIME_TYPE_PACKAGE_FILE.equalsIgnoreCase(dataFile.getContentType());
     }
 
+    public static String getStorageIdentifierFromLocation(String location) {
+    	int driverEnd = location.indexOf("://") + 3;
+    	int bucketEnd = driverEnd + location.substring(driverEnd).indexOf("/");
+    	return location.substring(0,bucketEnd) + ":" + location.substring(location.lastIndexOf("/") + 1);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
index b8836060069..8d0cb276a93 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
@@ -862,7 +862,7 @@ public String toString() {
     /**
      * See FileUploadMethods.
      *
-     * TODO: Consider if dataverse.files.s3-download-redirect belongs here since
+     * TODO: Consider if dataverse.files.<id>.download-redirect belongs here since
      * it's a way to bypass Glassfish when downloading.
      */
     public enum FileDownloadMethods {
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
index 3b8efa17513..40a1a31f12a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
@@ -24,6 +24,7 @@
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddressRange;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.datasetutility.OptionalFileParams;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
@@ -41,6 +42,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import javax.json.Json;
 import javax.json.JsonArray;
@@ -102,6 +104,7 @@ public Dataverse parseDataverse(JsonObject jobj) throws JsonParseException {
         dv.setPermissionRoot(jobj.getBoolean("permissionRoot", false));
         dv.setFacetRoot(jobj.getBoolean("facetRoot", false));
         dv.setAffiliation(jobj.getString("affiliation", null));
+      
         if (jobj.containsKey("dataverseContacts")) {
             JsonArray dvContacts = jobj.getJsonArray("dataverseContacts");
             int i = 0;
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index 9099a0bb498..cefbc69c446 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -33,6 +33,7 @@
 import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderRow;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.DatasetFieldWalker;
@@ -257,6 +258,9 @@ public static JsonObjectBuilder json(Dataverse dv, Boolean hideEmail) {
         if (dv.getDataverseTheme() != null) {
             bld.add("theme", JsonPrinter.json(dv.getDataverseTheme()));
         }
+        if(dv.getStorageDriverId() != null) {
+        	bld.add("storageDriverLabel", DataAccess.getStorageDriverLabelFor(dv.getStorageDriverId()));
+        }
 
         return bld;
     }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 04b19bb59ee..849df097420 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -35,6 +35,7 @@ name=Name
 institution=Institution
 position=Position
 affiliation=Affiliation
+storage=Storage
 createDataverse=Create Dataverse
 remove=Remove
 done=Done
@@ -691,6 +692,8 @@ dataverse.host.tip=Changing the host dataverse will clear any fields you may hav
 dataverse.host.autocomplete.nomatches=No matches
 dataverse.identifier.title=Short name used for the URL of this dataverse.
 dataverse.affiliation.title=The organization with which this dataverse is affiliated.
+dataverse.storage.title=A storage service to be used for datasets in this dataverse.
+dataverse.storage.usedefault=Use Default
 dataverse.category=Category
 dataverse.category.title=The type that most closely reflects this dataverse.
 dataverse.type.selectTab.top=Select one...
@@ -791,7 +794,8 @@ dataverse.selected=Selected
 dataverse.listing.error=Fatal error trying to list the contents of the dataverse. Please report this error to the Dataverse administrator.
 dataverse.datasize=Total size of the files stored in this dataverse: {0} bytes
 dataverse.datasize.ioerror=Fatal IO error while trying to determine the total size of the files stored in the dataverse. Please report this error to the Dataverse administrator.
-
+dataverse.storage.inherited=(inherited from enclosing Dataverse)
+dataverse.storage.default=(Default)
 # rolesAndPermissionsFragment.xhtml
 
 # advanced.xhtml
diff --git a/src/main/resources/db/migration/V4.19.0.1__6485_multistore.sql b/src/main/resources/db/migration/V4.19.0.1__6485_multistore.sql
new file mode 100644
index 00000000000..84364169614
--- /dev/null
+++ b/src/main/resources/db/migration/V4.19.0.1__6485_multistore.sql
@@ -0,0 +1,3 @@
+ALTER TABLE dataverse
+ADD COLUMN IF NOT EXISTS storagedriver TEXT;
+UPDATE dvobject set storageidentifier=CONCAT('file://', storageidentifier) where storageidentifier not like '%://%' and dtype='DataFile';
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index b6740a77394..e42630bb07b 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -140,6 +140,20 @@
                                     <p:message for="identifier" display="text"/>
                                 </div>
                             </div>
+                            <div class="col-md-6 form-group" jsf:rendered="#{dataverseSession.user.superuser}">
+                                <h:outputLabel for="dataverseStorage" styleClass="control-label">
+                                    #{bundle.storage} 
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.storage.title']}"></span>
+                                </h:outputLabel>
+                                <div class="form-col-container">
+                                            <h:selectOneMenu id="dataverseStorage" styleClass="form-control" value="#{DataversePage.dataverse.storageDriverId}">
+                                              <f:selectItem itemLabel="#{bundle['dataverse.storage.usedefault']}"/>
+                                              <f:selectItems value="#{DataversePage.getStorageDriverOptions()}" var="driver" itemLabel="#{driver.getKey()}" itemValue="#{driver.getValue()}"/>
+                                            </h:selectOneMenu>
+                                            <p:message for="dataverseStorage" display="text"/>
+                                </div>
+                            </div>
                         </div>
                         <div class="row">
                             <div class="col-md-6 form-group">
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index b451a43c9fe..811e6c4d55f 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -153,7 +153,7 @@
                     
                     </div>
                     
-                    <div jsf:id="rsyncPanel" jsf:rendered="#{settingsWrapper.rsyncUpload and !EditDatafilesPage.fileReplaceOperation}" class="panel panel-default">
+                    <div jsf:id="rsyncPanel" jsf:rendered="#{EditDatafilesPage.rsyncUploadSupported() and !EditDatafilesPage.fileReplaceOperation}" class="panel panel-default">
                         <!-- NOTE: conditional logic for 'glyphicon-chevron-up' icon in rsync header if HTTP is off, but isn't scalable when a third upload mode is added -->
                         <div role="tab" id="headingRsync" data-toggle="collapse" data-target="#panelCollapseRsync" class="panel-heading text-info" aria-expanded="true" aria-controls="panelCollapseRsync">
                             #{bundle['file.fromRsync']} &#160;<span class="glyphicon #{!settingsWrapper.HTTPUpload ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down'}"/>
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
index a1a96a363ed..5c148c8b77f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
@@ -2,6 +2,7 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -12,12 +13,15 @@
 public class DataAccessTest {
   DataFile datafile;
   Dataset dataset;
+  Dataverse dataverse;
 
   @BeforeEach
   void setUp() {
     datafile = MocksFactory.makeDataFile();
     dataset = MocksFactory.makeDataset();
+    dataverse = MocksFactory.makeDataverse();
     datafile.setOwner(dataset);
+    dataset.setOwner(dataverse);
   }
 
   @Test
@@ -50,6 +54,7 @@ void testCreateNewStorageIO_throwsOnUnsupported() {
 
   @Test
   void testCreateNewStorageIO_createsFileAccessIObyDefault() throws IOException {
+	System.setProperty("dataverse.files.file.type", "file");
     StorageIO<Dataset> storageIo = DataAccess.createNewStorageIO(dataset, "valid-tag");
     assertTrue(storageIo.getClass().equals(FileAccessIO.class));
   }
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
index 96c74515c76..286fe8a6595 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
@@ -39,6 +39,8 @@ public class FileAccessIOTest {
     private Dataset dataset;
     private DataFile dataFile;
 
+    private String dummyDriverId = "dummmy";
+    
     private Path fileSystemPath = new File("/tmp/files/tmp/dataset/Dataset").toPath();
 
     public FileAccessIOTest() {
@@ -56,10 +58,10 @@ public void setUpClass() throws IOException {
         dataFile = MocksFactory.makeDataFile();
         dataFile.setOwner(dataset);
         dataFile.setStorageIdentifier("DataFile");
-
-        datasetAccess = new FileAccessIO<>(dataset);
-        dataFileAccess = new FileAccessIO<>(dataFile);
-        dataverseAccess = new FileAccessIO<>(dataverse);
+        
+        datasetAccess = new FileAccessIO<>(dataset,null, dummyDriverId);
+        dataFileAccess = new FileAccessIO<>(dataFile, null, dummyDriverId);
+        dataverseAccess = new FileAccessIO<>(dataverse, null, dummyDriverId);
 
         File file = new File("/tmp/files/tmp/dataset/Dataset");
         file.getParentFile().mkdirs();
@@ -209,7 +211,7 @@ public void testDeleteAuxObject() throws IOException {
      */
     @Test
     public void testGetStorageLocation() {
-        String expResult = "file:///tmp/files/tmp/dataset/Dataset";
+        String expResult = dummyDriverId + ":///tmp/files/tmp/dataset/Dataset";
         String result = datasetAccess.getStorageLocation();
         assertEquals(expResult, result);
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
index 4ce821a5fee..f92b44862e2 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
@@ -43,8 +43,8 @@ public void setup() throws IOException {
         dataFile.setOwner(dataSet);
         dataFileId = UtilIT.getRandomIdentifier();
         dataFile.setStorageIdentifier("s3://bucket:"+dataFileId);
-        dataSetAccess = new S3AccessIO<>(dataSet, null, s3client);
-        dataFileAccess = new S3AccessIO<>(dataFile, null, s3client);
+        dataSetAccess = new S3AccessIO<>(dataSet, null, s3client, "s3");
+        dataFileAccess = new S3AccessIO<>(dataFile, null, s3client, "s3");
     }
     
     /*
@@ -99,7 +99,7 @@ void keyNullstorageIdNull_getMainFileKey() throws IOException {
     @Test
     void default_getUrlExpirationMinutes() {
         // given
-        System.clearProperty("dataverse.files.s3-url-expiration-minutes");
+        System.clearProperty("dataverse.files.s3.url-expiration-minutes");
         // when & then
         assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
     }
@@ -107,7 +107,7 @@ void default_getUrlExpirationMinutes() {
     @Test
     void validSetting_getUrlExpirationMinutes() {
         // given
-        System.setProperty("dataverse.files.s3-url-expiration-minutes", "120");
+        System.setProperty("dataverse.files.s3.url-expiration-minutes", "120");
         // when & then
         assertEquals(120, dataFileAccess.getUrlExpirationMinutes());
     }
@@ -115,7 +115,7 @@ void validSetting_getUrlExpirationMinutes() {
     @Test
     void invalidSetting_getUrlExpirationMinutes() {
         // given
-        System.setProperty("dataverse.files.s3-url-expiration-minutes", "NaN");
+        System.setProperty("dataverse.files.s3.url-expiration-minutes", "NaN");
         // when & then
         assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
index 2700bf3448c..513d4d90988 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
@@ -77,8 +77,9 @@ public void testGetDvObject() {
         } catch (ClassCastException ex) {
             assertEquals(ex.getMessage(), "edu.harvard.iq.dataverse.Dataset cannot be cast to edu.harvard.iq.dataverse.Dataverse");
         }
-        assertEquals(new DataFile(), new FileAccessIO<>(new DataFile()).getDataFile());
-        assertEquals(new Dataverse(), new FileAccessIO<>(new Dataverse()).getDataverse());
+        // null driver defaults to 'file'
+        assertEquals(new DataFile(), new FileAccessIO<>(new DataFile(), null, null).getDataFile());
+        assertEquals(new Dataverse(), new FileAccessIO<>(new Dataverse(), null, null).getDataverse());
     }
 
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
index 554242c9311..c1aa6b5fca3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
@@ -39,8 +39,9 @@ public void setUpClass() throws IOException {
         datafile = MocksFactory.makeDataFile();
         dataset = MocksFactory.makeDataset();
         datafile.setOwner(dataset);
-        datasetAccess = new SwiftAccessIO<>(dataset);
-        datafileAccess = new SwiftAccessIO<>(datafile);
+        String dummyDriverId="dummy";
+        datasetAccess = new SwiftAccessIO<>(dataset, null, dummyDriverId);
+        datafileAccess = new SwiftAccessIO<>(datafile, null, dummyDriverId);
         swiftAccess = new SwiftAccessIO();
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
index c72bc5d6faa..bb19a32c4f8 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
@@ -29,7 +29,8 @@ public void testGetThumbnailCandidates() {
         DataFile dataFile = MocksFactory.makeDataFile();
         dataFile.setContentType("image/");
         dataFile.setOwner(dataset);
-        dataFile.setStorageIdentifier("file://src/test/resources/images/coffeeshop.png");
+        System.setProperty("dataverse.files.testfile.type", "file");
+        dataFile.setStorageIdentifier("testfile://src/test/resources/images/coffeeshop.png");
 
         System.out.println(ImageThumbConverter.isThumbnailAvailable(dataFile));
         DatasetVersion version = dataset.getCreateVersion();
@@ -45,7 +46,8 @@ public void testGetThumbnailNullDataset() {
         assertNull(DatasetUtil.getThumbnail(null, null));
 
         Dataset dataset = MocksFactory.makeDataset();
-        dataset.setStorageIdentifier("file://");
+        System.setProperty("dataverse.files.testfile.type", "file");
+        dataset.setStorageIdentifier("testfile://");
         dataset.setUseGenericThumbnail(true);
 
         assertNull(DatasetUtil.getThumbnail(dataset));