Merge remote-tracking branch 'origin/master' into develar/is

diff --cc platform/core-api/core-api.iml
index 134b04215cc5d673574b8253a1ccf95a16f10b1b,0877129ba99ffc09a69151752761edab8d141293..9c4912acf281a1a87fa4ab5c23bd661b6b41d36b
--- 1/platform/core-api/core-api.iml
--- 2/platform/core-api/core-api.iml
+++ b/platform/core-api/core-api.iml
@@@ -23,8 -23,6 +23,7 @@@
          <SOURCES />
        </library>
      </orderEntry>
-     <orderEntry type="library" name="asm" level="project" />
      <orderEntry type="library" name="CGLIB" level="project" />
 +    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
    </component>
  </module>

diff --cc platform/util/resources/misc/registry.properties
Simple merge