diff --git a/addon/components/flexberry-file.js b/addon/components/flexberry-file.js
index 6c3656f6be..1716787c25 100644
--- a/addon/components/flexberry-file.js
+++ b/addon/components/flexberry-file.js
@@ -2,7 +2,7 @@
   @module ember-flexberry
 */
 
-import Ember from 'ember'; //TODO Import Module. Replace Ember.uuid()
+import generateUniqueId from 'ember-flexberry-data/utils/generate-unique-id';
 import $ from 'jquery';
 import RSVP from 'rsvp';
 import { typeOf, isBlank, isNone } from '@ember/utils';
@@ -63,7 +63,7 @@ export default FlexberryBaseComponent.extend({
     let fileInputId = 'flexberry-file-file-input-';
     let elementId = this.get('elementId');
     if (isBlank(elementId)) {
-      fileInputId += Ember.uuid();
+      fileInputId += generateUniqueId();
     } else {
       fileInputId += elementId;
     }
diff --git a/addon/components/flexberry/validation-summary.js b/addon/components/flexberry/validation-summary.js
index 63454870cd..1c2b9fd3ed 100644
--- a/addon/components/flexberry/validation-summary.js
+++ b/addon/components/flexberry/validation-summary.js
@@ -2,9 +2,8 @@
   @module ember-flexberry
 */
 
-import Ember from 'ember';
-
-const { Component, computed } = Ember;
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 /**
   Component for output messages of validation errors as a [Semantic UI Message](https://semantic-ui.com/collections/message.html) collection.
diff --git a/addon/services/compatibility-validations.js b/addon/services/compatibility-validations.js
index 1f1ad6e86f..61ffe4da67 100644
--- a/addon/services/compatibility-validations.js
+++ b/addon/services/compatibility-validations.js
@@ -2,9 +2,9 @@
  * @module ember-flexberry
  */
 
-import Ember from 'ember';
-
-const { Service, getOwner, set } = Ember;
+import Service from  '@ember/service';
+import { set } from '@ember/object';
+import { getOwner } from '@ember/application';
 
 const EMBER_VALIDATIONS_VALIDATORS = [
   'absence',
diff --git a/addon/services/log.js b/addon/services/log.js
index 5c352b2d3a..cc0c86abf3 100644
--- a/addon/services/log.js
+++ b/addon/services/log.js
@@ -375,9 +375,9 @@ export default Service.extend(Evented, {
 
     this.initProperties();
 
-    let originalEmberLoggerError = Ember.Logger.error;
+    let originalEmberLoggerError = console.error;
     originalMethodsCache.pushObject({
-      methodOwner: Ember.Logger,
+      methodOwner: console,
       methodName: 'error',
       methodReference: originalEmberLoggerError
     });
@@ -398,111 +398,141 @@ export default Service.extend(Evented, {
       _this._onError(reason, true);
     };
 
+    console.error = function(error) {
+      originalEmberLoggerError(error);
+      _this._onError(error, true);
+    };
+
+    console.warn = function(warn) {
+        originalEmberLoggerError(warn);
+        _this._onError(warn, true);
+    };
+
+    console.deprecated = function(deprecate) {
+        originalEmberLoggerError(deprecate);
+        _this._onError(deprecate, true);
+    };
+
+    console.log = function(log) {
+        originalEmberLoggerError(log);
+        _this._onError(log, true);
+    };
+
+    console.info = function(info) {
+        originalEmberLoggerError(info);
+        _this._onError(info, true);
+    };
+
+    console.debug = function(debug) {
+        originalEmberLoggerError(debug);
+        _this._onError(debug, true);
+    };
+
     // Assign Ember.onerror & RSVP.on('error', ...) handlers (see http://emberjs.com/api/#event_onerror).
     Ember.onerror = onError;
     RSVP.on('error', onPromiseError);
 
     // Extend Ember.Logger.error logic.
-    Ember.Logger.error = function() {
-      originalEmberLoggerError(...arguments);
-
-      return _this._queue.attach((resolve, reject) => {
-        return _this._storeToApplicationLog(messageCategory.error, joinArguments(...arguments), '').then((result) => {
-          resolve(result);
-        }).catch((reason) => {
-          reject(reason);
-        });
-      });
-    };
+    // Ember.Logger.error = function() {
+    //   originalEmberLoggerError(...arguments);
+
+    //   return _this._queue.attach((resolve, reject) => {
+    //     return _this._storeToApplicationLog(messageCategory.error, joinArguments(...arguments), '').then((result) => {
+    //       resolve(result);
+    //     }).catch((reason) => {
+    //       reject(reason);
+    //     });
+    //   });
+    // };
 
     // Extend Ember.Logger.warn logic.
-    let originalEmberLoggerWarn = Ember.Logger.warn;
+    let originalEmberLoggerWarn = console.warn;
     originalMethodsCache.pushObject({
-      methodOwner: Ember.Logger,
+      methodOwner: console,
       methodName: 'warn',
       methodReference: originalEmberLoggerWarn
     });
 
-    Ember.Logger.warn = function() {
-      originalEmberLoggerWarn(...arguments);
-
-      return _this._queue.attach((resolve, reject) => {
-        let message = joinArguments(...arguments);
-        if (message.indexOf('DEPRECATION') === 0) {
-          return _this._storeToApplicationLog(messageCategory.deprecate, message, '').then((result) => {
-            resolve(result);
-          }).catch((reason) => {
-            reject(reason);
-          });
-        } else {
-          return _this._storeToApplicationLog(messageCategory.warn, message, '').then((result) => {
-            resolve(result);
-          }).catch((reason) => {
-            reject(reason);
-          });
-        }
-      });
-    };
+    // Ember.Logger.warn = function() {
+    //   originalEmberLoggerWarn(...arguments);
+
+    //   return _this._queue.attach((resolve, reject) => {
+    //     let message = joinArguments(...arguments);
+    //     if (message.indexOf('DEPRECATION') === 0) {
+    //       return _this._storeToApplicationLog(messageCategory.deprecate, message, '').then((result) => {
+    //         resolve(result);
+    //       }).catch((reason) => {
+    //         reject(reason);
+    //       });
+    //     } else {
+    //       return _this._storeToApplicationLog(messageCategory.warn, message, '').then((result) => {
+    //         resolve(result);
+    //       }).catch((reason) => {
+    //         reject(reason);
+    //       });
+    //     }
+    //   });
+    // };
 
     // Extend Ember.Logger.log logic.
-    let originalEmberLoggerLog = Ember.Logger.log;
+    let originalEmberLoggerLog = console.log.bind;
     originalMethodsCache.pushObject({
-      methodOwner: Ember.Logger,
+      methodOwner: console,
       methodName: 'log',
       methodReference: originalEmberLoggerLog
     });
 
-    Ember.Logger.log = function() {
-      originalEmberLoggerLog(...arguments);
+  //   Ember.Logger.log = function() {
+  //     originalEmberLoggerLog(...arguments);
 
-      return _this._queue.attach((resolve, reject) => {
-        return _this._storeToApplicationLog(messageCategory.log, joinArguments(...arguments), '').then((result) => {
-          resolve(result);
-        }).catch((reason) => {
-          reject(reason);
-        });
-      });
-   };
+  //     return _this._queue.attach((resolve, reject) => {
+  //       return _this._storeToApplicationLog(messageCategory.log, joinArguments(...arguments), '').then((result) => {
+  //         resolve(result);
+  //       }).catch((reason) => {
+  //         reject(reason);
+  //       });
+  //     });
+  //  };
 
     // Extend Ember.Logger.info logic.
-    let originalEmberLoggerInfo = Ember.Logger.info;
+    let originalEmberLoggerInfo = console.info;
     originalMethodsCache.pushObject({
-      methodOwner: Ember.Logger,
+      methodOwner: console,
       methodName: 'info',
       methodReference: originalEmberLoggerInfo
     });
 
-    Ember.Logger.info = function() {
-      originalEmberLoggerInfo(...arguments);
+    // Ember.Logger.info = function() {
+    //   originalEmberLoggerInfo(...arguments);
 
-      return _this._queue.attach((resolve, reject) => {
-        return _this._storeToApplicationLog(messageCategory.info, joinArguments(...arguments), '').then((result) => {
-          resolve(result);
-        }).catch((reason) => {
-          reject(reason);
-        });
-      });
-    };
+    //   return _this._queue.attach((resolve, reject) => {
+    //     return _this._storeToApplicationLog(messageCategory.info, joinArguments(...arguments), '').then((result) => {
+    //       resolve(result);
+    //     }).catch((reason) => {
+    //       reject(reason);
+    //     });
+    //   });
+    // };
 
     // Extend Ember.Logger.debug logic.
-    let originalEmberLoggerDebug = Ember.Logger.debug;
+    let originalEmberLoggerDebug = console.debug;
     originalMethodsCache.pushObject({
-      methodOwner: Ember.Logger,
+      methodOwner: console,
       methodName: 'debug',
       methodReference: originalEmberLoggerDebug
     });
 
-    Ember.Logger.debug = function() {
-      originalEmberLoggerDebug(...arguments);
-
-      return _this._queue.attach((resolve, reject) => {
-        return _this._storeToApplicationLog(messageCategory.debug, joinArguments(...arguments), '').then((result) => {
-          resolve(result);
-        }).catch((reason) => {
-          reject(reason);
-        });
-      });
-    };
+    // Ember.Logger.debug = function() {
+    //   originalEmberLoggerDebug(...arguments);
+
+    //   return _this._queue.attach((resolve, reject) => {
+    //     return _this._storeToApplicationLog(messageCategory.debug, joinArguments(...arguments), '').then((result) => {
+    //       resolve(result);
+    //     }).catch((reason) => {
+    //       reject(reason);
+    //     });
+    //   });
+    // };
 
     this.set('_originalMethodsCache', originalMethodsCache);
   },
diff --git a/tests/acceptance/components/flexberry-groupedit/flexberry-groupedit-sort-test.js b/tests/acceptance/components/flexberry-groupedit/flexberry-groupedit-sort-test.js
index 6add4c3efd..1a77270e8e 100644
--- a/tests/acceptance/components/flexberry-groupedit/flexberry-groupedit-sort-test.js
+++ b/tests/acceptance/components/flexberry-groupedit/flexberry-groupedit-sort-test.js
@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { A } from '@ember/array';
+import { run } from '@ember/runloop';
 import { module, skip } from 'qunit';
 import startApp from '../../../helpers/start-app';
 
@@ -19,15 +20,15 @@ module('Acceptance | flexberry-groupedit | ' + testName, {
   },
 
   afterEach() {
-    Ember.run(app, 'destroy');
+    run(app, 'destroy');
   }
 });
 
 skip(testName, (assert) => {
   assert.expect(78);
-  let recordArray = new Ember.A();
+  let recordArray = new A();
 
-  Ember.run(() => {
+  run(() => {
     recordArray.insertAt(0, store.createRecord(
       'ember-flexberry-dummy-suggestion',
       {
@@ -129,7 +130,7 @@ skip(testName, (assert) => {
     specialArrayCompare(sortResult, [1, 3, 4, 5, 2], assert, 'sortRecords | partial sort | desc');
   }
   finally {
-    Ember.run(() => {
+    run(() => {
       recordArray.forEach(currentRecord => {
         store.deleteRecord(currentRecord);
       });
diff --git a/tests/acceptance/components/flexberry-objectlistview/folv-user-settings-test.js b/tests/acceptance/components/flexberry-objectlistview/folv-user-settings-test.js
index f0f3485f18..6e90f5a131 100644
--- a/tests/acceptance/components/flexberry-objectlistview/folv-user-settings-test.js
+++ b/tests/acceptance/components/flexberry-objectlistview/folv-user-settings-test.js
@@ -1,4 +1,6 @@
-import Ember from 'ember';
+import { set } from '@ember/object';
+import { run } from '@ember/runloop';
+import $ from 'jquery';
 import { module, test } from 'qunit';
 import startApp from '../../../helpers/start-app';
 import { deleteRecords, addRecords } from './folv-tests-functions';
@@ -27,13 +29,13 @@ module('Acceptance | flexberry-objectlistview | per page user settings', {
     store = app.__container__.lookup('service:store');
     route = app.__container__.lookup('route:components-acceptance-tests/flexberry-objectlistview/folv-user-settings');
     userService = app.__container__.lookup('service:user-settings')
-    Ember.set(userService, 'isUserSettingsServiceEnabled', true);
+    set(userService, 'isUserSettingsServiceEnabled', true);
   },
 
   afterEach() {
     // Destroy application.
-    Ember.set(userService, 'isUserSettingsServiceEnabled', true);
-    Ember.run(app, 'destroy');
+    set(userService, 'isUserSettingsServiceEnabled', true);
+    run(app, 'destroy');
   }
 });
 
@@ -49,7 +51,7 @@ test('check saving of user settings', function(assert) {
   route.set('developerUserSettings', { FOLVPagingObjectListView: { DEFAULT: { colsOrder: [ { propName: 'name' } ], perPage: 28 } } });
 
   // Add records for paging.
-  Ember.run(() => {
+  run(() => {
     addRecords(store, modelName, uuid).then(function(resolvedPromises) {
       assert.ok(resolvedPromises, 'All records saved.');
       let done = assert.async();
@@ -139,10 +141,10 @@ function checkWithDisabledUserSettings(assert, asyncDone, uuid) {
     andThen(function() {
       assert.equal(currentPath(), pathHelp);
       route.set('developerUserSettings', { FOLVPagingObjectListView: { DEFAULT: { colsOrder: [ { propName: 'name' } ], perPage: 11 } } });
-      Ember.set(userService, 'isUserSettingsServiceEnabled', false);
+      set(userService, 'isUserSettingsServiceEnabled', false);
 
       // Remove current saved not in Database settings.
-      Ember.set(userService, 'currentUserSettings', {});
+      set(userService, 'currentUserSettings', {});
 
       let done1 = assert.async();
       visit(path);   
@@ -155,7 +157,7 @@ function checkWithDisabledUserSettings(assert, asyncDone, uuid) {
         } catch(error) {
           throw error;
         } finally {
-          Ember.set(userService, 'isUserSettingsServiceEnabled', true);
+          set(userService, 'isUserSettingsServiceEnabled', true);
           deleteRecords(store, modelName, uuid, assert);
           deleteUserSetting(assert);
           done1();
@@ -175,14 +177,14 @@ function checkWithDisabledUserSettings(assert, asyncDone, uuid) {
 // Function to check current perPage value on page.
 function checkPaging(assert, expectedCount) {
   // check paging.
-  let $perPageElement = Ember.$('div.flexberry-dropdown div.text');
+  let $perPageElement = $('div.flexberry-dropdown div.text');
   assert.equal($perPageElement.length, 1, "Элемент количества записей на странице найден.");
   assert.equal($perPageElement.text(), expectedCount, `Количество элементов на странице равно заданному: ${expectedCount}.`)
 }
 
 // Function for deleting user settings from database.
 function deleteUserSetting(assert) {
-  Ember.run(() => {
+  run(() => {
     let done = assert.async();
     userService._getExistingSettings("FOLVPagingObjectListView", "DEFAULT").then(
       foundRecords => {
diff --git a/tests/dummy/app/controllers/log-service-examples/settings-example.js b/tests/dummy/app/controllers/log-service-examples/settings-example.js
index b2a970a90d..260088c914 100644
--- a/tests/dummy/app/controllers/log-service-examples/settings-example.js
+++ b/tests/dummy/app/controllers/log-service-examples/settings-example.js
@@ -1,4 +1,6 @@
-import Ember from 'ember'; //TODO Import Module. Replace Ember.generateGuid, Ember.Logger
+import Ember from 'ember'; //TODO Import Module. Replace Ember.Logger
+// import { generateGuid } from '@ember/object/internals';
+import generateUniqueId from 'ember-flexberry-data/utils/generate-unique-id';
 import { computed } from '@ember/object';
 import RSVP from 'rsvp';
 import { deprecate } from '@ember/application/deprecations';
@@ -249,7 +251,7 @@ export default ApplicationLogListFormController.extend({
     @private
   */
   _generateUniqueMessagePrefix() {
-    return '№' + Ember.generateGuid(null, '') + ': ';
+    return '№' + generateUniqueId() + ': ';
   },
 
   /**
diff --git a/tests/dummy/app/locales/en/translations.js b/tests/dummy/app/locales/en/translations.js
index 4b10b55526..564e67ba55 100644
--- a/tests/dummy/app/locales/en/translations.js
+++ b/tests/dummy/app/locales/en/translations.js
@@ -713,12 +713,12 @@ $.extend(true, translations, {
         'throw-exception-button-message': 'Exception thrown',
         'reject-rsvp-promise-button-message': 'Promise rejected',
         'ember-assert-button-message': 'assert called',
-        'ember-logger-error-button-message': 'Ember.Logger.error called',
-        'ember-logger-warn-button-message': 'Ember.warn called',
-        'ember-deprecate-button-message': 'Ember.deprecate called',
-        'ember-logger-log-button-message': 'Ember.Logger.log called',
-        'ember-logger-info-button-message': 'Ember.Logger.info called',
-        'ember-logger-debug-button-message': 'Ember.debug called'
+        'ember-logger-error-button-message': 'console.error called',
+        'ember-logger-warn-button-message': 'console.warn called',
+        'ember-deprecate-button-message': 'console.deprecate called',
+        'ember-logger-log-button-message': 'console.log called',
+        'ember-logger-info-button-message': 'console.info called',
+        'ember-logger-debug-button-message': 'console.debug called'
       }
     },
 
diff --git a/tests/dummy/app/locales/ru/translations.js b/tests/dummy/app/locales/ru/translations.js
index 476564ff31..97097b3663 100644
--- a/tests/dummy/app/locales/ru/translations.js
+++ b/tests/dummy/app/locales/ru/translations.js
@@ -713,12 +713,12 @@ $.extend(true, translations, {
         'throw-exception-button-message': 'Брошено исключение',
         'reject-rsvp-promise-button-message': 'Promise отклонен',
         'ember-assert-button-message': 'Вызван метод assert',
-        'ember-logger-error-button-message': 'Вызван метод Ember.Logger.error',
-        'ember-logger-warn-button-message': 'Вызван метод Ember.warn',
-        'ember-deprecate-button-message': 'Вызван метод Ember.deprecate',
-        'ember-logger-log-button-message': 'Вызван метод Ember.Logger.log',
-        'ember-logger-info-button-message': 'Вызван метод Ember.Logger.info',
-        'ember-logger-debug-button-message': 'Вызван метод Ember.debug'
+        'ember-logger-error-button-message': 'Вызван метод console.error',
+        'ember-logger-warn-button-message': 'Вызван метод console.warn',
+        'ember-deprecate-button-message': 'Вызван метод console.deprecate',
+        'ember-logger-log-button-message': 'Вызван метод console.log',
+        'ember-logger-info-button-message': 'Вызван метод console.info',
+        'ember-logger-debug-button-message': 'Вызван метод console.debug'
       }
     },
 
diff --git a/tests/dummy/app/models/ember-flexberry-dummy-application-user.js b/tests/dummy/app/models/ember-flexberry-dummy-application-user.js
index 6bb2cf023c..17af164da9 100644
--- a/tests/dummy/app/models/ember-flexberry-dummy-application-user.js
+++ b/tests/dummy/app/models/ember-flexberry-dummy-application-user.js
@@ -1,4 +1,3 @@
-import Ember from 'ember';
 import DS from 'ember-data';
 import EmberValidations from 'ember-validations';
 import EmberFlexberryDataModel from 'ember-flexberry-data/models/model';
diff --git a/tests/integration/components/flexberry/validation-summary-test.js b/tests/integration/components/flexberry/validation-summary-test.js
index a1819d0868..c8e948dd04 100644
--- a/tests/integration/components/flexberry/validation-summary-test.js
+++ b/tests/integration/components/flexberry/validation-summary-test.js
@@ -1,9 +1,8 @@
-import Ember from 'ember';
+import { A } from '@ember/array';
+import { run } from '@ember/runloop';
 import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
-const { A, run } = Ember;
-
 // eslint-disable-next-line ember/no-test-module-for
 moduleForComponent('flexberry/validation-summary', 'Integration | Component | flexberry/validation-summary', {
   integration: true
diff --git a/tests/unit/services/compatibility-validations-test.js b/tests/unit/services/compatibility-validations-test.js
index e261a826a9..2c85d86d9a 100644
--- a/tests/unit/services/compatibility-validations-test.js
+++ b/tests/unit/services/compatibility-validations-test.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { get } from '@ember/object';
 import { module, test } from 'qunit';
 
 import absence from 'ember-validations/validators/local/absence';
@@ -15,8 +15,6 @@ import CompatibilityValidationsService from 'ember-flexberry/services/compatibil
 
 import startApp from '../../helpers/start-app';
 
-const { get } = Ember;
-
 module('Unit | Service | compatibility-validations', function() {
   test('it works', function(assert) {
     const app = startApp();
diff --git a/tests/unit/services/device-test.js b/tests/unit/services/device-test.js
index bab0ef356b..a86c730ef8 100644
--- a/tests/unit/services/device-test.js
+++ b/tests/unit/services/device-test.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import { getOwner } from '@ember/application';
 import { module, test } from 'qunit';
 import sinon from 'sinon';
 import DeviceService from 'ember-flexberry/services/device';
@@ -10,7 +11,7 @@ module('Unit | Service | device', {
   },
   afterEach() {
     // eslint-disable-next-line ember/new-module-imports
-    Ember.getOwner.restore();
+    getOwner.restore();
   }
 });
 
diff --git a/tests/unit/services/user-settings-test.js b/tests/unit/services/user-settings-test.js
index 6f3a428785..9a216aaa54 100644
--- a/tests/unit/services/user-settings-test.js
+++ b/tests/unit/services/user-settings-test.js
@@ -2,6 +2,7 @@ import { module, test } from 'qunit';
 import sinon from 'sinon';
 import UserSettingsService from 'ember-flexberry/services/user-settings';
 import Ember from 'ember';
+import { getOwner } from '@ember/application';
 
 module('Unit | Service | userSettings',
 {
@@ -13,7 +14,7 @@ module('Unit | Service | userSettings',
       factoryFor: () =>({ class: { APP: {} }})
       })},
   afterEach() {
-     Ember.getOwner.restore();}
+     getOwner.restore();}
 });