diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index a3bf9967075..c30c71da4e5 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -3573,6 +3573,22 @@
 :Type: bool
 
 
+~~~~~~~~~~~~~~~~~~~~~
+``metadata_strategy``
+~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Determines how metadata will be set. Valid values are `directory`,
+    `extended` and `legacy`. In extended mode jobs will decide if a
+    tool run failed, the object stores configuration is serialized and
+    made available to the job and is used for writing output datasets
+    to the object store as part of the job and dynamic output
+    discovery (e.g. discovered datasets <discover_datasets>,
+    unpopulated collections, etc) happens as part of the job.
+:Default: ``directory``
+:Type: str
+
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ``retry_metadata_internally``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lib/galaxy/authnz/custos_authnz.py b/lib/galaxy/authnz/custos_authnz.py
index 11f6e43a52a..18f907a03f7 100644
--- a/lib/galaxy/authnz/custos_authnz.py
+++ b/lib/galaxy/authnz/custos_authnz.py
@@ -17,8 +17,8 @@ from galaxy.model import CustosAuthnzToken, User
 from ..authnz import IdentityProvider
 
 log = logging.getLogger(__name__)
-STATE_COOKIE_NAME = 'custos-state'
-NONCE_COOKIE_NAME = 'custos-nonce'
+STATE_COOKIE_NAME = 'galaxy-oidc-state'
+NONCE_COOKIE_NAME = 'galaxy-oidc-nonce'
 KEYCLOAK_BACKENDS = {'custos', 'cilogon', 'keycloak'}
 
 
diff --git a/lib/galaxy/authnz/managers.py b/lib/galaxy/authnz/managers.py
index 0b7afbd134a..a1cc2c1c989 100644
--- a/lib/galaxy/authnz/managers.py
+++ b/lib/galaxy/authnz/managers.py
@@ -292,7 +292,7 @@ class AuthnzManager(object):
             raise exceptions.AuthenticationFailed(e.message)
         except Exception as e:
             msg = 'The following error occurred when handling callback from `{}` identity provider: ' \
-                  '{}'.format(provider, e.message)
+                  '{}'.format(provider, str(e))
             log.exception(msg)
             return False, msg, (None, None)
 
@@ -321,7 +321,7 @@ class AuthnzManager(object):
             return True, message, backend.logout(trans, post_logout_redirect_url)
         except Exception as e:
             msg = 'The following error occurred when logging out from `{}` identity provider: ' \
-                  '{}'.format(provider, e.message)
+                  '{}'.format(provider, str(e))
             log.exception(msg)
             return False, msg, None
 
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index 3297cb5d0d5..5eda281b6aa 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -1751,6 +1751,15 @@ galaxy:
   # database.
   #enable_job_recovery: true
 
+  # Determines how metadata will be set. Valid values are `directory`,
+  # `extended` and `legacy`. In extended mode jobs will decide if a tool
+  # run failed, the object stores configuration is serialized and made
+  # available to the job and is used for writing output datasets to the
+  # object store as part of the job and dynamic output discovery (e.g.
+  # discovered datasets <discover_datasets>, unpopulated collections,
+  # etc) happens as part of the job.
+  #metadata_strategy: directory
+
   # Although it is fairly reliable, setting metadata can occasionally
   # fail.  In these instances, you can choose to retry setting it
   # internally or leave it in a failed state (since retrying internally
diff --git a/lib/galaxy/config/sample/job_conf.xml.sample_advanced b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
index 53254618eba..beb5feb3d13 100644
--- a/lib/galaxy/config/sample/job_conf.xml.sample_advanced
+++ b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
@@ -401,6 +401,17 @@
                try it early - it will slightly speed up local jobs by
                embedding metadata calculation in job script itself.
           -->
+          <param id="metadata_strategy">directory</param>
+          <!-- If set, overwrites metadata_strategy (configurable in galaxy.yml).
+               Valid values are `directory` (default), `extended` and `legacy`.
+               Setting metadata_strategy to `extended` requires that all object stores
+               that can be written to store datasets by uuid. In `extended` mode jobs
+               will decide if a tool run failed, the object stores configuration
+               is serialized and made available to the job and is used for writing output
+               datasets to the object store as part of the job and dynamic output discovery
+               (e.g. discovered datasets <discover_datasets>, unpopulated collections, etc)
+               happens as part of the job.
+          -->
           <job_metrics />
           <!-- Above element demonstrates embedded job metrics definition - see
                job_metrics_conf.xml.sample for full documentation on possible nested
diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index 60e8f57eb77..56c8b70c2b1 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -906,17 +906,20 @@ class JobWrapper(HasResourceParameters):
         self.output_paths = None
         self.output_hdas_and_paths = None
         self.tool_provided_job_metadata = None
-        # Wrapper holding the info required to restore and clean up from files used for setting metadata externally
-        metadata_strategy_override = None
-        if job.tasks:
-            metadata_strategy_override = "directory"
-        self.external_output_metadata = get_metadata_compute_strategy(self.app.config, job.id, metadata_strategy_override=metadata_strategy_override)
         self.job_runner_mapper = JobRunnerMapper(self, queue.dispatcher.url_to_destination, self.app.job_config)
         self.params = None
         if job.params:
             self.params = loads(job.params)
         if use_persisted_destination:
             self.job_runner_mapper.cached_job_destination = JobDestination(from_job=job)
+        # Wrapper holding the info required to restore and clean up from files used for setting metadata externally
+        try:
+            metadata_strategy_override = self.get_destination_configuration('metadata_strategy', None)
+        except JobMappingException:
+            metadata_strategy_override = None
+        if job.tasks:
+            metadata_strategy_override = "directory"
+        self.external_output_metadata = get_metadata_compute_strategy(self.app.config, job.id, metadata_strategy_override=metadata_strategy_override)
 
         self.__commands_in_new_shell = True
         self.__user_system_pwent = None
diff --git a/lib/galaxy/metadata/set_metadata.py b/lib/galaxy/metadata/set_metadata.py
index 7be7c7543b3..e590d247397 100644
--- a/lib/galaxy/metadata/set_metadata.py
+++ b/lib/galaxy/metadata/set_metadata.py
@@ -174,7 +174,7 @@ def set_metadata_portable():
 
         # Load outputs.
         import_model_store = store.imported_store_for_metadata('metadata/outputs_new', object_store=object_store)
-        export_store = store.DirectoryModelExportStore('metadata/outputs_populated', serialize_dataset_objects=True, for_edit=True)
+        export_store = store.DirectoryModelExportStore('metadata/outputs_populated', serialize_dataset_objects=True, for_edit=True, strip_metadata_files=False)
 
     for output_name, output_dict in outputs.items():
         if extended_metadata_collection:
diff --git a/lib/galaxy/model/metadata.py b/lib/galaxy/model/metadata.py
index aee9c4bd411..a0b87a076e4 100644
--- a/lib/galaxy/model/metadata.py
+++ b/lib/galaxy/model/metadata.py
@@ -526,8 +526,7 @@ class FileParameter(MetadataParameter):
             return None
         if isinstance(value, galaxy.model.MetadataFile) or isinstance(value, MetadataTempFile):
             return value
-        mf = session.query(galaxy.model.MetadataFile).get(value)
-        return mf
+        return session.query(galaxy.model.MetadataFile).get(value)
 
     def make_copy(self, value, target_context, source_context):
         value = self.wrap(value, object_session(target_context.parent))
@@ -542,7 +541,10 @@ class FileParameter(MetadataParameter):
     @classmethod
     def marshal(cls, value):
         if isinstance(value, galaxy.model.MetadataFile):
-            value = value.id
+            # We want to push value.id to the database, but need to skip this when no session is available,
+            # as in extended_metadata mode, so there we just accept MetadataFile.
+            # We will only serialize MetadataFile in this mode and not push to the database, so this is OK.
+            value = value.id or value
         return value
 
     def from_external_value(self, value, parent, path_rewriter=None):
diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml
index 310807f39a9..67d1ef8494f 100644
--- a/lib/galaxy/webapps/galaxy/config_schema.yml
+++ b/lib/galaxy/webapps/galaxy/config_schema.yml
@@ -2645,6 +2645,18 @@ mapping:
           it can "recover" them when it starts).  This is not safe to use if you are
           running more than one Galaxy server using the same database.
 
+      metadata_strategy:
+        type: str
+        required: false
+        default: directory
+        desc: |
+          Determines how metadata will be set. Valid values are `directory`, `extended` and `legacy`.
+          In extended mode jobs will decide if a tool run failed, the object stores
+          configuration is serialized and made available to the job and is used for
+          writing output datasets to the object store as part of the job and dynamic
+          output discovery (e.g. discovered datasets <discover_datasets>, unpopulated collections,
+          etc) happens as part of the job.
+
       retry_metadata_internally:
         type: bool
         default: true
