diff --git a/Composer/packages/client/src/components/CollapsableWrapper.tsx b/Composer/packages/client/src/components/CollapsableWrapper.tsx
index 7571f2e61c..c027d48a8a 100644
--- a/Composer/packages/client/src/components/CollapsableWrapper.tsx
+++ b/Composer/packages/client/src/components/CollapsableWrapper.tsx
@@ -29,7 +29,7 @@ export const CollapsableWrapper: React.FC<CollapsableComponentProps> = (props) =
     <div css={containerStyle}>
       <div data-is-focusable aria-label={title} css={header}>
         <IconButton
-          ariaLabel={isCollapsed ? formatMessage('Expand') : formatMessage('Collapse')}
+          ariaLabel={isCollapsed ? `${title}, ${formatMessage('Expand')}` : `${title}, ${formatMessage('Collapse')}`}
           iconProps={{ iconName: isCollapsed ? 'ChevronRight' : 'ChevronDown' }}
           styles={{ root: { color: NeutralColors.gray150 } }}
           onClick={() => setIsCollapsed(!isCollapsed)}
diff --git a/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx b/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
new file mode 100644
index 0000000000..b03d6e13a0
--- /dev/null
+++ b/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
@@ -0,0 +1,617 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+/** @jsx jsx */
+import { jsx } from '@emotion/core';
+import React, { useState, useEffect, Fragment } from 'react';
+import { Dialog, DialogType, DialogFooter } from 'office-ui-fabric-react/lib/Dialog';
+import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
+import formatMessage from 'format-message';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
+import { TextField } from 'office-ui-fabric-react/lib/TextField';
+import { Spinner } from 'office-ui-fabric-react/lib/Spinner';
+import { useRecoilValue } from 'recoil';
+import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
+import { SubscriptionClient } from '@azure/arm-subscriptions';
+import { Subscription } from '@azure/arm-subscriptions/esm/models';
+import { TokenCredentials } from '@azure/ms-rest-js';
+import { CognitiveServicesManagementClient } from '@azure/arm-cognitiveservices';
+import { ResourceManagementClient } from '@azure/arm-resources';
+import { ChoiceGroup, IChoiceGroupOption } from 'office-ui-fabric-react/lib/ChoiceGroup';
+import { ProvisionHandoff } from '@bfc/ui-shared';
+
+import { AuthClient } from '../../utils/authClient';
+import { AuthDialog } from '../Auth/AuthDialog';
+import { armScopes } from '../../constants';
+import { getTokenFromCache, isShowAuthDialog, userShouldProvideTokens } from '../../utils/auth';
+import { dispatcherState } from '../../recoilModel/atoms';
+
+type ManageSpeechProps = {
+  hidden: boolean;
+  onDismiss: () => void;
+  setVisibility: (visible: boolean) => void;
+  onGetKey: (settings: { subscriptionKey: string; region: string }) => void;
+  onNext?: () => void;
+};
+
+type KeyRec = {
+  name: string;
+  region: string;
+  resourceGroup: string;
+  key: string;
+};
+
+const dropdownStyles = { dropdown: { width: '100%' } };
+const summaryLabelStyles = { display: 'block', color: '#605E5C', fontSize: 14 };
+const summaryStyles = { background: '#F3F2F1', padding: '1px 1rem' };
+const mainElementStyle = { marginBottom: 20 };
+const CREATE_NEW_KEY = 'CREATE_NEW';
+const iconStyles = { marginRight: '8px' };
+
+export const ManageSpeech = (props: ManageSpeechProps) => {
+  const [localKey, setLocalKey] = useState<string>('');
+
+  const [showAuthDialog, setShowAuthDialog] = useState(false);
+  const [token, setToken] = useState<string | undefined>();
+
+  const { setApplicationLevelError } = useRecoilValue(dispatcherState);
+  const [subscriptionId, setSubscriptionId] = useState<string>('');
+  const [resourceGroups, setResourceGroups] = useState<any[]>([]);
+  const [createResourceGroup, setCreateResourceGroup] = useState<boolean>(false);
+  const [newResourceGroupName, setNewResourceGroupName] = useState<string>('');
+  const [resourceGroupKey, setResourceGroupKey] = useState<string>('');
+  const [resourceGroup, setResourceGroup] = useState<string>('');
+  const [locationList, setLocationList] = useState<{ key: string; text: string }[]>([]);
+
+  const [showHandoff, setShowHandoff] = useState<boolean>(false);
+  const [resourceName, setResourceName] = useState<string>('');
+  const [loading, setLoading] = useState<boolean>(false);
+  const [noKeys, setNoKeys] = useState<boolean>(false);
+  const [nextAction, setNextAction] = useState<string>('create');
+  const [actionOptions, setActionOptions] = useState<IChoiceGroupOption[]>([]);
+  const [availableSubscriptions, setAvailableSubscriptions] = useState<Subscription[]>([]);
+  const [keys, setKeys] = useState<KeyRec[]>([]);
+  const [localRegion, setLocalRegion] = useState<string>('westus');
+
+  const [currentPage, setCurrentPage] = useState<number>(1);
+  const [outcomeDescription, setOutcomeDescription] = useState<string>('');
+  const [outcomeSummary, setOutcomeSummary] = useState<React.ReactNode>();
+  const [outcomeError, setOutcomeError] = useState<boolean>(false);
+
+  const handoffInstructions = formatMessage(
+    'Using the Azure portal, create a Language Understanding resource. Create these in a subscription that the developer has accesss to. This will result in an authoring key and an endpoint key.  Provide these keys to the developer in a secure manner.'
+  );
+
+  /* Copied from Azure Publishing extension */
+  const getSubscriptions = async (token: string): Promise<Array<Subscription>> => {
+    const tokenCredentials = new TokenCredentials(token);
+    try {
+      const subscriptionClient = new SubscriptionClient(tokenCredentials);
+      const subscriptionsResult = await subscriptionClient.subscriptions.list();
+      // eslint-disable-next-line no-underscore-dangle
+      return subscriptionsResult._response.parsedBody;
+    } catch (err) {
+      setApplicationLevelError(err);
+      return [];
+    }
+  };
+
+  const hasAuth = async () => {
+    let newtoken = '';
+    if (userShouldProvideTokens()) {
+      if (isShowAuthDialog(false)) {
+        setShowAuthDialog(true);
+      }
+      newtoken = getTokenFromCache('accessToken');
+    } else {
+      newtoken = await AuthClient.getAccessToken(armScopes);
+    }
+
+    setToken(newtoken);
+
+    if (newtoken) {
+      // reset the list
+      setAvailableSubscriptions([]);
+
+      // fetch list of available subscriptions
+      setAvailableSubscriptions(await getSubscriptions(newtoken));
+    }
+  };
+
+  useEffect(() => {
+    // reset the ui
+    setSubscriptionId('');
+    setKeys([]);
+    setCurrentPage(1);
+    setActionOptions([
+      { key: 'create', text: formatMessage('Create a new Speech resource'), disabled: true },
+      { key: 'handoff', text: formatMessage('Generate a resource request'), disabled: true },
+      { key: 'choose', text: formatMessage('Choose from existing'), disabled: true },
+    ]);
+    if (!props.hidden) {
+      hasAuth();
+    }
+  }, [props.hidden]);
+
+  const handleRegionOnChange = (e, value?: IDropdownOption) => {
+    if (value) {
+      setLocalRegion(value.key as string);
+    } else {
+      setLocalRegion('');
+    }
+  };
+
+  const fetchKeys = async (cognitiveServicesManagementClient, accounts) => {
+    const keyList: KeyRec[] = [];
+    for (const account in accounts) {
+      const resourceGroup = accounts[account].id?.replace(/.*?\/resourceGroups\/(.*?)\/.*/, '$1');
+      const name = accounts[account].name;
+      if (resourceGroup && name) {
+        const keys = await cognitiveServicesManagementClient.accounts.listKeys(resourceGroup, name);
+        if (keys?.key1) {
+          keyList.push({
+            name: name,
+            resourceGroup: resourceGroup,
+            region: accounts[account].location || '',
+            key: keys?.key1 || '',
+          });
+        }
+      }
+    }
+    return keyList;
+  };
+
+  const fetchAccounts = async (subscriptionId) => {
+    if (token) {
+      setLoading(true);
+      setNoKeys(false);
+      const tokenCredentials = new TokenCredentials(token);
+      const cognitiveServicesManagementClient = new CognitiveServicesManagementClient(tokenCredentials, subscriptionId);
+      const accounts = await cognitiveServicesManagementClient.accounts.list();
+
+      const keys: KeyRec[] = await fetchKeys(
+        cognitiveServicesManagementClient,
+        accounts.filter((a) => a.kind === 'SpeechServices')
+      );
+      setLoading(false);
+      if (keys.length === 0) {
+        setNoKeys(true);
+        setActionOptions([
+          { key: 'create', text: formatMessage('Create a new Speech resource') },
+          { key: 'handoff', text: formatMessage('Generate a resource request'), disabled: false },
+          { key: 'choose', text: formatMessage('Choose from existing'), disabled: true },
+        ]);
+      } else {
+        setNoKeys(false);
+        setKeys(keys);
+        setActionOptions([
+          { key: 'create', text: formatMessage('Create a new Speech resource') },
+          { key: 'handoff', text: formatMessage('Generate a resource request'), disabled: false },
+          { key: 'choose', text: formatMessage('Choose from existing'), disabled: false },
+        ]);
+      }
+    }
+  };
+
+  const fetchLocations = async (subscriptionId) => {
+    if (token) {
+      const tokenCredentials = new TokenCredentials(token);
+      const subscriptionClient = new SubscriptionClient(tokenCredentials);
+      const locations = await subscriptionClient.subscriptions.listLocations(subscriptionId);
+      setLocationList(
+        locations.map((location) => {
+          return { key: location.name || '', text: location.displayName || '' };
+        })
+      );
+    }
+  };
+
+  const fetchResourceGroups = async (subscriptionId) => {
+    if (token) {
+      const tokenCredentials = new TokenCredentials(token);
+      const resourceClient = new ResourceManagementClient(tokenCredentials, subscriptionId);
+      const groups = await resourceClient.resourceGroups.list();
+
+      setResourceGroups([
+        {
+          id: CREATE_NEW_KEY,
+          data: { icon: 'Add' },
+          name: formatMessage('Create new'),
+        },
+        ...groups,
+      ]);
+    }
+  };
+
+  const createResources = async () => {
+    let key = '';
+    const serviceName = `${resourceName}`;
+
+    if (token) {
+      setLoading(true);
+      const tokenCredentials = new TokenCredentials(token);
+
+      const resourceGroupName = resourceGroupKey === CREATE_NEW_KEY ? newResourceGroupName : resourceGroup;
+      if (resourceGroupKey === CREATE_NEW_KEY) {
+        try {
+          const resourceClient = new ResourceManagementClient(tokenCredentials, subscriptionId);
+          await resourceClient.resourceGroups.createOrUpdate(resourceGroupName, {
+            location: localRegion,
+          });
+        } catch (err) {
+          setOutcomeDescription(
+            formatMessage(
+              'Due to the following error, we were unable to successfully add your selected Speech keys to your bot project:'
+            )
+          );
+          setOutcomeSummary(<p>{err.message}</p>);
+          setOutcomeError(true);
+          setCurrentPage(3);
+          setLoading(false);
+          return;
+        }
+      }
+
+      try {
+        const cognitiveServicesManagementClient = new CognitiveServicesManagementClient(
+          tokenCredentials,
+          subscriptionId
+        );
+        await cognitiveServicesManagementClient.accounts.create(resourceGroupName, serviceName, {
+          kind: 'SpeechServices',
+          sku: {
+            name: 'S0',
+          },
+          location: localRegion,
+        });
+
+        const keys = await cognitiveServicesManagementClient.accounts.listKeys(resourceGroupName, serviceName);
+        if (!keys?.key1) {
+          throw new Error('No key found for newly created authoring resource');
+        } else {
+          key = keys.key1;
+          setLocalKey(keys.key1);
+        }
+      } catch (err) {
+        setOutcomeDescription(
+          formatMessage(
+            'Due to the following error, we were unable to successfully add your selected Speech keys to your bot project:'
+          )
+        );
+        setOutcomeSummary(<p>{err.message}</p>);
+        setOutcomeError(true);
+        setCurrentPage(3);
+        setLoading(false);
+        return;
+      }
+
+      setOutcomeDescription(
+        formatMessage('The following Speech resource was successfully created and added to your bot project:')
+      );
+      setOutcomeSummary(
+        <div>
+          <p>
+            <label css={summaryLabelStyles}>{formatMessage('Subscription')}</label>
+            {subscriptionId}
+          </p>
+          <p>
+            <label css={summaryLabelStyles}>{formatMessage('Resource Group')}</label>
+            {resourceGroupName}
+          </p>
+          <p>
+            <label css={summaryLabelStyles}>{formatMessage('Region')}</label>
+            {localRegion}
+          </p>
+          <p>
+            <label css={summaryLabelStyles}>{formatMessage('Resource name')}</label>
+            {resourceName}
+          </p>
+        </div>
+      );
+      setOutcomeError(false);
+
+      // ALL DONE!
+      // this will pass the new values back to the caller
+      // have to wait a second for the key to be available to use
+      // otherwise the ARM api will throw an "unknown error"
+      setTimeout(() => {
+        setLoading(false);
+
+        props.onGetKey({
+          subscriptionKey: key,
+          region: localRegion,
+        });
+
+        setCurrentPage(3);
+      }, 3000);
+    }
+  };
+
+  // allow a user to provide a subscription id if one is missing
+  const onChangeSubscription = async (_, opt) => {
+    // get list of keys for this subscription
+    setSubscriptionId(opt.key);
+    fetchLocations(opt.key);
+    fetchAccounts(opt.key);
+    fetchResourceGroups(opt.key);
+  };
+
+  const onChangeKey = async (_, opt) => {
+    setLocalKey(opt.key);
+    setLocalRegion(opt.data.region);
+  };
+
+  const onChangeAction = async (_, opt) => {
+    setNextAction(opt.key);
+  };
+
+  const onChangeResourceGroup = async (_, opt) => {
+    setResourceGroupKey(opt.key);
+    setResourceGroup(opt.text);
+    if (opt.key === CREATE_NEW_KEY) {
+      setCreateResourceGroup(true);
+    } else {
+      setCreateResourceGroup(false);
+    }
+  };
+
+  const performNextAction = () => {
+    if (nextAction === 'choose') {
+      props.onGetKey({
+        subscriptionKey: localKey,
+        region: localRegion,
+      });
+      setOutcomeDescription(formatMessage('The following Speech key has been successfully added to your bot project:'));
+      setOutcomeSummary(
+        <div>
+          <p>
+            <label css={summaryLabelStyles}>{formatMessage('Key')}</label>
+            {localKey}
+          </p>
+          <p>
+            <label css={summaryLabelStyles}>{formatMessage('Region')}</label>
+            {localRegion}
+          </p>
+        </div>
+      );
+      setOutcomeError(false);
+
+      setCurrentPage(3);
+    } else if (nextAction === 'handoff') {
+      setShowHandoff(true);
+      props.onDismiss();
+    } else {
+      setCurrentPage(2);
+    }
+  };
+
+  const onRenderOption = (option) => {
+    return (
+      <div>
+        {option.data?.icon && <Icon aria-hidden="true" iconName={option.data.icon} style={iconStyles} />}
+        <span>{option.text}</span>
+      </div>
+    );
+  };
+
+  return (
+    <Fragment>
+      {showAuthDialog && (
+        <AuthDialog
+          needGraph={false}
+          next={hasAuth}
+          onDismiss={() => {
+            setShowAuthDialog(false);
+          }}
+        />
+      )}
+      <ProvisionHandoff
+        developerInstructions={formatMessage(
+          'Copy and share this information with your Azure admin. After your Speech key is provisioned, you will be ready to test your bot with speech.'
+        )}
+        handoffInstructions={handoffInstructions}
+        hidden={!showHandoff}
+        title={formatMessage('Share resource request')}
+        onBack={() => {
+          setShowHandoff(false);
+          props.setVisibility(true);
+        }}
+        onDismiss={() => setShowHandoff(false)}
+      />
+      <Dialog
+        dialogContentProps={{
+          type: DialogType.normal,
+          title: currentPage === 2 ? formatMessage('Create new Speech resources') : formatMessage('Select Speech keys'),
+        }}
+        hidden={props.hidden}
+        minWidth={480}
+        modalProps={{
+          isBlocking: false,
+        }}
+        onDismiss={props.onDismiss}
+      >
+        <div>
+          {currentPage === 1 && (
+            <div>
+              <p>
+                {formatMessage(
+                  'Select your Azure subscription and choose from existing Speech keys, or create a new Speech resource. Learn more'
+                )}
+              </p>
+              <div css={mainElementStyle}>
+                <Dropdown
+                  disabled={!!availableSubscriptions?.length}
+                  label={formatMessage('Select subscription')}
+                  options={
+                    availableSubscriptions
+                      ?.filter((p) => p.subscriptionId && p.displayName)
+                      .map((p) => {
+                        return { key: p.subscriptionId ?? '', text: p.displayName ?? 'Unnamed' };
+                      }) ?? []
+                  }
+                  placeholder={formatMessage('Select one')}
+                  selectedKey={subscriptionId}
+                  styles={dropdownStyles}
+                  onChange={onChangeSubscription}
+                />
+              </div>
+              <div css={mainElementStyle}>
+                {subscriptionId && (
+                  <ChoiceGroup options={actionOptions} selectedKey={nextAction} onChange={onChangeAction} />
+                )}
+
+                <div style={{ marginLeft: 26 }}>
+                  {noKeys && subscriptionId && (
+                    <span style={{ color: 'rgb(161, 159, 157)' }}>
+                      {formatMessage(
+                        'No existing Speech resource found in this subscription. Click “Next” to create a new one.'
+                      )}
+                    </span>
+                  )}
+                  {!noKeys && subscriptionId && (
+                    <div>
+                      <Dropdown
+                        disabled={!!keys?.length || nextAction !== 'choose'}
+                        label={formatMessage('Speech key')}
+                        options={
+                          keys.map((p) => {
+                            return { text: p.name, ...p, data: p };
+                          }) ?? []
+                        }
+                        placeholder={formatMessage('Select one')}
+                        styles={dropdownStyles}
+                        onChange={onChangeKey}
+                      />
+                    </div>
+                  )}
+                </div>
+              </div>
+              <DialogFooter>
+                {loading && (
+                  <Spinner
+                    label={formatMessage('Loading keys...')}
+                    labelPosition="right"
+                    styles={{ root: { float: 'left' } }}
+                  />
+                )}
+                <PrimaryButton
+                  disabled={
+                    loading || (nextAction === 'choose' && !localKey) || (nextAction === 'create' && !subscriptionId)
+                  }
+                  text={formatMessage('Next')}
+                  onClick={performNextAction}
+                />
+                <DefaultButton
+                  disabled={loading || showAuthDialog}
+                  text={formatMessage('Cancel')}
+                  onClick={props.onDismiss}
+                />
+              </DialogFooter>
+            </div>
+          )}
+          {currentPage === 2 && (
+            <div>
+              <div css={mainElementStyle}>
+                <p>
+                  {formatMessage(
+                    'Input your details below to create a new Speech resource. You will be able to manage your new resource in the Azure portal. Learn more'
+                  )}
+                </p>
+                <Dropdown
+                  disabled={!resourceGroups.length || loading}
+                  label={formatMessage('Resource group')}
+                  options={
+                    resourceGroups.map((p) => {
+                      return { key: p.id, text: p.name, data: p.data };
+                    }) ?? []
+                  }
+                  placeholder={formatMessage('Select one')}
+                  selectedKey={resourceGroupKey}
+                  styles={dropdownStyles}
+                  onChange={onChangeResourceGroup}
+                  onRenderOption={onRenderOption}
+                />
+                {createResourceGroup && (
+                  <TextField
+                    required
+                    aria-label={formatMessage('Resource group name')}
+                    data-testid={'resourceGroupName'}
+                    disabled={loading}
+                    label={formatMessage('Resource group name')}
+                    placeholder={formatMessage('Enter name for new resource group')}
+                    styles={{ root: { marginTop: 10 } }}
+                    value={newResourceGroupName}
+                    onChange={(e, val) => {
+                      setNewResourceGroupName(val || '');
+                    }}
+                  />
+                )}
+                <Dropdown
+                  required
+                  aria-label={formatMessage('Speech region')}
+                  data-testid={'rootRegion'}
+                  disabled={loading || !locationList}
+                  label={formatMessage('Speech region')}
+                  options={locationList}
+                  placeholder={formatMessage('Enter Speech region')}
+                  selectedKey={localRegion}
+                  styles={dropdownStyles}
+                  onChange={handleRegionOnChange}
+                />
+                <TextField
+                  required
+                  aria-label={formatMessage('Resource name')}
+                  data-testid={'resourceName'}
+                  disabled={loading}
+                  label={formatMessage('Resource name')}
+                  placeholder={formatMessage('Enter name for new Speech resources')}
+                  styles={{ root: { marginTop: 10 } }}
+                  value={resourceName}
+                  onChange={(e, val) => setResourceName(val || '')}
+                />
+              </div>
+              <DialogFooter>
+                {loading && (
+                  <Spinner
+                    label={formatMessage('Creating resources...')}
+                    labelPosition="right"
+                    styles={{ root: { float: 'left' } }}
+                  />
+                )}
+                <DefaultButton disabled={loading} text={formatMessage('Back')} onClick={() => setCurrentPage(1)} />
+                <PrimaryButton
+                  disabled={
+                    loading ||
+                    !resourceName ||
+                    !resourceGroupKey ||
+                    (resourceGroupKey == CREATE_NEW_KEY && !newResourceGroupName)
+                  }
+                  text={formatMessage('Next')}
+                  onClick={createResources}
+                />
+                <DefaultButton disabled={loading} text={formatMessage('Cancel')} onClick={props.onDismiss} />
+              </DialogFooter>
+            </div>
+          )}
+          {currentPage === 3 && (
+            <div>
+              <p>{outcomeDescription}</p>
+              <div css={summaryStyles}>{outcomeSummary}</div>
+              {outcomeError && (
+                <p>
+                  {formatMessage(
+                    'If you would like to try again, or select from existing resources, please click “Back”.'
+                  )}
+                </p>
+              )}
+              <DialogFooter>
+                {outcomeError && <DefaultButton text={formatMessage('Back')} onClick={() => setCurrentPage(1)} />}
+                <PrimaryButton text={formatMessage('Done')} onClick={props.onNext} />
+              </DialogFooter>
+            </div>
+          )}
+        </div>
+      </Dialog>
+    </Fragment>
+  );
+};
diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectHeader.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectHeader.tsx
index 8318f52085..6a17eb65ad 100644
--- a/Composer/packages/client/src/components/ProjectTree/ProjectHeader.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/ProjectHeader.tsx
@@ -18,11 +18,6 @@ import { isChildDialogLinkSelected, doesLinkMatch } from './helpers';
 import { TreeItem } from './treeItem';
 import { ProjectTreeOptions, TreeLink } from './types';
 
