diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
new file mode 100644
index 0000000000..ab65e6faa4
--- /dev/null
+++ b/.github/workflows/config.yml
@@ -0,0 +1,131 @@
+# name: Build & Test
+
+# on: push
+
+# env:
+#   NODE_VERSION: 18.x
+
+# jobs:
+#   test:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - run: echo "Triggered by ${{ github.event_name }} event."
+
+#       - name: Check out repository code ${{ github.repository }} on ${{ github.ref }}
+#         uses: actions/checkout@v3
+
+#       - name: Set up Node.js ${{ env.NODE_VERSION }}
+#         uses: actions/setup-node@v3
+#         with:
+#           node-version: ${{ env.NODE_VERSION }}
+#           cache: 'npm'
+      
+#       - name: Cache node modules
+#         uses: actions/cache@v3
+#         with:
+#           path: node_modules
+#           key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+#           restore-keys: |
+#             ${{ runner.os }}-node-
+            
+#       - name: Installing dependencies
+#         if: steps.cache.outputs.cache-hit != 'true'
+#         uses: borales/actions-yarn@v4
+#         with:
+#           cmd: install --frozen-lockfile
+
+#       - name: Lint
+#         uses: borales/actions-yarn@v4
+#         with:
+#           cmd: lint
+
+#       - name: Build
+#         uses: borales/actions-yarn@v4
+#         with:
+#           cmd: build
+
+#       - name: Test
+#         uses: borales/actions-yarn@v4
+#         with:
+#           cmd: test
+
+name: Build & Test
+
+on: push
+
+env:
+  NODE_VERSION: 18.x
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "Triggered by ${{ github.event_name }} event."
+
+      - name: Check out repository code ${{ github.repository }} on ${{ github.ref }}
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Installing dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: install --frozen-lockfile
+
+      - name: Lint
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: lint
+
+  build:
+    needs: setup
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code ${{ github.repository }} on ${{ github.ref }}
+        uses: actions/checkout@v3
+
+      - name: Restore node modules from cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Build
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: build
+
+  test:
+    needs: setup
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code ${{ github.repository }} on ${{ github.ref }}
+        uses: actions/checkout@v3
+
+      - name: Restore node modules from cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Test
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: test
\ No newline at end of file
diff --git a/Changelog.md b/Changelog.md
index 243974918f..eea6cb5340 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - FIO-4816: fixed email submission: data display issues
  - [Snyk] Upgrade core-js from 3.32.0 to 3.32.1
  - [Snyk] Upgrade vanilla-picker from 2.12.1 to 2.12.2
+ - Fixed issue where content component would not save in the form.
+ - FIO-7206: fixed an issue where removed components keys stay in the DataGrid defaultValue property
+ - FIO-7309: fixed an issue where min/maxDate settings for Day component are getting evaluated in Form Builder
+ - FIO-7207: changed tooltip and removed 'Hide label' option from the list of layout components
+ - FIO-7074: fixed an issue where setting submission on wizard does not update data
+ - FIO-7082: Moved Wizard Breadcrumbs Type to form settings
+ - FIO-7224: Fixed issues with layout components when Condensed mode is enabled
+ - FIO-4833: Removes Hide Label setting from Well, Columns, Tabs and Table components since they do not render a label
+ - FIO-5910: allow manual input for w and W date formats
+ - FIO-6370: Fixes issues with PasswordStrength Addon settings
+ - FIO-7146: formiojs-circleci-to-ghactions
+ - FIO-6859: update-s3-to-accept-headers-from-signer-presign
    
 ## 5.0.0-rc.26
 ### Changed
diff --git a/src/Embed.js b/src/Embed.js
index ad25434a47..97908a1f34 100644
--- a/src/Embed.js
+++ b/src/Embed.js
@@ -142,7 +142,7 @@ export class Formio {
     }
 
     // eslint-disable-next-line max-statements
