Merge remote-tracking branch 'origin/26914-deploy_history_data_source' into metrics-deployment-history