diff --git a/README.md b/README.md
index 7748387290..4d0504479d 100644
--- a/README.md
+++ b/README.md
@@ -216,6 +216,7 @@ This section provides a comprehensive reference for all Parse Dashboard configur
 | `supportedPushLocales`     | Array<String> | yes      | -         | -                    | -                                    | `["en","fr"]`                     | Supported locales for push notifications.                                                                    |
 | `preventSchemaEdits`       | Boolean             | yes      | `false`   | -                    | -                                    | `true`                            | Prevent schema modifications through the dashboard.                                                          |
 | `preventDataExport`        | Boolean             | yes      | `false`   | -                    | -                                    | `true`                            | Hide all data browser export options (export data, export selected/all rows, export schema).                 |
+| `useLocalTime`             | Boolean             | yes      | `false`   | -                    | -                                    | `true`                            | Display and edit dates in the viewer's local time zone instead of UTC. Dates are always stored in UTC.       |
 | `columnPreference`         | Object              | yes      | -         | -                    | -                                    | `{"_User":[...]}`                 | Column visibility/sorting/filtering preferences. See [column preferences details](#prevent-columns-sorting). |
 | `classPreference`          | Object              | yes      | -         | -                    | -                                    | `{"_Role":{...}}`                 | Persistent filters for all users. See [persistent filters details](#persistent-filters).                     |
 | `enableSecurityChecks`     | Boolean             | yes      | `false`   | -                    | -                                    | `true`                            | Enable security checks under App Settings > Security.                                                        |
diff --git a/src/components/BrowserCell/BrowserCell.react.js b/src/components/BrowserCell/BrowserCell.react.js
index 74cbe7ca04..d213ff9f22 100644
--- a/src/components/BrowserCell/BrowserCell.react.js
+++ b/src/components/BrowserCell/BrowserCell.react.js
@@ -18,8 +18,11 @@ import ScriptConfirmationModal from 'components/ScriptConfirmationModal/ScriptCo
 import styles from 'components/BrowserCell/BrowserCell.scss';
 import baseStyles from 'stylesheets/base.scss';
 import * as ColumnPreferences from 'lib/ColumnPreferences';
+import { CurrentApp } from 'context/currentApp';
 
 export default class BrowserCell extends Component {
+  static contextType = CurrentApp;
+
   constructor() {
     super();
 
@@ -153,7 +156,7 @@ export default class BrowserCell extends Component {
       } else if (typeof value === 'string') {
         this.props.value = new Date(this.props.value);
       }
-      this.copyableValue = content = dateStringUTC(this.props.value);
+      this.copyableValue = content = dateStringUTC(this.props.value, this.context?.useLocalTime);
     } else if (this.props.type === 'Boolean') {
       this.copyableValue = content = this.props.value ? 'True' : 'False';
     } else if (this.props.type === 'Object' || this.props.type === 'Bytes') {
diff --git a/src/components/BrowserFilter/BrowserFilter.react.js b/src/components/BrowserFilter/BrowserFilter.react.js
index 3e33b7d21c..f152f63652 100644
--- a/src/components/BrowserFilter/BrowserFilter.react.js
+++ b/src/components/BrowserFilter/BrowserFilter.react.js
@@ -824,6 +824,7 @@ export default class BrowserFilter extends React.Component {
                     active={this.props.filters.size > 0}
                     editMode={this.state.editMode}
                     parentContentId={POPOVER_CONTENT_ID}
+                    useLocalTime={this.context.useLocalTime}
                   />
                 )}
               />
diff --git a/src/components/BrowserFilter/FilterRow.react.js b/src/components/BrowserFilter/FilterRow.react.js
index 787cfd7f09..647634e748 100644
--- a/src/components/BrowserFilter/FilterRow.react.js
+++ b/src/components/BrowserFilter/FilterRow.react.js
@@ -180,7 +180,8 @@ function compareValue(
   setFocus,
   currentConstraint,
   modifiers,
-  onChangeModifiers
+  onChangeModifiers,
+  useLocalTime
 ) {
   if (currentConstraint === 'containedIn') {
     return (
@@ -279,6 +280,7 @@ function compareValue(
       return (
         <DateTimeEntry
           fixed={true}
+          local={useLocalTime}
           className={styles.date}
           value={Parse._decode('date', value)}
           onChange={value => onChangeCompareTo(Parse._encode(value))}
@@ -309,6 +311,7 @@ const FilterRow = ({
   active,
   parentContentId,
   editMode,
+  useLocalTime,
 }) => {
   const setFocus = useCallback(input => {
     if (input !== null && editMode) {
@@ -421,7 +424,8 @@ const FilterRow = ({
         setFocus,
         currentConstraint,
         modifiers,
-        onChangeModifiers
+        onChangeModifiers,
+        useLocalTime
       )}
       <button type="button" className={styles.remove} onClick={onDeleteRow}>
         <Icon name="minus-solid" width={14} height={14} fill="rgba(0,0,0,0.4)" />
diff --git a/src/components/DateTimeEditor/DateTimeEditor.react.js b/src/components/DateTimeEditor/DateTimeEditor.react.js
index e151b530c4..3c968addab 100644
--- a/src/components/DateTimeEditor/DateTimeEditor.react.js
+++ b/src/components/DateTimeEditor/DateTimeEditor.react.js
@@ -6,6 +6,7 @@
  * the root directory of this source tree.
  */
 import DateTimePicker from 'components/DateTimePicker/DateTimePicker.react';
+import { dateInputString, parseDateInput } from 'lib/DateUtils';
 import hasAncestor from 'lib/hasAncestor';
 import React from 'react';
 import styles from 'components/DateTimeEditor/DateTimeEditor.scss';
@@ -18,7 +19,7 @@ export default class DateTimeEditor extends React.Component {
       open: false,
       position: null,
       value: props.value,
-      text: props.value.toISOString(),
+      text: dateInputString(props.value, props.local),
     };
 
     this.checkExternalClick = this.checkExternalClick.bind(this);
@@ -71,34 +72,17 @@ export default class DateTimeEditor extends React.Component {
   }
 
   commitDate() {
-    if (this.state.text === this.props.value.toISOString()) {
+    if (this.state.text === dateInputString(this.props.value, this.props.local)) {
       return;
     }
-    const date = new Date(this.state.text);
-    if (isNaN(date.getTime())) {
+    const date = parseDateInput(this.state.text, this.props.local);
+    if (date === null) {
       this.setState({
         value: this.props.value,
-        text: this.props.value.toISOString(),
+        text: dateInputString(this.props.value, this.props.local),
       });
     } else {
-      if (this.state.text.endsWith('Z') || this.state.text.endsWith('UTC')) {
-        // Timezone is explicit; the parsed Date is already correct.
-        this.setState({ value: date });
-      } else {
-        // No timezone indicator; treat input as local time.
-        const utc = new Date(
-          Date.UTC(
-            date.getFullYear(),
-            date.getMonth(),
-            date.getDate(),
-            date.getHours(),
-            date.getMinutes(),
-            date.getSeconds(),
-            date.getMilliseconds()
-          )
-        );
-        this.setState({ value: utc });
-      }
+      this.setState({ value: date });
     }
   }
 
@@ -109,8 +93,11 @@ export default class DateTimeEditor extends React.Component {
         <div style={{ position: 'absolute', top: 30, left: 0 }}>
           <DateTimePicker
             value={this.state.value}
+            local={this.props.local}
             width={240}
-            onChange={value => this.setState({ value: value, text: value.toISOString() })}
+            onChange={value =>
+              this.setState({ value: value, text: dateInputString(value, this.props.local) })
+            }
             close={() =>
               this.setState({ open: false }, () => this.props.onCommit(this.state.value))
             }
diff --git a/src/components/DateTimeEntry/DateTimeEntry.react.js b/src/components/DateTimeEntry/DateTimeEntry.react.js
index ee49f84e92..658d8ca430 100644
--- a/src/components/DateTimeEntry/DateTimeEntry.react.js
+++ b/src/components/DateTimeEntry/DateTimeEntry.react.js
@@ -6,6 +6,7 @@
  * the root directory of this source tree.
  */
 import DateTimePicker from 'components/DateTimePicker/DateTimePicker.react';
+import { dateInputString, parseDateInput } from 'lib/DateUtils';
 import Popover from 'components/Popover/Popover.react';
 import Position from 'lib/Position';
 import React from 'react';
@@ -17,7 +18,7 @@ export default class DateTimeEntry extends React.Component {
     this.state = {
       open: false,
       position: null,
-      value: props.value.toISOString ? props.value.toISOString() : props.value,
+      value: props.value.toISOString ? dateInputString(props.value, props.local) : props.value,
     };
 
     this.rootRef = React.createRef();
@@ -26,7 +27,7 @@ export default class DateTimeEntry extends React.Component {
 
   componentWillReceiveProps(props) {
     this.setState({
-      value: props.value.toISOString ? props.value.toISOString() : props.value,
+      value: props.value.toISOString ? dateInputString(props.value, props.local) : props.value,
     });
   }
 
@@ -64,25 +65,12 @@ export default class DateTimeEntry extends React.Component {
   }
 
   commitDate() {
-    if (this.state.value === this.props.value.toISOString()) {
+    if (this.state.value === dateInputString(this.props.value, this.props.local)) {
       return;
     }
-    const date = new Date(this.state.value);
-    if (isNaN(date.getTime())) {
-      this.setState({ value: this.props.value.toISOString() });
-    } else if (!this.state.value.toLowerCase().endsWith('z')) {
-      const utc = new Date(
-        Date.UTC(
-          date.getFullYear(),
-          date.getMonth(),
-          date.getDate(),
-          date.getHours(),
-          date.getMinutes(),
-          date.getSeconds(),
-          date.getMilliseconds()
-        )
-      );
-      this.props.onChange(utc);
+    const date = parseDateInput(this.state.value, this.props.local);
+    if (date === null) {
+      this.setState({ value: dateInputString(this.props.value, this.props.local) });
     } else {
       this.props.onChange(date);
     }
@@ -104,6 +92,7 @@ export default class DateTimeEntry extends React.Component {
         >
           <DateTimePicker
             value={this.props.value}
+            local={this.props.local}
             width={Math.max(this.rootRef.current.clientWidth, 240)}
             onChange={this.props.onChange}
             close={() => this.setState({ open: false })}
diff --git a/src/components/PushCerts/CertsTable.react.js b/src/components/PushCerts/CertsTable.react.js
index 9c1524c6d8..4a192e553d 100644
--- a/src/components/PushCerts/CertsTable.react.js
+++ b/src/components/PushCerts/CertsTable.react.js
@@ -11,7 +11,7 @@ import { dateStringUTC } from 'lib/DateUtils';
 
 const MONTH_IN_MS = 1000 * 60 * 60 * 24 * 30;
 
-const CertsTable = ({ certs, onDelete, uploadPending }) => {
+const CertsTable = ({ certs, onDelete, uploadPending, useLocalTime }) => {
   const tableData = certs.map(c => {
     let color = '';
     let expiresKeyColor = '';
@@ -36,7 +36,7 @@ const CertsTable = ({ certs, onDelete, uploadPending }) => {
         {
           key: isExpired ? 'Expired' : 'Expires',
           keyColor: expiresKeyColor,
-          value: dateStringUTC(new Date(c.expiration)),
+          value: dateStringUTC(new Date(c.expiration), useLocalTime),
         },
       ],
     };
diff --git a/src/dashboard/Account/AccountOverview.react.js b/src/dashboard/Account/AccountOverview.react.js
index 6cc68b9851..71f660fa9a 100644
--- a/src/dashboard/Account/AccountOverview.react.js
+++ b/src/dashboard/Account/AccountOverview.react.js
@@ -24,11 +24,14 @@ import styles from 'dashboard/Settings/Settings.scss';
 import TextInput from 'components/TextInput/TextInput.react';
 import Toolbar from 'components/Toolbar/Toolbar.react';
 import { dateStringUTC } from 'lib/DateUtils';
+import { CurrentApp } from 'context/currentApp';
 
 const DEFAULT_LABEL_WIDTH = 56;
 const XHR_KEY = 'AccountOverview';
 
 export default class AccountOverview extends React.Component {
+  static contextType = CurrentApp;
+
   constructor() {
     super();
     this.state = {
@@ -152,7 +155,7 @@ export default class AccountOverview extends React.Component {
                     },
                     {
                       key: 'Expires',
-                      value: dateStringUTC(new Date(key.expiresAt)),
+                      value: dateStringUTC(new Date(key.expiresAt), this.context?.useLocalTime),
                     },
                   ],
                 }))}
diff --git a/src/dashboard/Data/Browser/BrowserTable.react.js b/src/dashboard/Data/Browser/BrowserTable.react.js
index 80ec614b7d..588b402cf8 100644
--- a/src/dashboard/Data/Browser/BrowserTable.react.js
+++ b/src/dashboard/Data/Browser/BrowserTable.react.js
@@ -496,6 +496,7 @@ export default class BrowserTable extends React.Component {
                 value={value}
                 readonly={readonly}
                 width={width}
+                useLocalTime={this.context.useLocalTime}
                 onCommit={newValue => {
                   if (newValue !== value) {
                     this.props.updateRow(this.props.current.row, name, newValue);
diff --git a/src/dashboard/Data/Browser/DataBrowser.react.js b/src/dashboard/Data/Browser/DataBrowser.react.js
index cbf52aba34..47da9603a0 100644
--- a/src/dashboard/Data/Browser/DataBrowser.react.js
+++ b/src/dashboard/Data/Browser/DataBrowser.react.js
@@ -42,7 +42,7 @@ const GRAPH_PANEL_WIDTH = 'graphPanelWidth';
 const AGGREGATION_PANEL_AUTO_SCROLL = 'aggregationPanelAutoScroll';
 const AGGREGATION_PANEL_AUTO_SCROLL_REQUIRE_HOVER = 'aggregationPanelAutoScrollRequireHover';
 
-function formatValueForCopy(value, type) {
+function formatValueForCopy(value, type, useLocalTime) {
   if (value === undefined) {
     return '';
   }
@@ -62,7 +62,7 @@ function formatValueForCopy(value, type) {
         value = new Date(value);
       }
       if (value instanceof Date && !isNaN(value)) {
-        return dateStringUTC(value);
+        return dateStringUTC(value, useLocalTime);
       }
       break;
     case 'File':
@@ -968,7 +968,7 @@ export default class DataBrowser extends React.Component {
             if (typeof value === 'number' && !isNaN(value)) {
               rowData.push(String(value));
             } else {
-              rowData.push(formatValueForCopy(value, type));
+              rowData.push(formatValueForCopy(value, type, this.context.useLocalTime));
             }
           }
 
diff --git a/src/dashboard/Data/Browser/EditRowDialog.react.js b/src/dashboard/Data/Browser/EditRowDialog.react.js
index a275591ed4..83c66c661e 100644
--- a/src/dashboard/Data/Browser/EditRowDialog.react.js
+++ b/src/dashboard/Data/Browser/EditRowDialog.react.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import Parse from 'parse';
 import { dateStringUTC } from 'lib/DateUtils';
+import { CurrentApp } from 'context/currentApp';
 import Modal from 'components/Modal/Modal.react';
 import Field from 'components/Field/Field.react';
 import Label from 'components/Label/Label.react';
@@ -17,6 +18,8 @@ import encode from 'parse/lib/browser/encode';
 import validateNumeric from 'lib/validateNumeric';
 
 export default class EditRowDialog extends React.Component {
+  static contextType = CurrentApp;
+
   constructor(props) {
     super(props);
 
@@ -326,6 +329,7 @@ export default class EditRowDialog extends React.Component {
           inputComponent = (
             <DateTimeInput
               disabled={isDisabled}
+              local={this.context.useLocalTime}
               value={selectedObject[name]}
               onChange={newValue => this.handleChange(newValue, name)}
             />
@@ -485,12 +489,14 @@ export default class EditRowDialog extends React.Component {
           <div style={{ paddingTop: '5px', fontSize: '12px' }}>
             {selectedObject.createdAt && (
               <p>
-                CreatedAt <strong>{dateStringUTC(selectedObject.createdAt)}</strong>
+                CreatedAt{' '}
+                <strong>{dateStringUTC(selectedObject.createdAt, this.context.useLocalTime)}</strong>
               </p>
             )}
             {selectedObject.updatedAt && (
               <p>
-                UpdatedAt <strong>{dateStringUTC(selectedObject.updatedAt)}</strong>
+                UpdatedAt{' '}
+                <strong>{dateStringUTC(selectedObject.updatedAt, this.context.useLocalTime)}</strong>
               </p>
             )}
           </div>
diff --git a/src/dashboard/Data/Browser/Editor.react.js b/src/dashboard/Data/Browser/Editor.react.js
index 0a5ea3716d..fe1c5ffe05 100644
--- a/src/dashboard/Data/Browser/Editor.react.js
+++ b/src/dashboard/Data/Browser/Editor.react.js
@@ -16,7 +16,7 @@ import decode from 'parse/lib/browser/decode';
 import React from 'react';
 import StringEditor from 'components/StringEditor/StringEditor.react';
 
-const Editor = ({ top, left, type, targetClass, value, readonly, width, onCommit, onCancel, setContextMenu, arrayConfigParams, onAddToArrayConfig, getRelatedRecordsMenuItem }) => {
+const Editor = ({ top, left, type, targetClass, value, readonly, width, useLocalTime, onCommit, onCancel, setContextMenu, arrayConfigParams, onAddToArrayConfig, getRelatedRecordsMenuItem }) => {
   let content = null;
   if (type === 'String') {
     content = (
@@ -116,7 +116,7 @@ const Editor = ({ top, left, type, targetClass, value, readonly, width, onCommit
         />
       );
     } else {
-      content = <DateTimeEditor value={value || new Date()} width={width} onCommit={onCommit} onCancel={onCancel} />;
+      content = <DateTimeEditor value={value || new Date()} local={useLocalTime} width={width} onCommit={onCommit} onCancel={onCancel} />;
     }
   } else if (type === 'Boolean') {
     content = <BooleanEditor value={value} width={width} onCommit={onCommit} />;
diff --git a/src/dashboard/Data/Config/ConfigDialog.react.js b/src/dashboard/Data/Config/ConfigDialog.react.js
index 3293bf0665..fdd1ca9a56 100644
--- a/src/dashboard/Data/Config/ConfigDialog.react.js
+++ b/src/dashboard/Data/Config/ConfigDialog.react.js
@@ -588,7 +588,7 @@ export default class ConfigDialog extends React.Component {
               <Dropdown value={String(this.state.selectedIndex)} onChange={index => handleIndexChange(Number(index))}>
                 {configHistory.map((value, i) => (
                   <Option key={i} value={String(i)}>
-                    {dateStringUTC(new Date(value.time))}
+                    {dateStringUTC(new Date(value.time), this.context.useLocalTime)}
                   </Option>
                 ))}
               </Dropdown>
diff --git a/src/dashboard/Data/Jobs/Jobs.react.js b/src/dashboard/Data/Jobs/Jobs.react.js
index 4fb234977d..806b5eee4a 100644
--- a/src/dashboard/Data/Jobs/Jobs.react.js
+++ b/src/dashboard/Data/Jobs/Jobs.react.js
@@ -163,9 +163,13 @@ class Jobs extends TableView {
       return (
         <tr key={data.objectId}>
           <td style={{ width: '20%' }}>{data.jobName}</td>
-          <td style={{ width: '20%' }}>{DateUtils.dateStringUTC(new Date(data.createdAt))}</td>
           <td style={{ width: '20%' }}>
-            {data.finishedAt ? DateUtils.dateStringUTC(new Date(data.finishedAt.iso)) : ''}
+            {DateUtils.dateStringUTC(new Date(data.createdAt), this.context.useLocalTime)}
+          </td>
+          <td style={{ width: '20%' }}>
+            {data.finishedAt
+              ? DateUtils.dateStringUTC(new Date(data.finishedAt.iso), this.context.useLocalTime)
+              : ''}
           </td>
           <td style={{ width: '20%' }}>
             <div style={{ fontSize: 12, whiteSpace: 'normal', lineHeight: '16px' }}>
diff --git a/src/dashboard/Data/Jobs/JobsForm.react.js b/src/dashboard/Data/Jobs/JobsForm.react.js
index 25899f45a0..09fae8e2e4 100644
--- a/src/dashboard/Data/Jobs/JobsForm.react.js
+++ b/src/dashboard/Data/Jobs/JobsForm.react.js
@@ -220,6 +220,7 @@ export default class JobsForm extends DashboardView {
               input={
                 <DateTimeInput
                   disabled={!!this.props.initialFields.job}
+                  local={this.context.useLocalTime}
                   value={fields.runAt}
                   onChange={setField.bind(null, 'runAt')}
                 />
@@ -284,7 +285,11 @@ export default class JobsForm extends DashboardView {
           if (fields.immediate) {
             pieces.push(<strong>immediately</strong>, '.');
           } else {
-            pieces.push('on ', <strong>{dateStringUTC(fields.runAt)}</strong>, '.');
+            pieces.push(
+              'on ',
+              <strong>{dateStringUTC(fields.runAt, this.context.useLocalTime)}</strong>,
+              '.'
+            );
           }
           if (fields.repeat) {
             pieces.push(' It will repeat ');
diff --git a/src/dashboard/Settings/AppleCerts.react.js b/src/dashboard/Settings/AppleCerts.react.js
index a05158d37c..44630f4ad6 100644
--- a/src/dashboard/Settings/AppleCerts.react.js
+++ b/src/dashboard/Settings/AppleCerts.react.js
@@ -59,6 +59,7 @@ export default class AppleCerts extends React.Component {
           certs={this.state.certs}
           error={this.state.error}
           uploadPending={this.state.uploadPending}
+          useLocalTime={this.context.useLocalTime}
           onUpload={this.handleUpload.bind(this)}
           onDelete={this.handleDelete.bind(this)}
         />
diff --git a/src/lib/DateUtils.js b/src/lib/DateUtils.js
index 3ffd0a7cff..5c9e968c46 100644
--- a/src/lib/DateUtils.js
+++ b/src/lib/DateUtils.js
@@ -102,7 +102,7 @@ export function monthsFrom(date, delta) {
   );
 }
 
-export function dateStringUTC(date) {
+export function dateStringUTC(date, useLocalTime = false) {
   // Use locale 'en-GB' to maintain the current date time format of "dd MMM yyyy, HH:mm:ss";
   // when supporting multiple locales in the future, this forced locale should be removed
   return date.toLocaleDateString('en-GB', {
@@ -113,11 +113,39 @@ export function dateStringUTC(date) {
     minute: 'numeric',
     second: 'numeric',
     hour12: false,
-    timeZone: 'UTC',
+    timeZone: useLocalTime ? undefined : 'UTC',
     timeZoneName: 'short',
   });
 }
 
+export function dateInputString(date, useLocalTime = false) {
+  if (!useLocalTime) {
+    return date.toISOString();
+  }
+  return new Date(date.getTime() - date.getTimezoneOffset() * 60000).toISOString().slice(0, -1);
+}
+
+export function parseDateInput(text, useLocalTime = false) {
+  const date = new Date(text);
+  if (isNaN(date.getTime())) {
+    return null;
+  }
+  if (useLocalTime || /(z|utc)$/i.test(text.trim())) {
+    return date;
+  }
+  return new Date(
+    Date.UTC(
+      date.getFullYear(),
+      date.getMonth(),
+      date.getDate(),
+      date.getHours(),
+      date.getMinutes(),
+      date.getSeconds(),
+      date.getMilliseconds()
+    )
+  );
+}
+
 export function monthDayStringUTC(date) {
   return `${shortMonth(date.getUTCMonth())} ${date.getUTCDate()}`;
 }
diff --git a/src/lib/ParseApp.js b/src/lib/ParseApp.js
index f173f5cc80..01e445f770 100644
--- a/src/lib/ParseApp.js
+++ b/src/lib/ParseApp.js
@@ -46,6 +46,7 @@ export default class ParseApp {
     supportedPushLocales,
     preventSchemaEdits,
     preventDataExport,
+    useLocalTime,
     graphQLServerURL,
     columnPreference,
     scripts,
@@ -79,6 +80,7 @@ export default class ParseApp {
     this.supportedPushLocales = supportedPushLocales ? supportedPushLocales : [];
     this.preventSchemaEdits = preventSchemaEdits || false;
     this.preventDataExport = preventDataExport || false;
+    this.useLocalTime = useLocalTime || false;
     this.graphQLServerURL = graphQLServerURL;
     this.columnPreference = columnPreference;
     this.scripts = scripts;
diff --git a/src/lib/tests/DateUtils.test.js b/src/lib/tests/DateUtils.test.js
index 1b667ffeea..b54f3f10c9 100644
--- a/src/lib/tests/DateUtils.test.js
+++ b/src/lib/tests/DateUtils.test.js
@@ -65,3 +65,79 @@ describe('daysInMonth', () => {
     expect(DateUtils.daysInMonth(new Date(2015, 8))).toBe(30);
   });
 });
+
+describe('dateStringUTC', () => {
+  const date = new Date('2020-01-15T13:45:30Z');
+
+  it('formats in UTC by default', () => {
+    expect(DateUtils.dateStringUTC(date)).toBe('15 Jan 2020, 13:45:30 UTC');
+    expect(DateUtils.dateStringUTC(date, false)).toBe('15 Jan 2020, 13:45:30 UTC');
+  });
+
+  it('formats in the local time zone when useLocalTime is true', () => {
+    // Delegate to the runtime's local zone rather than forcing UTC. Compared against the
+    // equivalent locale call with no timeZone so the assertion holds in any test-machine zone.
+    const localReference = date.toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      hour: 'numeric',
+      minute: 'numeric',
+      second: 'numeric',
+      hour12: false,
+      timeZoneName: 'short',
+    });
+    expect(DateUtils.dateStringUTC(date, true)).toBe(localReference);
+  });
+});
+
+describe('dateInputString', () => {
+  const date = new Date('2020-01-15T13:45:30Z');
+
+  it('returns the UTC ISO string by default', () => {
+    expect(DateUtils.dateInputString(date)).toBe(date.toISOString());
+    expect(DateUtils.dateInputString(date, false)).toBe('2020-01-15T13:45:30.000Z');
+  });
+
+  it('returns the local wall-clock (no trailing Z) when local is true, round-tripping', () => {
+    const local = DateUtils.dateInputString(date, true);
+    expect(local.endsWith('Z')).toBe(false);
+    // Re-parsing the zone-less string as local time yields the original instant.
+    expect(new Date(local).getTime()).toBe(date.getTime());
+  });
+});
+
+describe('parseDateInput', () => {
+  it('returns null for invalid input', () => {
+    expect(DateUtils.parseDateInput('not a date', false)).toBe(null);
+  });
+
+  it('interprets zone-less input as UTC by default', () => {
+    const parsed = DateUtils.parseDateInput('2020-01-15T08:45:30', false);
+    expect(parsed.getUTCFullYear()).toBe(2020);
+    expect(parsed.getUTCMonth()).toBe(0);
+    expect(parsed.getUTCDate()).toBe(15);
+    expect(parsed.getUTCHours()).toBe(8);
+    expect(parsed.getUTCMinutes()).toBe(45);
+    expect(parsed.getUTCSeconds()).toBe(30);
+  });
+
+  it('interprets zone-less input as local time when local is true', () => {
+    const parsed = DateUtils.parseDateInput('2020-01-15T08:45:30', true);
+    expect(parsed.getFullYear()).toBe(2020);
+    expect(parsed.getMonth()).toBe(0);
+    expect(parsed.getDate()).toBe(15);
+    expect(parsed.getHours()).toBe(8);
+    expect(parsed.getMinutes()).toBe(45);
+    expect(parsed.getSeconds()).toBe(30);
+  });
+
+  it('honors an explicit Z/UTC suffix regardless of mode', () => {
+    expect(DateUtils.parseDateInput('2020-01-15T13:45:30Z', false).toISOString()).toBe(
+      '2020-01-15T13:45:30.000Z'
+    );
+    expect(DateUtils.parseDateInput('2020-01-15T13:45:30Z', true).toISOString()).toBe(
+      '2020-01-15T13:45:30.000Z'
+    );
+  });
+});
diff --git a/testing/preprocessor.js b/testing/preprocessor.js
index d5fc55f3cc..8b8cd3a8c6 100644
--- a/testing/preprocessor.js
+++ b/testing/preprocessor.js
@@ -33,6 +33,7 @@ module.exports = {
     src = src.replace(/from 'lib/g, 'from \'' + relPrefix + 'lib');
     src = src.replace(/from 'components/g, 'from \'' + relPrefix + 'components');
     src = src.replace(/from 'dashboard/g, 'from \'' + relPrefix + 'dashboard');
+    src = src.replace(/from 'context/g, 'from \'' + relPrefix + 'context');
 
     // Ignore most files within node_modules, but transpile ESM-only packages
     // babel files can be .js, .es, .jsx or .es6