diff --git a/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js b/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js
index d623550da..26fb91034 100644
--- a/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js
+++ b/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js
@@ -58,7 +58,7 @@
 
         this.$el.on('hidden.oc.inspector', '[data-inspectable]', function() {
             var values = $('[data-inspector-values]', this).val(),
-                parsedValues = $.parseJSON(values),
+                parsedValues = JSON.parse(values),
                 li = $(this).closest('li').get(0)
 
             self.$form.request(self.alias + '::onUpdateWidget', {
diff --git a/modules/cms/assets/js/october.cmspage.js b/modules/cms/assets/js/october.cmspage.js
index 728d09943..e4721abad 100644
--- a/modules/cms/assets/js/october.cmspage.js
+++ b/modules/cms/assets/js/october.cmspage.js
@@ -397,7 +397,7 @@
 
     CmsPage.prototype.onInspectorHidden = function(ev) {
         var element = ev.target,
-            values = $.parseJSON($('[data-inspector-values]', element).val())
+            values = JSON.parse($('[data-inspector-values]', element).val())
 
         $('[name="component_aliases[]"]', element).val(values['oc.alias'])
         $('span.alias', element).text(values['oc.alias'])
@@ -405,7 +405,7 @@
 
     CmsPage.prototype.onInspectorHiding = function(ev, values) {
         var element = ev.target,
-            values = $.parseJSON($('[data-inspector-values]', element).val()),
+            values = JSON.parse($('[data-inspector-values]', element).val()),
             alias = values['oc.alias'],
             $componentList = $('#cms-master-tabs > div.tab-content > .tab-pane.active .control-componentlist .layout'),
             $cell = $(ev.target).parent()
diff --git a/modules/system/assets/ui/js/inspector.datainteraction.js b/modules/system/assets/ui/js/inspector.datainteraction.js
index 90de00a5a..f9bfbba39 100644
--- a/modules/system/assets/ui/js/inspector.datainteraction.js
+++ b/modules/system/assets/ui/js/inspector.datainteraction.js
@@ -52,7 +52,7 @@
             var valuesStr = $.trim(valuesField.value)
 
             try {
-                return valuesStr.length === 0 ? {} : $.parseJSON(valuesStr)
+                return valuesStr.length === 0 ? {} : JSON.parse(valuesStr)
             }
             catch (err) {
                 throw new Error('Error parsing Inspector field values. ' + err)
@@ -134,7 +134,7 @@
             }
 
             try {
-               return $.parseJSON(configuration)
+               return JSON.parse(configuration)
             }
             catch(err) {
                 throw new Error('Error parsing Inspector configuration. ' + err)
diff --git a/modules/system/assets/ui/js/inspector.editor.objectlist.js b/modules/system/assets/ui/js/inspector.editor.objectlist.js
index e116fdd3b..a8ed51d01 100644
--- a/modules/system/assets/ui/js/inspector.editor.objectlist.js
+++ b/modules/system/assets/ui/js/inspector.editor.objectlist.js
@@ -297,7 +297,7 @@
         }
 
         var properties = this.propertyDefinition.itemProperties,
-            values = $.parseJSON(dataStr),
+            values = JSON.parse(dataStr),
             options = {
                 enableExternalParameterEditor: false,
                 onChange: this.proxy(this.onInspectorDataChange),
@@ -447,7 +447,7 @@
 
         for (var i = 0, len = dataRows.length; i < len; i++) {
             var dataRow = dataRows[i],
-                rowData = $.parseJSON(dataRow.getAttribute('data-inspector-values'))
+                rowData = JSON.parse(dataRow.getAttribute('data-inspector-values'))
 
             if (!this.isKeyValueMode()) {
                 result.push(rowData)
@@ -500,7 +500,7 @@
 
         for (var i = 0, len = dataRows.length; i < len; i++) {
             var dataRow = dataRows[i],
-                rowData = $.parseJSON(dataRow.getAttribute('data-inspector-values'))
+                rowData = JSON.parse(dataRow.getAttribute('data-inspector-values'))
 
             if (selectedRow == dataRow) {
                 continue
diff --git a/modules/system/assets/ui/js/inspector.wrapper.base.js b/modules/system/assets/ui/js/inspector.wrapper.base.js
index 4b69a358f..ed80fa92e 100644
--- a/modules/system/assets/ui/js/inspector.wrapper.base.js
+++ b/modules/system/assets/ui/js/inspector.wrapper.base.js
@@ -168,7 +168,7 @@
             var valuesStr = $.trim($valuesField.val())
 
             try {
-                return valuesStr.length === 0 ? {} : $.parseJSON(valuesStr)
+                return valuesStr.length === 0 ? {} : JSON.parse(valuesStr)
             }
             catch (err) {
                 throw new Error('Error parsing Inspector field values. ' + err)
@@ -338,7 +338,7 @@
             }
 
             try {
-               return $.parseJSON(configuration)
+               return JSON.parse(configuration)
             }
             catch(err) {
                 throw new Error('Error parsing Inspector configuration. ' + err)
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 54e1ec81a..e7dbf92aa 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -5097,7 +5097,7 @@ BaseWrapper.prototype.cleanupAfterSwitch=function(){this.switched=true
 this.dispose()}
 BaseWrapper.prototype.loadValues=function(configuration){var $valuesField=this.getElementValuesInput()
 if($valuesField.length>0){var valuesStr=$.trim($valuesField.val())
-try{return valuesStr.length===0?{}:$.parseJSON(valuesStr)}
+try{return valuesStr.length===0?{}:JSON.parse(valuesStr)}
 catch(err){throw new Error('Error parsing Inspector field values. '+err)}}
 var values={},attributes=this.$element.get(0).attributes
 for(var i=0,len=attributes.length;i<len;i++){var attribute=attributes[i],matches=[]
@@ -5134,7 +5134,7 @@ var $form=this.$element.closest('form'),data=this.$element.data(),self=this
 $.oc.stripeLoadIndicator.show()
 $form.request('onGetInspectorConfiguration',{data:data}).done(function inspectorConfigurationRequestDoneClosure(data){self.onConfigurartionRequestDone(data,result)}).always(function(){$.oc.stripeLoadIndicator.hide()})}
 BaseWrapper.prototype.parseConfiguration=function(configuration){if(!$.isArray(configuration)&&!$.isPlainObject(configuration)){if($.trim(configuration)===0){return{}}
-try{return $.parseJSON(configuration)}
+try{return JSON.parse(configuration)}
 catch(err){throw new Error('Error parsing Inspector configuration. '+err)}}
 else{return configuration}}
 BaseWrapper.prototype.configurationLoaded=function(configuration){var values=this.loadValues(configuration.properties)
@@ -6009,7 +6009,7 @@ $.oc.foundation.element.addClass(row,'active')
 this.createInspectorForRow(row,inspectorContainer)}
 ObjectListEditor.prototype.createInspectorForRow=function(row,inspectorContainer){var dataStr=row.getAttribute('data-inspector-values')
 if(dataStr===undefined||typeof dataStr!=='string'){throw new Error('Values not found for the selected row.')}
-var properties=this.propertyDefinition.itemProperties,values=$.parseJSON(dataStr),options={enableExternalParameterEditor:false,onChange:this.proxy(this.onInspectorDataChange),inspectorClass:this.inspector.options.inspectorClass}
+var properties=this.propertyDefinition.itemProperties,values=JSON.parse(dataStr),options={enableExternalParameterEditor:false,onChange:this.proxy(this.onInspectorDataChange),inspectorClass:this.inspector.options.inspectorClass}
 this.currentRowInspector=new $.oc.inspector.surface(inspectorContainer,properties,values,$.oc.inspector.helpers.generateElementUniqueId(inspectorContainer),options)}
 ObjectListEditor.prototype.disposeInspector=function(){$.oc.foundation.controlUtils.disposeControls(this.popup.querySelector('[data-inspector-container]'))
 this.currentRowInspector=null}
@@ -6054,7 +6054,7 @@ ObjectListEditor.prototype.applyDataToParentInspector=function(){var selectedRow
 if(selectedRow){if(!this.validateKeyValue()){return}
 if(this.currentRowInspector){if(!this.currentRowInspector.validate()){return}}
 this.applyDataToRow(selectedRow)}
-for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=$.parseJSON(dataRow.getAttribute('data-inspector-values'))
+for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=JSON.parse(dataRow.getAttribute('data-inspector-values'))
 if(!this.isKeyValueMode()){result.push(rowData)}
 else{var rowKey=rowData[this.propertyDefinition.keyProperty]
 result[rowKey]=this.removeKeyProperty(rowData)}}
@@ -6071,7 +6071,7 @@ if(typeof keyPropertyValue!=='string'){throw new Error('Key property ('+keyPrope
 if($.trim(keyPropertyValue).length===0){$.oc.flashMsg({text:'The value of key property '+keyPropertyTitle+' cannot be empty.','class':'error','interval':3})
 return false}
 var selectedRow=this.getSelectedRow(),tbody=this.getTableBody(),dataRows=tbody.querySelectorAll('tr[data-inspector-values]')
-for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=$.parseJSON(dataRow.getAttribute('data-inspector-values'))
+for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=JSON.parse(dataRow.getAttribute('data-inspector-values'))
 if(selectedRow==dataRow){continue}
 if(rowData[keyProperty]==keyPropertyValue){$.oc.flashMsg({text:'The value of key property '+keyPropertyTitle+' should be unique.','class':'error','interval':3})
 return false}}