Merge changes Ida110947,I8289c8b2

* changes:
  The great formatting
  Fix eslint errors