diff --git a/packages/app/HISTORY.rst b/packages/app/HISTORY.rst
index ec2f0e746e9..72090ac4c88 100644
--- a/packages/app/HISTORY.rst
+++ b/packages/app/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/app/galaxy/project_galaxy_app.py b/packages/app/galaxy/project_galaxy_app.py
index 95cac65f339..61a6ae88785 100644
--- a/packages/app/galaxy/project_galaxy_app.py
+++ b/packages/app/galaxy/project_galaxy_app.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-app"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/auth/HISTORY.rst b/packages/auth/HISTORY.rst
index ec2f0e746e9..72090ac4c88 100644
--- a/packages/auth/HISTORY.rst
+++ b/packages/auth/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/auth/galaxy/project_galaxy_auth.py b/packages/auth/galaxy/project_galaxy_auth.py
index dbd94f1ced5..a15658b18cb 100644
--- a/packages/auth/galaxy/project_galaxy_auth.py
+++ b/packages/auth/galaxy/project_galaxy_auth.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-auth"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/containers/HISTORY.rst b/packages/containers/HISTORY.rst
index 52c2df7066e..7879816905a 100644
--- a/packages/containers/HISTORY.rst
+++ b/packages/containers/HISTORY.rst
@@ -6,11 +6,17 @@ History
 .. to_doc
 
 ---------------------
-19.9.1.dev0
+20.5.1.dev0
 ---------------------
 
 
 
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
+
 ---------------------
 19.9.0 (2019-12-16)
 ---------------------
diff --git a/packages/containers/galaxy/project_galaxy_containers.py b/packages/containers/galaxy/project_galaxy_containers.py
index 54af538bb38..8d1702ac5a9 100644
--- a/packages/containers/galaxy/project_galaxy_containers.py
+++ b/packages/containers/galaxy/project_galaxy_containers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.1.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-containers"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/data/HISTORY.rst b/packages/data/HISTORY.rst
index ec2f0e746e9..4f7ba0c7b9d 100644
--- a/packages/data/HISTORY.rst
+++ b/packages/data/HISTORY.rst
@@ -6,7 +6,14 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/data/galaxy/project_galaxy_data.py b/packages/data/galaxy/project_galaxy_data.py
index 1a2efe784b6..25e11b314df 100644
--- a/packages/data/galaxy/project_galaxy_data.py
+++ b/packages/data/galaxy/project_galaxy_data.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev1'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-data"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/job_execution/HISTORY.rst b/packages/job_execution/HISTORY.rst
index ec2f0e746e9..72090ac4c88 100644
--- a/packages/job_execution/HISTORY.rst
+++ b/packages/job_execution/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/job_execution/galaxy/project_galaxy_job_execution.py b/packages/job_execution/galaxy/project_galaxy_job_execution.py
index f2c11c58e0e..c88e1f230ac 100644
--- a/packages/job_execution/galaxy/project_galaxy_job_execution.py
+++ b/packages/job_execution/galaxy/project_galaxy_job_execution.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-job-execution"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/job_metrics/HISTORY.rst b/packages/job_metrics/HISTORY.rst
index 52c2df7066e..7879816905a 100644
--- a/packages/job_metrics/HISTORY.rst
+++ b/packages/job_metrics/HISTORY.rst
@@ -6,11 +6,17 @@ History
 .. to_doc
 
 ---------------------
-19.9.1.dev0
+20.5.1.dev0
 ---------------------
 
 
 
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
+
 ---------------------
 19.9.0 (2019-12-16)
 ---------------------
diff --git a/packages/job_metrics/galaxy/project_galaxy_job_metrics.py b/packages/job_metrics/galaxy/project_galaxy_job_metrics.py
index 1a710fcca5a..1b7831b5354 100644
--- a/packages/job_metrics/galaxy/project_galaxy_job_metrics.py
+++ b/packages/job_metrics/galaxy/project_galaxy_job_metrics.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.1.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-job-metrics"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/objectstore/HISTORY.rst b/packages/objectstore/HISTORY.rst
index 52c2df7066e..7879816905a 100644
--- a/packages/objectstore/HISTORY.rst
+++ b/packages/objectstore/HISTORY.rst
@@ -6,11 +6,17 @@ History
 .. to_doc
 
 ---------------------