-    static async init(element, builder = false) {
+    static async init(element, options = {}, builder = false) {
         Formio.cdn = new CDN(Formio.config.cdn);
         Formio.config.libs = Formio.config.libs || {
             uswds: {
@@ -160,10 +160,19 @@ export class Formio {
         const id = Formio.config.id || `formio-${Math.random().toString(36).substring(7)}`;
 
         // Create a new wrapper and add the element inside of a new wrapper.
-        const wrapper = Formio.createElement('div', {
+        let wrapper = Formio.createElement('div', {
             'id': `"${id}-wrapper"`
         });
         element.parentNode.insertBefore(wrapper, element);
+
+        // If we include the libraries, then we will attempt to run this in shadow dom.
+        if (Formio.config.includeLibs && (typeof wrapper.attachShadow === 'function') && !Formio.config.premium) {
+            wrapper = wrapper.attachShadow({
+                mode: 'open'
+            });
+            options.shadowRoot = wrapper;
+        }
+
         element.parentNode.removeChild(element);
         wrapper.appendChild(element);
 
@@ -246,7 +255,7 @@ export class Formio {
     }
 
     static async createForm(element, form, options) {
-        const wrapper = await Formio.init(element);
+        const wrapper = await Formio.init(element, options);
         return Formio.FormioClass.createForm(element, form, {
             ...options,
             ...{ noLoader: true }
@@ -278,7 +287,7 @@ export class Formio {
     }
 
     static async builder(element, form, options) {
-        const wrapper = await Formio.init(element, true);
+        const wrapper = await Formio.init(element, options, true);
         return Formio.FormioClass.builder(element, form, options).then((instance) => {
             Formio.debug('Builder created', instance);
             Formio.debug('Removing loader');
diff --git a/src/WebformBuilder.js b/src/WebformBuilder.js
index 6975e500b2..461e4559bd 100644
--- a/src/WebformBuilder.js
+++ b/src/WebformBuilder.js
@@ -417,7 +417,7 @@ export default class WebformBuilder extends Component {
       this.attachTooltip(component.refs.removeComponent, this.t('Remove'));
 
       component.addEventListener(component.refs.removeComponent, 'click', () =>
-        this.removeComponent(component.schema, parent, component.component));
+        this.removeComponent(component.schema, parent, component.component, component));
     }
 
     return element;
@@ -849,6 +849,10 @@ export default class WebformBuilder extends Component {
     }
 
     if (info) {
+      //if this is a custom component that was already assigned a key, don't stomp on it
+      if (!Components.components.hasOwnProperty(info.type) && info.key) {
+        return info;
+      }
       info.key = this.generateKey(info);
     }
 
@@ -1081,7 +1085,7 @@ export default class WebformBuilder extends Component {
     }
   }
 
-  removeComponent(component, parent, original) {
+  removeComponent(component, parent, original, componentInstance) {
     if (!parent) {
       return;
     }
@@ -1110,6 +1114,9 @@ export default class WebformBuilder extends Component {
       else if (parent.formioComponent && parent.formioComponent.removeChildComponent) {
         parent.formioComponent.removeChildComponent(component);
       }
+      if (component.input && componentInstance && componentInstance.parent) {
+        _.unset(componentInstance._data, componentInstance.key);
+      }
       const rebuild = parent.formioComponent.rebuild() || Promise.resolve();
       rebuild.then(() => {
         this.emit('removeComponent', component, parent.formioComponent.schema, path, index);
@@ -1451,7 +1458,11 @@ export default class WebformBuilder extends Component {
       {
         ..._.omit(this.options, ['hooks', 'builder', 'events', 'attachMode', 'skipInit']),
         language: this.options.language,
-        ...editFormOptions
+        ...editFormOptions,
+        evalContext: {
+          ...(editFormOptions?.evalContext || this.options?.evalContext || {}),
+          buildingForm: this.form,
+        },
       }
     );
 
@@ -1577,8 +1588,15 @@ export default class WebformBuilder extends Component {
           }
         }
 
+        // If the edit form has any nested form inside, we get a partial data (nested form's data) in the
+        // event.data property
+        let editFormData;
+        if (event.changed.instance && event.changed.instance.root && event.changed.instance.root.id !== this.editForm.id) {
+          editFormData = this.editForm.data;
+        }
+
         // Update the component.
-        this.updateComponent(event.data.componentJson || event.data, event.changed);
+        this.updateComponent(event.data.componentJson || editFormData || event.data, event.changed);
       }
     });
 
diff --git a/src/WebformBuilder.unit.js b/src/WebformBuilder.unit.js
index 9311556ee4..5b3979ac16 100644
--- a/src/WebformBuilder.unit.js
+++ b/src/WebformBuilder.unit.js
@@ -206,4 +206,66 @@ describe('WebformBuilder tests', function() {
       done();
     }).catch(done);
   });
+
+  it('Should keep min/max date validation settings with moment.js function', (done) => {
+    const builder = Harness.getBuilder();
+    builder.setForm(columnsForm).then(() => {
+      const column1 = builder.webform.element.querySelector('[ref="columns-container"]');
+      Harness.buildComponent('day', column1);
+
+      setTimeout(() => {
+        const maxDateComp = builder.editForm.getComponent('maxDate');
+        maxDateComp.setValue('moment().add(10, \'days\')');
+
+        setTimeout(() => {
+          Harness.saveComponent();
+
+          setTimeout(() => {
+            const dayComp = builder.webform.getComponent(['day']);
+            assert.equal(dayComp.component.maxDate, 'moment().add(10, \'days\')');
+            done();
+          }, 200);
+        }, 200);
+      }, 150);
+    }).catch(done);
+  });
+
+  it('Should remove deleted components keys from default value', (done) => {
+    const builder = Harness.getBuilder();
+    builder.setForm({}).then(() => {
+      Harness.buildComponent('datagrid');
+
+      setTimeout(() => {
+        const dataGridDefaultValue = builder.editForm.getComponent('defaultValue');
+        dataGridDefaultValue.removeRow(0);
+
+        setTimeout(() => {
+          Harness.saveComponent();
+          setTimeout(() => {
+            const dataGridContainer = builder.webform.element.querySelector('[ref="dataGrid-container"]');
+            Harness.buildComponent('textfield', dataGridContainer);
+
+            setTimeout(() => {
+              Harness.saveComponent();
+
+              setTimeout(() => {
+                const textField = builder.webform.getComponent(['dataGrid', 'textField'])[0];
+                textField.refs.removeComponent.dispatchEvent( new MouseEvent('click', {
+                  view: window,
+                  bubbles: true,
+                  cancelable: true
+                }));
+
+                setTimeout(() => {
+                  const dataGrid = builder.webform.getComponent(['dataGrid']);
+                  assert.deepEqual(dataGrid.schema.defaultValue, [{}], 'Should remove TextField key');
+                  done();
+                }, 300);
+              });
+            }, 300);
+          }, 300);
+        }, 350);
+      }, 350);
+    }).catch(done);
+  });
 });
diff --git a/src/Wizard.js b/src/Wizard.js
index 7e258dd26a..da8bd99609 100644
--- a/src/Wizard.js
+++ b/src/Wizard.js
@@ -211,7 +211,9 @@ export default class Wizard extends Webform {
   }
 
   prepareHeaderSettings(ctx, headerType) {
-    if (this.currentPanel && this.currentPanel.breadcrumb === 'none' || ctx.isSubForm) {
+    const shouldHideBreadcrumbs = this.currentPanel?.breadcrumb === 'none' ||
+      _.get(this.form, 'settings.wizardBreadcrumbsType', '') === 'none';
+    if (shouldHideBreadcrumbs || ctx.isSubForm) {
       return null;
     }
     return this.renderTemplate(headerType, ctx);
@@ -895,27 +897,30 @@ export default class Wizard extends Webform {
   }
 
   setValue(submission, flags = {}, ignoreEstablishment) {
-    this._submission = submission;
-    if (
-      (flags && flags.fromSubmission && (this.options.readOnly || this.editMode) && !this.isHtmlRenderMode()) ||
+    const changed = this.getPages({ all: true }).reduce((changed, page) => {
+      return this.setNestedValue(page, submission.data, flags, changed) || changed;
+    }, false);
+
+    if (!flags.sanitize ||
       (flags && flags.fromSubmission && (this.prefixComps.length || this.suffixComps.length) && submission._id) ||
       (this.options.server && (this.prefixComps.length || this.suffixComps.length))
     ) {
-      this._data = submission.data;
+      this.mergeData(this.data, submission.data);
     }
 
-    if (!ignoreEstablishment) {
-      this.establishPages(submission.data);
-    }
-    const changed = this.getPages({ all: true }).reduce((changed, page) => {
-      return this.setNestedValue(page, submission.data, flags, changed) || changed;
-    }, false);
-
     if (changed) {
       this.pageFieldLogic(this.page);
     }
+
     this.setEditMode(submission);
 
+    submission.data = this.data;
+    this._submission = submission;
+
+    if (!ignoreEstablishment) {
+      this.establishPages(submission.data);
+    }
+
     return changed;
   }
 
diff --git a/src/Wizard.unit.js b/src/Wizard.unit.js
index 549dfcaf10..1956a789d1 100644
--- a/src/Wizard.unit.js
+++ b/src/Wizard.unit.js
@@ -161,7 +161,7 @@ describe('Wizard tests', () => {
                   }, 'Should contain correct submission data');
 
                   done();
-                }, 200);
+                }, 500);
               }, 200);
             }, 200);
           }, 200);
diff --git a/src/addons/index.js b/src/addons/index.js
index 1555897676..fb579eb0c7 100644
--- a/src/addons/index.js
+++ b/src/addons/index.js
@@ -7,7 +7,11 @@ export const editForms = [
   key: 'settings',
   display: 'form',
   input: true,
-  components,
+  components: components.map((comp) => {
+    comp.tableView = false;
+    return comp;
+  }),
+  tableView: false,
   defaultValue: {
     data: defaultSettings
   },
diff --git a/src/components/_classes/component/Component.js b/src/components/_classes/component/Component.js
index 3fa7232550..c64abaa4eb 100644
--- a/src/components/_classes/component/Component.js
+++ b/src/components/_classes/component/Component.js
@@ -768,7 +768,7 @@ export default class Component extends Element {
 
     let contentMargin = '';
     if (this.component.hideLabel) {
-      const margin = this.labelWidth + this.labelMargin;
+      const margin = isCondensed ? 0 : this.labelWidth + this.labelMargin;
       contentMargin = isRightPosition ? `margin-right: ${margin}%` : '';
       contentMargin = isLeftPosition ? `margin-left: ${margin}%` : '';
     }
diff --git a/src/components/_classes/component/editForm/Component.edit.addons.js b/src/components/_classes/component/editForm/Component.edit.addons.js
index b3ac3f7da1..7d63552572 100644
--- a/src/components/_classes/component/editForm/Component.edit.addons.js
+++ b/src/components/_classes/component/editForm/Component.edit.addons.js
@@ -10,6 +10,33 @@ export default [
     input: true,
     key: 'addons',
     label: 'Addons',
+    templates: {
+      // eslint-disable-next-line quotes
+      header: `<div class="row">
+                <div class="col-6">{{ t(components[0].label) }}</div>
+                <div class="col-4">Settings</div>
+              </div>`,
+      // eslint-disable-next-line quotes
+      row: `<div class="row">
+              <div class="col-6">
+                {{ row.name.label }}
+              </div>
+              <div class="col-4 text-muted">
+                Click Edit to see addon's settings
+              </div>
+
+              {% if (!instance.options.readOnly && !instance.disabled) { %}
+                <div class="col-2">
+                  <div class="btn-group pull-right">
+                    <button class="btn btn-default btn-light btn-sm editRow"><i class="{{ iconClass('edit') }}"></i></button>
+                    {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}
+                      <button class="btn btn-danger btn-sm removeRow"><i class="{{ iconClass('trash') }}"></i></button>
+                    {% } %}
+                  </div>
+                </div>
+              {% } %}
+            </div>`,
+    },
     components: [
       {
         label: 'Name',
@@ -32,7 +59,10 @@ export default [
             }));
           },
         },
-        input: true
+        input: true,
+        validate: {
+          required: true,
+        },
       },
       ...editForms,
     ]
