diff --git a/types/oracle__oraclejet/index.d.ts b/types/oracle__oraclejet/index.d.ts
index dd99802419..fae850b7df 100644
--- a/types/oracle__oraclejet/index.d.ts
+++ b/types/oracle__oraclejet/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for oraclejet 6.0
+// Type definitions for oraclejet 6.1
 // Project: https://github.com/oracle/oraclejet
 // Definitions by: Naizam Olakara <https://github.com/nolakara>
 //                 Jing Wu <https://github.com/jingxwu>
diff --git a/types/oracle__oraclejet/ojchart/index.d.ts b/types/oracle__oraclejet/ojchart/index.d.ts
index 25970f316e..dead9ee55f 100644
--- a/types/oracle__oraclejet/ojchart/index.d.ts
+++ b/types/oracle__oraclejet/ojchart/index.d.ts
@@ -667,7 +667,7 @@ export namespace ojChart {
     }> {
     }
     interface ojSelectInput extends CustomEvent<{
-        items: any[];
+        items: string[];
         selectionData: Array<{
             data: object;
             itemData: object;
@@ -1486,7 +1486,7 @@ export interface ojChartItem extends JetElement<ojChartItemSettableProperties> {
     close?: number;
     color?: string;
     drilling?: 'on' | 'off' | 'inherit';
-    groupId: string[];
+    groupId: Array<(string | number)>;
     high?: number;
     items?: object[] | number[];
     label?: string | string[];
@@ -1502,7 +1502,7 @@ export interface ojChartItem extends JetElement<ojChartItemSettableProperties> {
     q1?: number;
     q2?: number;
     q3?: number;
-    seriesId: string;
+    seriesId: string | number;
     shortDesc?: string;
     source?: string;
     sourceHover?: string;
@@ -1619,7 +1619,7 @@ export interface ojChartItemSettableProperties extends JetSettableProperties {
     close?: number;
     color?: string;
     drilling?: 'on' | 'off' | 'inherit';
-    groupId: string[];
+    groupId: Array<(string | number)>;
     high?: number;
     items?: object[] | number[];
     label?: string | string[];
@@ -1635,7 +1635,7 @@ export interface ojChartItemSettableProperties extends JetSettableProperties {
     q1?: number;
     q2?: number;
     q3?: number;
-    seriesId: string;
+    seriesId: string | number;
     shortDesc?: string;
     source?: string;
     sourceHover?: string;
diff --git a/types/oracle__oraclejet/ojcheckboxset/index.d.ts b/types/oracle__oraclejet/ojcheckboxset/index.d.ts
index afed42d51c..47f2dc44c0 100644
--- a/types/oracle__oraclejet/ojcheckboxset/index.d.ts
+++ b/types/oracle__oraclejet/ojcheckboxset/index.d.ts
@@ -1,8 +1,12 @@
+import { DataProvider } from '../ojdataprovider';
 import { editableValue, editableValueEventMap, editableValueSettableProperties } from '../ojeditablevalue';
 import { JetElement, JetSettableProperties, JetElementCustomEvent, JetSetPropertyType } from '..';
-export interface ojCheckboxset extends editableValue<any[], ojCheckboxsetSettableProperties> {
+export interface ojCheckboxset<K, D> extends editableValue<any[], ojCheckboxsetSettableProperties<K, D>> {
     disabled: boolean;
     labelledBy: string | null;
+    optionRenderer?: ((param0: ojCheckboxset.OptionContext<D>) => Element) | null;
+    options: DataProvider<K, D> | null;
+    optionsKeys?: ojCheckboxset.OptionsKeys;
     required: boolean;
     value: any[];
     translations: {
@@ -12,19 +16,22 @@ export interface ojCheckboxset extends editableValue<any[], ojCheckboxsetSettabl
             messageSummary?: string;
         };
     };
-    onDisabledChanged: ((event: JetElementCustomEvent<ojCheckboxset["disabled"]>) => any) | null;
-    onLabelledByChanged: ((event: JetElementCustomEvent<ojCheckboxset["labelledBy"]>) => any) | null;
-    onRequiredChanged: ((event: JetElementCustomEvent<ojCheckboxset["required"]>) => any) | null;
-    onValueChanged: ((event: JetElementCustomEvent<ojCheckboxset["value"]>) => any) | null;
+    onDisabledChanged: ((event: JetElementCustomEvent<ojCheckboxset<K, D>["disabled"]>) => any) | null;
+    onLabelledByChanged: ((event: JetElementCustomEvent<ojCheckboxset<K, D>["labelledBy"]>) => any) | null;
+    onOptionRendererChanged: ((event: JetElementCustomEvent<ojCheckboxset<K, D>["optionRenderer"]>) => any) | null;
+    onOptionsChanged: ((event: JetElementCustomEvent<ojCheckboxset<K, D>["options"]>) => any) | null;
+    onOptionsKeysChanged: ((event: JetElementCustomEvent<ojCheckboxset<K, D>["optionsKeys"]>) => any) | null;
+    onRequiredChanged: ((event: JetElementCustomEvent<ojCheckboxset<K, D>["required"]>) => any) | null;
+    onValueChanged: ((event: JetElementCustomEvent<ojCheckboxset<K, D>["value"]>) => any) | null;
     onOjAnimateEnd: ((event: ojCheckboxset.ojAnimateEnd) => any) | null;
     onOjAnimateStart: ((event: ojCheckboxset.ojAnimateStart) => any) | null;
-    addEventListener<T extends keyof ojCheckboxsetEventMap>(type: T, listener: (this: HTMLElement, ev: ojCheckboxsetEventMap[T]) => any, useCapture?: boolean): void;
+    addEventListener<T extends keyof ojCheckboxsetEventMap<K, D>>(type: T, listener: (this: HTMLElement, ev: ojCheckboxsetEventMap<K, D>[T]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    getProperty<T extends keyof ojCheckboxsetSettableProperties>(property: T): ojCheckboxset[T];
+    getProperty<T extends keyof ojCheckboxsetSettableProperties<K, D>>(property: T): ojCheckboxset<K, D>[T];
     getProperty(property: string): any;
-    setProperty<T extends keyof ojCheckboxsetSettableProperties>(property: T, value: ojCheckboxsetSettableProperties[T]): void;
-    setProperty<T extends string>(property: T, value: JetSetPropertyType<T, ojCheckboxsetSettableProperties>): void;
-    setProperties(properties: ojCheckboxsetSettablePropertiesLenient): void;
+    setProperty<T extends keyof ojCheckboxsetSettableProperties<K, D>>(property: T, value: ojCheckboxsetSettableProperties<K, D>[T]): void;
+    setProperty<T extends string>(property: T, value: JetSetPropertyType<T, ojCheckboxsetSettableProperties<K, D>>): void;
+    setProperties(properties: ojCheckboxsetSettablePropertiesLenient<K, D>): void;
     refresh(): void;
     validate(): Promise<string>;
 }
@@ -42,18 +49,41 @@ export namespace ojCheckboxset {
         [propName: string]: any;
     }> {
     }
+    // tslint:disable-next-line interface-over-type-literal
+    type Option = {
+        disabled?: boolean;
+        label?: string;
+        value: any;
+    };
+    // tslint:disable-next-line interface-over-type-literal
+    type OptionContext<D> = {
+        component: Element;
+        index: number;
+        data: D;
+    };
+    // tslint:disable-next-line interface-over-type-literal
+    type OptionsKeys = {
+        label?: string;
+        value?: string;
+    };
 }
-export interface ojCheckboxsetEventMap extends editableValueEventMap<any[], ojCheckboxsetSettableProperties> {
+export interface ojCheckboxsetEventMap<K, D> extends editableValueEventMap<any[], ojCheckboxsetSettableProperties<K, D>> {
     'ojAnimateEnd': ojCheckboxset.ojAnimateEnd;
     'ojAnimateStart': ojCheckboxset.ojAnimateStart;
-    'disabledChanged': JetElementCustomEvent<ojCheckboxset["disabled"]>;
-    'labelledByChanged': JetElementCustomEvent<ojCheckboxset["labelledBy"]>;
-    'requiredChanged': JetElementCustomEvent<ojCheckboxset["required"]>;
-    'valueChanged': JetElementCustomEvent<ojCheckboxset["value"]>;
+    'disabledChanged': JetElementCustomEvent<ojCheckboxset<K, D>["disabled"]>;
+    'labelledByChanged': JetElementCustomEvent<ojCheckboxset<K, D>["labelledBy"]>;
+    'optionRendererChanged': JetElementCustomEvent<ojCheckboxset<K, D>["optionRenderer"]>;
+    'optionsChanged': JetElementCustomEvent<ojCheckboxset<K, D>["options"]>;
+    'optionsKeysChanged': JetElementCustomEvent<ojCheckboxset<K, D>["optionsKeys"]>;
+    'requiredChanged': JetElementCustomEvent<ojCheckboxset<K, D>["required"]>;
+    'valueChanged': JetElementCustomEvent<ojCheckboxset<K, D>["value"]>;
 }
-export interface ojCheckboxsetSettableProperties extends editableValueSettableProperties<any[]> {
+export interface ojCheckboxsetSettableProperties<K, D> extends editableValueSettableProperties<any[]> {
     disabled: boolean;
     labelledBy: string | null;
+    optionRenderer?: ((param0: ojCheckboxset.OptionContext<D>) => Element) | null;
+    options: DataProvider<K, D> | null;
+    optionsKeys?: ojCheckboxset.OptionsKeys;
     required: boolean;
     value: any[];
     translations: {
@@ -64,6 +94,6 @@ export interface ojCheckboxsetSettableProperties extends editableValueSettablePr
         };
     };
 }
-export interface ojCheckboxsetSettablePropertiesLenient extends Partial<ojCheckboxsetSettableProperties> {
+export interface ojCheckboxsetSettablePropertiesLenient<K, D> extends Partial<ojCheckboxsetSettableProperties<K, D>> {
     [key: string]: any;
 }
diff --git a/types/oracle__oraclejet/ojcontext/index.d.ts b/types/oracle__oraclejet/ojcontext/index.d.ts
index 0bb6a856c7..d6590a6682 100644
--- a/types/oracle__oraclejet/ojcontext/index.d.ts
+++ b/types/oracle__oraclejet/ojcontext/index.d.ts
@@ -1,6 +1,9 @@
 declare class BusyContext {
     addBusyState(options: {
-        description: object | (() => string);
+        description: {
+            toString: () => string;
+            [propName: string]: any;
+        } | (() => string) | string;
     }): (() => void);
     applicationBootstrapComplete(): undefined;
     clear(): undefined;
@@ -16,7 +19,10 @@ declare class BusyContext {
 declare namespace Context {
     interface BusyContext {
         addBusyState(options: {
-            description: object | (() => string);
+            description: {
+                toString: () => string;
+                [propName: string]: any;
+            } | (() => string) | string;
         }): (() => void);
         applicationBootstrapComplete(): undefined;
         clear(): undefined;
diff --git a/types/oracle__oraclejet/ojdataprovider/index.d.ts b/types/oracle__oraclejet/ojdataprovider/index.d.ts
index accc1f25bc..d05976730f 100644
--- a/types/oracle__oraclejet/ojdataprovider/index.d.ts
+++ b/types/oracle__oraclejet/ojdataprovider/index.d.ts
@@ -47,6 +47,10 @@ export interface DataProviderOperationEventDetail<K, D> {
     keys: Set<K>;
     metadata?: Array<ItemMetadata<K>>;
 }
+export interface FetchAttribute {
+    attributes?: Array<string | FetchAttribute>;
+    name: string;
+}
 export interface FetchByKeysCapability<D> {
     implementation: 'iteration' | 'lookup';
 }
@@ -56,6 +60,7 @@ export namespace FetchByKeysMixin {
     }): any;
 }
 export interface FetchByKeysParameters<K> {
+    attributes?: Array<string | FetchAttribute>;
     keys: Set<K>;
 }
 export interface FetchByKeysResults<K, D> {
@@ -71,6 +76,7 @@ export namespace FetchByOffsetMixin {
     }): any;
 }
 export interface FetchByOffsetParameters<D> extends FetchListParameters<D> {
+    attributes?: Array<string | FetchAttribute>;
     offset: number;
 }
 export interface FetchByOffsetResults<K, D> {
@@ -79,6 +85,7 @@ export interface FetchByOffsetResults<K, D> {
     results: Array<Item<K, D>>;
 }
 export interface FetchListParameters<D> {
+    attributes?: Array<string | FetchAttribute>;
     filterCriterion?: FilterOperator<D>;
     size: number;
     sortCriteria?: Array<SortCriterion<D>>;
diff --git a/types/oracle__oraclejet/ojdiagram-utils/index.d.ts b/types/oracle__oraclejet/ojdiagram-utils/index.d.ts
new file mode 100644
index 0000000000..3cc5e21632
--- /dev/null
+++ b/types/oracle__oraclejet/ojdiagram-utils/index.d.ts
@@ -0,0 +1,38 @@
+import { DvtDiagramLayoutContext, DvtDiagramLayoutContextNode, DvtDiagramLayoutContextLink } from '../ojdiagram';
+export function getLayout(obj: {
+    nodes: {
+        id: any;
+        x: number;
+        y: number;
+        labelLayout: LabelLayout;
+    };
+    links: {
+        id: any;
+        path: string;
+        coordinateSpace: any;
+        labelLayout: LabelLayout;
+    };
+    nodeDefaults: {
+        labelLayout: LabelLayout | ((context: DvtDiagramLayoutContext, node: DvtDiagramLayoutContextNode) => LabelLayout);
+    };
+    linkDefaults: {
+        path: (context: DvtDiagramLayoutContext, link: DvtDiagramLayoutContextLink) => string;
+        labelLayout: (context: DvtDiagramLayoutContext, link: DvtDiagramLayoutContextLink) => LabelLayout;
+    };
+    viewport: {
+        x: number;
+        y: number;
+        w: number;
+        h: number;
+    };
+}): (context: DvtDiagramLayoutContext) => void;
+// tslint:disable-next-line interface-over-type-literal
+export type LabelLayout = {
+    x: number;
+    y: number;
+    rotationPointX: number;
+    rotationPointY: number;
+    angle: number;
+    halign: string;
+    valign: string;
+};
diff --git a/types/oracle__oraclejet/ojdialog/index.d.ts b/types/oracle__oraclejet/ojdialog/index.d.ts
index 42a8569bd4..709081b6de 100644
--- a/types/oracle__oraclejet/ojdialog/index.d.ts
+++ b/types/oracle__oraclejet/ojdialog/index.d.ts
@@ -1,6 +1,7 @@
 import { baseComponent, baseComponentEventMap, baseComponentSettableProperties, JetElementCustomEvent, JetSetPropertyType } from '..';
 export interface ojDialog extends baseComponent<ojDialogSettableProperties> {
     cancelBehavior: 'icon' | 'escape' | 'none';
+    dialogTitle: string | null;
     dragAffordance: 'title-bar' | 'none';
     initialVisibility: 'hide' | 'show';
     modality: 'modal' | 'modeless';
@@ -11,6 +12,7 @@ export interface ojDialog extends baseComponent<ojDialogSettableProperties> {
         labelCloseIcon?: string;
     };
     onCancelBehaviorChanged: ((event: JetElementCustomEvent<ojDialog["cancelBehavior"]>) => any) | null;
+    onDialogTitleChanged: ((event: JetElementCustomEvent<ojDialog["dialogTitle"]>) => any) | null;
     onDragAffordanceChanged: ((event: JetElementCustomEvent<ojDialog["dragAffordance"]>) => any) | null;
     onInitialVisibilityChanged: ((event: JetElementCustomEvent<ojDialog["initialVisibility"]>) => any) | null;
     onModalityChanged: ((event: JetElementCustomEvent<ojDialog["modality"]>) => any) | null;
@@ -124,6 +126,7 @@ export interface ojDialogEventMap extends baseComponentEventMap<ojDialogSettable
     'ojResizeStart': ojDialog.ojResizeStart;
     'ojResizeStop': ojDialog.ojResizeStop;
     'cancelBehaviorChanged': JetElementCustomEvent<ojDialog["cancelBehavior"]>;
+    'dialogTitleChanged': JetElementCustomEvent<ojDialog["dialogTitle"]>;
     'dragAffordanceChanged': JetElementCustomEvent<ojDialog["dragAffordance"]>;
     'initialVisibilityChanged': JetElementCustomEvent<ojDialog["initialVisibility"]>;
     'modalityChanged': JetElementCustomEvent<ojDialog["modality"]>;
@@ -133,6 +136,7 @@ export interface ojDialogEventMap extends baseComponentEventMap<ojDialogSettable
 }
 export interface ojDialogSettableProperties extends baseComponentSettableProperties {
     cancelBehavior: 'icon' | 'escape' | 'none';
+    dialogTitle: string | null;
     dragAffordance: 'title-bar' | 'none';
     initialVisibility: 'hide' | 'show';
     modality: 'modal' | 'modeless';
diff --git a/types/oracle__oraclejet/ojlistdataproviderview/index.d.ts b/types/oracle__oraclejet/ojlistdataproviderview/index.d.ts
index 031611e08e..87040139a3 100644
--- a/types/oracle__oraclejet/ojlistdataproviderview/index.d.ts
+++ b/types/oracle__oraclejet/ojlistdataproviderview/index.d.ts
@@ -1,15 +1,17 @@
-import { DataProvider, SortCriterion, FetchByKeysParameters, ContainsKeysResults, FetchByKeysResults, FetchByOffsetParameters, FetchByOffsetResults, DataMapping, FetchListResult,
-   FetchListParameters } from '../ojdataprovider';
+import { DataProvider, SortCriterion, FetchByKeysParameters, ContainsKeysResults, FetchByKeysResults, FetchByOffsetParameters, FetchByOffsetResults, DataMapping, FetchListResult, FetchListParameters,
+   FetchAttribute } from '../ojdataprovider';
 declare class ListDataProviderView<K, D, Kin, Din> implements DataProvider<K, D> {
+    attributes: Array<string | FetchAttribute>;
     dataMapping: DataMapping<K, D, Kin, Din>;
-    from: any;
+    from: Kin;
     offset: number;
     sortCriteria: Array<SortCriterion<D>>;
     constructor(dataProvider: DataProvider<K, D>, options?: {
-        from?: object;
+        from?: Kin;
         offset?: number;
         sortCriteria?: Array<SortCriterion<D>>;
         dataMapping?: DataMapping<K, D, Kin, Din>;
+        attributes?: Array<string | FetchAttribute>;
     });
     addEventListener(eventType: string, listener: EventListener): void;
     containsKeys(params: FetchByKeysParameters<K>): Promise<ContainsKeysResults<K>>;
diff --git a/types/oracle__oraclejet/ojmenu/index.d.ts b/types/oracle__oraclejet/ojmenu/index.d.ts
index b6b1c8a9cb..d2b72d9677 100644
--- a/types/oracle__oraclejet/ojmenu/index.d.ts
+++ b/types/oracle__oraclejet/ojmenu/index.d.ts
@@ -43,6 +43,7 @@ export namespace ojMenu {
     }> {
     }
     interface ojBeforeOpen extends CustomEvent<{
+        openOptions: OpenOptions;
         [propName: string]: any;
     }> {
     }
diff --git a/types/oracle__oraclejet/ojmessage/index.d.ts b/types/oracle__oraclejet/ojmessage/index.d.ts
index 55e905ba8d..47541dd949 100644
--- a/types/oracle__oraclejet/ojmessage/index.d.ts
+++ b/types/oracle__oraclejet/ojmessage/index.d.ts
@@ -1,5 +1,6 @@
 import { JetElement, JetSettableProperties, JetElementCustomEvent, JetSetPropertyType } from '..';
 export interface ojMessage extends JetElement<ojMessageSettableProperties> {
+    displayOptions: ojMessage.DisplayOptions;
     message: ojMessage.Message;
     translations: {
         categories?: {
@@ -10,6 +11,7 @@ export interface ojMessage extends JetElement<ojMessageSettableProperties> {
         };
         labelCloseIcon?: string;
     };
+    onDisplayOptionsChanged: ((event: JetElementCustomEvent<ojMessage["displayOptions"]>) => any) | null;
     onMessageChanged: ((event: JetElementCustomEvent<ojMessage["message"]>) => any) | null;
     onTranslationsChanged: ((event: JetElementCustomEvent<ojMessage["translations"]>) => any) | null;
     onOjAnimateEnd: ((event: ojMessage.ojAnimateEnd) => any) | null;
@@ -39,11 +41,15 @@ export namespace ojMessage {
     }> {
     }
     interface ojClose extends CustomEvent<{
-        message: object;
+        message: Message;
         [propName: string]: any;
     }> {
     }
     // tslint:disable-next-line interface-over-type-literal
+    type DisplayOptions = {
+        category?: 'header' | 'none' | 'auto';
+    };
+    // tslint:disable-next-line interface-over-type-literal
     type Message = {
         icon?: string;
         category?: string;
@@ -60,10 +66,12 @@ export interface ojMessageEventMap extends HTMLElementEventMap {
     'ojAnimateEnd': ojMessage.ojAnimateEnd;
     'ojAnimateStart': ojMessage.ojAnimateStart;
     'ojClose': ojMessage.ojClose;
+    'displayOptionsChanged': JetElementCustomEvent<ojMessage["displayOptions"]>;
     'messageChanged': JetElementCustomEvent<ojMessage["message"]>;
     'translationsChanged': JetElementCustomEvent<ojMessage["translations"]>;
 }
 export interface ojMessageSettableProperties extends JetSettableProperties {
+    displayOptions: ojMessage.DisplayOptions;
     message: ojMessage.Message;
     translations: {
         categories?: {
diff --git a/types/oracle__oraclejet/ojmessages/index.d.ts b/types/oracle__oraclejet/ojmessages/index.d.ts
index 0b410266a3..f7d75a2be2 100644
--- a/types/oracle__oraclejet/ojmessages/index.d.ts
+++ b/types/oracle__oraclejet/ojmessages/index.d.ts
@@ -3,6 +3,7 @@ import { ojMessage } from '../ojmessage';
 import { JetElement, JetSettableProperties, JetElementCustomEvent, JetSetPropertyType } from '..';
 export interface ojMessages extends JetElement<ojMessagesSettableProperties> {
     display: 'general' | 'notification';
+    displayOptions: ojMessage.DisplayOptions;
     messages: ojMessage.Message[] | null | DataProvider<any, ojMessage.Message>;
     position: ojMessages.Position | null;
     translations: {
@@ -15,6 +16,7 @@ export interface ojMessages extends JetElement<ojMessagesSettableProperties> {
         labelLandmark?: string;
     };
     onDisplayChanged: ((event: JetElementCustomEvent<ojMessages["display"]>) => any) | null;
+    onDisplayOptionsChanged: ((event: JetElementCustomEvent<ojMessages["displayOptions"]>) => any) | null;
     onMessagesChanged: ((event: JetElementCustomEvent<ojMessages["messages"]>) => any) | null;
     onPositionChanged: ((event: JetElementCustomEvent<ojMessages["position"]>) => any) | null;
     onTranslationsChanged: ((event: JetElementCustomEvent<ojMessages["translations"]>) => any) | null;
@@ -25,17 +27,19 @@ export interface ojMessages extends JetElement<ojMessagesSettableProperties> {
     setProperty<T extends keyof ojMessagesSettableProperties>(property: T, value: ojMessagesSettableProperties[T]): void;
     setProperty<T extends string>(property: T, value: JetSetPropertyType<T, ojMessagesSettableProperties>): void;
     setProperties(properties: ojMessagesSettablePropertiesLenient): void;
-    close(associated: object): void;
+    close(message: ojMessage.Message): void;
     closeAll(closeFilter?: (message: ojMessage.Message) => boolean): void;
 }
 export interface ojMessagesEventMap extends HTMLElementEventMap {
     'displayChanged': JetElementCustomEvent<ojMessages["display"]>;
+    'displayOptionsChanged': JetElementCustomEvent<ojMessages["displayOptions"]>;
     'messagesChanged': JetElementCustomEvent<ojMessages["messages"]>;
     'positionChanged': JetElementCustomEvent<ojMessages["position"]>;
     'translationsChanged': JetElementCustomEvent<ojMessages["translations"]>;
 }
 export interface ojMessagesSettableProperties extends JetSettableProperties {
     display: 'general' | 'notification';
+    displayOptions: ojMessage.DisplayOptions;
     messages: ojMessage.Message[] | null | DataProvider<any, ojMessage.Message>;
     position: ojMessages.Position | null;
     translations: {
diff --git a/types/oracle__oraclejet/ojmodule-element/index.d.ts b/types/oracle__oraclejet/ojmodule-element/index.d.ts
index 693cb518f6..0501e30e26 100644
--- a/types/oracle__oraclejet/ojmodule-element/index.d.ts
+++ b/types/oracle__oraclejet/ojmodule-element/index.d.ts
@@ -27,9 +27,9 @@ export interface ModuleElementAnimation {
 export interface ojModule extends JetElement<ojModuleSettableProperties> {
     animation: object;
     config: {
-        cleanupMode: 'onDisconnect' | 'none';
+        cleanupMode?: 'onDisconnect' | 'none';
         view: Node[];
-        viewModel: object;
+        viewModel: object | null;
     };
     onAnimationChanged: ((event: JetElementCustomEvent<ojModule["animation"]>) => any) | null;
     onConfigChanged: ((event: JetElementCustomEvent<ojModule["config"]>) => any) | null;
@@ -79,9 +79,9 @@ export interface ojModuleEventMap extends HTMLElementEventMap {
 export interface ojModuleSettableProperties extends JetSettableProperties {
     animation: object;
     config: {
-        cleanupMode: 'onDisconnect' | 'none';
+        cleanupMode?: 'onDisconnect' | 'none';
         view: Node[];
-        viewModel: object;
+        viewModel: object | null;
     };
 }
 export interface ojModuleSettablePropertiesLenient extends Partial<ojModuleSettableProperties> {
diff --git a/types/oracle__oraclejet/ojoffcanvas/index.d.ts b/types/oracle__oraclejet/ojoffcanvas/index.d.ts
new file mode 100644
index 0000000000..7f099aea33
--- /dev/null
+++ b/types/oracle__oraclejet/ojoffcanvas/index.d.ts
@@ -0,0 +1,29 @@
+export function close(offcanvas: {
+    selector: string;
+}): Promise<boolean>;
+export function open(offcanvas: {
+    selector: string;
+    content: string;
+    edge?: 'start' | 'end' | 'top' | 'bottom';
+    displayMode?: 'push' | 'overlay';
+    autoDismiss?: 'focusLoss' | 'none';
+    size?: string;
+    modality?: 'modal' | 'modeless';
+}): Promise<boolean>;
+export function setupResponsive(offcanvas: {
+    selector: string;
+    edge?: 'start' | 'end' | 'top' | 'bottom';
+    query: string | null;
+}): void;
+export function tearDownResponsive(offcanvas: {
+    selector: string;
+}): void;
+export function toggle(offcanvas: {
+    selector: string;
+    content: string;
+    edge?: 'start' | 'end' | 'top' | 'bottom';
+    displayMode?: 'push' | 'overlay';
+    autoDismiss?: 'focusLoss' | 'none';
+    size?: string;
+    modality?: 'modal' | 'modeless';
+}): Promise<boolean>;
diff --git a/types/oracle__oraclejet/ojradioset/index.d.ts b/types/oracle__oraclejet/ojradioset/index.d.ts
index 4b910c22fd..0860018f9d 100644
--- a/types/oracle__oraclejet/ojradioset/index.d.ts
+++ b/types/oracle__oraclejet/ojradioset/index.d.ts
@@ -1,8 +1,12 @@
+import { DataProvider } from '../ojdataprovider';
 import { editableValue, editableValueEventMap, editableValueSettableProperties } from '../ojeditablevalue';
 import { JetElement, JetSettableProperties, JetElementCustomEvent, JetSetPropertyType } from '..';
-export interface ojRadioset extends editableValue<any, ojRadiosetSettableProperties> {
+export interface ojRadioset<K, D> extends editableValue<any, ojRadiosetSettableProperties<K, D>> {
     disabled: boolean;
     labelledBy: string | null;
+    optionRenderer?: ((param0: ojRadioset.OptionContext<D>) => Element) | null;
+    options: DataProvider<K, D> | null;
+    optionsKeys?: ojRadioset.OptionsKeys;
     required: boolean;
     value: any;
     translations: {
@@ -12,19 +16,22 @@ export interface ojRadioset extends editableValue<any, ojRadiosetSettablePropert
             messageSummary?: string;
         };
     };
-    onDisabledChanged: ((event: JetElementCustomEvent<ojRadioset["disabled"]>) => any) | null;
-    onLabelledByChanged: ((event: JetElementCustomEvent<ojRadioset["labelledBy"]>) => any) | null;
-    onRequiredChanged: ((event: JetElementCustomEvent<ojRadioset["required"]>) => any) | null;
-    onValueChanged: ((event: JetElementCustomEvent<ojRadioset["value"]>) => any) | null;
+    onDisabledChanged: ((event: JetElementCustomEvent<ojRadioset<K, D>["disabled"]>) => any) | null;
+    onLabelledByChanged: ((event: JetElementCustomEvent<ojRadioset<K, D>["labelledBy"]>) => any) | null;
+    onOptionRendererChanged: ((event: JetElementCustomEvent<ojRadioset<K, D>["optionRenderer"]>) => any) | null;
+    onOptionsChanged: ((event: JetElementCustomEvent<ojRadioset<K, D>["options"]>) => any) | null;
+    onOptionsKeysChanged: ((event: JetElementCustomEvent<ojRadioset<K, D>["optionsKeys"]>) => any) | null;
+    onRequiredChanged: ((event: JetElementCustomEvent<ojRadioset<K, D>["required"]>) => any) | null;
+    onValueChanged: ((event: JetElementCustomEvent<ojRadioset<K, D>["value"]>) => any) | null;
     onOjAnimateEnd: ((event: ojRadioset.ojAnimateEnd) => any) | null;
     onOjAnimateStart: ((event: ojRadioset.ojAnimateStart) => any) | null;
-    addEventListener<T extends keyof ojRadiosetEventMap>(type: T, listener: (this: HTMLElement, ev: ojRadiosetEventMap[T]) => any, useCapture?: boolean): void;
+    addEventListener<T extends keyof ojRadiosetEventMap<K, D>>(type: T, listener: (this: HTMLElement, ev: ojRadiosetEventMap<K, D>[T]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    getProperty<T extends keyof ojRadiosetSettableProperties>(property: T): ojRadioset[T];
+    getProperty<T extends keyof ojRadiosetSettableProperties<K, D>>(property: T): ojRadioset<K, D>[T];
     getProperty(property: string): any;
-    setProperty<T extends keyof ojRadiosetSettableProperties>(property: T, value: ojRadiosetSettableProperties[T]): void;
-    setProperty<T extends string>(property: T, value: JetSetPropertyType<T, ojRadiosetSettableProperties>): void;
-    setProperties(properties: ojRadiosetSettablePropertiesLenient): void;
+    setProperty<T extends keyof ojRadiosetSettableProperties<K, D>>(property: T, value: ojRadiosetSettableProperties<K, D>[T]): void;
+    setProperty<T extends string>(property: T, value: JetSetPropertyType<T, ojRadiosetSettableProperties<K, D>>): void;
+    setProperties(properties: ojRadiosetSettablePropertiesLenient<K, D>): void;
     refresh(): void;
     validate(): Promise<string>;
 }
@@ -42,18 +49,41 @@ export namespace ojRadioset {
         [propName: string]: any;
     }> {
     }
+    // tslint:disable-next-line interface-over-type-literal
+    type Option = {
+        disabled?: boolean;
+        label?: string;
+        value: any;
+    };
+    // tslint:disable-next-line interface-over-type-literal
+    type OptionContext<D> = {
+        component: Element;
+        index: number;
+        data: D;
+    };
+    // tslint:disable-next-line interface-over-type-literal
+    type OptionsKeys = {
+        label?: string;
+        value?: string;
+    };
 }
-export interface ojRadiosetEventMap extends editableValueEventMap<any, ojRadiosetSettableProperties> {
+export interface ojRadiosetEventMap<K, D> extends editableValueEventMap<any, ojRadiosetSettableProperties<K, D>> {
     'ojAnimateEnd': ojRadioset.ojAnimateEnd;
     'ojAnimateStart': ojRadioset.ojAnimateStart;
-    'disabledChanged': JetElementCustomEvent<ojRadioset["disabled"]>;
-    'labelledByChanged': JetElementCustomEvent<ojRadioset["labelledBy"]>;
-    'requiredChanged': JetElementCustomEvent<ojRadioset["required"]>;
-    'valueChanged': JetElementCustomEvent<ojRadioset["value"]>;
+    'disabledChanged': JetElementCustomEvent<ojRadioset<K, D>["disabled"]>;
+    'labelledByChanged': JetElementCustomEvent<ojRadioset<K, D>["labelledBy"]>;
+    'optionRendererChanged': JetElementCustomEvent<ojRadioset<K, D>["optionRenderer"]>;
+    'optionsChanged': JetElementCustomEvent<ojRadioset<K, D>["options"]>;
+    'optionsKeysChanged': JetElementCustomEvent<ojRadioset<K, D>["optionsKeys"]>;
+    'requiredChanged': JetElementCustomEvent<ojRadioset<K, D>["required"]>;
+    'valueChanged': JetElementCustomEvent<ojRadioset<K, D>["value"]>;
 }
-export interface ojRadiosetSettableProperties extends editableValueSettableProperties<any> {
+export interface ojRadiosetSettableProperties<K, D> extends editableValueSettableProperties<any> {
     disabled: boolean;
     labelledBy: string | null;
+    optionRenderer?: ((param0: ojRadioset.OptionContext<D>) => Element) | null;
+    options: DataProvider<K, D> | null;
+    optionsKeys?: ojRadioset.OptionsKeys;
     required: boolean;
     value: any;
     translations: {
@@ -64,6 +94,6 @@ export interface ojRadiosetSettableProperties extends editableValueSettablePrope
         };
     };
 }
-export interface ojRadiosetSettablePropertiesLenient extends Partial<ojRadiosetSettableProperties> {
+export interface ojRadiosetSettablePropertiesLenient<K, D> extends Partial<ojRadiosetSettableProperties<K, D>> {
     [key: string]: any;
 }
diff --git a/types/oracle__oraclejet/ojselectcombobox/index.d.ts b/types/oracle__oraclejet/ojselectcombobox/index.d.ts
index 2444c99c4c..2775d8a22a 100644
--- a/types/oracle__oraclejet/ojselectcombobox/index.d.ts
+++ b/types/oracle__oraclejet/ojselectcombobox/index.d.ts
@@ -74,9 +74,7 @@ export interface ojComboboxMany<K, D> extends ojCombobox<any[] | null, ojCombobo
     asyncValidators: Array<AsyncValidator<any[]>>;
     converter: Converter<any> | Validation.RegisteredConverter | null;
     minLength: number;
-    optionRenderer?: ((param0: ojCombobox.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojCombobox.OptionContext) => Element) | null;
     options: Array<ojCombobox.Option | ojCombobox.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys: {
@@ -95,6 +93,7 @@ export interface ojComboboxMany<K, D> extends ojCombobox<any[] | null, ojCombobo
     };
     placeholder: string | null;
     readonly rawValue: string | null;
+    readOnly: boolean;
     required: boolean;
     validators: Array<Validator<any[]> | Validation.RegisteredValidator> | null;
     value: any[] | null;
@@ -120,6 +119,7 @@ export interface ojComboboxMany<K, D> extends ojCombobox<any[] | null, ojCombobo
     onPickerAttributesChanged: ((event: JetElementCustomEvent<ojComboboxMany<K, D>["pickerAttributes"]>) => any) | null;
     onPlaceholderChanged: ((event: JetElementCustomEvent<ojComboboxMany<K, D>["placeholder"]>) => any) | null;
     onRawValueChanged: ((event: JetElementCustomEvent<ojComboboxMany<K, D>["rawValue"]>) => any) | null;
+    onReadOnlyChanged: ((event: JetElementCustomEvent<ojComboboxMany<K, D>["readOnly"]>) => any) | null;
     onRequiredChanged: ((event: JetElementCustomEvent<ojComboboxMany<K, D>["required"]>) => any) | null;
     onValidatorsChanged: ((event: JetElementCustomEvent<ojComboboxMany<K, D>["validators"]>) => any) | null;
     onValueChanged: ((event: JetElementCustomEvent<ojComboboxMany<K, D>["value"]>) => any) | null;
@@ -161,6 +161,7 @@ export interface ojComboboxManyEventMap<K, D> extends ojComboboxEventMap<any[] |
     'pickerAttributesChanged': JetElementCustomEvent<ojComboboxMany<K, D>["pickerAttributes"]>;
     'placeholderChanged': JetElementCustomEvent<ojComboboxMany<K, D>["placeholder"]>;
     'rawValueChanged': JetElementCustomEvent<ojComboboxMany<K, D>["rawValue"]>;
+    'readOnlyChanged': JetElementCustomEvent<ojComboboxMany<K, D>["readOnly"]>;
     'requiredChanged': JetElementCustomEvent<ojComboboxMany<K, D>["required"]>;
     'validatorsChanged': JetElementCustomEvent<ojComboboxMany<K, D>["validators"]>;
     'valueChanged': JetElementCustomEvent<ojComboboxMany<K, D>["value"]>;
@@ -170,9 +171,7 @@ export interface ojComboboxManySettableProperties<K, D> extends ojComboboxSettab
     asyncValidators: Array<AsyncValidator<any[]>>;
     converter: Converter<any> | Validation.RegisteredConverter | null;
     minLength: number;
-    optionRenderer?: ((param0: ojCombobox.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojCombobox.OptionContext) => Element) | null;
     options: Array<ojCombobox.Option | ojCombobox.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys: {
@@ -191,6 +190,7 @@ export interface ojComboboxManySettableProperties<K, D> extends ojComboboxSettab
     };
     placeholder: string | null;
     readonly rawValue: string | null;
+    readOnly: boolean;
     required: boolean;
     validators: Array<Validator<any[]> | Validation.RegisteredValidator> | null;
     value: any[] | null;
@@ -216,9 +216,7 @@ export interface ojComboboxOne<K, D> extends ojCombobox<any, ojComboboxOneSettab
     converter: Converter<any> | Validation.RegisteredConverter | null;
     filterOnOpen: 'none' | 'rawValue';
     minLength: number;
-    optionRenderer?: ((param0: ojCombobox.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojCombobox.OptionContext) => Element) | null;
     options: Array<ojCombobox.Option | ojCombobox.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys: {
@@ -237,6 +235,7 @@ export interface ojComboboxOne<K, D> extends ojCombobox<any, ojComboboxOneSettab
     };
     placeholder: string | null;
     readonly rawValue: string | null;
+    readOnly: boolean;
     required: boolean;
     validators: Array<Validator<any> | Validation.RegisteredValidator> | null;
     value: any;
@@ -263,6 +262,7 @@ export interface ojComboboxOne<K, D> extends ojCombobox<any, ojComboboxOneSettab
     onPickerAttributesChanged: ((event: JetElementCustomEvent<ojComboboxOne<K, D>["pickerAttributes"]>) => any) | null;
     onPlaceholderChanged: ((event: JetElementCustomEvent<ojComboboxOne<K, D>["placeholder"]>) => any) | null;
     onRawValueChanged: ((event: JetElementCustomEvent<ojComboboxOne<K, D>["rawValue"]>) => any) | null;
+    onReadOnlyChanged: ((event: JetElementCustomEvent<ojComboboxOne<K, D>["readOnly"]>) => any) | null;
     onRequiredChanged: ((event: JetElementCustomEvent<ojComboboxOne<K, D>["required"]>) => any) | null;
     onValidatorsChanged: ((event: JetElementCustomEvent<ojComboboxOne<K, D>["validators"]>) => any) | null;
     onValueChanged: ((event: JetElementCustomEvent<ojComboboxOne<K, D>["value"]>) => any) | null;
@@ -313,6 +313,7 @@ export interface ojComboboxOneEventMap<K, D> extends ojComboboxEventMap<any, ojC
     'pickerAttributesChanged': JetElementCustomEvent<ojComboboxOne<K, D>["pickerAttributes"]>;
     'placeholderChanged': JetElementCustomEvent<ojComboboxOne<K, D>["placeholder"]>;
     'rawValueChanged': JetElementCustomEvent<ojComboboxOne<K, D>["rawValue"]>;
+    'readOnlyChanged': JetElementCustomEvent<ojComboboxOne<K, D>["readOnly"]>;
     'requiredChanged': JetElementCustomEvent<ojComboboxOne<K, D>["required"]>;
     'validatorsChanged': JetElementCustomEvent<ojComboboxOne<K, D>["validators"]>;
     'valueChanged': JetElementCustomEvent<ojComboboxOne<K, D>["value"]>;
@@ -323,9 +324,7 @@ export interface ojComboboxOneSettableProperties<K, D> extends ojComboboxSettabl
     converter: Converter<any> | Validation.RegisteredConverter | null;
     filterOnOpen: 'none' | 'rawValue';
     minLength: number;
-    optionRenderer?: ((param0: ojCombobox.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojCombobox.OptionContext) => Element) | null;
     options: Array<ojCombobox.Option | ojCombobox.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys: {
@@ -344,6 +343,7 @@ export interface ojComboboxOneSettableProperties<K, D> extends ojComboboxSettabl
     };
     placeholder: string | null;
     readonly rawValue: string | null;
+    readOnly: boolean;
     required: boolean;
     validators: Array<Validator<any> | Validation.RegisteredValidator> | null;
     value: any;
@@ -434,9 +434,7 @@ export interface ojSelectSettablePropertiesLenient<V, SV> extends Partial<ojSele
 }
 export interface ojSelectMany<K, D> extends ojSelect<any[] | null, ojSelectManySettableProperties<K, D>> {
     minimumResultsForSearch: number;
-    optionRenderer?: ((param0: ojSelect.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojSelect.OptionContext) => Element) | null;
     options: Array<ojSelect.Option | ojSelect.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys?: {
@@ -454,6 +452,7 @@ export interface ojSelectMany<K, D> extends ojSelect<any[] | null, ojSelectManyS
         class?: string;
     };
     placeholder: string | null;
+    readOnly: boolean;
     renderMode: 'jet' | 'native';
     required: boolean;
     value: any[] | null;
@@ -479,6 +478,7 @@ export interface ojSelectMany<K, D> extends ojSelect<any[] | null, ojSelectManyS
     onOptionsKeysChanged: ((event: JetElementCustomEvent<ojSelectMany<K, D>["optionsKeys"]>) => any) | null;
     onPickerAttributesChanged: ((event: JetElementCustomEvent<ojSelectMany<K, D>["pickerAttributes"]>) => any) | null;
     onPlaceholderChanged: ((event: JetElementCustomEvent<ojSelectMany<K, D>["placeholder"]>) => any) | null;
+    onReadOnlyChanged: ((event: JetElementCustomEvent<ojSelectMany<K, D>["readOnly"]>) => any) | null;
     onRenderModeChanged: ((event: JetElementCustomEvent<ojSelectMany<K, D>["renderMode"]>) => any) | null;
     onRequiredChanged: ((event: JetElementCustomEvent<ojSelectMany<K, D>["required"]>) => any) | null;
     onValueChanged: ((event: JetElementCustomEvent<ojSelectMany<K, D>["value"]>) => any) | null;
@@ -517,6 +517,7 @@ export interface ojSelectManyEventMap<K, D> extends ojSelectEventMap<any[] | nul
     'optionsKeysChanged': JetElementCustomEvent<ojSelectMany<K, D>["optionsKeys"]>;
     'pickerAttributesChanged': JetElementCustomEvent<ojSelectMany<K, D>["pickerAttributes"]>;
     'placeholderChanged': JetElementCustomEvent<ojSelectMany<K, D>["placeholder"]>;
+    'readOnlyChanged': JetElementCustomEvent<ojSelectMany<K, D>["readOnly"]>;
     'renderModeChanged': JetElementCustomEvent<ojSelectMany<K, D>["renderMode"]>;
     'requiredChanged': JetElementCustomEvent<ojSelectMany<K, D>["required"]>;
     'valueChanged': JetElementCustomEvent<ojSelectMany<K, D>["value"]>;
@@ -524,9 +525,7 @@ export interface ojSelectManyEventMap<K, D> extends ojSelectEventMap<any[] | nul
 }
 export interface ojSelectManySettableProperties<K, D> extends ojSelectSettableProperties<any[] | null> {
     minimumResultsForSearch: number;
-    optionRenderer?: ((param0: ojSelect.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojSelect.OptionContext) => Element) | null;
     options: Array<ojSelect.Option | ojSelect.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys?: {
@@ -544,6 +543,7 @@ export interface ojSelectManySettableProperties<K, D> extends ojSelectSettablePr
         class?: string;
     };
     placeholder: string | null;
+    readOnly: boolean;
     renderMode: 'jet' | 'native';
     required: boolean;
     value: any[] | null;
@@ -569,9 +569,7 @@ export interface ojSelectManySettablePropertiesLenient<K, D> extends Partial<ojS
 }
 export interface ojSelectOne<K, D> extends ojSelect<any, ojSelectOneSettableProperties<K, D>> {
     minimumResultsForSearch: number;
-    optionRenderer?: ((param0: ojSelect.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojSelect.OptionContext) => Element) | null;
     options: Array<ojSelect.Option | ojSelect.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys?: {
@@ -589,6 +587,7 @@ export interface ojSelectOne<K, D> extends ojSelect<any, ojSelectOneSettableProp
         class?: string;
     };
     placeholder: string | null;
+    readOnly: boolean;
     renderMode: 'jet' | 'native';
     required: boolean;
     value: any;
@@ -614,6 +613,7 @@ export interface ojSelectOne<K, D> extends ojSelect<any, ojSelectOneSettableProp
     onOptionsKeysChanged: ((event: JetElementCustomEvent<ojSelectOne<K, D>["optionsKeys"]>) => any) | null;
     onPickerAttributesChanged: ((event: JetElementCustomEvent<ojSelectOne<K, D>["pickerAttributes"]>) => any) | null;
     onPlaceholderChanged: ((event: JetElementCustomEvent<ojSelectOne<K, D>["placeholder"]>) => any) | null;
+    onReadOnlyChanged: ((event: JetElementCustomEvent<ojSelectOne<K, D>["readOnly"]>) => any) | null;
     onRenderModeChanged: ((event: JetElementCustomEvent<ojSelectOne<K, D>["renderMode"]>) => any) | null;
     onRequiredChanged: ((event: JetElementCustomEvent<ojSelectOne<K, D>["required"]>) => any) | null;
     onValueChanged: ((event: JetElementCustomEvent<ojSelectOne<K, D>["value"]>) => any) | null;
@@ -652,6 +652,7 @@ export interface ojSelectOneEventMap<K, D> extends ojSelectEventMap<any, ojSelec
     'optionsKeysChanged': JetElementCustomEvent<ojSelectOne<K, D>["optionsKeys"]>;
     'pickerAttributesChanged': JetElementCustomEvent<ojSelectOne<K, D>["pickerAttributes"]>;
     'placeholderChanged': JetElementCustomEvent<ojSelectOne<K, D>["placeholder"]>;
+    'readOnlyChanged': JetElementCustomEvent<ojSelectOne<K, D>["readOnly"]>;
     'renderModeChanged': JetElementCustomEvent<ojSelectOne<K, D>["renderMode"]>;
     'requiredChanged': JetElementCustomEvent<ojSelectOne<K, D>["required"]>;
     'valueChanged': JetElementCustomEvent<ojSelectOne<K, D>["value"]>;
@@ -659,9 +660,7 @@ export interface ojSelectOneEventMap<K, D> extends ojSelectEventMap<any, ojSelec
 }
 export interface ojSelectOneSettableProperties<K, D> extends ojSelectSettableProperties<any> {
     minimumResultsForSearch: number;
-    optionRenderer?: ((param0: ojSelect.OptionContext) => {
-        insert: Element;
-    } | undefined) | null;
+    optionRenderer?: ((param0: ojSelect.OptionContext) => Element) | null;
     options: Array<ojSelect.Option | ojSelect.Optgroup> | DataProvider<K, D> | null;
     optionsKeys: {
         childKeys?: {
@@ -679,6 +678,7 @@ export interface ojSelectOneSettableProperties<K, D> extends ojSelectSettablePro
         class?: string;
     };
     placeholder: string | null;
+    readOnly: boolean;
     renderMode: 'jet' | 'native';
     required: boolean;
     value: any;
diff --git a/types/oracle__oraclejet/ojthematicmap/index.d.ts b/types/oracle__oraclejet/ojthematicmap/index.d.ts
index 45bbd3b907..830db16e8e 100644
--- a/types/oracle__oraclejet/ojthematicmap/index.d.ts
+++ b/types/oracle__oraclejet/ojthematicmap/index.d.ts
@@ -78,7 +78,6 @@ export interface ojThematicMap<K1, K2, K3, D1, D2, D3> extends dvtBaseComponent<
     touchResponse: 'touchStart' | 'auto';
     zooming: 'auto' | 'none';
     translations: {
-        areasRegion?: string;
         componentName?: string;
         labelAndValue?: string;
         labelClearSelection?: string;
@@ -86,8 +85,6 @@ export interface ojThematicMap<K1, K2, K3, D1, D2, D3> extends dvtBaseComponent<
         labelDataVisualization?: string;
         labelInvalidData?: string;
         labelNoData?: string;
-        linksRegion?: string;
-        markersRegion?: string;
         stateCollapsed?: string;
         stateDrillable?: string;
         stateExpanded?: string;
@@ -249,7 +246,6 @@ export interface ojThematicMapSettableProperties<K1, K2, K3, D1, D2, D3> extends
     touchResponse: 'touchStart' | 'auto';
     zooming: 'auto' | 'none';
     translations: {
-        areasRegion?: string;
         componentName?: string;
         labelAndValue?: string;
         labelClearSelection?: string;
@@ -257,8 +253,6 @@ export interface ojThematicMapSettableProperties<K1, K2, K3, D1, D2, D3> extends
         labelDataVisualization?: string;
         labelInvalidData?: string;
         labelNoData?: string;
-        linksRegion?: string;
-        markersRegion?: string;
         stateCollapsed?: string;
         stateDrillable?: string;
         stateExpanded?: string;
diff --git a/types/oracle__oraclejet/ojvalidation-base/index.d.ts b/types/oracle__oraclejet/ojvalidation-base/index.d.ts
index 83a20555db..af2aad5ed5 100644
--- a/types/oracle__oraclejet/ojvalidation-base/index.d.ts
+++ b/types/oracle__oraclejet/ojvalidation-base/index.d.ts
@@ -1,7 +1,7 @@
 import Message = require('../ojmessaging');
 import Color = require('../ojcolor');
 export interface AsyncValidator<V> {
-    hint: Promise<string>;
+    hint: Promise<(string | null)>;
     validate(value: V): Promise<boolean>;
 }
 export class ColorConverter implements Converter<Color> {
diff --git a/types/oracle__oraclejet/ojvalidation-number/index.d.ts b/types/oracle__oraclejet/ojvalidation-number/index.d.ts
index 09addc6522..7184d33135 100644
--- a/types/oracle__oraclejet/ojvalidation-number/index.d.ts
+++ b/types/oracle__oraclejet/ojvalidation-number/index.d.ts
@@ -23,9 +23,14 @@ export namespace IntlNumberConverter {
         pattern?: string;
         roundingMode?: 'HALF_UP' | 'HALF_DOWN' | 'HALF_EVEN';
         roundDuringParse?: boolean;
-        separators?: object;
+        separators?: Separators;
         lenientParse?: 'full' | 'none';
     };
+    // tslint:disable-next-line interface-over-type-literal
+    type Separators = {
+        decimal?: string;
+        group?: string;
+    };
 }
 export class NumberConverter implements Converter<number> {
     format(value: number): string | null;
diff --git a/types/oracle__oraclejet/tsconfig.json b/types/oracle__oraclejet/tsconfig.json
index 5f529007f8..be741c3fe7 100644
--- a/types/oracle__oraclejet/tsconfig.json
+++ b/types/oracle__oraclejet/tsconfig.json
@@ -52,6 +52,7 @@
         "ojdefer/index.d.ts",
         "ojdeferreddataprovider/index.d.ts",
         "ojdiagram/index.d.ts",
+        "ojdiagram-utils/index.d.ts",
         "ojdialog/index.d.ts",
         "ojdvt-base/index.d.ts",
         "ojeditablevalue/index.d.ts",
@@ -87,6 +88,7 @@
         "ojmoduleanimations/index.d.ts",
         "ojnavigationlist/index.d.ts",
         "ojnbox/index.d.ts",
+        "ojoffcanvas/index.d.ts",
         "ojoptgroup/index.d.ts",
         "ojoption/index.d.ts",
         "ojpictochart/index.d.ts",