-19.9.1.dev0
+20.5.1.dev0
 ---------------------
 
 
 
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
+
 ---------------------
 19.9.0 (2019-12-16)
 ---------------------
diff --git a/packages/objectstore/galaxy/project_galaxy_objectstore.py b/packages/objectstore/galaxy/project_galaxy_objectstore.py
index 8389a7251b6..cc83b9e9564 100644
--- a/packages/objectstore/galaxy/project_galaxy_objectstore.py
+++ b/packages/objectstore/galaxy/project_galaxy_objectstore.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.1.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-objectstore"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/selenium/HISTORY.rst b/packages/selenium/HISTORY.rst
index ec2f0e746e9..72090ac4c88 100644
--- a/packages/selenium/HISTORY.rst
+++ b/packages/selenium/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/selenium/galaxy/project_galaxy_selenium.py b/packages/selenium/galaxy/project_galaxy_selenium.py
index 73ec5c1cf31..8682a60d8ee 100644
--- a/packages/selenium/galaxy/project_galaxy_selenium.py
+++ b/packages/selenium/galaxy/project_galaxy_selenium.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-selenium"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/test_base/HISTORY.rst b/packages/test_base/HISTORY.rst
index 7cb67f838f8..b8a2e6045e6 100644
--- a/packages/test_base/HISTORY.rst
+++ b/packages/test_base/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-20.1.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 20.01 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* Initial import from the 20.05 branch of Galaxy.
diff --git a/packages/test_base/galaxy/project_galaxy_test_base.py b/packages/test_base/galaxy/project_galaxy_test_base.py
index 668485b359f..d2ae57543f9 100644
--- a/packages/test_base/galaxy/project_galaxy_test_base.py
+++ b/packages/test_base/galaxy/project_galaxy_test_base.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '20.1.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-test-base"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/test_driver/HISTORY.rst b/packages/test_driver/HISTORY.rst
index 7cb67f838f8..72090ac4c88 100644
--- a/packages/test_driver/HISTORY.rst
+++ b/packages/test_driver/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-20.1.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 20.01 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/test_driver/galaxy/project_galaxy_test_driver.py b/packages/test_driver/galaxy/project_galaxy_test_driver.py
index 3c665e4adfb..ccf9c1596b8 100644
--- a/packages/test_driver/galaxy/project_galaxy_test_driver.py
+++ b/packages/test_driver/galaxy/project_galaxy_test_driver.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '20.1.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-test-driver"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/tool_util/HISTORY.rst b/packages/tool_util/HISTORY.rst
index d2be3810139..6524c304020 100644
--- a/packages/tool_util/HISTORY.rst
+++ b/packages/tool_util/HISTORY.rst
@@ -6,13 +6,19 @@ History
 .. to_doc
 
 ---------------------
-20.5.0.dev0
+20.5.1.dev0
+---------------------
+
+
+
+---------------------
+20.5.0 (2020-07-04)
 ---------------------
 
 * First release from the 20.05 branch of Galaxy.
 
 ---------------------
-20.1.0.dev0
+20.1.0 (2020-07-04)
 ---------------------
 
 * First release from the 20.01 branch of Galaxy.
diff --git a/packages/tool_util/galaxy/project_galaxy_tool_util.py b/packages/tool_util/galaxy/project_galaxy_tool_util.py
index e1595d959a7..42a4eb677a4 100644
--- a/packages/tool_util/galaxy/project_galaxy_tool_util.py
+++ b/packages/tool_util/galaxy/project_galaxy_tool_util.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '20.5.0.dev3'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-tool-util"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/web_framework/HISTORY.rst b/packages/web_framework/HISTORY.rst
index ec2f0e746e9..72090ac4c88 100644
--- a/packages/web_framework/HISTORY.rst
+++ b/packages/web_framework/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/web_framework/galaxy/project_galaxy_web_framework.py b/packages/web_framework/galaxy/project_galaxy_web_framework.py
index e6f46b22814..79a5de41962 100644
--- a/packages/web_framework/galaxy/project_galaxy_web_framework.py
+++ b/packages/web_framework/galaxy/project_galaxy_web_framework.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-web-framework"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/web_stack/HISTORY.rst b/packages/web_stack/HISTORY.rst
index ec2f0e746e9..72090ac4c88 100644
--- a/packages/web_stack/HISTORY.rst
+++ b/packages/web_stack/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/web_stack/galaxy/project_galaxy_web_stack.py b/packages/web_stack/galaxy/project_galaxy_web_stack.py
index 987fdbbd1fd..a454a258c8d 100644
--- a/packages/web_stack/galaxy/project_galaxy_web_stack.py
+++ b/packages/web_stack/galaxy/project_galaxy_web_stack.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-web-stack"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/packages/webapps/HISTORY.rst b/packages/webapps/HISTORY.rst
index ec2f0e746e9..72090ac4c88 100644
--- a/packages/webapps/HISTORY.rst
+++ b/packages/webapps/HISTORY.rst
@@ -6,7 +6,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+20.5.1.dev0
 ---------------------
 