-const icons = {
-  BOT: 'CubeShape',
-  EXTERNAL_SKILL: 'Globe',
-};
-
 const headerCSS = (label: string) => css`
   margin-top: -6px;
   width: 100%;
@@ -159,10 +154,10 @@ export const ProjectHeader = (props: ProjectHeaderProps) => {
     <span key={name} css={headerCSS('bot-header')} data-testid={`BotHeader-${name}`}>
       <TreeItem
         hasChildren={!isRemote}
-        icon={isRemote ? icons.EXTERNAL_SKILL : icons.BOT}
         isActive={doesLinkMatch(link, selectedLink)}
         isChildSelected={isChildDialogLinkSelected(link, selectedLink)}
         isMenuOpen={isMenuOpen}
+        itemType={isRemote ? 'external skill' : 'bot'}
         link={link}
         menu={options.showMenu ? menu : []}
         menuOpenCallback={setMenuOpen}
diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
index fd8e0ff8a5..dfd4b6c439 100644
--- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
@@ -53,17 +53,6 @@ const focusStyle = css`
   position: relative;
 `;
 
-const icons = {
-  TRIGGER: 'LightningBolt',
-  DIALOG: 'Org',
-  FORM_DIALOG: 'Table',
-  FORM_FIELD: 'Variable2', // x in parentheses
-  FORM_TRIGGER: 'TriggerAuto', // lightning bolt with gear
-  FILTER: 'Filter',
-  LG: 'Robot',
-  LU: 'People',
-};
-
 const tree = css`
   height: calc(100% - 45px);
   overflow-y: auto;