diff --git a/src/components/columns/Columns.js b/src/components/columns/Columns.js
index cb21879754..c18ab5da6b 100644
--- a/src/components/columns/Columns.js
+++ b/src/components/columns/Columns.js
@@ -74,7 +74,7 @@ export default class ColumnsComponent extends NestedComponent {
       if (!column.size) {
         column.size = 'md';
       }
-      column.currentWidth = column.width || 0;
+      column.currentWidth = this.options.condensedMode ? this.gridSize : column.width || 0;
       // Ensure there is a components array.
       if (!Array.isArray(column.components)) {
         column.components = [];
diff --git a/src/components/columns/editForm/Columns.edit.display.js b/src/components/columns/editForm/Columns.edit.display.js
index edc92838e1..a19b1151c1 100644
--- a/src/components/columns/editForm/Columns.edit.display.js
+++ b/src/components/columns/editForm/Columns.edit.display.js
@@ -31,6 +31,24 @@ export default [
     key: 'tableView',
     ignore: true
   },
+  {
+    key: 'hideLabel',
+    ignore: true
+  },
+  {
+    weight: 0,
+    type: 'textfield',
+    input: true,
+    key: 'label',
+    label: 'Label',
+    placeholder: 'Field Label',
+    tooltip: 'The label for this field.',
+    validate: {
+      required: true
+    },
+    autofocus: true,
+    overrideEditForm: true
+  },
   {
     weight: 150,
     type: 'datagrid',
@@ -94,5 +112,9 @@ export default [
     tooltip: 'Will automatically adjust columns based on if nested components are hidden.',
     key: 'autoAdjust',
     input: true
-  }
+  },
+  {
+    key: 'hideLabel',
+    ignore: true
+  },
 ];
diff --git a/src/components/content/Content.js b/src/components/content/Content.js
index 37e8dbb6c9..8ca7273481 100644
--- a/src/components/content/Content.js
+++ b/src/components/content/Content.js
@@ -18,6 +18,7 @@ export default class ContentComponent extends Component {
       group: 'layout',
       icon: 'html5',
       preview: false,
+      showPreview: false,
       documentation: '/userguide/form-building/layout-components#content',
       weight: 5,
       schema: ContentComponent.schema()
diff --git a/src/components/day/Day.js b/src/components/day/Day.js
index 26f133c4d3..add4bb960d 100644
--- a/src/components/day/Day.js
+++ b/src/components/day/Day.js
@@ -54,10 +54,10 @@ export default class DayComponent extends Field {
   }
 
   constructor(component, options, data) {
-    if (component.maxDate) {
+    if (component.maxDate && component.maxDate.indexOf('moment(') === -1) {
       component.maxDate = moment(component.maxDate, 'YYYY-MM-DD').toISOString();
     }
-    if (component.minDate) {
+    if (component.minDate && component.minDate.indexOf('moment(') === -1) {
       component.minDate = moment(component.minDate, 'YYYY-MM-DD').toISOString();
     }
     super(component, options, data);
diff --git a/src/components/file/fixtures/comp3.js b/src/components/file/fixtures/comp3.js
new file mode 100644
index 0000000000..3e6cf953c1
--- /dev/null
+++ b/src/components/file/fixtures/comp3.js
@@ -0,0 +1,29 @@
+export default {
+  type: 'form',
+  display: 'form',
+  components: [
+    {
+      label: 'Upload',
+      tableView: false,
+      storage: 'base64',
+      webcam: false,
+      fileTypes: [
+        {
+          label: '',
+          value: ''
+        }
+      ],
+      key: 'file',
+      type: 'file',
+      input: true
+    },
+    {
+      type: 'button',
+      label: 'Submit',
+      key: 'submit',
+      disableOnInvalid: true,
+      input: true,
+      tableView: false
+    }
+  ],
+};
diff --git a/src/components/panel/Panel.unit.js b/src/components/panel/Panel.unit.js
index 8a09760151..ba416b8115 100644
--- a/src/components/panel/Panel.unit.js
+++ b/src/components/panel/Panel.unit.js
@@ -64,7 +64,6 @@ describe('Panel Component', () => {
       const components = flattenComponents(panelEditForm().components);
       const keys = Object.keys(components).map(path => components[path].key);
       const settings = [
-        'breadcrumb',
         'breadcrumbClickable'
       ];
 
diff --git a/src/components/panel/editForm/Panel.edit.display.js b/src/components/panel/editForm/Panel.edit.display.js
index ce97999c7c..72076c705d 100644
--- a/src/components/panel/editForm/Panel.edit.display.js
+++ b/src/components/panel/editForm/Panel.edit.display.js
@@ -75,28 +75,15 @@ export default [
     type: 'fieldset',
     input: false,
     components: [
-      {
-        type: 'select',
-        input: true,
-        label: 'Breadcrumb Type',
-        key: 'breadcrumb',
-        dataSrc: 'values',
-        data: {
-          values: [
-            { label: 'Default', value: 'default' },
-            { label: 'Condensed', value: 'condensed' },
-            { label: 'Hidden', value: 'none' },
-          ]
-        }
-      },
       {
         input: true,
         type: 'checkbox',
         label: 'Allow click on Breadcrumb',
         key: 'breadcrumbClickable',
         defaultValue: true,
-        conditional: {
-          json: { '!==': [{ var: 'data.breadcrumb' }, 'none'] }
+        customConditional({ data = {}, buildingForm = {} }) {
+          const formSettings = buildingForm.settings || {};
+          return ![data.breadcrumb, formSettings.wizardBreadcrumbsType].includes('none');
         }
       },
       {
diff --git a/src/components/table/editForm/Table.edit.display.js b/src/components/table/editForm/Table.edit.display.js
index b1e2b18a6a..634e000e4b 100644
--- a/src/components/table/editForm/Table.edit.display.js
+++ b/src/components/table/editForm/Table.edit.display.js
@@ -31,6 +31,24 @@ export default [
     key: 'tableView',
     ignore: true
   },
+  {
+    key: 'hideLabel',
+    ignore: true
+  },
+  {
+    weight: 0,
+    type: 'textfield',
+    input: true,
+    key: 'label',
+    label: 'Label',
+    placeholder: 'Field Label',
+    tooltip: 'The label for this field.',
+    validate: {
+      required: true
+    },
+    autofocus: true,
+    overrideEditForm: true
+  },
   {
     type: 'number',
     label: 'Number of Rows',
@@ -106,4 +124,8 @@ export default [
     tooltip: 'Condense the size of the table.',
     weight: 704
   },
+  {
+    key: 'hideLabel',
+    ignore: true
+  },
 ];
diff --git a/src/components/tabs/editForm/Tabs.edit.display.js b/src/components/tabs/editForm/Tabs.edit.display.js
index 5328daf944..1f1fb19b0d 100644
--- a/src/components/tabs/editForm/Tabs.edit.display.js
+++ b/src/components/tabs/editForm/Tabs.edit.display.js
@@ -31,6 +31,24 @@ export default [
     key: 'tableView',
     ignore: true
   },
+  {
+    key: 'hideLabel',
+    ignore: true
+  },
+  {
+    weight: 0,
+    type: 'textfield',
+    input: true,
+    key: 'label',
+    label: 'Label',
+    placeholder: 'Field Label',
+    tooltip: 'The label for this field.',
+    validate: {
+      required: true
+    },
+    autofocus: true,
+    overrideEditForm: true
+  },
   {
     key: 'components',
     type: 'datagrid',
@@ -63,4 +81,8 @@ export default [
     key: 'verticalLayout',
     input: true
   },
+  {
+    key: 'hideLabel',
+    ignore: true
+  },
 ];
diff --git a/src/components/well/editForm/Well.edit.display.js b/src/components/well/editForm/Well.edit.display.js
index 61d3e0aa9c..ec0e46dba3 100644
--- a/src/components/well/editForm/Well.edit.display.js
+++ b/src/components/well/editForm/Well.edit.display.js
@@ -27,4 +27,22 @@ export default [
     key: 'tableView',
     ignore: true
   },
+  {
+    key: 'hideLabel',
+    ignore: true
+  },
+  {
+    weight: 0,
+    type: 'textfield',
+    input: true,
+    key: 'label',
+    label: 'Label',
+    placeholder: 'Field Label',
+    tooltip: 'The label for this field.',
+    validate: {
+      required: true
+    },
+    autofocus: true,
+    overrideEditForm: true
+  },
 ];
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1359933ef0..473ba571b3 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -803,8 +803,10 @@ export function convertFormatToMask(format) {
     .replace(/M{3}/g, '***')
     // Short month conversion if input as text.
     .replace(/e/g, 'Q')
+    // Month number conversion.
+    .replace(/W/g, '99')
     // Year conversion.
-    .replace(/[ydhmsHMG]/g, '9')
+    .replace(/[ydhmswHMG]/g, '9')
     // AM/PM conversion.
     .replace(/a/g, 'AA');
 }
diff --git a/yarn.lock b/yarn.lock
index 8229110dac..d3822a5834 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2033,11 +2033,16 @@ core-js@^2.0.0, core-js@^2.4.0:
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-core-js@^3.0.0, core-js@^3.21.1, core-js@^3.30.2, core-js@^3.31.0:
+core-js@^3.0.0, core-js@^3.21.1, core-js@^3.30.2:
   version "3.32.0"
   resolved "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz#7643d353d899747ab1f8b03d2803b0312a0fb3b6"
   integrity sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww==
 
+core-js@^3.32.1:
+  version "3.32.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7"
+  integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==
+
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -3687,9 +3692,9 @@ get-caller-file@^2.0.5:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
@@ -8148,10 +8153,10 @@ value-or-function@^3.0.0:
   resolved "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
   integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==
 
-vanilla-picker@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.12.1.tgz#6e619eecf553891b8d2d042b745a23c91f19f34c"
-  integrity sha512-2qrEP9VYylKXbyzXKsbu2dferBTvqnlsr29XjHwFE+/MEp0VNj6oEUESLDtKZ7DWzGdSv1x/+ujqFZF+KsO3cg==
+vanilla-picker@^2.12.2:
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/vanilla-picker/-/vanilla-picker-2.12.2.tgz#b4c6a3f4015dbd208080265fe7edd311709aa251"
+  integrity sha512-dk0gNeNL9fQFGd1VEhNDQfFlbCqAiksRh1H2tVPlavkH88n/a/y30rXi9PPKrYPTK5kEfPO4xcldt4ts/1wIAg==
   dependencies:
     "@sphinxxxx/color-conversion" "^2.2.2"