-* Initial import from dev branch of Galaxy during 19.09 development cycle.
+
+
+---------------------
+20.5.0 (2020-07-04)
+---------------------
+
+* First release from the 20.05 branch of Galaxy.
diff --git a/packages/webapps/galaxy/project_galaxy_webapps.py b/packages/webapps/galaxy/project_galaxy_webapps.py
index 1aa81b9ca1e..67cb650e0be 100644
--- a/packages/webapps/galaxy/project_galaxy_webapps.py
+++ b/packages/webapps/galaxy/project_galaxy_webapps.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '19.9.0.dev0'
+__version__ = '20.5.1.dev0'
 
 PROJECT_NAME = "galaxy-webapps"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
diff --git a/test/functional/tools/metadata_bam.xml b/test/functional/tools/metadata_bam.xml
index 2f20be5b531..6cf73b2e9c3 100644
--- a/test/functional/tools/metadata_bam.xml
+++ b/test/functional/tools/metadata_bam.xml
@@ -1,5 +1,8 @@
-<tool id="metadata_bam" name="metadata BAM" version="1.0.0">
-  <command>echo "${ref_names}" &gt; "${output_of_input_metadata}"</command>
+<tool id="metadata_bam" name="metadata BAM" version="1.0.0" profile="16.04">
+  <command><![CDATA[
+#assert $input_bam.metadata.bam_index
+echo '${ref_names}' > '${output_of_input_metadata}'
+  ]]></command>
   <inputs>
     <param name="input_bam" type="data" format="bam" label="BAM File"/>
     <param name="ref_names" type="select" optional="False" label="Select references you would like to restrict bam to" multiple="True">
diff --git a/test/integration/embedded_pulsar_metadata_job_conf.yml b/test/integration/embedded_pulsar_metadata_job_conf.yml
index 76520bf4ed5..451162866a0 100644
--- a/test/integration/embedded_pulsar_metadata_job_conf.yml
+++ b/test/integration/embedded_pulsar_metadata_job_conf.yml
@@ -13,6 +13,7 @@ execution:
       runner: pulsar_embed
       remote_metadata: true
       default_file_action: copy
+      metadata_strategy: directory
 
 tools:
 - id: upload1
diff --git a/test/integration/test_pulsar_embedded_metadata.py b/test/integration/test_pulsar_embedded_metadata.py
index 4ebae4a5037..4ba5a600c7d 100644
--- a/test/integration/test_pulsar_embedded_metadata.py
+++ b/test/integration/test_pulsar_embedded_metadata.py
@@ -16,8 +16,13 @@ class EmbeddedMetadataPulsarIntegrationInstance(integration_util.IntegrationInst
     @classmethod
     def handle_galaxy_config_kwds(cls, config):
         config["job_config_file"] = EMBEDDED_PULSAR_JOB_CONFIG_FILE
+        config['object_store_store_by'] = 'uuid'
+        # We set the global metadata_strategy to `extended, but`metadata_strategy is
+        # being overridden in embedded_pulsar_metadata_job_conf.yml, since extended_metadata does not yet work on pulsar
+        config['metadata_strategy'] = 'extended'
+        config['retry_metadata_internally'] = False
 
 
 instance = integration_util.integration_module_instance(EmbeddedMetadataPulsarIntegrationInstance)
 
-test_tools = integration_util.integration_tool_runner(["simple_constructs"])
+test_tools = integration_util.integration_tool_runner(["simple_constructs", "metadata_bam"])