@@ -287,10 +276,10 @@ export const ProjectTree: React.FC<Props> = ({
         >
           <TreeItem
             hasChildren
-            icon={isFormDialog ? icons.FORM_DIALOG : icons.DIALOG}
             isActive={doesLinkMatch(dialogLink, selectedLink)}
             isChildSelected={isChildTriggerLinkSelected(dialogLink, selectedLink)}
             isMenuOpen={isMenuOpen}
+            itemType={isFormDialog ? 'form dialog' : 'dialog'}
             link={dialogLink}
             menu={options.showMenu ? menu : options.showQnAMenu ? [QnAMenuItem] : []}
             menuOpenCallback={setMenuOpen}
@@ -320,9 +309,9 @@ export const ProjectTree: React.FC<Props> = ({
       <span key={'common'} ref={null} css={headerCSS('dialog-header')} data-testid={`DialogHeader-Common`}>
         <TreeItem
           hasChildren
-          icon={icons.DIALOG}
           isActive={doesLinkMatch(dialogLink, selectedLink)}
           isMenuOpen={isMenuOpen}
+          itemType={'dialog'}
           link={dialogLink}
           menuOpenCallback={setMenuOpen}
           padLeft={depth * LEVEL_PADDING}
@@ -363,9 +352,9 @@ export const ProjectTree: React.FC<Props> = ({
         key={`${item.id}_${item.index}`}
         dialogName={dialog.displayName}
         extraSpace={INDENT_PER_LEVEL}
-        icon={icons.TRIGGER}
         isActive={doesLinkMatch(link, selectedLink)}
         isMenuOpen={isMenuOpen}
+        itemType={'trigger'}
         link={link}
         marginLeft={depth * INDENT_PER_LEVEL}
         menu={
@@ -440,6 +429,7 @@ export const ProjectTree: React.FC<Props> = ({
           hasChildren
           isMenuOpen={isMenuOpen}
           isSubItemActive={false}
+          itemType={'trigger group'}
           link={link}
           menuOpenCallback={setMenuOpen}
           showErrors={options.showErrors}
@@ -516,9 +506,9 @@ export const ProjectTree: React.FC<Props> = ({
       <TreeItem
         key={`lg_${item.id}`}
         extraSpace={INDENT_PER_LEVEL}
-        icon={icons.DIALOG}
         isActive={doesLinkMatch(link, selectedLink)}
         isMenuOpen={isMenuOpen}
+        itemType={'dialog'}
         link={link}
         menu={[]}
         menuOpenCallback={setMenuOpen}
@@ -545,9 +535,9 @@ export const ProjectTree: React.FC<Props> = ({
       <TreeItem
         key={`lg_${item.id}`}
         extraSpace={INDENT_PER_LEVEL}
-        icon={icons.DIALOG}
         isActive={doesLinkMatch(link, selectedLink)}
         isMenuOpen={isMenuOpen}
+        itemType={'dialog'}
         link={link}
         menu={[]}
         menuOpenCallback={setMenuOpen}
@@ -581,9 +571,9 @@ export const ProjectTree: React.FC<Props> = ({
       <TreeItem
         key={`lu_${item.id}`}
         extraSpace={INDENT_PER_LEVEL}
-        icon={icons.DIALOG}
         isActive={doesLinkMatch(link, selectedLink)}
         isMenuOpen={isMenuOpen}
+        itemType={'dialog'}
         link={link}
         menu={[]}
         menuOpenCallback={setMenuOpen}
@@ -610,9 +600,9 @@ export const ProjectTree: React.FC<Props> = ({
       <TreeItem
         key={`lu_${item.id}`}
         extraSpace={INDENT_PER_LEVEL}
-        icon={icons.DIALOG}
         isActive={doesLinkMatch(link, selectedLink)}
         isMenuOpen={isMenuOpen}
+        itemType={'dialog'}
         link={link}
         menu={[]}
         menuOpenCallback={setMenuOpen}
@@ -797,10 +787,10 @@ export const ProjectTree: React.FC<Props> = ({
           aria-label={formatMessage(
             `{
             dialogNum, plural,
-                =0 {No bots}
-                =1 {One bot}
-              other {# bots}
-            } have been found.
+                =0 {No bots have}
+                =1 {One bot has}
+              other {# bots have}
+            } been found.
             {
               dialogNum, select,
                   0 {}
diff --git a/Composer/packages/client/src/components/ProjectTree/treeItem.tsx b/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
index 8dddea6909..8775ce8e38 100644
--- a/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
@@ -225,6 +225,44 @@ const calloutRootStyle = css`
   padding: 11px;
 `;
 
+type TreeObject =
+  | 'bot'
+  | 'dialog'
+  | 'trigger' // basic ProjectTree elements
+  | 'trigger group'
+  | 'form dialog'
+  | 'form field'
+  | 'form trigger' // used with form dialogs
+  | 'lg'
+  | 'lu' // used on other pages
+  | 'external skill'; // used with multi-bot authoring
+
+const icons: { [key in TreeObject]: string | null } = {
+  bot: 'CubeShape',
+  dialog: 'Org',
+  trigger: 'LightningBolt',
+  'trigger group': null,
+  'form dialog': 'Table',
+  'form field': 'Variable2', // x in parentheses
+  'form trigger': 'TriggerAuto', // lightning bolt with gear
+  lg: 'Robot',
+  lu: 'People',
+  'external skill': 'Globe',
+};
+
+const objectNames: { [key in TreeObject]: () => string } = {
+  trigger: () => formatMessage('Trigger'),
+  dialog: () => formatMessage('Dialog'),
+  'trigger group': () => formatMessage('Trigger group'),
+  'form dialog': () => formatMessage('Form dialog'),
+  'form field': () => formatMessage('Form field'),
+  'form trigger': () => formatMessage('Form trigger'),
+  lg: () => formatMessage('LG'),
+  lu: () => formatMessage('LU'),
+  bot: () => formatMessage('Bot'),
+  'external skill': () => formatMessage('External skill'),
+};
+
 // -------------------- TreeItem -------------------- //
 
 type ITreeItemProps = {
@@ -233,7 +271,7 @@ type ITreeItemProps = {
   isChildSelected?: boolean;
   isSubItemActive?: boolean;
   onSelect?: (link: TreeLink) => void;
-  icon?: string;
+  itemType: TreeObject;
   dialogName?: string;
   textWidth?: number;
   extraSpace?: number;
@@ -372,7 +410,7 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
   link,
   isActive = false,
   isChildSelected = false,
-  icon,
+  itemType,
   dialogName,
   onSelect,
   textWidth = 100,
@@ -387,7 +425,9 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
   role,
 }) => {
   const [thisItemSelected, setThisItemSelected] = useState<boolean>(false);
-  const a11yLabel = `${dialogName ?? '$Root'}_${link.displayName}`;
+
+  const ariaLabel = `${objectNames[itemType]()} ${link.displayName}`;
+  const dataTestId = `${dialogName ?? '$Root'}_${link.displayName}`;
 
   const overflowMenu = menu.map(renderTreeMenuItem(link));
 
@@ -422,16 +462,16 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
       return (
         <div
           data-is-focusable
-          aria-label={`${item.displayName} ${warningContent} ${errorContent}`}
+          aria-label={`${ariaLabel} ${warningContent} ${errorContent}`}
           css={projectTreeItemContainer}
           tabIndex={0}
           onBlur={item.onBlur}
           onFocus={item.onFocus}
         >
           <div css={projectTreeItem} role="presentation" tabIndex={-1}>
-            {item.icon != null && (
+            {item.itemType != null && icons[item.itemType] != null && (
               <Icon
-                iconName={item.icon}
+                iconName={icons[item.itemType]}
                 styles={{
                   root: {
                     width: '12px',
@@ -471,7 +511,12 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
       return (overflowItems: IContextualMenuItem[] | undefined) => {
         if (overflowItems == null) return null;
         return (
-          <TooltipHost content={moreLabel} directionalHint={DirectionalHint.rightCenter} styles={moreButtonContainer}>
+          <TooltipHost
+            content={moreLabel}
+            directionalHint={DirectionalHint.rightCenter}
+            styles={moreButtonContainer}
+            tabIndex={0}
+          >
             <IconButton
               ariaLabel={moreLabel}
               className="dialog-more-btn"
@@ -508,7 +553,7 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
 
   return (
     <div
-      aria-label={a11yLabel}
+      aria-label={ariaLabel}
       css={navContainer(
         isMenuOpen,
         isActive,
@@ -518,7 +563,7 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
         padLeft,
         marginLeft
       )}
-      data-testid={a11yLabel}
+      data-testid={dataTestId}
       role={role}
       tabIndex={0}
       onClick={() => {
@@ -530,7 +575,7 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
         }
       }}
     >
-      <div style={{ minWidth: `${spacerWidth}px` }}></div>
+      <div style={{ minWidth: `${spacerWidth}px` }} />
       <OverflowSet
         //In 8.0 the OverflowSet will no longer be wrapped in a FocusZone
         //remove this at that time
@@ -540,7 +585,8 @@ export const TreeItem: React.FC<ITreeItemProps> = ({
         items={[
           {
             key: linkString,
-            icon: isBroken ? 'RemoveLink' : icon,
+            icon: isBroken ? 'RemoveLink' : icons[itemType],
+            itemType,
             ...link,
           },
         ]}
diff --git a/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx b/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx
index 6e2500e049..bef478ff85 100644
--- a/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx
+++ b/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx
@@ -41,8 +41,7 @@ import {
   columnSizes,
 } from '../styles';
 import { TeamsManifestGeneratorModal } from '../../../components/Adapters/TeamsManifestGeneratorModal';
-
-import ABSChannelSpeechModal from './ABSChannelSpeechModal';
+import { ManageSpeech } from '../../../components/ManageSpeech/ManageSpeech';
 
 const teamsHelpLink = 'https://aka.ms/composer-channel-teams';
 const webchatHelpLink = 'https://aka.ms/composer-channel-webchat';
@@ -370,7 +369,11 @@ export const ABSChannels: React.FC<RuntimeSettingsProps> = (props) => {
     };
   };
 
-  const toggleSpeechOn = async (key: string, region: string, isDefault: boolean) => {
+  const toggleSpeechOn = async (
+    settings: { subscriptionKey: string; region: string },
+    isDefault: boolean,
+    attempt = 0
+  ) => {
     setChannelStatus({
       ...channelStatus,
       [CHANNELS.SPEECH]: {
@@ -381,8 +384,8 @@ export const ABSChannels: React.FC<RuntimeSettingsProps> = (props) => {
 
     try {
       await createChannelService(CHANNELS.SPEECH, {
-        cognitiveServiceSubscriptionKey: key,
-        cognitiveServiceRegion: region,
+        cognitiveServiceSubscriptionKey: settings.subscriptionKey,
+        cognitiveServiceRegion: settings.region,
         isDefaultBotForCogSvcAccount: isDefault,
       });
     } catch (err) {
@@ -395,8 +398,13 @@ export const ABSChannels: React.FC<RuntimeSettingsProps> = (props) => {
           loading: false,
         },
       });
-
-      if (err?.response?.data?.error.code === 'InvalidChannelData') {
+      if (err?.response?.data?.error.code === 'UnknownError' && attempt < 5) {
+        console.error(err);
+        console.log('Retrying...');
+        setTimeout(() => {
+          toggleSpeechOn(settings, isDefault, attempt + 1);
+        }, 3000);
+      } else if (err?.response?.data?.error.code === 'InvalidChannelData') {
         const result = await OpenConfirmModal(
           formatMessage('Enable speech'),
           formatMessage(
@@ -404,7 +412,7 @@ export const ABSChannels: React.FC<RuntimeSettingsProps> = (props) => {
           )
         );
         if (result) {
-          toggleSpeechOn(key, region, false);
+          toggleSpeechOn(settings, false);
         }
       } else {
         setApplicationLevelError(err);
@@ -539,12 +547,18 @@ export const ABSChannels: React.FC<RuntimeSettingsProps> = (props) => {
           }}
         />
       )}
-      <ABSChannelSpeechModal
-        isOpen={showSpeechModal}
-        onClose={() => {
+      <ManageSpeech
+        hidden={!showSpeechModal}
+        setVisibility={setShowSpeechModal}
+        onDismiss={() => {
+          setShowSpeechModal(false);
+        }}
+        onGetKey={(settings) => {
+          toggleSpeechOn(settings, true);
+        }}
+        onNext={() => {
           setShowSpeechModal(false);
         }}
-        onUpdateKey={toggleSpeechOn}
       />
       <div>
         <Dropdown
diff --git a/Composer/packages/client/src/pages/botProject/adapters/ExternalAdapterSettings.tsx b/Composer/packages/client/src/pages/botProject/adapters/ExternalAdapterSettings.tsx
index 2590def75d..f49a67cc0f 100644
--- a/Composer/packages/client/src/pages/botProject/adapters/ExternalAdapterSettings.tsx
+++ b/Composer/packages/client/src/pages/botProject/adapters/ExternalAdapterSettings.tsx
@@ -99,14 +99,18 @@ const ExternalAdapterSettings = (props: Props) => {
                   styles={{ root: { color: SharedColors.green10, fontSize: '18px' } }}
                 />
               ) : (
-                <Link key={key} onClick={() => openModal(key, true, packageName)}>
+                <Link
+                  key={key}
+                  ariaLabel={formatMessage('Configure {title}', { title })}
+                  onClick={() => openModal(key, true, packageName)}
+                >
                   {formatMessage('Configure')}
                 </Link>
               )}
             </div>
             <div css={tableRowItem(columnSizes[2])} role="cell">
               <Toggle
-                ariaLabel={formatMessage('Enable')}
+                ariaLabel={formatMessage('{title} connection', { title })}
                 checked={keyEnabled}
                 data-testid={`toggle_${key}`}
                 disabled={!keyConfigured}
diff --git a/Composer/packages/client/src/pages/design/DebugPanel/TabExtensions/DiagnosticsTab/DiagnosticsStatus.tsx b/Composer/packages/client/src/pages/design/DebugPanel/TabExtensions/DiagnosticsTab/DiagnosticsStatus.tsx
index 66d2c6252e..3524d5d31b 100644
--- a/Composer/packages/client/src/pages/design/DebugPanel/TabExtensions/DiagnosticsTab/DiagnosticsStatus.tsx
+++ b/Composer/packages/client/src/pages/design/DebugPanel/TabExtensions/DiagnosticsTab/DiagnosticsStatus.tsx
@@ -7,6 +7,7 @@ import { DefaultButton } from 'office-ui-fabric-react/lib/Button';
 import { useSetRecoilState } from 'recoil';
 import { FontSizes, SharedColors } from '@uifabric/fluent-theme';
 import { FontIcon } from 'office-ui-fabric-react/lib/Icon';
+import formatMessage from 'format-message';
 
 import { debugPanelExpansionState, debugPanelActiveTabState } from '../../../../../recoilModel';
 import { DiagnosticsTabKey } from '../types';
@@ -23,12 +24,33 @@ export const DiagnosticsStatus = () => {
 
   if (!errorsCount && !warningsCount) return null;
 
+  const errorLabel = formatMessage(
+    `{
+    errorsCount, plural,
+        =0 {No errors}
+        =1 {One error}
+      other {# errors}
+    }`,
+    { errorsCount }
+  );
+
+  const warningLabel = formatMessage(
+    `{
+    warningsCount, plural,
+        =0 {No warnings}
+        =1 {One warning}
+      other {# warnings}
+    }`,
+    { warningsCount }
+  );
+
   return (
     <div
       css={{ height: '100%', display: 'flex', alignItems: 'center', paddingLeft: '8px' }}
       data-testid="diagnostics-tab-header--collapsed"
     >
       <DefaultButton
+        ariaLabel={`${errorLabel} ${warningLabel}`}
         styles={{
           root: {
             height: '36px',
diff --git a/Composer/packages/client/src/pages/setting/app-settings/SettingToggle.tsx b/Composer/packages/client/src/pages/setting/app-settings/SettingToggle.tsx
index 35e20ad97c..4dc0647d69 100644
--- a/Composer/packages/client/src/pages/setting/app-settings/SettingToggle.tsx
+++ b/Composer/packages/client/src/pages/setting/app-settings/SettingToggle.tsx
@@ -39,6 +39,7 @@ const SettingToggle: React.FC<ISettingToggleProps> = (props) => {
       </div>
       {!hideToggle && (
         <Toggle
+          ariaLabel={`${title} ${description}`}
           checked={!!checked}
           data-testid={id}
           id={id || uniqueId}
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/provision.ts b/Composer/packages/client/src/recoilModel/dispatchers/provision.ts
index 89cad0c849..35b341969d 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/provision.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/provision.ts
@@ -27,6 +27,13 @@ export const provisionDispatcher = () => {
       type: 'success',
     };
   };
+  const getProvisionPartialSuccessNotification = (value: string): CardProps => {
+    return {
+      title: formatMessage('Provision partially completed'),
+      description: formatMessage('{msg}', { msg: value }),
+      type: 'warning',
+    };
+  };
   const getProvisionFailureNotification = (value: string): CardProps => {
     return {
       title: formatMessage('Provision failure'),
@@ -115,7 +122,11 @@ export const provisionDispatcher = () => {
         isCleanTimer = false;
       try {
         const response = await httpClient.get(`/provision/${projectId}/status/${targetType}/${targetName}/${jobId}`);
-        if (response.data?.status === 200 && response.data.config && response.data.config != {}) {
+        if (
+          (response.data?.status === 200 || response.data?.status === 206) &&
+          response.data.config &&
+          response.data.config != {}
+        ) {
           // delete provisionStatus
           callbackHelpers.set(provisionStatusState(projectId), (status) => {
             const newStatus = { ...status };
@@ -143,7 +154,11 @@ export const provisionDispatcher = () => {
             subscriptionId: response.data.config.subscriptionId,
           });
 
-          notification = getProvisionSuccessNotification(response.data.message);
+          if (response.data?.status === 200) {
+            notification = getProvisionSuccessNotification(response.data.message);
+          } else {
+            notification = getProvisionPartialSuccessNotification(response.data.message);
+          }
           isCleanTimer = true;
         } else {
           if (response.data.status !== 500) {
diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index e314109a3b..da9f1ceb70 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -2,9 +2,6 @@
   "0_bytes_a1e1cdb3": {
     "message": "0 Bytes"
   },
-  "5_minute_intro_7ea06d2b": {
-    "message": "5 Minute Intro"
-  },
   "ErrorInfo_part1": {
     "message": "An error occurred in the form editor!"
   },
@@ -317,9 +314,6 @@
   "application_updates_bdf5f8b6": {
     "message": "Application Updates"
   },
-  "apr_9_2020_3c8b47d7": {
-    "message": "Apr 9, 2020"
-  },
   "are_you_sure_you_want_to_delete_your_bot_this_acti_214a9e11": {
     "message": "Are you sure you want to delete your bot? This action cannot be undone and your bot and all related files in the bot project folder will be permanently deleted. Your Azure resources will remain unchanged."
   },
@@ -440,9 +434,6 @@
   "begindialog_a5594562": {
     "message": "BeginDialog"
   },
-  "ben_brown_99c12d19": {
-    "message": "Ben Brown"
-  },
   "boolean_6000988a": {
     "message": "Boolean"
   },
@@ -503,11 +494,8 @@
   "bot_framework_composer_is_a_visual_authoring_canva_c3947d91": {
     "message": "Bot Framework Composer is a visual authoring canvas for building bots and other types of conversational application with the Microsoft Bot Framework technology stack. With Composer you will find everything you need to build a modern, state-of-the-art conversational experience."
   },
-  "bot_framework_composer_is_an_open_source_visual_au_2be2e02b": {
-    "message": "Bot Framework Composer is an open-source visual authoring canvas for developers and multi-disciplinary teams to build bots. Composer integrates LUIS and QnA Maker, and allows sophisticated composition of bot replies using language generation."
-  },
-  "bot_framework_provides_the_most_comprehensive_expe_e34a7f5d": {
-    "message": "Bot Framework provides the most comprehensive experience for building conversational applications."
+  "bot_framework_emulator_fefd4a59": {
+    "message": "Bot Framework Emulator"
   },
   "bot_is_botname_c5af0c89": {
     "message": "Bot is { botName }"
@@ -569,9 +557,6 @@
   "break_out_of_loop_ab30157c": {
     "message": "Break out of loop"
   },
-  "build_your_first_bot_f9c3e427": {
-    "message": "Build your first bot"
-  },
   "building_5e8a3c1d": {
     "message": "Building"
   },
@@ -602,9 +587,6 @@
   "cannot_parse_attachment_c3e552a5": {
     "message": "Cannot parse attachment."
   },
-  "cannot_post_activity_conversation_not_found_c1e26d2d": {
-    "message": "Cannot post activity. Conversation not found."
-  },
   "cannot_upload_file_conversation_not_found_8a983504": {
     "message": "Cannot upload file. Conversation not found."
   },
@@ -617,6 +599,9 @@
   "check_for_updates_and_install_them_automatically_50337340": {
     "message": "Check for updates and install them automatically."
   },
+  "check_out_the_resources_on_github_4d73792a": {
+    "message": "Check out the resources on GitHub."
+  },
   "choice_input_f75a2353": {
     "message": "Choice Input"
   },
@@ -638,9 +623,6 @@
   "choose_subscription_3d78d10d": {
     "message": "Choose subscription"
   },
-  "chris_whitten_11df1f35": {
-    "message": "Chris Whitten"
-  },
   "clear_all_da755751": {
     "message": "Clear all"
   },
@@ -686,12 +668,12 @@
   "composer_cannot_yet_translate_your_bot_automatical_2d54081b": {
     "message": "Composer cannot yet translate your bot automatically.\nTo create a translation manually, Composer will create a copy of your bot’s content with the name of the additional language. This content can then be translated without affecting the original bot logic or flow and you can switch between languages to ensure the responses are correctly and appropriately translated."
   },
+  "composer_documentation_60a27d37": {
+    "message": "Composer documentation"
+  },
   "composer_includes_a_telemetry_feature_that_collect_8fd7bfbf": {
     "message": "Composer includes a telemetry feature that collects usage information. It is important that the Composer team understands how the tool is being used so that it can be improved."
   },
-  "composer_introduction_98a93701": {
-    "message": "Composer introduction"
-  },
   "composer_is_up_to_date_9118257d": {
     "message": "Composer is up to date."
   },
@@ -704,6 +686,9 @@
   "composer_needs_net_core_sdk_46e2a8ae": {
     "message": "Composer needs .NET Core SDK"
   },
+  "composer_on_github_1e3782ef": {
+    "message": "Composer on GitHub"
+  },
   "composer_settings_31b04099": {
     "message": "Composer Settings"
   },
@@ -932,9 +917,6 @@
   "create_new_e0946c49": {
     "message": "Create new"
   },
-  "create_new_empty_bot_21cf0ea3": {
-    "message": "Create new empty bot"
-  },
   "create_new_folder_19d3faa4": {
     "message": "Create new folder"
   },
@@ -1100,6 +1082,9 @@
   "deleting_dialogid_failed_1d7cc05a": {
     "message": "Deleting \"{ dialogId }\" failed."
   },
+  "deleting_one_source_file_will_also_delete_qna_file_f3afd698": {
+    "message": "Deleting one source file will also delete qna files with the same name on other locales"
+  },
   "describe_your_skill_88554792": {
     "message": "Describe your skill"
   },
@@ -1226,6 +1211,9 @@
   "done_54e3d4b6": {
     "message": "Done"
   },
+  "download_emulator_c8fb3403": {
+    "message": "Download Emulator"
+  },
   "download_icon_2e0d10": {
     "message": "Download Icon"
   },
@@ -1235,9 +1223,6 @@
   "downloading_bb6fb34b": {
     "message": "Downloading..."
   },
-  "downloading_language_model_9d40c817": {
-    "message": "Downloading Language Model"
-  },
   "due_to_the_following_error_we_were_unable_to_succe_5ca033c7": {
     "message": "Due to the following error, we were unable to successfully add your selected QnA keys to your bot project:"
   },
@@ -1379,11 +1364,14 @@
   "endpoints_ff946539": {
     "message": "Endpoints"
   },
+  "engage_with_other_bot_builders_ask_and_answer_ques_550d86bc": {
+    "message": "Engage with other bot builders. Ask and answer questions."
+  },
   "ensure_your_bot_can_understand_your_users_by_frequ_c3f5c722": {
     "message": "Ensure your bot can understand your users by frequently training your LUIS model."
   },
-  "enter_a_manifest_url_to_add_a_new_skill_to_your_bo_57e9d660": {
-    "message": "Enter a manifest url to add a new skill to your bot."
+  "enter_a_manifest_url_to_add_a_new_skill_to_your_bo_eb966c95": {
+    "message": "Enter a manifest URL to add a new skill to your bot."
   },
   "enter_a_max_value_14e8ba52": {
     "message": "Enter a max value"
@@ -1439,8 +1427,8 @@
   "enter_qna_region_4dae87f5": {
     "message": "Enter QnA region"
   },
-  "enter_skill_host_endpoint_url_e22eeab5": {
-    "message": "Enter Skill host endpoint url"
+  "enter_skill_host_endpoint_url_7489a83f": {
+    "message": "Enter Skill host endpoint URL"
   },
   "entities_ef09392c": {
     "message": "Entities"
@@ -1610,6 +1598,9 @@
   "find_pre_built_adaptive_expressions_b106308e": {
     "message": "Find pre-built Adaptive expressions"
   },
+  "find_tutorials_step_by_step_guides_discover_what_y_8f3e3863": {
+    "message": "Find tutorials, step-by-step guides. Discover what you can build with Composer."
+  },
   "firstselector_a3daca5d": {
     "message": "FirstSelector"
   },
@@ -1721,15 +1712,18 @@
   "getting_help_ab6811b0": {
     "message": "Getting Help"
   },
-  "getting_started_f45a7e87": {
-    "message": "Getting Started"
-  },
   "getting_template_910a4116": {
     "message": "Getting template"
   },
+  "go_to_composer_repository_cba5d3d2": {
+    "message": "Go to Composer repository"
+  },
   "go_to_qna_all_up_view_page_d475333d": {
     "message": "Go to QnA all-up view page."
   },
+  "go_to_stack_overflow_e525148": {
+    "message": "Go to Stack Overflow"
+  },
   "got_it_2c06b54a": {
     "message": "Got it!"
   },
@@ -1802,14 +1796,14 @@
   "import_as_new_35630827": {
     "message": "Import as new"
   },
-  "import_new_url_and_overwrite_ef1f405e": {
-    "message": "Import new url and overwrite"
+  "import_new_url_and_overwrite_5e463747": {
+    "message": "Import new URL and overwrite"
   },
   "import_schema_75659c5f": {
     "message": "Import schema"
   },
-  "import_url_ccaa2f16": {
-    "message": "Import Url"
+  "import_url_62402b7c": {
+    "message": "Import URL"
   },
   "import_your_bot_to_new_project_8751d82f": {
     "message": "Import your bot to new project"
@@ -1958,9 +1952,6 @@
   "itemcount_plural_0_no_schemas_1_one_schema_other_s_e1aea7f": {
     "message": "{ itemCount, plural,\n     =0 {No schemas}\n     =1 {One schema}\n  other {# schemas}\n} have been found.\n            { itemCount, select,\n      0 {}\n  other {Press down arrow key to navigate the search results}\n}"
   },
-  "jan_28_2020_8beb36dc": {
-    "message": "Jan 28, 2020"
-  },
   "just_add_a_qna_key_and_you_ll_be_ready_to_talk_to__d18758bb": {
     "message": "Just add a QnA key and you’ll be ready to talk to your bot."
   },
@@ -1982,8 +1973,8 @@
   "knowledge_base_name_7d83bbe4": {
     "message": "Knowledge base name"
   },
-  "knowledge_qna_7a4e84f7": {
-    "message": "Knowledge(QnA)"
+  "knowledge_qna_1a599dcf": {
+    "message": "Knowledge (QnA)"
   },
   "knowledge_source_dd66f38f": {
     "message": "Knowledge source"
@@ -2231,11 +2222,11 @@
   "manifest_editor_1426637": {
     "message": "manifest editor"
   },
-  "manifest_url_30824e88": {
-    "message": "Manifest url"
+  "manifest_url_a6250c02": {
+    "message": "Manifest URL"
   },
-  "manifest_url_can_not_be_accessed_a7f147b2": {
-    "message": "Manifest url can not be accessed"
+  "manifest_url_can_not_be_accessed_ba43fc31": {
+    "message": "Manifest URL can not be accessed"
   },
   "manifest_version_1edc004a": {
     "message": "Manifest Version"
@@ -2348,9 +2339,6 @@
   "ms_teams_15993b97": {
     "message": "MS Teams"
   },
-  "msft_ignite_ai_show_e131edef": {
-    "message": "MSFT Ignite AI Show"
-  },
   "msg_bf173fef": {
     "message": "{ msg }"
   },
@@ -2471,6 +2459,9 @@
   "no_qna_file_with_name_id_7cb89755": {
     "message": "NO QNA FILE WITH NAME { id }"
   },
+  "no_recent_bots_f4cf7d0a": {
+    "message": "No recent bots"
+  },
   "no_search_results_1ba50423": {
     "message": "No search results"
   },
@@ -2483,6 +2474,9 @@
   "no_uploads_were_attached_as_a_part_of_the_request_63e92f54": {
     "message": "No uploads were attached as a part of the request."
   },
+  "no_web_chat_activity_yet_4227dc1a": {
+    "message": "No Web Chat activity yet."
+  },
   "no_wildcard_ff439e76": {
     "message": "no wildcard"
   },
@@ -2501,9 +2495,6 @@
   "notifications_cbfa7704": {
     "message": "Notifications"
   },
-  "nov_12_2019_96ec5473": {
-    "message": "Nov 12, 2019"
-  },
   "number_a6dc44e": {
     "message": "Number"
   },
@@ -2618,6 +2609,9 @@
   "or_4f7d4edb": {
     "message": "Or: "
   },
+  "orchestrator_downloading_language_model_e785be44": {
+    "message": "Orchestrator: Downloading language model"
+  },
   "orchestrator_recognizer_cf38b65a": {
     "message": "Orchestrator recognizer"
   },
@@ -2660,8 +2654,8 @@
   "please_enter_an_event_name_a148275a": {
     "message": "Please enter an event name"
   },
-  "please_input_a_manifest_url_d726edbf": {
-    "message": "Please input a manifest Url"
+  "please_input_a_manifest_url_79cce9d5": {
+    "message": "Please input a manifest URL"
   },
   "please_input_regex_pattern_5cd659a2": {
     "message": "Please input regEx pattern"
@@ -2804,6 +2798,9 @@
   "provision_failure_983d3844": {
     "message": "Provision failure"
   },
+  "provision_partially_completed_b0120a72": {
+    "message": "Provision partially completed"
+  },
   "provision_success_d6a6e437": {
     "message": "Provision success"
   },
@@ -2918,6 +2915,9 @@
   "re_prompt_for_input_reprompt_dialog_event_ba028f7": {
     "message": "Re-prompt for input (Reprompt dialog event)"
   },
+  "read_documentation_d5df5d59": {
+    "message": "Read documentation"
+  },
   "read_me_4734ca1": {
     "message": "Read Me"
   },
@@ -3044,6 +3044,9 @@
   "resource_name_817b6e75": {
     "message": "Resource name"
   },
+  "resources_ccefab27": {
+    "message": "Resources"
+  },
   "response_is_response_3cd62f8f": {
     "message": "Response is { response }"
   },
@@ -3332,8 +3335,8 @@
   "skill_host_endpoint_4118a173": {
     "message": "Skill host endpoint"
   },
-  "skill_host_endpoint_url_e68b65f6": {
-    "message": "Skill host endpoint url"
+  "skill_host_endpoint_url_702c277c": {
+    "message": "Skill host endpoint URL"
   },
   "skill_manifest_endpoint_is_configured_improperly_e083731d": {
     "message": "Skill manifest endpoint is configured improperly"
@@ -3383,6 +3386,9 @@
   "specify_an_attachment_layout_when_there_are_more_t_28ffc0c2": {
     "message": "Specify an attachment layout when there are more than one."
   },
+  "specify_an_existing_bot_to_connect_to_your_azure_b_3c632ffa": {
+    "message": "Specify an existing bot to connect to your Azure Bot resource."
+  },
   "speech_16063aed": {
     "message": "Speech"
   },
@@ -3392,6 +3398,9 @@
   "ssml_tag_981a8aac": {
     "message": "SSML tag"
   },
+  "stack_overflow_de80008e": {
+    "message": "Stack Overflow"
+  },
   "start_and_stop_local_bot_runtimes_individually_901c8d7d": {
     "message": "Start and stop local bot runtimes individually."
   },
@@ -3503,6 +3512,9 @@
   "terms_of_use_6542769b": {
     "message": "Terms of Use"
   },
+  "test_and_debug_bots_built_using_the_bot_framework__fa382385": {
+    "message": "Test and debug bots built using the Bot Framework SDK. Available on GitHub."
+  },
   "test_in_emulator_b1b3c278": {
     "message": "Test in Emulator"
   },
@@ -3842,11 +3854,11 @@
   "updating_scripts_e17a5722": {
     "message": "Updating scripts... "
   },
-  "url_8c4ff7d2": {
-    "message": "Url"
+  "url_22a5f3b8": {
+    "message": "URL"
   },
-  "url_should_start_with_http_s_9ca55d94": {
-    "message": "Url should start with http[s]://"
+  "url_should_start_with_http_or_https_c34632bb": {
+    "message": "URL should start with http:// or https://"
   },
   "use_custom_luis_authoring_key_9c71470b": {
     "message": "Use custom LUIS authoring key"
@@ -3908,9 +3920,6 @@
   "video_card_cda18e03": {
     "message": "Video card"
   },
-  "video_tutorials_79eb26ca": {
-    "message": "Video tutorials:"
-  },
   "view_dialog_f5151228": {
     "message": "View dialog"
   },
@@ -3926,9 +3935,6 @@
   "view_project_readme_ff079d2e": {
     "message": "View project readme"
   },
-  "vishwac_sena_45910bf0": {
-    "message": "Vishwac Sena"
-  },
   "visit_a_this_page_a_to_learn_more_about_entity_def_c7c862a9": {
     "message": "Visit <a>this page</a> to learn more about entity definition."
   },
@@ -3950,15 +3956,9 @@
   "we_need_to_define_the_endpoints_for_the_skill_to_a_5dc98d90": {
     "message": "We need to define the endpoints for the skill to allow other bots to interact with it."
   },
-  "weather_bot_c38920cd": {
-    "message": "Weather Bot"
-  },
   "web_chat_c5ca7ab6": {
     "message": "Web Chat"
   },
-  "webchat_inspector_4d0dfeb7": {
-    "message": "Webchat Inspector"
-  },
   "webchat_log_b7213a9e": {
     "message": "Webchat log."
   },
@@ -3995,6 +3995,12 @@
   "what_is_the_type_of_this_trigger_d2701744": {
     "message": "What is the type of this trigger?"
   },
+  "what_s_new_a9752a8e": {
+    "message": "What''s new"
+  },
+  "what_s_new_list_6fe719cb": {
+    "message": "What''s new list"
+  },
   "what_you_need_to_know_to_get_started_e2ab837a": {
     "message": "What you need to know to get started"
   },
@@ -4067,6 +4073,9 @@
   "you_do_not_have_permission_to_save_bots_here_56cc10c7": {
     "message": "You do not have permission to save bots here"
   },
+  "you_don_t_have_any_bot_yet_start_to_link_create_a__ccacc2d6": {
+    "message": "You don’t have any bot yet. Start to <Link>create a new bot</Link>"
+  },
   "you_have_successfully_published_name_to_publishtar_bc81d3c1": {
     "message": "You have successfully published { name } to { publishTarget }"
   },
diff --git a/extensions/azurePublish/src/components/azureProvisionDialog.tsx b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
index d8751a7142..2499f6a6d5 100644
--- a/extensions/azurePublish/src/components/azureProvisionDialog.tsx
+++ b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
@@ -451,10 +451,8 @@ export const AzureProvisionDialog: React.FC = () => {
 
   const getResources = async () => {
     try {
-      if (isMounted.current) {
-        const resources = await getResourceList(currentProjectId(), publishType);
-        setExtensionResourceOptions(resources);
-      }
+      const resources = await getResourceList(currentProjectId(), publishType);
+      setExtensionResourceOptions(resources);
     } catch (err) {
       // todo: how do we handle API errors in this component
       // eslint-disable-next-line no-console
@@ -462,6 +460,10 @@ export const AzureProvisionDialog: React.FC = () => {
     }
   };
 
+  useEffect(() => {
+    getResources();
+  }, [publishType]);
+
   useEffect(() => {
     if (token) {
       setSubscriptionsErrorMessage(undefined);
@@ -483,8 +485,6 @@ export const AzureProvisionDialog: React.FC = () => {
             setSubscriptionsErrorMessage(err.message);
           }
         });
-
-      getResources();
     }
   }, [token]);
 
@@ -683,7 +683,7 @@ export const AzureProvisionDialog: React.FC = () => {
       style={{ height: 'calc(100vh - 64px)' }}
     >
       <ChooseProvisionAction
-        choice="create"
+        choice={formData.creationType}
         onChoiceChanged={(choice) => {
           updateFormData('creationType', choice);
         }}
@@ -882,8 +882,10 @@ export const AzureProvisionDialog: React.FC = () => {
                   case 'import':
                     setPageAndTitle(PageTypes.EditJson);
                     break;
-                  case 'create':
                   case 'generate':
+                    onNext(formData.hostname);
+                    break;
+                  case 'create':
                   default:
                     setPageAndTitle(PageTypes.ConfigProvision);
                     break;
@@ -969,7 +971,11 @@ export const AzureProvisionDialog: React.FC = () => {
               style={{ margin: '0 4px' }}
               text={formatMessage('Back')}
               onClick={() => {
-                setPageAndTitle(PageTypes.ConfigProvision);
+                if (formData.creationType === 'generate') {
+                  setPageAndTitle(PageTypes.ChooseAction);
+                } else {
+                  setPageAndTitle(PageTypes.ConfigProvision);
+                }
               }}
             />
             <PrimaryButton
diff --git a/extensions/azurePublish/src/node/index.ts b/extensions/azurePublish/src/node/index.ts
index feff14f6dc..d67a56e3c6 100644
--- a/extensions/azurePublish/src/node/index.ts
+++ b/extensions/azurePublish/src/node/index.ts
@@ -284,72 +284,73 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
       // perform the provision using azureProvisioner.create.
       // this will start the process, then return.
       // However, the process will continue in the background
-      try {
-        const provisionResults = await azureProvisioner.create(config);
-        // GOT PROVISION RESULTS!
-        // cast this into the right form for a publish profile
+      const provisionResults = await azureProvisioner.create(config);
 
-        let currentProfile = null;
-        if (config.currentProfile) {
-          currentProfile = JSON.parse(config.currentProfile.configuration);
-        }
-        const currentSettings = currentProfile?.settings;
-
-        const publishProfile = {
-          name: currentProfile?.name ?? config.hostname,
-          environment: currentProfile?.environment ?? 'composer',
-          tenantId: provisionResults?.tenantId ?? currentProfile?.tenantId,
-          subscriptionId: provisionResults.subscriptionId ?? currentProfile?.subscriptionId,
-          resourceGroup: currentProfile?.resourceGroup ?? provisionResults.resourceGroup?.name,
-          botName: currentProfile?.botName ?? provisionResults.botName,
-          hostname: config.hostname ?? currentProfile?.hostname,
-          luisResource: provisionResults.luisPrediction ? `${config.hostname}-luis` : currentProfile?.luisResource,
-          runtimeIdentifier: currentProfile?.runtimeIdentifier ?? 'win-x64',
-          region: config.location,
-          settings: {
-            applicationInsights: {
-              InstrumentationKey:
-                provisionResults.appInsights?.instrumentationKey ??
-                currentSettings?.applicationInsights?.InstrumentationKey,
-            },
-            cosmosDb: provisionResults.cosmosDB ?? currentSettings?.cosmosDb,
-            blobStorage: provisionResults.blobStorage ?? currentSettings?.blobStorage,
-            luis: {
-              authoringKey: provisionResults.luisAuthoring?.authoringKey ?? currentSettings?.luis?.authoringKey,
-              authoringEndpoint:
-                provisionResults.luisAuthoring?.authoringEndpoint ?? currentSettings?.luis?.authoringEndpoint,
-              endpointKey: provisionResults.luisPrediction?.endpointKey ?? currentSettings?.luis?.endpointKey,
-              endpoint: provisionResults.luisPrediction?.endpoint ?? currentSettings?.luis?.endpoint,
-              region: provisionResults.luisPrediction?.location ?? currentSettings?.luis?.region,
-            },
-            qna: {
-              subscriptionKey: provisionResults.qna?.subscriptionKey ?? currentSettings?.qna?.subscriptionKey,
-              qnaRegion: provisionResults.qna?.region ?? currentSettings?.qna?.qnaRegion,
-            },
-            MicrosoftAppId: provisionResults.appId ?? currentSettings?.MicrosoftAppId,
-            MicrosoftAppPassword: provisionResults.appPassword ?? currentSettings?.MicrosoftAppPassword,
+      // cast this into the right form for a publish profile
+      let currentProfile = null;
+      if (config.currentProfile) {
+        currentProfile = JSON.parse(config.currentProfile.configuration);
+      }
+      const currentSettings = currentProfile?.settings;
+
+      const publishProfile = {
+        name: currentProfile?.name ?? config.hostname,
+        environment: currentProfile?.environment ?? 'composer',
+        tenantId: provisionResults?.tenantId ?? currentProfile?.tenantId,
+        subscriptionId: provisionResults.subscriptionId ?? currentProfile?.subscriptionId,
+        resourceGroup: currentProfile?.resourceGroup ?? provisionResults.resourceGroup?.name,
+        botName: currentProfile?.botName ?? provisionResults.botName,
+        hostname: config.hostname ?? currentProfile?.hostname,
+        luisResource: provisionResults.luisPrediction ? `${config.hostname}-luis` : currentProfile?.luisResource,
+        runtimeIdentifier: currentProfile?.runtimeIdentifier ?? 'win-x64',
+        region: config.location,
+        settings: {
+          applicationInsights: {
+            InstrumentationKey:
+              provisionResults.appInsights?.instrumentationKey ??
+              currentSettings?.applicationInsights?.InstrumentationKey,
           },
-        };
-        for (const configUnit in currentProfile) {
-          if (!(configUnit in publishProfile)) {
-            publishProfile[configUnit] = currentProfile[configUnit];
-          }
+          cosmosDb: provisionResults.cosmosDB ?? currentSettings?.cosmosDb,
+          blobStorage: provisionResults.blobStorage ?? currentSettings?.blobStorage,
+          luis: {
+            authoringKey: provisionResults.luisAuthoring?.authoringKey ?? currentSettings?.luis?.authoringKey,
+            authoringEndpoint:
+              provisionResults.luisAuthoring?.authoringEndpoint ?? currentSettings?.luis?.authoringEndpoint,
+            endpointKey: provisionResults.luisPrediction?.endpointKey ?? currentSettings?.luis?.endpointKey,
+            endpoint: provisionResults.luisPrediction?.endpoint ?? currentSettings?.luis?.endpoint,
+            region: provisionResults.luisPrediction?.location ?? currentSettings?.luis?.region,
+          },
+          qna: {
+            subscriptionKey: provisionResults.qna?.subscriptionKey ?? currentSettings?.qna?.subscriptionKey,
+            qnaRegion: provisionResults.qna?.region ?? currentSettings?.qna?.qnaRegion,
+          },
+          MicrosoftAppId: provisionResults.appId ?? currentSettings?.MicrosoftAppId,
+          MicrosoftAppPassword: provisionResults.appPassword ?? currentSettings?.MicrosoftAppPassword,
+        },
+      };
+      for (const configUnit in currentProfile) {
+        if (!(configUnit in publishProfile)) {
+          publishProfile[configUnit] = currentProfile[configUnit];
         }
+      }
 
-        this.logger(publishProfile);
+      this.logger(publishProfile);
 
-        BackgroundProcessManager.updateProcess(jobId, 200, 'Provision completed successfully!', publishProfile);
-      } catch (error) {
-        BackgroundProcessManager.updateProcess(
-          jobId,
-          500,
-          `${stringifyError(error)}
-        detail message can see ${getProvisionLogName(name)} in your bot folder`
-        );
-        // save provision history to log file.
-        const provisionHistoryPath = path.resolve(project.dataDir, getProvisionLogName(name));
-        await this.persistProvisionHistory(jobId, name, provisionHistoryPath);
+      if (provisionResults.success) {
+        BackgroundProcessManager.updateProcess(jobId, 200, 'Provisioning completed successfully!', publishProfile);
+      } else {
+        const partialSuccess = provisionResults.provisionedCount > 0;
+        const errorCode = partialSuccess ? 206 : 500;
+        let message = `${provisionResults.errorMessage}. See ${getProvisionLogName(name)} in your bot folder`;
+        if (partialSuccess) {
+          message = `Provisioning completed ${provisionResults.provisionedCount} items before encountering a problem. ${message}`;
+        }
+        BackgroundProcessManager.updateProcess(jobId, errorCode, message, partialSuccess ? publishProfile : undefined);
       }
+      // save provision history to log file.
+      const provisionHistoryPath = path.resolve(project.dataDir, getProvisionLogName(name));
+      await this.persistProvisionHistory(jobId, name, provisionHistoryPath);
+
       // add in history
       this.addProvisionHistory(project.id, config.name, BackgroundProcessManager.getStatus(jobId));
       BackgroundProcessManager.removeProcess(jobId);
diff --git a/extensions/azurePublish/src/node/provision.ts b/extensions/azurePublish/src/node/provision.ts
index 8825b09baa..fb46fddfb8 100644
--- a/extensions/azurePublish/src/node/provision.ts
+++ b/extensions/azurePublish/src/node/provision.ts
@@ -219,6 +219,26 @@ export class BotProjectProvision {
    * Provision a set of Azure resources for use with a bot
    */
   public async create(config: ProvisionConfig) {
+    // this object collects all of the various configuration output
+    const provisionResults = {
+      success: false,
+      provisionedCount: 0,
+      errorMessage: null,
+      subscriptionId: null,
+      appId: null,
+      appPassword: null,
+      resourceGroup: null,
+      webApp: null,
+      luisPrediction: null,
+      luisAuthoring: null,
+      blobStorage: null,
+      cosmosDB: null,
+      appInsights: null,
+      qna: null,
+      botName: null,
+      tenantId: this.tenantId,
+    };
+
     try {
       // ensure a tenantId is available.
       if (!this.tenantId) {
@@ -228,23 +248,6 @@ export class BotProjectProvision {
       // tokenCredentials is used for authentication across the API calls
       const tokenCredentials = new TokenCredentials(this.accessToken);
 
-      // this object collects all of the various configuration output
-      const provisionResults = {
-        subscriptionId: null,
-        appId: null,
-        appPassword: null,
-        resourceGroup: null,
-        webApp: null,
-        luisPrediction: null,
-        luisAuthoring: null,
-        blobStorage: null,
-        cosmosDB: null,
-        appInsights: null,
-        qna: null,
-        botName: null,
-        tenantId: this.tenantId,
-      };
-
       const resourceGroupName = config.resourceGroup ?? config.hostname;
 
       // azure resource manager class config
@@ -404,22 +407,30 @@ export class BotProjectProvision {
               name: `${config.hostname}-qna`,
             });
             break;
+
+          default:
+            continue;
         }
+
+        provisionResults.provisionedCount += 1;
       }
 
+      provisionResults.success = true;
+
       // TODO: NOT SURE WHAT THIS DOES! Something about tracking what deployments happen because of composer?
       // await this.azureResourceManagementClient.deployDeploymentCounter({
       //   resourceGroupName: resourceGroupName,
       //   name: '1d41002f-62a1-49f3-bd43-2f3f32a19cbb', // WHAT IS THIS CONSTANT???
       // });
-
-      return provisionResults;
     } catch (err) {
+      const errorMessage = JSON.stringify(err, Object.getOwnPropertyNames(err));
       this.logger({
         status: BotProjectDeployLoggerType.PROVISION_ERROR,
-        message: JSON.stringify(err, Object.getOwnPropertyNames(err)),
+        message: errorMessage,
       });
-      throw stringifyError(err);
+      provisionResults.errorMessage = errorMessage;
     }
+
+    return provisionResults;
   }
 }